aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Joas Schilling2016-01-095-3/+50
|\ | | | | | | | | | | | | Conflicts: build/build.xml phpBB/docs/CHANGELOG.html phpBB/includes/acp/acp_bbcodes.php
| * Merge branch 'prep-release-3.1.7' into 3.1.xJoas Schilling2016-01-095-4/+51
| |\ | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| | * [prep-release-3.1.7] Add changelog for 3.1.7-pl1Joas Schilling2016-01-091-0/+12
| | |
| | * [prep-release-3.1.7] Add migration for 3.1.7-pl1Joas Schilling2016-01-091-0/+31
| | |
| | * [prep-release-3.1.7] Update version to 3.1.7-pl1Joas Schilling2016-01-093-4/+4
| | |
| | * Merge pull request #24 from phpbb/ticket/security-188Joas Schilling2016-01-092-2/+6
| | |\ | | | | | | | | | | | | [ticket/security-188] Check form key in acp_bbcodes
| | | * [ticket/security-188] Remove unused form key from acp_extensionsMarc Alexander2015-12-231-2/+0
| | | | | | | | | | | | | | | | SECURITY-188
| | | * [ticket/security-188] Check form key in acp_bbcodesMarc Alexander2015-12-231-0/+6
| | | | | | | | | | | | | | | | SECURITY-188
| | * | [ticket/14343] Added missing $phpbb_dispatcherkasimi2016-01-091-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14343
* | | | Merge pull request #4058 from marc1706/ticket/13454Tristan Darricau2016-01-09106-454/+240
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13454] Remove unused variables, globals, and parameters * marc1706/ticket/13454: [ticket/13454] Add excessively removed code back [ticket/13454] Remove more unused variables [ticket/13454] Remove double semi-colons [ticket/13454] Remove unused variables [ticket/13454] Fix code sniffer complaints [ticket/13454] Fix a few issues introduced by overdeleting stuff [ticket/13454] Remove unused variables [ticket/13454] Remove unused variables [ticket/13454] Remove unused variables [ticket/13454] Remove unused variables
| * | | | [ticket/13454] Add excessively removed code backMarc Alexander2016-01-065-3/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-13454
| * | | | [ticket/13454] Remove more unused variablesMarc Alexander2016-01-0616-27/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should be the last part. Off to checking if the changes were correct. PHPBB3-13454
| * | | | [ticket/13454] Remove double semi-colonsMarc Alexander2016-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13454
| * | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-0632-134/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part 5 and there is more to come. PHPBB3-13454
| * | | | [ticket/13454] Fix code sniffer complaintsMarc Alexander2016-01-062-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13454
| * | | | [ticket/13454] Fix a few issues introduced by overdeleting stuffMarc Alexander2016-01-063-1/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-13454
| * | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-0635-78/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part 4 PHPBB3-13454
| * | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-065-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part 3 should fix tests up a little bit again. PHPBB3-13454
| * | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-0637-88/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part 2 of the pr. PHPBB3-13454
| * | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-0672-144/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first part of the changes. More to come. PHPBB3-13454
* | | | | Merge branch '3.1.x'Marc Alexander2016-01-090-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #4097 from Nicofuma/ticket/14382Marc Alexander2016-01-092-1/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14382] Specify the branch-alias in the composer.json files
* | \ \ \ \ Merge pull request #4098 from Nicofuma/ticket/14382-masterMarc Alexander2016-01-092-1/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14382] Specify the branch-alias in the composer.json files
| * | | | | | [ticket/14382] Specify the branch-alias in the composer.json filesTristan Darricau2016-01-092-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14382
| * | | | | | Merge branch 'ticket/14382' into ticket/14382-masterTristan Darricau2016-01-090-0/+0
| |\ \ \ \ \ \ |/ / / / / / / | | | _ / / / | | | / / / | | | | | | * ticket/14382: [ticket/14382] Specify the branch-alias in the composer.json files
| * | | | | [ticket/14382] Specify the branch-alias in the composer.json filesTristan Darricau2016-01-092-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14382
* | | | | | Merge branch '3.1.x'Oliver Schramm2016-01-081-2/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #4114 from marc1706/ticket/14396Oliver Schramm2016-01-081-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14396] Use VCHAR_UNI and correct depends_on() version
| | * | | | | [ticket/14396] Use VCHAR_UNI and correct depends_on() versionMarc Alexander2016-01-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14396
* | | | | | | Merge branch '3.1.x'Marc Alexander2016-01-081-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4115 from Elsensee/ticket/14397Marc Alexander2016-01-081-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | [ticket/14397] Fix @since tag in event 'core.ucp_prefs_view_after'
| | * | | | | [ticket/14397] Fix @since tag in event 'core.ucp_prefs_view_after'Oliver Schramm2016-01-081-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-14397
* | | | | | Merge branch '3.1.x'Marc Alexander2016-01-085-4/+39
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/ucp_prefs_personal.html
| * | | | | Merge pull request #4112 from marc1706/ticket/13180Marc Alexander2016-01-086-5/+40
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13180] Increase dateformat field size
| | * | | | | [ticket/13180] Increase dateformat field sizeSaeed Hubaishan2016-01-071-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove empty line as marc1706 guided PHPBB3-13180
| | * | | | | [ticket/13180] Increase dateformat field sizeSaeed Hubaishan2016-01-076-5/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13180] Increase dateformat field size change field size to 64 in these files add new migration file to update the database schema PHPBB3-13180
* | | | | | | Merge branch '3.1.x'Oliver Schramm2016-01-081-0/+43
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3924 from Senky/ticket/14190Oliver Schramm2016-01-081-0/+43
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14190] Add core.ucp_prefs_view_after event
| | * | | | | | [ticket/14190] Add core.ucp_prefs_view_after eventJakub Senko2015-10-121-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14190
* | | | | | | | Merge branch '3.1.x'Mate Bartus2016-01-086-1/+23
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14394] Only purge cache in functional tests if necessary
| * | | | | | | Merge pull request #4111 from marc1706/ticket/14394Máté Bartus2016-01-086-1/+23
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | [ticket/14394] Only purge cache in functional tests if necessary
| | * | | | | | [ticket/14394] Only purge cache in functional tests if necessaryMarc Alexander2016-01-076-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14394
* | | | | | | | Merge branch '3.1.x'Marc Alexander2016-01-072-0/+32
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/prosilver/template/viewtopic_body.html phpBB/styles/subsilver2/template/viewtopic_body.html
| * | | | | | | Merge pull request #4079 from rxu/ticket/14356Marc Alexander2016-01-073-2/+38
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | [ticket/14356] Add template events to viewtopic around back2top link
| | * | | | | | [ticket/14356] Add template events to viewtopic around back2top linkrxu2015-12-173-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14356
* | | | | | | | Merge pull request #4000 from Elsensee/ticket/14250Marc Alexander2016-01-0710-922/+697
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | [ticket/14250] Review/bump dependencies
| * | | | | | | [ticket/14250] Added symfony/debug as requirementOliver Schramm2016-01-062-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14250
| * | | | | | | [ticket/14250] Update symfony dev-requirements to stableOliver Schramm2016-01-052-36/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14250
| * | | | | | | [ticket/14250] Replace abandoned guzzle packagesOliver Schramm2016-01-042-162/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14250
| * | | | | | | [ticket/14250] Track version numbers instead of commit idOliver Schramm2016-01-042-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14250
generated by cgit v1.2.1 (git 2.21.0) at 2025-08-09 12:16:23 +0000