aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge pull request #3285 from MGaetan89/ticket/13497Marc Alexander2015-02-133-15/+19
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13497] Change get_tables() calls with $db_tools->sql_list_tables()
| * | | | | | | | | | [ticket/13497] Update calls to `get_tables()`Gaëtan Muller2015-02-113-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13497
* | | | | | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2015-02-130-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| / / / / / / / / / | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusMarc Alexander2015-02-130-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| / / / / / / / | | |/ / / / / / / | | | | | | | | | | | | | | | | | | Conflicts: .travis.yml travis/phpunit-mysqli-travis.xml
| | * | | | | | | Merge pull request #3393 from bantu/ticket/13599Marc Alexander2015-02-133-70/+2
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13599] Remove Travis CI PHP 5.2 environment. No longer supported.
| | | * | | | | | | [ticket/13599] Remove Travis CI PHP 5.2 environment. No longer supported.Andreas Fischer2015-02-123-70/+2
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13599
* | | | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-02-117-14/+14
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13597] Modify variable-variable syntax to be compatible with PHP7
| * | | | | | | | Merge pull request #3391 from marc1706/ticket/13597Andreas Fischer2015-02-117-14/+14
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13597] Modify variable-variable syntax to be compatible with PHP7 * marc1706/ticket/13597: [ticket/13597] Modify variable-variable syntax to be compatible with PHP7
| | * | | | | | | [ticket/13597] Modify variable-variable syntax to be compatible with PHP7Marc Alexander2015-02-117-14/+14
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13597
* | | | | | | | Merge pull request #3332 from nickvergessen/ticket/10748-mssqlNicofuma2015-02-0922-605/+922
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10748] Split MS SQL from the db tools file into it's own
| * | | | | | | | [ticket/10748] Overwrite the type map correctlyJoas Schilling2015-02-072-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10748
| * | | | | | | | [ticket/10748] Replace direct creations of tools();Joas Schilling2015-02-0719-31/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10748
| * | | | | | | | [ticket/10748] Split MS SQL from the db tools file into it's ownJoas Schilling2015-02-073-574/+859
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10748
* | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-02-071-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3379 from Crizz0/ticket/13588Joas Schilling2015-02-071-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | [ticket/13588] Fixes wrong message in info fsockopen() disabled
| | * | | | | | [ticket/13588] Fixes wrong message in info fsockopen() disabledCrizzo2015-02-071-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13588
* | | | | | | Merge pull request #3207 from Nicofuma/ticket/13407Andreas Fischer2015-02-0417-218/+281
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13407] Update Symfony to 2.7.*@dev * Nicofuma/ticket/13407: [ticket/13407] Update composer.lock file [ticket/13407] Bump minimal version to php 5.3.9 [ticket/13407] Introduce a request_stack service [ticket/13407] Remove the last occurence of pattern in routing files [ticket/13407] Update Symfony to 2.7.*@dev
| * | | | | | | [ticket/13407] Update composer.lock fileNicofuma2015-02-041-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13407
| * | | | | | | [ticket/13407] Bump minimal version to php 5.3.9Nicofuma2015-02-0414-21/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13407
| * | | | | | | [ticket/13407] Introduce a request_stack serviceNicofuma2015-02-041-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13407
| * | | | | | | [ticket/13407] Remove the last occurence of pattern in routing filesNicofuma2015-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13407
| * | | | | | | [ticket/13407] Update Symfony to 2.7.*@devNicofuma2015-02-043-198/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13407
* | | | | | | | Merge pull request #3257 from MGaetan89/ticket/13455Andreas Fischer2015-02-0497-1078/+1071
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13455] Change request_var() calls with $request->variable() * MGaetan89/ticket/13455: [ticket/13455] Remove `request_var()` references from comments [ticket/13455] Remove unnecessary calls to `utf8_normalize_nfc()` [ticket/13455] Update calls to `request_var()`
| * | | | | | | [ticket/13455] Remove `request_var()` references from commentsGaëtan Muller2015-02-038-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13455
| * | | | | | | [ticket/13455] Remove unnecessary calls to `utf8_normalize_nfc()`Gaëtan Muller2015-02-0336-97/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13455
| * | | | | | | [ticket/13455] Update calls to `request_var()`Gaëtan Muller2015-02-0393-1068/+1061
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13455
* | | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-02-031-5/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13348] Remove unnecessary global $cache [ticket/13348] Use close method to free query result handle
| * | | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-02-030-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | * develop-olympus:
| | * | | | | Merge pull request #3365 from marc1706/ticket/13348-olympusAndreas Fischer2015-02-031-5/+7
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13348] Use close method to free query result handle * marc1706/ticket/13348-olympus: [ticket/13348] Remove unnecessary global $cache [ticket/13348] Use close method to free query result handle
| * | \ \ \ \ \ Merge pull request #3366 from marc1706/ticket/13348Andreas Fischer2015-02-031-5/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13348] Use close method to free feed query result handle * marc1706/ticket/13348: [ticket/13348] Remove unnecessary global $cache [ticket/13348] Use close method to free query result handle
| | * \ \ \ \ \ \ Merge branch 'ticket/13348-olympus' into ticket/13348Marc Alexander2015-02-031-5/+6
| | |\ \ \ \ \ \ \ | |/ / / / / / / / | | | | _ / / / / | | | | / / / / | | | | | | | | Conflicts: phpBB/feed.php
| | * | | | | | [ticket/13348] Remove unnecessary global $cacheMarc Alexander2015-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $cache is not used in the method get_item(). PHPBB3-13348
| | * | | | | | [ticket/13348] Use close method to free query result handleMarc Alexander2015-02-031-4/+6
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13348
* | | | | | | Merge pull request #3281 from MGaetan89/ticket/13496Andreas Fischer2015-02-0320-67/+52
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13496] Change set_config_count() calls with $config->increment() * MGaetan89/ticket/13496: [ticket/13496] Update calls to `set_config_count()`
| * | | | | | | [ticket/13496] Update calls to `set_config_count()`Gaëtan Muller2015-02-0220-67/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13496
* | | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-02-033-0/+72
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13538] Add tests for double nested pagination loop [ticket/13538] Fix tests for pagination in nested loop [ticket/13538] Add test for pagination in nested loop
| * | | | | | | Merge pull request #3328 from marc1706/ticket/13538Andreas Fischer2015-02-033-0/+72
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13538] Add tests for pagination in nested loops * marc1706/ticket/13538: [ticket/13538] Add tests for double nested pagination loop [ticket/13538] Fix tests for pagination in nested loop [ticket/13538] Add test for pagination in nested loop
| | * | | | | | | [ticket/13538] Add tests for double nested pagination loopMarc Alexander2015-01-242-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13538
| | * | | | | | | [ticket/13538] Fix tests for pagination in nested loopMarc Alexander2015-01-242-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13538
| | * | | | | | | [ticket/13538] Add test for pagination in nested loopMarc Alexander2015-01-232-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13538
* | | | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-02-036-2/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13569] Add missing sql_freeresults and remove unneeded results
| * | | | | | | | Merge pull request #3361 from marc1706/ticket/13569Andreas Fischer2015-02-036-2/+7
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13569] Add missing sql_freeresults and remove unneeded results * marc1706/ticket/13569: [ticket/13569] Add missing sql_freeresults and remove unneeded results
| | * | | | | | | | [ticket/13569] Add missing sql_freeresults and remove unneeded resultsMarc Alexander2015-02-026-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13569
* | | | | | | | | | Merge pull request #3028 from Nicofuma/ticket/13139Andreas Fischer2015-02-034-18/+23
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13139] Update Twig to 1.18.0 * Nicofuma/ticket/13139: [ticket/13139] Fix tests [ticket/13139] Update Twig to 1.8.0 [ticket/13139] Update Twig to 1.16.2
| * | | | | | | | | | [ticket/13139] Fix testsNicofuma2015-02-032-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13139
| * | | | | | | | | | [ticket/13139] Update Twig to 1.8.0Nicofuma2015-02-031-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13139
| * | | | | | | | | | [ticket/13139] Update Twig to 1.16.2Tristan Darricau2015-02-032-9/+14
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13139
* | | | | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-02-031-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13572] Update composer to version 1.0.0-alpha9
| * | | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-02-031-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/13572] Update composer to version 1.0.0-alpha9
| | * | | | | | | | Merge pull request #3363 from Nicofuma/ticket/13572Andreas Fischer2015-02-031-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13572] Update composer to version 1.0.0-alpha9 * Nicofuma/ticket/13572: [ticket/13572] Update composer to version 1.0.0-alpha9