aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2799 from nickvergessen/ticket/12901Marc Alexander2014-08-061-2/+2
|\ | | | | | | Ticket/12901 Wrong type hint in show_available_child_styles() doc block
| * [ticket/12901] Fix another wrong type hint for $levelJoas Schilling2014-08-031-1/+1
| | | | | | | | PHPBB3-12901
| * [ticket/12901] Fix type hinting of style $leveljeroendedauw2014-08-031-1/+1
| | | | | | | | PHPBB3-12901
* | Merge pull request #2807 from nickvergessen/ticket/12875Marc Alexander2014-08-061-4/+30
|\ \ | | | | | | | | | [ticket/12875] Find language files in the default and english language
| * | [ticket/12875] Find language files in the default and english language ...Joas Schilling2014-08-061-4/+30
| | | | | | | | | | | | | | | | | | ... when looking for info_xcp_ files. PHPBB3-12875
* | | Merge pull request #2798 from tmbackoff/ticket/12912Joas Schilling2014-08-061-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12912] Undefined index when adding logs from extensions * tmbackoff/ticket/12912: [ticket/12912] Undefined index when adding logs from extensions
| * | | [ticket/12912] Undefined index when adding logs from extensionsTabitha Backoff2014-08-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Add isset() to forum_id and topic_id. PHPBB3-12912
* | | | Merge pull request #2795 from Dragooon/ticket/12910Joas Schilling2014-08-061-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12910] Set get_name for Google+ fields * Dragooon/ticket/12910: [ticket/12910] Set get_name for Google+ fields
| * | | | [ticket/12910] Set get_name for Google+ fieldsShitiz Garg2014-08-031-0/+8
| | |_|/ | |/| | | | | | | | | | PHPBB3-12910
* | | | Merge pull request #2806 from rxu/ticket/12913Joas Schilling2014-08-061-4/+23
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | [ticket/12913] Add more parameters to core.submit_post_end event * rxu/ticket/12913: [ticket/12913] Add more parameters to core.submit_post_end event
| * | | [ticket/12913] Add more parameters to core.submit_post_end eventrxu2014-08-061-4/+23
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | As @event core.modify_submit_post_data can modify any of the function submit_post parameters, they may be needed to perform actions directly after a post or topic has been submitted in @event core.submit_post_end (includes/functions_posting.php). PHPBB3-12913
* | | Merge pull request #2796 from bantu/ticket/12906Andreas Fischer2014-08-032-2/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | [ticket/12906] Add rel="help" to FAQ link * bantu/ticket/12906: [ticket/12906] Add rel="help" to FAQ link
| * | [ticket/12906] Add rel="help" to FAQ linkLouis77772014-08-032-2/+2
| |/ | | | | | | PHPBB3-12906
* | Merge pull request #2793 from n-aleha/ticket/12909Andreas Fischer2014-08-031-2/+2
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12909] Use correct lang vars in cli extension enable * n-aleha/ticket/12909: [ticket/12909] Use correct lang vars in cli extension enable
| * | [ticket/12909] Use correct lang vars in cli extension enablen-aleha2014-08-031-2/+2
| |/ | | | | | | PHPBB3-12909
* | Merge pull request #2792 from n-aleha/ticket/12908Andreas Fischer2014-08-031-1/+1
|\ \ | |/ |/| | | | | | | | | [ticket/12908] Fix operator typo in increment.php * n-aleha/ticket/12908: [ticket/12908] Fix operator typo in increment.php
| * [ticket/12908] Fix operator typo in increment.phpn-aleha2014-08-031-1/+1
|/ | | | PHPBB3-12908
* Merge pull request #2782 from marc1706/ticket/12895Joas Schilling2014-08-023-9/+9
|\ | | | | | | | | | | | | [ticket/12895] Rename user style setting to resolve conflict with style param * marc1706/ticket/12895: [ticket/12895] Rename user style setting to resolve conflict with style param
| * [ticket/12895] Rename user style setting to resolve conflict with style paramMarc Alexander2014-07-293-9/+9
| | | | | | | | | | | | | | The style URL parameter, i.e. style=1, will conflict with the user's style setting due to it also being named style. This patch with solve this conflict. PHPBB3-12895
* | Merge branch 'ticket/JeroenDeDauw/12902' into develop-ascraeusJoas Schilling2014-08-021-1/+0
|\ \ | | | | | | | | | | | | * ticket/JeroenDeDauw/12902: [ticket/12902] Remove duplicate entry in switch statement
| * | [ticket/12902] Remove duplicate entry in switch statementjeroendedauw2014-08-021-1/+0
| | | | | | | | | | | | PHPBB3-12902
* | | Merge remote-tracking branch 'brunoais/ticket/12801' into develop-ascraeusMarc Alexander2014-08-011-2/+16
|\ \ \
| * | | [ticket/12801] Changed name change @since as requestedbrunoais2014-08-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed name to core.load_drafts_draft_list_result as requested Changed @since to 3.1.0-RC3 because RC2 is already out. PHPBB3-12801
| * | | [ticket/12801] missing $phpbb_dispatcher as a globalbrunoais2014-07-201-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12801
| * | | [ticket/12801] Add core.functions_posting.load_drafts_draft_list_resultsbrunoais2014-07-061-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | Adding event core.functions_posting.load_drafts_draft_list_results PHPBB3-12801
| * | | [ticket/12801] Add topic_poster to load_drafts' topics querybrunoais2014-07-031-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12801
* | | | Merge remote-tracking branch 'brunoais/ticket/12800' into develop-ascraeusMarc Alexander2014-08-011-1/+14
|\ \ \ \ | |_|/ / |/| | |
| * | | [ticket/12880] Changed name change @since as requestedbrunoais2014-08-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed name to core.display_user_activity_modify_actives as requested Changed @since to 3.1.0-RC3 because RC2 is already out. PHPBB3-12880
| * | | [ticket/12800] removed superfulous tab characterbrunoais2014-07-201-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12800
| * | | [ticket/12800] Missing $phpbb_dispatcher as a globalbrunoais2014-07-201-1/+2
| | | | | | | | | | | | | | | | PHPBB3-12800
| * | | [ticket/12800] core.functions_display.display_user_activity.actives_afterbrunoais2014-07-031-0/+12
| |/ / | | | | | | | | | | | | | | | Adding core.functions_display.display_user_activity.actives_after PHPBB3-12800
* | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-08-010-0/+0
|\ \ \ | | | | | | | | | | | | * develop-olympus:
| * \ \ Merge pull request #2350 from Nicofuma/ticket/11480Joas Schilling2014-08-013-9/+125
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11480] PM : "Unknown folder" returned when inbox folder is full * Nicofuma/ticket/11480: [ticket/11480] Move the test into get_folder() [ticket/11480] Fix the double spaces in phpbb_functional_test_case [ticket/11480] Fix typos [ticket/11480] Add functionnal test [ticket/11480] PM : "Unknown folder" returned when inbox folder is full
* | \ \ \ Merge pull request #2784 from Nicofuma/ticket/11480-ascraeusJoas Schilling2014-08-013-22/+141
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11480-ascraeus] PM : "Unknown folder" returned when inbox folder is full * Nicofuma/ticket/11480-ascraeus: [ticket/11480] Header file [ticket/11480] Fix unit tests [ticket/11480] Move the test into get_folder() [ticket/11480] Fix the double spaces in phpbb_functional_test_case [ticket/11480] Fix typos [ticket/11480] Add functionnal test [ticket/11480] PM : "Unknown folder" returned when inbox folder is full
| * | | | | [ticket/11480] Header fileTristan Darricau2014-07-311-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11480
| * | | | | [ticket/11480] Fix unit testsTristan Darricau2014-07-311-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11480
| * | | | | Merge branch 'ticket/11480' into ticket/11480-ascraeusTristan Darricau2014-07-303-22/+139
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11480: [ticket/11480] Move the test into get_folder() [ticket/11480] Fix the double spaces in phpbb_functional_test_case [ticket/11480] Fix typos [ticket/11480] Add functionnal test [ticket/11480] PM : "Unknown folder" returned when inbox folder is full Conflicts: tests/test_framework/phpbb_functional_test_case.php
| | * | | | [ticket/11480] Move the test into get_folder()Tristan Darricau2014-07-302-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11480
| | * | | | [ticket/11480] Fix the double spaces in phpbb_functional_test_caseTristan Darricau2014-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11480
| | * | | | [ticket/11480] Fix typosTristan Darricau2014-05-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11480
| | * | | | [ticket/11480] Add functionnal testTristan Darricau2014-05-292-8/+123
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11480
| | * | | | [ticket/11480] PM : "Unknown folder" returned when inbox folder is fullNicofuma2014-04-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-11480 PHPBB3-11480
* | | | | | Merge remote-tracking branch 'VSE/ticket/12864' into develop-ascraeusMarc Alexander2014-07-317-0/+43
|\ \ \ \ \ \
| * | | | | | [ticket/12864] Update event docsMatt Friedman2014-07-271-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12864
| * | | | | | [ticket/12864] Add template event to header after stylesheetsMatt Friedman2014-07-187-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12864 PHPBB3-12864
* | | | | | | Merge pull request #2767 from Nicofuma/ticket/12882Joas Schilling2014-07-311-0/+34
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12882] Update search_type when it's not prefixed by phpbb_search * Nicofuma/ticket/12882: [ticket/12882] Use a new migration [ticket/12882] Update search_type when it's not prefixed by phpbb_search
| * | | | | | [ticket/12882] Use a new migrationTristan Darricau2014-07-212-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12882
| * | | | | | [ticket/12882] Update search_type when it's not prefixed by phpbb_searchTristan Darricau2014-07-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12882
* | | | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-07-301-1/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12492] Add support of special chars
| * | | | | | Merge pull request #2425 from Zoddo/ticket/12492Joas Schilling2014-07-301-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12492] Add support of special chars * Zoddo/ticket/12492: [ticket/12492] Add support of special chars