aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-181-1/+1
|\
| * Merge pull request #3154 from cyberalien/ticket/13349Marc Alexander2014-11-181-1/+1
| |\ | | | | | | | | | [ticket/13349] Fix breadcrumb arrow entity
| | * [ticket/13349] Fix breadcrumb arrow entitycyberalien2014-11-181-1/+1
| | | | | | | | | | | | PHPBB3-13349
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-181-0/+2
|\ \ \ | |/ /
| * | Merge pull request #3151 from nickvergessen/ticket/13298Marc Alexander2014-11-181-0/+2
| |\ \ | | | | | | | | | | | | [ticket/13298] Add missing $db->freeresult(); calls in functions_admin.php
| | * | [ticket/13298] Add missing $db->freeresult(); calls in functions_admin.phpJoas Schilling2014-11-171-0/+2
| | | | | | | | | | | | | | | | PHPBB3-13298
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-181-1/+2
|\ \ \ \ | |/ / /
| * | | Merge pull request #3152 from prototech/ticket/13277Marc Alexander2014-11-181-1/+2
| |\ \ \ | | |_|/ | |/| | | | | | [ticket/13277] Force IE to not cache AJAX requests.
| | * | [ticket/13277] Force IE to not cache AJAX requests.Cesar G2014-11-181-1/+2
| | |/ | | | | | | | | | | | | | | | | | | Caching causes problems, such as the inability to move a forum/CPF/module in the same direction by more than one row. PHPBB3-13277
* | | Merge branch 'develop-ascraeus' into developCesar G2014-11-182-0/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13023] Add template event posting_editor_buttons_custom_tags_before Conflicts: phpBB/styles/subsilver2/template/posting_buttons.html
| * | Merge remote-tracking branch 'Nicofuma/ticket/13023' into develop-ascraeusCesar G2014-11-183-11/+19
| |\ \ | | |/ | |/| | | | | | | * Nicofuma/ticket/13023: [ticket/13023] Add template event posting_editor_buttons_custom_tags_before
| | * [ticket/13023] Add template event posting_editor_buttons_custom_tags_beforeTristan Darricau2014-11-163-11/+19
| | | | | | | | | | | | PHPBB3-13023
* | | Merge branch 'develop-ascraeus' into developNils Adermann2014-11-167-30/+60
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13280] Output escaping for the symfony request object [ticket/13280] Add new tests [ticket/13280] Make the tests failing [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"
| * | Merge remote-tracking branch 'github-nicofuma/ticket/13280' into ↵Nils Adermann2014-11-167-30/+60
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nicofuma/ticket/13280: [ticket/13280] Output escaping for the symfony request object [ticket/13280] Add new tests [ticket/13280] Make the tests failing [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"
| | * | [ticket/13280] Output escaping for the symfony request objectTristan Darricau2014-11-167-24/+62
| | | | | | | | | | | | | | | | PHPBB3-13280
| | * | [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"Tristan Darricau2014-11-122-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a1b58d05d158ff7afd789c1b27821e17198f8d58, reversing changes made to 0e772afb9db640e54e84cfccaddcf74f3edbb3fb. PHPBB3-13280
* | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-161-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13332] Fix auth provider tests [ticket/13332] Remove useless $result assignment [ticket/13332] Pass user row to passwords manager check method
| * | | Merge pull request #3136 from marc1706/ticket/13332Tristan Darricau2014-11-161-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13332] Pass user row to passwords manager check method * marc1706/ticket/13332: [ticket/13332] Fix auth provider tests [ticket/13332] Remove useless $result assignment [ticket/13332] Pass user row to passwords manager check method
| | * | | [ticket/13332] Remove useless $result assignmentMarc Alexander2014-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13332
| | * | | [ticket/13332] Pass user row to passwords manager check methodMarc Alexander2014-11-111-2/+2
| | |/ / | | | | | | | | | | | | PHPBB3-13332
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-131-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #3125 from lavigor/ticket/13318Marc Alexander2014-11-131-1/+1
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13318] login_username needs to have the multibyte parameter set to true
| | * | | [ticket/13318] login_username needs to have the multibyte parameter set to truelavigor2014-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for usernames with UTF-8 characters. PHPBB3-13318
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-132-2/+14
|\ \ \ \ \ | |/ / / /
| * | | | 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-ascraeus' into developMarc Alexander2014-11-121-0/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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-ascraeus' into developTristan Darricau2014-11-111-22/+18
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.
| * | | | 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.
| | * | | | [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.Andreas Fischer2014-11-111-22/+18
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13324
| | * | | | Merge pull request #3090 from Nicofuma/ticket/13234Joas Schilling2014-10-281-30/+39
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Ticket/13234
| | | * | | | [ticket/13234] Fix conditions and CSTristan Darricau2014-10-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13234
| | | * | | | [ticket/13234] Never allow autologin/remember me to modify the useridNils Adermann2014-10-271-31/+40
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents admin relogin with forced user id from overwriting remember me cookies PHPBB3-13234
* | | | | | [develop] Update / Fix composer.lock hash.Andreas Fischer2014-11-111-4/+10
| | | | | |
* | | | | | Merge pull request #1880 from nicolas-grekas/developTristan Darricau2014-11-1119-3121/+175
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [3.2] Rely on Intl and mbstring, use patchwork/utf8 as fallback * nicolas-grekas/develop: [feature/patchwork-utf8] Rely on mbstring, use patchwork/utf8 as fallback [feature/patchwork-utf8] Remove utf8_str_replace [feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallback
| * | | | | | [feature/patchwork-utf8] Rely on mbstring, use patchwork/utf8 as fallbackNicolas Grekas2014-11-081-516/+64
| | | | | | |
| * | | | | | [feature/patchwork-utf8] Remove utf8_str_replaceNicolas Grekas2014-11-082-51/+4
| | | | | | |
| * | | | | | [feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallbackNicolas Grekas2014-11-0818-2554/+107
| | | | | | |
* | | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-111-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13083] Fix language string NO_ENTRIES for logs
| * | | | | | 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 branch 'develop-ascraeus' into developMarc Alexander2014-11-091-10/+18
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 branch 'develop-ascraeus' into developJoas Schilling2014-11-093-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 17:07:07 +0000