aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ticket/14339' into ticket/14339-masterMarc Alexander2015-12-073-3/+3
|\ | | | | | | | | | | | | Conflicts: phpBB/composer.json phpBB/docs/INSTALL.html phpBB/docs/README.html
| * [ticket/14339] Properly state PHP version supportMarc Alexander2015-12-053-3/+3
| | | | | | | | PHPBB3-14339
* | Merge branch '3.1.x'Tristan Darricau2015-12-071-0/+16
|\ \ | | | | | | | | | | | | * 3.1.x: [ticket/14343] Add event when locking/unlocking posts/topics
| * \ Merge pull request #4066 from kasimi/ticket/14343Tristan Darricau2015-12-071-0/+16
| |\ \ | | |/ | |/| | | | | | | | | | | | | [ticket/14343] Add event when locking/unlocking posts/topics * kasimi/ticket/14343: [ticket/14343] Add event when locking/unlocking posts/topics
| | * [ticket/14343] Add event when locking/unlocking posts/topicskasimi2015-12-061-0/+16
| |/ | | | | | | PHPBB3-14343
* | Merge pull request #4068 from marc1706/ticket/14310Tristan Darricau2015-12-072-1/+2
|\ \ | | | | | | | | | | | | | | | | | | [ticket/14310] Put progress percentage inside span and make more visible * marc1706/ticket/14310: [ticket/14310] Put progress percentage inside span and make more visible
| * | [ticket/14310] Put progress percentage inside span and make more visibleMarc Alexander2015-12-072-1/+2
| | | | | | | | | | | | PHPBB3-14310
* | | Merge pull request #4067 from marc1706/ticket/14345Tristan Darricau2015-12-071-3/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | [ticket/14345] Check if description exists in message ary * marc1706/ticket/14345: [ticket/14345] Move new line to ternary comparison [ticket/14345] Check if description exists in message ary
| * | [ticket/14345] Move new line to ternary comparisonMarc Alexander2015-12-071-3/+3
| | | | | | | | | | | | PHPBB3-14345
| * | [ticket/14345] Check if description exists in message aryMarc Alexander2015-12-071-3/+6
|/ / | | | | | | PHPBB3-14345
* | Merge pull request #4046 from CHItA/ticket/14269Tristan Darricau2015-12-075-2/+147
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14269] Use http_exceptions in the installer instead of die() * CHItA/ticket/14269: [ticket/14269] Change HTTP status codes to 403 [ticket/14269] Fix comments and language var names [ticket/14269] Use http_exceptions in the installer instead of die()
| * | [ticket/14269] Change HTTP status codes to 403Mate Bartus2015-12-052-2/+2
| | | | | | | | | | | | PHPBB3-14269
| * | [ticket/14269] Fix comments and language var namesMate Bartus2015-12-034-6/+6
| | | | | | | | | | | | PHPBB3-14269
| * | [ticket/14269] Use http_exceptions in the installer instead of die()Mate Bartus2015-11-275-2/+147
| | | | | | | | | | | | PHPBB3-14269
* | | Merge pull request #4065 from michaelcullum/ticket/14341Tristan Darricau2015-12-063-125/+471
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14341] Update dependencies to Symfony 2.8 stable * michaelcullum/ticket/14341: [ticket/14341] Update dependencies to Symfony 2.8 stable
| * | | [ticket/14341] Update dependencies to Symfony 2.8 stableMichaelC2015-12-063-125/+471
|/ / / | | | | | | | | | PHPBB3-14341
* | | Merge pull request #4006 from brunoais/feature/sql-bool-builderTristan Darricau2015-12-052-37/+64
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [feature/sql-bool-builder] New syntax for DBAL query builder for boolean generation * brunoais/feature/sql-bool-builder: [feature/sql-bool-builder] Fixing misuse of LOGICAL_OP instead of STATEMENTS [feature/sql-bool-builder] Fixing typos in previous commit [feature/sql-bool-builder] Changing syntax pt3. Don't use magic numbers [feature/sql-bool-builder] Changing syntax pt2. Fix tests [feature/sql-bool-builder] Changing syntax
| * | | [feature/sql-bool-builder] Fixing misuse of LOGICAL_OP instead of STATEMENTSbrunoais2015-11-241-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13652
| * | | [feature/sql-bool-builder] Fixing typos in previous commitbrunoais2015-11-121-2/+2
| | | | | | | | | | | | | | | | PHPBB3-13652
| * | | [feature/sql-bool-builder] Changing syntax pt3. Don't use magic numbersbrunoais2015-11-111-15/+24
| | | | | | | | | | | | | | | | PHPBB3-13652
| * | | [feature/sql-bool-builder] Changing syntax pt2. Fix testsbrunoais2015-11-111-20/+38
| | | | | | | | | | | | | | | | PHPBB3-13652
| * | | [feature/sql-bool-builder] Changing syntaxbrunoais2015-11-111-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Changing the syntax used to the one Nicofuma suggested. PHPBB3-13652
* | | | Merge pull request #4005 from Elsensee/ticket/14257Tristan Darricau2015-12-0510-61/+647
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14257] Reparse after update * Elsensee/ticket/14257: [ticket/14257] Add tests for reparser manager [ticket/14257] Fix CLI reparser and set cron interval [ticket/14257] Fix CLI error message [ticket/14257] Fix phpdoc in CLI command [ticket/14257] Add text_reparser manager [ticket/14257] Use migrations instead of cron job for some reparsers [ticket/14257] Fix lock acquire in CLI command [ticket/14257] Fix if condition [ticket/14257] Add reparse_lock to CLI command [ticket/14257] Add cron tasks for reparsing text
| * | | | [ticket/14257] Add tests for reparser managerOliver Schramm2015-11-212-0/+124
| | | | | | | | | | | | | | | | | | | | PHPBB3-14257
| * | | | [ticket/14257] Fix CLI reparser and set cron intervalOliver Schramm2015-11-084-25/+22
| | | | | | | | | | | | | | | | | | | | PHPBB3-14257
| * | | | [ticket/14257] Fix CLI error messageOliver Schramm2015-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14257
| * | | | [ticket/14257] Fix phpdoc in CLI commandOliver Schramm2015-10-261-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14257
| * | | | [ticket/14257] Add text_reparser managerOliver Schramm2015-10-267-104/+195
| | | | | | | | | | | | | | | | | | | | PHPBB3-14257
| * | | | [ticket/14257] Use migrations instead of cron job for some reparsersOliver Schramm2015-10-252-52/+87
| | | | | | | | | | | | | | | | | | | | PHPBB3-14257
| * | | | [ticket/14257] Fix lock acquire in CLI commandOliver Schramm2015-10-251-22/+20
| | | | | | | | | | | | | | | | | | | | PHPBB3-14257
| * | | | [ticket/14257] Fix if conditionOliver Schramm2015-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14257
| * | | | [ticket/14257] Add reparse_lock to CLI commandOliver Schramm2015-10-243-16/+36
| | | | | | | | | | | | | | | | | | | | PHPBB3-14257
| * | | | [ticket/14257] Add cron tasks for reparsing textOliver Schramm2015-10-243-0/+321
| | | | | | | | | | | | | | | | | | | | PHPBB3-14257
* | | | | Merge branch '3.1.x'Tristan Darricau2015-12-050-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | * 3.1.x: [ticket/14334] Use phpbb_get_avatar() in user_loader
| * | | | Merge pull request #4057 from marc1706/ticket/14334Tristan Darricau2015-12-051-6/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14334] Use phpbb_get_avatar() in user_loader * marc1706/ticket/14334: [ticket/14334] Use phpbb_get_avatar() in user_loader
| | * | | | [ticket/14334] Use phpbb_get_avatar() in user_loaderMarc Alexander2015-12-031-6/+1
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-14334
* | | | | Merge pull request #4050 from nickvergessen/ticket/14317Tristan Darricau2015-12-052-13/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ticket/14317 Update language help files * nickvergessen/ticket/14317: [ticket/14317] Make it easier to change the language iso tag [ticket/14317] Run the script again
| * | | | | [ticket/14317] Make it easier to change the language iso tagJoas Schilling2015-11-281-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14317
| * | | | | [ticket/14317] Run the script againJoas Schilling2015-11-281-2/+2
| | |_|_|/ | |/| | | | | | | | | | | | | PHPBB3-14317
* | | | | Merge pull request #4060 from rxu/ticket/14340Tristan Darricau2015-12-051-4/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14340] Revert fix for segmentation fault error on phpBB 3.2 PHP7 tests * rxu/ticket/14340: [ticket/14340] Revert fix for segmentation fault error on phpBB 3.2 PHP7 tests
| * | | | | [ticket/14340] Revert fix for segmentation fault error on phpBB 3.2 PHP7 testsrxu2015-12-051-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix was introduces with #3826, now the PHP core bug has been fixed: https://bugs.php.net/bug.php?id=70249 PHPBB3-14340
* | | | | | Merge pull request #4061 from JoshyPHP/ticket/9791Tristan Darricau2015-12-052-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/9791] Added regression test * JoshyPHP/ticket/9791: [ticket/9791] Added regression test
| * | | | | | [ticket/9791] Added regression testJoshyPHP2015-12-052-0/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-9791
* | | | | | Merge pull request #4062 from JoshyPHP/ticket/13451Tristan Darricau2015-12-052-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13451] Added regression test * JoshyPHP/ticket/13451: [ticket/13451] Added regression test
| * | | | | [ticket/13451] Added regression testJoshyPHP2015-12-052-0/+2
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-13451
* | | | | Merge pull request #4051 from CHItA/ticket/14311Marc Alexander2015-12-031-1/+43
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14311] Show errors in installer invoked by trigger_error
| * | | | | [ticket/14311] Use the iohandler for notices and warnings if possibleMate Bartus2015-12-011-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14311
| * | | | | [ticket/14311] Show errors in installer invoked by trigger_errorMate Bartus2015-11-301-1/+31
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-14311
* | | | | Merge pull request #4055 from CHItA/ticket/14326Marc Alexander2015-12-032-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14326] Decode diffed file's content during update
| * | | | | [ticket/14326] Decode diffed file's content during updateMate Bartus2015-12-022-6/+6
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-14326