aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2916 from Nicofuma/ticket/12661Marc Alexander2014-09-021-1/+21
|\ | | | | | | [ticket/12661] Fix unit tests
| * [ticket/12661] Fix unit testsTristan Darricau2014-09-021-1/+21
|/ | | | PHPBB3-12661
* Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-026-2/+89
|\
| * Merge pull request #2908 from Pico/t/12661Marc Alexander2014-09-026-2/+89
| |\ | | | | | | | | | [ticket/12661] Load extensions templates from "all" folder by render()
| | * [ticket/12661] Add new line at the end of filesPico2014-08-252-2/+2
| | | | | | | | | | | | PHPBB3-12661
| | * [ticket/12661] Add template testPico882014-08-246-3/+86
| | | | | | | | | | | | PHPBB3-12661
| | * [ticket/12661] Load extensions templates from "all" folder by render()Pico882014-08-241-0/+4
| | | | | | | | | | | | PHPBB3-12661
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-013-0/+36
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/mcp_warn_post.html phpBB/styles/subsilver2/template/mcp_warn_user.html
| * | Merge pull request #2887 from Pico/ticket/12991Marc Alexander2014-09-015-0/+50
| |\ \ | | | | | | | | | | | | [ticket/12991] Have events after/before "add warning" field - user and post
| | * | [ticket/12991] Correct language mistakesPico2014-08-301-4/+4
| | | | | | | | | | | | | | | | PHPBB3-12991
| | * | [ticket/12991] Have events after/before "add warning" field - user and postPico882014-08-175-0/+50
| | | | | | | | | | | | | | | | PHPBB3-12991
* | | | Merge pull request #2914 from Nicofuma/ticket/13024Marc Alexander2014-09-011-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13024] Fix event file (remove subsilver references)
| * | | | [ticket/13024] Fix event file (remove subsilver references)Tristan Darricau2014-09-011-1/+0
|/ / / / | | | | | | | | | | | | PHPBB3-13024
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-312-0/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/viewtopic_body.html
| * | | Merge pull request #2913 from Nicofuma/ticket/13024Marc Alexander2014-08-313-0/+12
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13024] Add template event viewtopic_body_postrow_post_content_footer
| | * | | [ticket/13024] Add template event viewtopic_body_postrow_post_content_footerTristan Darricau2014-08-303-0/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-13024
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-301-0/+21
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2826 from brunoais/ticket/12928Marc Alexander2014-08-301-0/+21
| |\ \ \ \ | | |/ / / | |/| | | | | | | | [ticket/12928] core.mcp_reports_gather_query_before
| | * | | [ticket/12928] Update to RC4brunoais2014-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12928
| | * | | [ticket/12928] core.mcp_reports_gather_query_beforebrunoais2014-08-081-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the core.mcp_reports_gather_query_before event to mcp backend. PHPBB3-12928
* | | | | Merge branch 'develop-ascraeus' into developDhruv2014-08-2915-33/+51
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Dhruv Goel (1) and Marc Alexander (1) * develop-ascraeus: [ticket/12966] Sort by post_time and post_id where applicable [ticket/12966] Sort posts by post_id in addition to sorting by post_time
| * | | | Merge pull request #2865 from marc1706/ticket/12966Dhruv Goel2014-08-2915-33/+51
| |\ \ \ \ | | | | | | | | | | | | [ticket/12966] Sort posts by post_id in addition to sorting by post_time
| | * | | | [ticket/12966] Sort by post_time and post_id where applicableMarc Alexander2014-08-2315-32/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change was not applied to the search as this would require a larger rewrite of the search methods. PHPBB3-12966
| | * | | | [ticket/12966] Sort posts by post_id in addition to sorting by post_timeMarc Alexander2014-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should make sure that posts with the same post time are properly sorted on database backends like postgres. PHPBB3-12966
* | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-281-54/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #2909 from n-aleha/ticket/11909Marc Alexander2014-08-281-54/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/11909] Remove unused function load_migrations
| | * | | | | [ticket/11909] Remove unused function load_migrationsn-aleha2014-08-261-54/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused function load_migrations from \phpbb\db\migrator PHPBB3-11909
* | | | | | Merge branch 'develop-ascraeus' into developCesar G2014-08-257-9/+51
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12506] Fix search result h3 margin [ticket/12506] Fix responsive profile min-height (no avatar) [ticket/12506] Reposition buttons to make room for "online" banner [ticket/12506] Reposition post-buttons for compact layout
| * | | | | Merge remote-tracking branch 'PayBas/ticket/12506' into develop-ascraeusCesar G2014-08-257-9/+51
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PayBas/ticket/12506: [ticket/12506] Fix search result h3 margin [ticket/12506] Fix responsive profile min-height (no avatar) [ticket/12506] Reposition buttons to make room for "online" banner [ticket/12506] Reposition post-buttons for compact layout
| | * | | | | [ticket/12506] Fix search result h3 marginPayBas2014-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no buttons present, so don't need to do all this stuff. PHPBB3-12506
| | * | | | | [ticket/12506] Fix responsive profile min-height (no avatar)PayBas2014-08-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12506
| | * | | | | [ticket/12506] Reposition buttons to make room for "online" bannerPayBas2014-08-072-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12506
| | * | | | | [ticket/12506] Reposition post-buttons for compact layoutPayBas2014-08-078-4/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12506
* | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-248-1/+69
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13008] Add functionnal test [ticket/13008] Use an absolute path with the FileLocator for the routing files
| * | | | | | Merge pull request #2905 from Nicofuma/ticket/13008Andreas Fischer2014-08-248-1/+69
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13008] Use an absolute path with the FileLocator for the routing files * Nicofuma/ticket/13008: [ticket/13008] Add functionnal test [ticket/13008] Use an absolute path with the FileLocator for the routing files
| | * | | | | [ticket/13008] Add functionnal testTristan Darricau2014-08-247-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13008
| | * | | | | [ticket/13008] Use an absolute path with the FileLocator for the routing filesTristan Darricau2014-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13008
* | | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-08-241-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13010] Specifiy correct clean_row() call in phpbb_get_avatar docblock
| * | | | | | Merge pull request #2907 from marc1706/ticket/13010Tristan Darricau2014-08-241-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13010] Specifiy correct clean_row() call in phpbb_get_avatar docblock * marc1706/ticket/13010: [ticket/13010] Specifiy correct clean_row() call in phpbb_get_avatar docblock
| | * | | | | | [ticket/13010] Specifiy correct clean_row() call in phpbb_get_avatar docblockMarc Alexander2014-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13010
* | | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-241-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #2904 from Nicofuma/ticket/12990Marc Alexander2014-08-241-0/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | [ticket/12990] Disable all the notifications types which are not in the core
| | * | | | | | [ticket/12990] Disable all the notifications types which are not in the coreTristan Darricau2014-08-231-0/+5
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-12990
* | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-231-0/+251
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12658] Rebased and fixed unit tests [ticket/12658] Fix wrong eol character [ticket/12658] Refactoring code [ticket/12658] Fix typo and coding style mistakes [ticket/12658] Add test for command config:delete [ticket/12658] Add test for command config:increment [ticket/12658] Add test for command config:get [ticket/12658] Add test for command config:set-atomic [ticket/12658] Add test for base case of command config:set
| * | | | | | Merge pull request #2551 from ptitlazy/ticket/12658Andreas Fischer2014-08-231-0/+251
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12658] Add test for base case of commands config: * ptitlazy/ticket/12658: [ticket/12658] Rebased and fixed unit tests [ticket/12658] Fix wrong eol character [ticket/12658] Refactoring code [ticket/12658] Fix typo and coding style mistakes [ticket/12658] Add test for command config:delete [ticket/12658] Add test for command config:increment [ticket/12658] Add test for command config:get [ticket/12658] Add test for command config:set-atomic [ticket/12658] Add test for base case of command config:set
| | * | | | | | [ticket/12658] Rebased and fixed unit testsTristan Darricau2014-08-231-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12658
| | * | | | | | [ticket/12658] Fix wrong eol characterLEZY Thomas2014-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12658
| | * | | | | | [ticket/12658] Refactoring codeLEZY Thomas2014-08-231-33/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12658
| | * | | | | | [ticket/12658] Fix typo and coding style mistakesLEZY Thomas2014-08-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12658
| | * | | | | | [ticket/12658] Add test for command config:deleteLEZY Thomas2014-08-231-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12658
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 01:36:04 +0000