aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3137 from prototech/ticket/13209Marc Alexander2014-11-132-2/+14
|\ | | | | | | [ticket/13209] Fix loss of CPF language field values when switching steps
| * [ticket/13209] Gather language field values for boolean CPF's in all steps.Cesar G2014-11-111-1/+1
| | | | | | | | | | | | | | The user can move back and forth between all three steps and as such the lang field data should be expected in all steps. PHPBB3-13209
| * [ticket/13209] Fix expected request value of CPF language fields.Cesar G2014-11-111-1/+13
| | | | | | | | | | | | Multiple languages can be edited, thus the expected value is an array. PHPBB3-13209
* | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-11-120-0/+0
|\ \
| * \ Merge pull request #3142 from bantu/ticket/13331Joas Schilling2014-11-124-42/+69
| |\ \ | | | | | | | | | | | | [ticket/13331] Use docs target for this branch, add docs-all for all branches
* | \ \ Merge pull request #3143 from bantu/ticket/13331-ascraeusJoas Schilling2014-11-125-36/+39
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13331] Use docs target for this branch, add docs-all for all branches
| * | | | [ticket/13331] Remove travis/sami.conf.php. Use build/sami-checkout.conf.php.Andreas Fischer2014-11-122-20/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13331
| * | | | Merge pull request #3142 from bantu/ticket/13331Andreas Fischer2014-11-123-16/+38
| |\ \ \ \ |/ / / / / | | | _ / | | | / | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13331] Use docs target for this branch, add docs-all for all branches * bantu/ticket/13331: [ticket/13331] Use docs target for this branch, add docs-all for dev branches. Conflicts: build/build.xml build/sami-checkout.conf.php
| * | | [ticket/13331] Use docs target for this branch, add docs-all for dev branches.Andreas Fischer2014-11-123-20/+51
| | | | | | | | | | | | | | | | PHPBB3-13331
* | | | Merge pull request #3139 from prototech/ticket/13239Marc Alexander2014-11-121-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13239] Ensure "Add files" button position is correctly calculated.
| * | | | [ticket/13239] Ensure "Add files" button position is correctly calculated.Cesar G2014-11-111-0/+8
| | |_|/ | |/| | | | | | | | | | PHPBB3-13239
* | | | Merge branch 'develop-olympus' into develop-ascraeusTristan Darricau2014-11-111-22/+18
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * develop-olympus: [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.
| * | | Merge pull request #3133 from bantu/ticket/13324Tristan Darricau2014-11-111-22/+18
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location * bantu/ticket/13324: [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.
| | * | [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.Andreas Fischer2014-11-111-22/+18
| |/ / | | | | | | | | | PHPBB3-13324
* | | Merge pull request #3112 from Elsensee/ticket/13083Tristan Darricau2014-11-111-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13083] Fix language string NO_ENTRIES for logs * Elsensee/ticket/13083: [ticket/13083] Fix language string NO_ENTRIES for logs
| * | | [ticket/13083] Fix language string NO_ENTRIES for logsOliver Schramm2014-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The string was misleading because there does not always have to be a period when viewing log entries. PHPBB3-13083
* | | | Merge pull request #3113 from prototech/ticket/13251Marc Alexander2014-11-091-10/+18
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13251] Escape container parameters defined from config.php.
| * | | | [ticket/13251] Escape container parameters defined from config.php.Cesar G2014-11-071-10/+18
| | | | | | | | | | | | | | | | | | | | PHPBB3-13251
* | | | | Merge pull request #3121 from Elsensee/ticket/13300Joas Schilling2014-11-093-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13300] Don't show jabber in profile if jabber is disabled
| * | | | | [ticket/13300] Don't show jabber in profile if jabber is disabledOliver Schramm2014-11-093-4/+4
| | |_|_|/ | |/| | | | | | | | | | | | | PHPBB3-13300
* | | | | Merge pull request #3120 from Elsensee/ticket/13301Marc Alexander2014-11-091-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13301] Fix called function in apche auth module
| * | | | | [ticket/13301] Fix called function in apche auth moduleOliver Schramm2014-11-091-2/+2
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13301
* | | | | Merge pull request #3119 from Elsensee/ticket/13243Marc Alexander2014-11-091-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | [ticket/13243] Validate announcement entry for existence in version_helper
| * | | | [ticket/13243] Validate announcement entry for existence in version_helperOliver Schramm2014-11-091-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-13243
* | | | Merge pull request #3110 from Elsensee/ticket/13242Joas Schilling2014-11-091-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13242] Fix HTML validity
| * | | | [ticket/13242] Fix HTML validityOliver Schramm2014-11-051-0/+1
| | |/ / | |/| | | | | | | | | | PHPBB3-13242
* | | | Merge remote-tracking branch 'Elsensee/ticket/13265' into develop-ascraeusCesar G2014-11-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/13265: [ticket/13265] Don't show link to edit own profile to those without permission
| * | | | [ticket/13265] Don't show link to edit own profile to those without permissionOliver Schramm2014-11-051-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-13265
* | | | Merge pull request #3118 from prototech/ticket/13270Tristan Darricau2014-11-071-0/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12. * prototech/ticket/13270: [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12.
| * | | | [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12.Cesar G2014-11-071-0/+31
| | |/ / | |/| | | | | | | | | | PHPBB3-13270
* | | | Merge pull request #3117 from prototech/ticket/13303Tristan Darricau2014-11-071-1/+9
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | [ticket/13303] Speed up migration dependency calculation. * prototech/ticket/13303: [ticket/13303] Speed up migration dependency calculation.
| * | | [ticket/13303] Speed up migration dependency calculation.Cesar G2014-11-071-1/+9
|/ / / | | | | | | | | | PHPBB3-13303
* | | Merge pull request #3107 from marc1706/ticket/13280Tristan Darricau2014-11-074-12/+38
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13280] Properly format the current page and add sanitizer to tests * marc1706/ticket/13280: [ticket/13280] Remove unneeded str_replace in build_url() [ticket/13280] Only run sanitizer for server superglobal and modify tests [ticket/13280] Seperate server sanitizer call and add comment [ticket/13280] Add additional sanitizer for ampersands in server superglobal [ticket/13280] Correctly format user page for build_url() [ticket/13280] Properly format the current page and add sanitizer to tests
| * | [ticket/13280] Remove unneeded str_replace in build_url()Marc Alexander2014-11-061-1/+1
| | | | | | | | | | | | PHPBB3-13280
| * | [ticket/13280] Only run sanitizer for server superglobal and modify testsMarc Alexander2014-11-042-4/+9
| | | | | | | | | | | | PHPBB3-13280
| * | [ticket/13280] Seperate server sanitizer call and add commentMarc Alexander2014-11-041-0/+2
| | | | | | | | | | | | PHPBB3-13280
| * | [ticket/13280] Add additional sanitizer for ampersands in server superglobalMarc Alexander2014-11-033-10/+14
| | | | | | | | | | | | PHPBB3-13280
| * | [ticket/13280] Correctly format user page for build_url()Marc Alexander2014-11-032-2/+10
| | | | | | | | | | | | PHPBB3-13280
| * | [ticket/13280] Properly format the current page and add sanitizer to testsMarc Alexander2014-11-032-11/+18
|/ / | | | | | | PHPBB3-13280
* | Merge branch 'prep-release-3.1.1' into develop-ascraeusNils Adermann2014-11-0223-29/+245
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.1: [ticket/13271] Disable CC sender feature for anonymous users [prep-release-3.1.1] Add 3.1.1 CHANGELOG [prep-release-3.1.1] Add 3.1.1 migration file [ticket/13263] Make sure default style exists and clean up code [ticket/13263] Only install/set prosilver if no style available [ticket/13263] Use prosilver as default style if user's style doesn't exist [ticket/security-164] Correctly format page_name [ticket/security-164] Sanitize all global variables in symfony_request class [ticket/13248] Use functional framework login method in tests [ticket/13248] Correctly pass provider name [ticket/13248] Always use provider collection for getting provider [ticket/13248] Allow specifying different auth provider in provider collection [ticket/13248] Use auth provider collection for getting provider [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1 [ticket/13267] Update Automatic Update instructions to include vendor directory [ticket/13268] Properly append ternary result in get_existing_indexes() [prep-release-3.1.1] Update version number to 3.1.1 Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| * \ Merge remote-tracking branch 'github-security/ticket/security-164-alt' into ↵Nils Adermann2014-11-022-1/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.1.1 * github-security/ticket/security-164-alt: [ticket/security-164] Correctly format page_name [ticket/security-164] Sanitize all global variables in symfony_request class
| | * | [ticket/security-164] Correctly format page_nameMarc Alexander2014-11-011-1/+1
| | | | | | | | | | | | | | | | SECURITY-164
| | * | [ticket/security-164] Sanitize all global variables in symfony_request classMarc Alexander2014-11-011-0/+3
| | | | | | | | | | | | | | | | SECURITY-164
| * | | Merge branch 'ticket/13271' into prep-release-3.1.1Nils Adermann2014-11-023-1/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/13271: [ticket/13271] Disable CC sender feature for anonymous users
| | * | | [ticket/13271] Disable CC sender feature for anonymous usersNils Adermann2014-11-023-1/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-13271
| * | | | [prep-release-3.1.1] Add 3.1.1 CHANGELOGNils Adermann2014-11-021-0/+19
| | | | |
| * | | | [prep-release-3.1.1] Add 3.1.1 migration fileNils Adermann2014-11-021-0/+32
| | | | |
| * | | | Merge remote-tracking branch 'github-marc1706/ticket/13263' into ↵Nils Adermann2014-11-011-0/+136
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.1.1 * github-marc1706/ticket/13263: [ticket/13263] Make sure default style exists and clean up code [ticket/13263] Only install/set prosilver if no style available [ticket/13263] Use prosilver as default style if user's style doesn't exist
| | * | | | [ticket/13263] Make sure default style exists and clean up codeMarc Alexander2014-11-011-47/+12
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13263
| | * | | | [ticket/13263] Only install/set prosilver if no style availableMarc Alexander2014-11-011-28/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users that have a nonexistent style selectd will revert back to the default style. PHPBB3-13263
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 06:03:11 +0000