aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816Nathan Guse2013-09-0614-1477/+529
|\
| * [ticket/11825] Move schema_data.php into includes/ instead of phpbb/Dhruv2013-09-031-1194/+0
| * Merge remote-tracking branch 'EXreaction/ticket/11755' into developDavid King2013-09-022-241/+1447
| |\
| | * [ticket/11755] MySQL upgrader out of dateNathan Guse2013-09-022-241/+1447
| * | Merge pull request #1102 from imkingdavid/ticket/11215Nathan Guse2013-09-021-16/+17
| |\ \
| | * | [ticket/11215] Fix helper_url_test.php testsDavid King2013-09-021-1/+1
| | * | [ticket/11215] Make controller helper url() method use correct formatDavid King2013-09-021-16/+17
| | |/
| * | [ticket/11812] Fix empty defineNathan Guse2013-09-021-1/+1
| |/
| * Merge remote-tracking branch 'EXreaction/ticket/11724' into developJoas Schilling2013-08-301-3/+6
| |\
| | * [ticket/11724] Handle ELSE IF separatelyNathan Guse2013-08-281-5/+7
| | * [ticket/11724] Replace spaces with tabsNathan Guse2013-07-281-1/+1
| | * [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same wayNathan Guse2013-07-271-1/+2
| * | [ticket/11628] Create base template class with common functionsNathan Guse2013-08-282-179/+149
| * | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628Nathan Guse2013-08-2846-93/+225
| |\ \
| * | | [ticket/11628] phpbb_template, not phpbb_template_interfaceNathan Guse2013-07-251-1/+1
| * | | [ticket/11628] Make get_template_vars protectedNathaniel Guse2013-07-241-1/+1
| * | | [ticket/11628] Fix a bug I noticed in template->destroyNathaniel Guse2013-07-241-1/+1
| * | | [ticket/11628] Remove the one usage of get_style_path()Nathaniel Guse2013-07-242-17/+3
| * | | [ticket/11628] Shorten an if to an inline statementNathaniel Guse2013-07-241-9/+2
| * | | [ticket/11628] Remove template_path option on set_custom_styleNathaniel Guse2013-07-242-12/+4
| * | | [ticket/11628] Remove set_style_names function, moved to set_custom_styleNathaniel Guse2013-07-242-31/+6
| * | | [ticket/11628] Set admin namespace in the constructorNathaniel Guse2013-07-241-13/+6
| * | | [ticket/11628] Change set_custom_style $template path to default to stringNathaniel Guse2013-07-242-5/+5
| * | | [ticket/11628] Remove third parameter ($names) from set_custom_styleNathaniel Guse2013-07-242-8/+6
| * | | [ticket/11628] Return $this from set_style, set_custom_styleNathaniel Guse2013-07-242-6/+6
| * | | [ticket/11628] Move setting core namespace to set_style()Nathaniel Guse2013-07-241-15/+15
| * | | [ticket/11628] Remove $this->names, $this->style_names from phpbb_templateNathaniel Guse2013-07-241-16/+3
| * | | [ticket/11628] Remove phpbb_style (move methods to phpbb_template)Nathaniel Guse2013-07-245-186/+146
| * | | [ticket/11628] Remove style path providerNathaniel Guse2013-07-244-265/+1
| * | | [ticket/11628] Remove style resource locatorNathaniel Guse2013-07-243-555/+1
| | |/ | |/|
* | | [ticket/11816] Fix define/loop checks in IF statements containing parenthesisNathan Guse2013-08-291-4/+4
| |/ |/|
* | Merge remote-tracking branch 'rechosen/ticket/11792' into developJoas Schilling2013-08-221-1/+16
|\ \
| * | [ticket/11792] Add performance remark to core.user_setup event PHPDocrechosen2013-08-191-0/+3
| * | [ticket/11792] Add variable 'lang_set_ext' to event core.user_setuprechosen2013-08-191-1/+13
* | | Merge remote-tracking branch 'Elsensee/ticket/11760' into developDhruv2013-08-1936-36/+36
|\ \ \ | |/ / |/| |
| * | [ticket/11760] Use phpbb_version_compare() wrapperOliver Schramm2013-08-0236-36/+36
* | | [ticket/11784] Remove naming redundancy for event listenersMatt Friedman2013-08-132-2/+1
* | | Merge pull request #1643 from rechosen/ticket/11777Joas Schilling2013-08-121-1/+7
|\ \ \
| * | | [ticket/11777] Require a suffix of '_listener' on extension template listenersrechosen2013-08-121-1/+1
| * | | [ticket/11777] Rename the extension template listener subdirectory to 'event/'rechosen2013-08-121-6/+7
| * | | [ticket/11777] Add subdirectory 'events/' to the template event search pathrechosen2013-08-121-3/+8
* | | | [ticket/11781] Include func update_post_information()Vjacheslav Trushkin2013-08-111-0/+5
|/ / /
* | | Merge pull request #1633 from nickvergessen/ticket/11751Nathan Guse2013-08-091-0/+55
|\ \ \
| * | | [ticket/11751] Add mcp modules for softdelete on updateJoas Schilling2013-07-311-0/+55
* | | | Merge remote-tracking branch 'EXreaction/ticket/11701' into developJoas Schilling2013-08-092-10/+11
|\ \ \ \
| * | | | [ticket/11701] Refix regex for appending |lengthNathaniel Guse2013-07-231-2/+2
| * | | | [ticket/11701] Fix regex for appending |lengthNathaniel Guse2013-07-231-2/+2
| * | | | [ticket/11701] Fix loops var checkNathaniel Guse2013-07-231-2/+6
| * | | | [ticket/11701] Remove useless str_replaceNathaniel Guse2013-07-231-3/+0
| * | | | [ticket/11701] Loop variables are not passed correctly to eventsNathaniel Guse2013-07-232-7/+7