aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | [feature/oauth] Change name of new method on requestJoseph Warner2013-07-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | [feature/oauth] Allow getting original global arrays from requestJoseph Warner2013-07-142-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816Nathan Guse2013-09-0614-1477/+529
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By David King (16) and others # Via David King (13) and others * 'develop' of github.com:phpbb/phpbb3: (67 commits) [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ [ticket/11215] Remove unnecessary comment [ticket/11755] MySQL upgrader out of date [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. [ticket/11823] Set up nginx server to match PHP files with characters after .php [ticket/11812] Fix empty define [ticket/11818] Update Symfony dependencies to 2.3.* [ticket/11791] Load adm/ events from styles/adm/event/ [ticket/11215] Fix helper_url_test.php tests [ticket/11215] Add newline back to .htaccess, fix wording [ticket/11215] Update comment in .htaccess [ticket/11215] Uncomment rewrite rules in .htaccess [ticket/11215] Make controller helper url() method use correct format [ticket/11215] Add commented-out URL rewrite capability to .htaccess [ticket/11821] Fix comma usage next to "You are receiving this notification". [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11215] Use new URL structure for controllers [ticket/11215] Everything appears to be working... ... Conflicts: phpBB/phpbb/template/twig/lexer.php tests/template/template_test.php
| | * | | | | [ticket/11825] Move schema_data.php into includes/ instead of phpbb/Dhruv2013-09-031-1194/+0
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-11825
| | * | | | 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
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | De-duplicating code from create_schema_files, mysql_upgrader. New file phpbb/db/schema_data which contains all the current schema data. New function in db_tools public static function get_dbms_type_map() to make the type map available everywhere (without requiring $db be setup already) PHPBB3-11755
| | * | | | Merge pull request #1102 from imkingdavid/ticket/11215Nathan Guse2013-09-021-16/+17
| | |\ \ \ \ | | | | | | | | | | | | | | [ticket/11215] Correct paths when path info is used for controller access
| | | * | | | [ticket/11215] Fix helper_url_test.php testsDavid King2013-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11215
| | | * | | | [ticket/11215] Make controller helper url() method use correct formatDavid King2013-09-021-16/+17
| | | |/ / / | | | | | | | | | | | | | | | | | | PHPBB3-11215
| | * | | | [ticket/11812] Fix empty defineNathan Guse2013-09-021-1/+1
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-11812
| | * | | Merge remote-tracking branch 'EXreaction/ticket/11724' into developJoas Schilling2013-08-301-3/+6
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11724: [ticket/11724] Handle ELSE IF separately [ticket/11724] Replace spaces with tabs [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same way
| | | * | | [ticket/11724] Handle ELSE IF separatelyNathan Guse2013-08-281-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11724
| | | * | | [ticket/11724] Replace spaces with tabsNathan Guse2013-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11724
| | | * | | [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same wayNathan Guse2013-07-271-1/+2
| | | | |/ | | | |/| | | | | | | | | | | PHPBB3-11724
| | * | | [ticket/11628] Create base template class with common functionsNathan Guse2013-08-282-179/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E.g. assign_vars PHPBB3-11628
| | * | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628Nathan Guse2013-08-2846-93/+225
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Bruno Ais (42) and others # Via Joas Schilling (39) and others * 'develop' of github.com:phpbb/phpbb3: (157 commits) [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0 [ticket/11799] Send anti abuse headers in "new password" emails. [ticket/11792] Add functional test for var lang_set_ext of core.user_setup [ticket/11804] Remove </li> from overall_header which was not open [ticket/11802] replace $browser with $user->browser [ticket/11801] removed some whitespace and added missing semi colon's in css [ticket/11792] Add performance remark to core.user_setup event PHPDoc [ticket/11792] Add variable 'lang_set_ext' to event core.user_setup [ticket/11789] Remove inline color in memberlist_view [ticket/11800] Fix scripts variable in subsilver simple_footer [ticket/11800] Fix JavaScript in simple_footer.html [ticket/11800] Remove forum_fn from memberlist_search.html [ticket/11796] Replace pagination with pagination.html [ticket/11794] Add missing array element commas to docs/coding-guidelines.html [ticket/11775] Fix doc blocks syntax [ticket/11775] Remove spaces at line ends [ticket/11789] Remove colors from HTML code [ticket/11784] Remove naming redundancy for event listeners [ticket/11775] Split test into multiple steps [ticket/11777] Fix new test for loop variables in extension template listeners ... Conflicts: phpBB/install/index.php phpBB/install/install_update.php
| | * | | | [ticket/11628] phpbb_template, not phpbb_template_interfaceNathan Guse2013-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11628
| | * | | | [ticket/11628] Make get_template_vars protectedNathaniel Guse2013-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all references to it and the hacky code in messenger that was using it PHPBB3-11628
| | * | | | [ticket/11628] Fix a bug I noticed in template->destroyNathaniel Guse2013-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should not be setting $this->context = array()! PHPBB3-11628
| | * | | | [ticket/11628] Remove the one usage of get_style_path()Nathaniel Guse2013-07-242-17/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes the code easier to follow PHPBB3-11628
| | * | | | [ticket/11628] Shorten an if to an inline statementNathaniel Guse2013-07-241-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11628
| | * | | | [ticket/11628] Remove template_path option on set_custom_styleNathaniel Guse2013-07-242-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was set to default 'template/' to append template/ to all the paths, but every location was actually just setting it to '' to not append anything. So removed the option entirely (additional paths can be appended to the paths being sent to the function already) PHPBB3-11628
| | * | | | [ticket/11628] Remove set_style_names function, moved to set_custom_styleNathaniel Guse2013-07-242-31/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11628
| | * | | | [ticket/11628] Set admin namespace in the constructorNathaniel Guse2013-07-241-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11628
| | * | | | [ticket/11628] Change set_custom_style $template path to default to stringNathaniel Guse2013-07-242-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than default to false and compare === false ? 'template/' : value just assign this default in the arguments PHPBB3-11628
| | * | | | [ticket/11628] Remove third parameter ($names) from set_custom_styleNathaniel Guse2013-07-242-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was basically duplicating functionality. $names would be used if not empty, else array($name) would be used. Merged functionality into the first argument PHPBB3-11628
| | * | | | [ticket/11628] Return $this from set_style, set_custom_styleNathaniel Guse2013-07-242-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11628
| | * | | | [ticket/11628] Move setting core namespace to set_style()Nathaniel Guse2013-07-241-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11628
| | * | | | [ticket/11628] Remove $this->names, $this->style_names from phpbb_templateNathaniel Guse2013-07-241-16/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are not used anywhere PHPBB3-11628
| | * | | | [ticket/11628] Remove phpbb_style (move methods to phpbb_template)Nathaniel Guse2013-07-245-186/+146
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11628
| | * | | | [ticket/11628] Remove style path providerNathaniel Guse2013-07-244-265/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No longer used since Twig was implemented. PHPBB3-11628
| | * | | | [ticket/11628] Remove style resource locatorNathaniel Guse2013-07-243-555/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | No longer used since Twig was implemented. PHPBB3-11628
| * | | | [ticket/11816] Fix define/loop checks in IF statements containing parenthesisNathan Guse2013-08-291-4/+4
| | |/ / | |/| | | | | | | | | | PHPBB3-11816
| * | | Merge remote-tracking branch 'rechosen/ticket/11792' into developJoas Schilling2013-08-221-1/+16
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rechosen/ticket/11792: [ticket/11792] Add functional test for var lang_set_ext of core.user_setup [ticket/11792] Add performance remark to core.user_setup event PHPDoc [ticket/11792] Add variable 'lang_set_ext' to event core.user_setup
| | * | | [ticket/11792] Add performance remark to core.user_setup event PHPDocrechosen2013-08-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent extension authors from loading all their translations globally, a remark on this was added to the PHPDoc documentation of the core.user_setup event. PHPBB3-11792
| | * | | [ticket/11792] Add variable 'lang_set_ext' to event core.user_setuprechosen2013-08-191-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To allow extensions to add global language strings just like mods can, add the 'lang_set_ext' variable to the core.user_setup event. It requires an ext_name to be specified as well as a lang_set, and loads the specified lang_set in the context of the extension. PHPBB3-11792
| * | | | Merge remote-tracking branch 'Elsensee/ticket/11760' into developDhruv2013-08-1936-36/+36
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | # By Oliver Schramm # Via Oliver Schramm * Elsensee/ticket/11760: [ticket/11760] Use phpbb_version_compare() wrapper
| | * | | [ticket/11760] Use phpbb_version_compare() wrapperOliver Schramm2013-08-0236-36/+36
| | | | | | | | | | | | | | | | | | | | PHPBB3-11760
| * | | | [ticket/11784] Remove naming redundancy for event listenersMatt Friedman2013-08-132-2/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11784
| * | | | Merge pull request #1643 from rechosen/ticket/11777Joas Schilling2013-08-121-1/+7
| |\ \ \ \ | | | | | | | | | | | | [ticket/11777] Search for template listeners in the php event listeners way
| | * | | | [ticket/11777] Require a suffix of '_listener' on extension template listenersrechosen2013-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To further mirror the file name and location requirements for php template event listeners, require extension template event listener files to follow the '<event name>_listener.html' naming format. PHPBB3-11777
| | * | | | [ticket/11777] Rename the extension template listener subdirectory to 'event/'rechosen2013-08-121-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per suggestion of EXreaction and nickvergessen, do not look for extension template event listeners in styles/[style]/template/events/ but in styles/[style]/template/event/ (without the trailing 's') to match the way phpBB looks for php template event listeners. PHPBB3-11777
| | * | | | [ticket/11777] Add subdirectory 'events/' to the template event search pathrechosen2013-08-121-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes the twig template engine look in the events/ subdirectory instead of the main styles/[style]/template/ directory for extension template events. Note that it does _not_ look recursively! PHPBB3-11777
| * | | | | [ticket/11781] Include func update_post_information()Vjacheslav Trushkin2013-08-111-0/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Include functions_posting before using functions defined in that file PHPBB3-11781
| * | | | Merge pull request #1633 from nickvergessen/ticket/11751Nathan Guse2013-08-091-0/+55
| |\ \ \ \ | | | | | | | | | | | | [ticket/11751] Add mcp modules for softdelete on update
| | * | | | [ticket/11751] Add mcp modules for softdelete on updateJoas Schilling2013-07-311-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11751
| * | | | | Merge remote-tracking branch 'EXreaction/ticket/11701' into developJoas Schilling2013-08-092-10/+11
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11701: [ticket/11701] New line at EOF [ticket/11701] Test events in loops [ticket/11701] Refix regex for appending |length [ticket/11701] Fix regex for appending |length [ticket/11701] Fix loops var check [ticket/11701] Remove useless str_replace [ticket/11701] Loop variables are not passed correctly to events
| | * | | | | [ticket/11701] Refix regex for appending |lengthNathaniel Guse2013-07-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11701
| | * | | | | [ticket/11701] Fix regex for appending |lengthNathaniel Guse2013-07-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11701
| | * | | | | [ticket/11701] Fix loops var checkNathaniel Guse2013-07-231-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11701