aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4072 from marc1706/ticket/14344Tristan Darricau2015-12-082-0/+8
|\ | | | | | | | | | | | | [ticket/14344] Improve output of HTML errors trigged during install * marc1706/ticket/14344: [ticket/14344] Improve output of HTML errors trigged during install
| * [ticket/14344] Improve output of HTML errors trigged during installMarc Alexander2015-12-072-0/+8
| | | | | | | | PHPBB3-14344
* | Merge pull request #4073 from CHItA/ticket/14348Marc Alexander2015-12-081-0/+11
|\ \ | | | | | | | | | [ticket/14348] Add install/index.html
| * | [ticket/14348] Add install/index.htmlMate Bartus2015-12-081-0/+11
| |/ | | | | | | PHPBB3-14348
* | Merge pull request #4070 from VSEphpbb/ticket/14247Marc Alexander2015-12-0852-1120/+1120
|\ \ | |/ |/| | | [ticket/14247] Use quotes around @ and % strings in YAML
| * [ticket/14247] Use quotes around @ and % strings in YAMLMatt Friedman2015-12-0752-1120/+1120
|/ | | | PHPBB3-14247
* Merge branch '3.1.x'Tristan Darricau2015-12-073-45/+39
|\ | | | | | | | | | | * 3.1.x: [ticket/14261] Fix tests by removing old code. [ticket/14261] Move the update of session informations to page_footer()
| * Merge pull request #4008 from Zoddo/ticket/14261Tristan Darricau2015-12-073-45/+39
| |\ | | | | | | | | | | | | | | | | | | | | | [ticket/14261] Move the update of session informations to page_footer() * Zoddo/ticket/14261: [ticket/14261] Fix tests by removing old code. [ticket/14261] Move the update of session informations to page_footer()
| | * [ticket/14261] Fix tests by removing old code.Zoddo2015-10-281-9/+0
| | | | | | | | | | | | | | | | | | | | | This will obselete GH-4007 PHPBB3-14261 PHPBB3-13202
| | * [ticket/14261] Move the update of session informations to page_footer()Zoddo2015-10-273-45/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the unique way to disable the update of session_page is to pass "false" to the parameter of session_begin(). This method is directly called in app.php, so pages served from the routing system can't disable the update of session informations. By moving the update to page_footer, we can allow controllers to tell to the session manager that we don't want to update the session infos. PHPBB3-14261
* | | Merge branch '3.1.x'Tristan Darricau2015-12-071-1/+1
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/14346] Do not turn version red if update status is unknown
| * | Merge pull request #4069 from marc1706/ticket/14346Tristan Darricau2015-12-071-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14346] Do not turn version red if update status is unknown * marc1706/ticket/14346: [ticket/14346] Do not turn version red if update status is unknown
| | * | [ticket/14346] Do not turn version red if update status is unknownMarc Alexander2015-12-071-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14346
* | | | Merge branch '3.1.x'Tristan Darricau2015-12-070-0/+0
|\ \ \ \ | |/ / / | | | | | | | | * 3.1.x:
| * | | Merge pull request #4063 from marc1706/ticket/14339Tristan Darricau2015-12-073-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14339] Properly state PHP version support * marc1706/ticket/14339: [ticket/14339] Properly state PHP version support
* | \ \ \ Merge pull request #4064 from marc1706/ticket/14339-masterTristan Darricau2015-12-073-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14339] Properly state PHP version support * marc1706/ticket/14339-master: [ticket/14339] Specify that PHP 7.0 is supported instead of "prior versions" [ticket/14339] Properly state PHP version support
| * | | | | [ticket/14339] Specify that PHP 7.0 is supported instead of "prior versions"Marc Alexander2015-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14339
| * | | | | 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