aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * \ 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
| | * | | | [ticket/11701] Remove useless str_replaceNathaniel Guse2013-07-231-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11701
| | * | | | [ticket/11701] Loop variables are not passed correctly to eventsNathaniel Guse2013-07-232-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11701
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/11574' into developDhruv2013-08-083-7/+14
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling (16) and Igor Wiedler (6) # Via Joas Schilling (5) and Igor Wiedler (2) * nickvergessen/ticket/11574: (22 commits) [ticket/11574] Remove install/udpate/new/ fallback from database_update.php [ticket/11574] Do not display incompatible package note after successful update [ticket/11574] Remove old "continue step"-message [ticket/11574] Change order of files and database update [ticket/11574] Fix more issues in the updater [ticket/11574] Add trailing slash for consistency [ticket/11574] Fix table prefix in database updater [ticket/11574] Fix various path issues in the updater [ticket/11574] Make install language filename less crazy [ticket/11574] Use alternate DI config file for updater [ticket/11574] Include normalizer so it loads form the correct directory [ticket/11574] Only fall back to install/update versions, when IN_INSTALL ;) [ticket/11574] Use log object instead of old function [ticket/11574] Include vendor into update packages [ticket/11574] Create phpbb_log object before using it. [ticket/11574] Add correct language parameter to return links [ticket/11574] Use request object rather then request_var function [ticket/11574] Load new language files whenever possible [ticket/11574] Require new files in install/index.php and add a class loader [ticket/11574] Require new files in database_update.php and add a class loader ...
| | * | | | Merge remote-tracking branch 'phpbb/develop' into ticket/11574Joas Schilling2013-07-309-22/+385
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpbb/develop: (130 commits) [ticket/11638] Changed the layout to match the other similar commits [ticket/11640] removed the space that I wonder what it was doing there. [ticket/11749] Move event after all template data has been defined [ticket/10917] Variable used only once so delete it [ticket/10917] Revert use of phpbb wrapper [ticket/11749] Template events for topic_list_row_pre/append [ticket/11749] PHP Events for viewforum.php [ticket/11749] PHP Events for search.php [ticket/11740] Update FAQ to include Ideas Centre [ticket/11062] If user's language is english there is no further work needed [ticket/11062] Load new strings from user's language file if provided [ticket/10917] Using phpbb wrapper [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version [ticket/11741] Fix empty brackets and remove bullet [ticket/11638] Removed the unneeded reset. [ticket/11638] Use the $parse_flags like the other commits [ticket/11638] Reverted to use the $parse tags way as the other ones [ticket/11638] Updated: bitwise $parse_flags use optionset() [ticket/11656] Made the check for the bitfield just like other PR's [ticket/11667] Use @inheritdoc ...
| | * | | | [ticket/11574] Fix more issues in the updaterIgor Wiedler2013-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Stupid mistake in phpbb_create_update_container * Do not bootstrap extensions in installer/updater * Fix template lookup in installer/updater * Do not attempt to delete posts from bots The latter is a really fun problem. Since deleting posts now depends on a new db column that does not exist yet, we cannot call delete_post from a migration, ever. By using retain, we can hack around the issue for now. PHPBB3-11574
| | * | | | Merge remote-tracking branch 'upstream/develop' into ticket/11574Igor Wiedler2013-07-141-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: [ticket/11704] Use the correct directory for dependency checking. [ticket/11704] Correctly escape " [ticket/11697] author_search() used incorrect parameter
| | * | | | | Merge remote-tracking branch 'upstream/develop' into ticket/11574Igor Wiedler2013-07-142-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (575 commits) [ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php [ticket/11696] Move file to new directory [ticket/11696] Rename constructor to __construct() [ticket/11696] Remove manual loading of db_tools in extension controller test [ticket/11696] Rename db_tools.php so it can be autoloaded [ticket/11698] Moving all autoloadable files to phpbb/ [ticket/11694] Do not locate assets with root path [ticket/11692] Don't update search_type in dev migration if already appended [ticket/11675] Fix template loop [ticket/11690] Old module class names may get autoloaded by class_exists [ticket/9649] Display information on index for moderators on unapproved posts [ticket/10999] Fix assets_version in ACP [prep-release-3.0.12] More changelog items for the 3.0.12 release. [ticket/11687] Add assets_version to phpbb_config [ticket/11686] Not checking for phpBB Debug errors on functional tests [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)". [ticket/11674] Do not include vendor folder if there are no dependencies. [ticket/11685] Remove logout confirmation page [ticket/11684] Remove useless confirmation page after login and admin login [ticket/9657] Define user before injecting ... Conflicts: phpBB/includes/functions_container.php phpBB/install/database_update.php phpBB/install/index.php
| * | | | | | [ticket/11759] Change lowercase to uppercaseOliver Schramm2013-08-0224-47/+47
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | PHPBB3-11759
| * | | | | Merge pull request #1563 from cyberalien/ticket/11688Nathan Guse2013-07-311-13/+57
| |\ \ \ \ \ | | | | | | | | | | | | | | [ticket/11688] Purge TWIG cache
| | * | | | | [ticket/11688] Fix docblockVjacheslav Trushkin2013-07-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11688
| | * | | | | [ticket/11688] Rename purge_dir to remove_dirVjacheslav Trushkin2013-07-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11688
| | * | | | | [ticket/11688] tpl_ files are no longer usedVjacheslav Trushkin2013-07-141-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove tpl_ and ctpl_ from cache->purge() because those prefixes are no longer used. PHPBB3-11688
| | * | | | | [ticket/11688] Purge TWIG cacheVjacheslav Trushkin2013-07-141-13/+54
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Purge directories Replace opendir() with DirectoryIterator PHPBB3-11688
| * | | | | [ticket/11757] Fix typo in signature_module_auth migrationOliver Schramm2013-07-301-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | PHPBB3-11757
* | | | | [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
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-20 08:33:41 +0000