aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMarc Alexander2017-01-061-2/+1
|\
| * Merge pull request #4613 from rxu/ticket/14958Marc Alexander2017-01-061-2/+1
| |\ | | | | | | | | | [ticket/14958] Optimize Twig extension lang() function
| | * [ticket/14958] Optimize Twig extension lang() functionrxu2017-01-051-2/+1
| | | | | | | | | | | | PHPBB3-14958
* | | Merge pull request #4617 from marc1706/ticket/14949Marc Alexander2017-01-061-1/+7
|\ \ \ | | | | | | | | | | | | [ticket/14949] Pass full notification array and post data for updating
| * | | [ticket/14949] Pass full notification array and post data for updatingMarc Alexander2017-01-051-1/+7
| | | | | | | | | | | | | | | | PHPBB3-14949
* | | | Merge pull request #4608 from marc1706/ticket/14954Marc Alexander2017-01-062-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14954] Properly check if topic has attachments in mcp_queue
| * | | | [ticket/14954] Properly check if topic has attachments in mcp_queueMarc Alexander2017-01-022-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14954
* | | | | Merge pull request #4615 from marc1706/ticket/14946Marc Alexander2017-01-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14946] Make sure to pass integers to max()
| * | | | | [ticket/14946] Make sure to pass integers to max()Marc Alexander2017-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14946
* | | | | | Merge pull request #4616 from marc1706/ticket/14945Marc Alexander2017-01-061-7/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | [ticket/14945] Parse signature preview with generate_text_for_display()
| * | | | | [ticket/14945] Parse signature preview with generate_text_for_display()Marc Alexander2017-01-041-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14945
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-01-042-1/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Merge pull request #4532 from senky/ticket/14662Marc Alexander2017-01-043-2/+18
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14662] Add memberlist_team_username_prepend/append
| | * | | | [ticket/14662] Add memberlist_team_username_prepend/appendJakub Senko2016-12-183-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14662
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-01-041-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Merge pull request #4600 from hubaishan/ticket/14549Marc Alexander2017-01-041-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14549] fix mcp page redirect back after topic merge and rised warning
| | * | | | [ticket/14549] Correcting $redirect var to avoid the bughubaishan2016-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by this correct $redirect will go to clean mcp page after merge PHPBB3-14549
* | | | | | Merge pull request #4443 from Crizz0/ticket/14780Marc Alexander2017-01-042-5/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14780] Correction to let group setting overwrite global PM setting
| * | | | | | [ticket/14780] Only use $max_setting in this functionCrizzo2016-09-151-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14780
| * | | | | | [ticket/14780] Fixes array with exspected results in test-functionCrizzo2016-09-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14780
| * | | | | | [ticket/14780] Correct if sentence to let group setting overwrite globalCrizzo2016-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14780
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-01-041-9/+16
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #4595 from DavidIQ/ticket/14941Marc Alexander2017-01-041-9/+16
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | [ticket/14941] Apply changes individually for MySQL fulltext search
| | * | | | | [ticket/14941] Apply changes individually for MySQL fulltext searchDavid Colón2016-12-271-9/+16
| | | | | | |
* | | | | | | Merge pull request #4614 from marc1706/ticket/14838Marc Alexander2017-01-042-1/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14838] Add missing method to mock'ed feed
| * | | | | | | [ticket/14838] Correctly instantiate language objectMarc Alexander2017-01-041-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14838
| * | | | | | | [ticket/14838] Add missing method to mock'ed feedMarc Alexander2017-01-041-0/+5
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-14838
* | | | | | | Merge pull request #4599 from VSEphpbb/ticket/14945Marc Alexander2017-01-042-2/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14945] Fix bbcode flags in user sig previews
| * | | | | | | [ticket/14945] Send bbcode flags in user sig previewsMatt Friedman2016-12-282-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14945
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-01-0410-11/+161
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #4611 from marc1706/ticket/14838Marc Alexander2017-01-0410-11/+161
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [icket/14838] Do not query full attachments table in feeds
| | * | | | | | | [ticket/14838] Remove obsolete overriding methodMarc Alexander2017-01-041-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14838
| | * | | | | | | [ticket/14838] Add simple test for fetch_attachments methodMarc Alexander2017-01-032-0/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14838
| | * | | | | | | [ticket/14838] Do not query full attachments table in feedsMarc Alexander2017-01-038-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fetch_attachments() will also now throw a runtime exception if a feed tries to do this nonetheless. PHPBB3-14838
* | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-01-040-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pull request #4609 from marc1706/ticket/14957Marc Alexander2017-01-046-10/+22
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | [ticket/14957] Do not cache database config entries
* | | | | | | | | Merge pull request #4610 from marc1706/ticket/14957-rheaMarc Alexander2017-01-0410-10/+62
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | [ticket/14957] Do not cache database config entries -- Rhea version
| * | | | | | | | [ticket/14957] Make sure config_php_file is set before injectingMarc Alexander2017-01-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14957
| * | | | | | | | Merge branch 'ticket/14957' into ticket/14957-rheaMarc Alexander2017-01-032-1/+3
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | [ticket/14957] Do not use method return in write contextMarc Alexander2017-01-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for PHP 5.3.x compatibility. PHPBB3-14957
| * | | | | | | | Merge branch 'ticket/14957' into ticket/14957-rheaMarc Alexander2017-01-039-10/+55
| |\ \ \ \ \ \ \ \ |/ / / / / / / / / | | _ / / / / / / | | / / / / / /
| * | | | | | | [ticket/14957] Do not cache database config entriesMarc Alexander2017-01-036-10/+21
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-14957
* | | | | | | Merge pull request #4602 from Nicofuma/ticket/14947Marc Alexander2017-01-025-90/+306
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14947] Updates phpunit to 4.8
| * | | | | | | [ticket/14947] Create new webdriver instance for every testMarc Alexander2017-01-023-44/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPUnit seems to have emptied the webdriver between every test, which causes curl errors. A new webdriver instance will now be created for every test file. This does not cause a lot of overhead for ui tests. PHPBB3-14947
| * | | | | | | [ticket/14947] Updates phpunit to 4.8Tristan Darricau2016-12-302-46/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $ composer update phpunit/phpunit --with-dependencies Dependency "symfony/yaml" is also a root requirement, but is not explicitly whitelisted. Ignoring. Loading composer repositories with package information Updating dependencies (including require-dev) - Installing sebastian/global-state (1.1.1) Loading from cache - Installing doctrine/instantiator (1.0.5) Loading from cache - Removing phpunit/phpunit-mock-objects (2.1.5) - Installing phpunit/phpunit-mock-objects (2.3.8) Loading from cache - Removing phpunit/php-file-iterator (1.3.4) - Installing phpunit/php-file-iterator (1.4.2) Loading from cache - Installing phpdocumentor/reflection-docblock (2.0.4) Downloading: 100% - Installing phpspec/prophecy (v1.6.2) Loading from cache - Removing phpunit/phpunit (4.1.6) - Installing phpunit/phpunit (4.8.31) Downloading: 100% sebastian/global-state suggests installing ext-uopz (*) phpdocumentor/reflection-docblock suggests installing dflydev/markdown (~1.0) phpdocumentor/reflection-docblock suggests installing erusev/parsedown (~1.0) Writing lock file Generating autoload files > echo 'You MUST manually modify the clean-vendor-dir target in build/build.xml when adding or upgrading dependencies.' You MUST manually modify the clean-vendor-dir target in build/build.xml when adding or upgrading dependencies. PHPBB3-14947
* | | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-01-021-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | | | | | | | * 3.1.x: [ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query
| * | | | | | Merge pull request #4607 from marc1706/ticket/14953Tristan Darricau2017-01-021-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query * marc1706/ticket/14953: [ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query
| | * | | | | | [ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql queryMarc Alexander2017-01-021-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-14953
* | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-12-302-0/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4593 from javiexin/ticket/14940Tristan Darricau2016-12-302-0/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14940] Add ACP template event acp_ext_details_end
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-12 08:24:41 +0000