aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11786] s/@return void/@return null in content_visibility.phprechosen2013-08-131-3/+3
| | | | | | | The file phpbb/content_visibility.php still contained a few instances of '@return void' in its PHPDoc blocks, fixed. Thanks to JoshyPHP for reporting. PHPBB3-11786
* [ticket/11786] Fix PHPDoc documentation of a few eventsrechosen2013-08-133-10/+10
| | | | | | | | Fixed some PHPDoc errors I noticed while working on the karma extension. Mostly spacing issues or omitted characters, though there was one description that made no sense at all. PHPBB3-11786
* [ticket/11786] Fix typo and ugly English in the notification system PHPDocrechosen2013-08-132-2/+2
| | | | | | The notification system contained two PHPDoc lines that needed improvement. PHPBB3-11786
* 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
* | Merge remote-tracking branch 'cyberalien/ticket/11781' into developAndreas Fischer2013-08-121-0/+5
|\ \ | | | | | | | | | | | | * cyberalien/ticket/11781: [ticket/11781] Include func update_post_information()
| * | [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
* | [ticket/11780] Remove references to unused imagesVjacheslav Trushkin2013-08-112-60/+0
| | | | | | | | PHPBB3-11780
* | [ticket/11780] Remove unused imagesVjacheslav Trushkin2013-08-116-0/+0
|/ | | | PHPBB3-11780
* 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
* | | [ticket/11774] Fix constant to avoid PHP errorsOliver Schramm2013-08-081-1/+1
| | | | | | | | | | | | PHPBB3-11774
* | | Merge remote-tracking branch 'nickvergessen/ticket/11574' into developDhruv2013-08-089-140/+169
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 ...
| * | | [ticket/11574] Remove install/udpate/new/ fallback from database_update.phpJoas Schilling2013-07-302-57/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we switched the order, everything should be in the normal root by then. PHPBB3-11574
| * | | [ticket/11574] Do not display incompatible package note after successful updateJoas Schilling2013-07-301-0/+5
| | | | | | | | | | | | | | | | PHPBB3-11574
| * | | Merge remote-tracking branch 'phpbb/develop' into ticket/11574Joas Schilling2013-07-3038-352/+719
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Remove old "continue step"-messageJoas Schilling2013-07-291-14/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| * | | | [ticket/11574] Change order of files and database updateJoas Schilling2013-07-295-35/+55
| | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| * | | | [ticket/11574] Fix more issues in the updaterIgor Wiedler2013-07-144-20/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-14405-5189/+8510
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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/11574] Add trailing slash for consistencyIgor Wiedler2013-07-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| * | | | | | [ticket/11574] Fix table prefix in database updaterIgor Wiedler2013-07-142-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| * | | | | | [ticket/11574] Fix various path issues in the updaterIgor Wiedler2013-07-143-30/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| * | | | | | [ticket/11574] Make install language filename less crazyIgor Wiedler2013-07-131-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| * | | | | | [ticket/11574] Use alternate DI config file for updaterIgor Wiedler2013-07-133-19/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| * | | | | | [ticket/11574] Include normalizer so it loads form the correct directoryJoas Schilling2013-07-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| * | | | | | [ticket/11574] Only fall back to install/update versions, when IN_INSTALL ;)Joas Schilling2013-07-132-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| * | | | | | [ticket/11574] Use log object instead of old functionJoas Schilling2013-07-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| * | | | | | [ticket/11574] Create phpbb_log object before using it.Joas Schilling2013-07-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| * | | | | | [ticket/11574] Add correct language parameter to return linksJoas Schilling2013-07-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| * | | | | | [ticket/11574] Use request object rather then request_var functionJoas Schilling2013-07-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| * | | | | | [ticket/11574] Load new language files whenever possibleJoas Schilling2013-07-131-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| * | | | | | [ticket/11574] Require new files in install/index.php and add a class loaderJoas Schilling2013-07-131-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| * | | | | | [ticket/11574] Require new files in database_update.php and add a class loaderJoas Schilling2013-07-131-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| * | | | | | [ticket/11574] Find language files in update/new before throwing an errorJoas Schilling2013-07-131-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| * | | | | | [ticket/11574] Try to load updated service.yml before the default oneJoas Schilling2013-07-131-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
* | | | | | | Merge remote-tracking branch 'asperous/ticket/11761' into developAndreas Fischer2013-08-062-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * asperous/ticket/11761: [ticket/11761] Serve blank file locally in functional test
| * | | | | | | [ticket/11761] Serve blank file locally in functional testAndy Chase2013-08-062-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example.org no longer serves blank responses, failing functional tests. this patch creates a blank file and serve it locally during the test, instead of hitting the http://example.org servers kindly provided by IANA. PHPBB3-11761
* | | | | | | | Merge remote-tracking branch 'brunoais/ticket11639' into developJoas Schilling2013-08-041-9/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket11639: [ticket/11639] Changing how censorship is handled. [ticket/11639] Removed a non-needed unset [ticket/11639] Whitespace fixing [ticket/11639] Whitespace fixing [ticket/11639] Added an useful comment. [ticket/11639] generate_text_for_display on functions_posting.php
| * | | | | | | | [ticket/11639] Changing how censorship is handled.brunoais2013-08-031-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11639
| * | | | | | | | [ticket/11639] Removed a non-needed unsetBruno Ais2013-07-241-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11639