aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12716] Add regression testTristan Darricau2014-06-193-0/+47
| | | | PHPBB3-12716
* [ticket/12716] Add the missing parameters in the call of clearTokenTristan Darricau2014-06-151-1/+1
| | | | PHPBB3-12716
* Merge remote-tracking branch 'dhruvgoel92/ticket/12709' into develop-ascraeusCesar G2014-06-141-1/+1
|\ | | | | | | | | * dhruvgoel92/ticket/12709: [ticket/12709] Update plupload.full.min.js
| * [ticket/12709] Update plupload.full.min.jsDhruv2014-06-141-1/+1
|/ | | | | | The earlier js file was not returning the correct list of filesAdded PHPBB3-12709
* Merge pull request #2594 from bantu/ticket/12708Dhruv Goel2014-06-141-1/+1
|\ | | | | [ticket/12708] Fix install_main still linking to docs/COPYING
| * [ticket/12708] Make the path absolute by using __DIR__.Andreas Fischer2014-06-141-1/+1
| | | | | | | | PHPBB3-12708
| * [ticket/12708] Correct the path to the LICENSE file in install_main.Huynh Buu Tam2014-06-141-1/+1
| | | | | | | | PHPBB3-12708
* | Merge pull request #2583 from nickvergessen/ticket/12209Dhruv Goel2014-06-141-1/+1
|\ \ | |/ |/| [ticket/12209] Notify the admin that OAuth still allows DB authentification
| * [ticket/12209] Notify the admin that OAuth still allows DB authentificationJoas Schilling2014-06-131-1/+1
| | | | | | | | PHPBB3-12209
* | Merge pull request #2590 from bantu/ticket/12707Joas Schilling2014-06-141-1/+1
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12707] Do not try to load 3.1 DBMS driver name as 3.0 driver. * bantu/ticket/12707: [ticket/12707] Do not try to load 3.1 DBMS driver name as 3.0 driver.
| * | [ticket/12707] Do not try to load 3.1 DBMS driver name as 3.0 driver.Andreas Fischer2014-06-141-1/+1
| | | | | | | | | | | | PHPBB3-12707
* | | Merge pull request #2483 from Nicofuma/ticket/12575Andreas Fischer2014-06-142-3/+131
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12575] Use a proxy pattern in \phpbb\di\service_collection * Nicofuma/ticket/12575: [ticket/12575] Use strict comparison [ticket/12575] Add missing property [ticket/12575] Usethe new header [ticket/12575] Fix 2 typos in comments [ticket/12575] Fix typos in comments [ticket/12575] Skip sniffer issue triggered by the solution of a php bug [ticket/12575] Remove inline assignments [ticket/12575] Fix the tests [ticket/12575] Move service_collection_iterator to its own file [ticket/12575] Speed up load_class()
| * | | [ticket/12575] Use strict comparisonTristan Darricau2014-06-141-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12575
| * | | [ticket/12575] Add missing propertyTristan Darricau2014-06-141-1/+6
| | | | | | | | | | | | | | | | PHPBB3-12575
| * | | [ticket/12575] Usethe new headerTristan Darricau2014-06-141-5/+10
| | | | | | | | | | | | | | | | PHPBB3-12575
| * | | [ticket/12575] Fix 2 typos in commentsTristan Darricau2014-06-142-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12575
| * | | [ticket/12575] Fix typos in commentsTristan Darricau2014-06-142-4/+4
| | | | | | | | | | | | | | | | PHPBB3-12575
| * | | [ticket/12575] Skip sniffer issue triggered by the solution of a php bugTristan Darricau2014-06-142-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.php.net/bug.php?id=66834 https://bugs.php.net/bug.php?id=67067 PHPBB3-12575
| * | | [ticket/12575] Remove inline assignmentsTristan Darricau2014-06-142-3/+6
| | | | | | | | | | | | | | | | PHPBB3-12575
| * | | [ticket/12575] Fix the testsTristan Darricau2014-06-142-0/+16
| | | | | | | | | | | | | | | | PHPBB3-12575
| * | | [ticket/12575] Move service_collection_iterator to its own fileTristan Darricau2014-06-142-55/+65
| | | | | | | | | | | | | | | | PHPBB3-12575
| * | | [ticket/12575] Speed up load_class()Tristan Darricau2014-06-141-2/+77
| |/ / | | | | | | | | | | | | | | | | | | Load the services referenced in a service_collection only when they are used to avoid to load some unsuded services. PHPBB3-12575
* | | Merge pull request #2589 from nickvergessen/ticket/12706Andreas Fischer2014-06-141-0/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | Ticket/12706 Add languages styles and rank images to git ignore * nickvergessen/ticket/12706: [ticket/12706] Ignore additional rank images [ticket/12706] Ignore additional languages [ticket/12706] Ignore additional styles
| * | [ticket/12706] Ignore additional rank imagesJoas Schilling2014-06-141-0/+1
| | | | | | | | | | | | PHPBB3-12706
| * | [ticket/12706] Ignore additional languagesJoas Schilling2014-06-141-0/+2
| | | | | | | | | | | | PHPBB3-12706
| * | [ticket/12706] Ignore additional stylesJoas Schilling2014-06-141-0/+3
| | | | | | | | | | | | PHPBB3-12706
* | | Merge pull request #2527 from dhruvgoel92/ticket/11445Andreas Fischer2014-06-142-16/+57
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | [ticket/11445] optimize no of queries in get_global_subscriptions( ) * dhruvgoel92/ticket/11445: [ticket/11445] Move get user's notification code into its own method [ticket/11445] Remove unused foreach key $group_name [ticket/11445] Improve unit tests for get_global_subscriptions [ticket/11445] Optimize no of queries in get_global_subscriptions
| * | [ticket/11445] Move get user's notification code into its own methodDhruv2014-06-071-14/+29
| | | | | | | | | | | | PHPBB3-11445
| * | [ticket/11445] Remove unused foreach key $group_nameDhruv2014-06-071-1/+1
| | | | | | | | | | | | PHPBB3-11445
| * | [ticket/11445] Improve unit tests for get_global_subscriptionsDhruv2014-06-011-0/+21
| | | | | | | | | | | | PHPBB3-11445
| * | [ticket/11445] Optimize no of queries in get_global_subscriptionsDhruv2014-06-011-13/+18
| | | | | | | | | | | | PHPBB3-11445
* | | Merge pull request #2582 from bantu/ticket/12682Joas Schilling2014-06-131-10/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12682] Make Code Sniffer run properly on Travis CI again. * bantu/ticket/12682: [ticket/12682] Make Code Sniffer run properly on Travis CI again.
| * | | [ticket/12682] Make Code Sniffer run properly on Travis CI again.Andreas Fischer2014-06-131-10/+10
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | The --ignore parameter takes a case-insensitive pattern and as such 'phpBB/phpbb/*' matches any '/home/travis/build/phpbb/phpbb/...' file name. This results in nothing being checked against ruleset-php-legacy.xml. Using absolute paths in the --ignore pattern fixes this issues. PHPBB3-12682
* | | Merge pull request #2570 from Nicofuma/ticket/12687Andreas Fischer2014-06-132-58/+70
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12687] Add a constant to display the load time without DEBUG * Nicofuma/ticket/12687: [ticket/12687] Remove french spaces [ticket/12687] Display the number of cached queries [ticket/12687] Don't check if memory_get_peak_usage() exists [ticket/12687] Wrap $GLOBALS['starttime'] in a if [ticket/12687] Fix the namespace of $request [ticket/12687] Update doc block [ticket/12687] Use microtime(true) [ticket/12687] Remove globals [ticket/12687] Return a string and move the displaying of the sql report [ticket/12687] Rename DISPLAY_LOAD_TIME to PHPBB_DISPLAY_LOAD_TIME [ticket/12687] Display the explain link only when DEBUG is set [ticket/12687] Add a constant to display the load time without DEBUG
| * | [ticket/12687] Remove french spacesTristan Darricau2014-06-131-3/+3
| | | | | | | | | | | | PHPBB3-12687
| * | [ticket/12687] Display the number of cached queriesTristan Darricau2014-06-131-1/+1
| | | | | | | | | | | | PHPBB3-12687
| * | [ticket/12687] Don't check if memory_get_peak_usage() existsTristan Darricau2014-06-131-7/+4
| | | | | | | | | | | | PHPBB3-12687
| * | [ticket/12687] Wrap $GLOBALS['starttime'] in a ifTristan Darricau2014-06-131-2/+5
| | | | | | | | | | | | PHPBB3-12687
| * | [ticket/12687] Fix the namespace of $requestTristan Darricau2014-06-131-2/+2
| | | | | | | | | | | | PHPBB3-12687
| * | [ticket/12687] Update doc blockTristan Darricau2014-06-121-3/+13
| | | | | | | | | | | | PHPBB3-12687
| * | [ticket/12687] Use microtime(true)Tristan Darricau2014-06-121-2/+1
| | | | | | | | | | | | PHPBB3-12687
| * | [ticket/12687] Remove globalsTristan Darricau2014-06-122-12/+8
| | | | | | | | | | | | PHPBB3-12687
| * | [ticket/12687] Return a string and move the displaying of the sql reportTristan Darricau2014-06-122-16/+22
| | | | | | | | | | | | PHPBB3-12687
| * | [ticket/12687] Rename DISPLAY_LOAD_TIME to PHPBB_DISPLAY_LOAD_TIMETristan Darricau2014-06-112-70/+59
| | | | | | | | | | | | PHPBB3-12687
| * | [ticket/12687] Display the explain link only when DEBUG is setTristan Darricau2014-06-102-12/+24
| | | | | | | | | | | | PHPBB3-12687
| * | [ticket/12687] Add a constant to display the load time without DEBUGTristan Darricau2014-06-102-6/+6
| | | | | | | | | | | | PHPBB3-12687
* | | Merge pull request #2580 from VSEphpbb/ticket/12697Joas Schilling2014-06-131-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12697] Delete cached extension schema.json files after testing * VSEphpbb/ticket/12697: [ticket/12697] Delete cached extension schema.json files after testing
| * | | [ticket/12697] Delete cached extension schema.json files after testingMatt Friedman2014-06-121-0/+1
| | | | | | | | | | | | | | | | PHPBB3-12697
* | | | Merge pull request #2577 from marc1706/ticket/12694Dhruv Goel2014-06-111-1/+1
|\ \ \ \ | | | | | | | | | | [ticket/12694] Remove whitespace at end of line from acp_groups
| * | | | [ticket/12694] Remove whitespace at end of line from acp_groupsMarc Alexander2014-06-111-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-12694