aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into ticket/11574Igor Wiedler2013-07-14509-5962/+12698
| | |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | | | | | | | Merge pull request #7 from igorw/ticket/11574Joas Schilling2013-07-144-33/+33
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11574] Fix various path issues in the updater
| | * | | | | | | | | | | [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-134-22/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Include vendor into update packagesJoas Schilling2013-07-131-0/+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-063-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * asperous/ticket/11761: [ticket/11761] Serve blank file locally in functional test
| * | | | | | | | | | | [ticket/11761] Serve blank file locally in functional testAndy Chase2013-08-063-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | [ticket/11639] Whitespace fixingBruno Ais2013-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11639
| * | | | | | | | | | | | [ticket/11639] Whitespace fixingBruno Ais2013-07-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11639
| * | | | | | | | | | | | [ticket/11639] Added an useful comment.Bruno Ais2013-07-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11639
| * | | | | | | | | | | | [ticket/11639] generate_text_for_display on functions_posting.phpBruno Ais2013-07-151-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11639
* | | | | | | | | | | | | Merge remote-tracking branch 'brunoais/ticket/11642' into developJoas Schilling2013-08-031-11/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/11642: [ticket/11642] Use $parse_flags [ticket/11642] Fixed typo in the variable name. [ticket/11642] generate_text_for_display on mcp/mcp_post.php
| * | | | | | | | | | | | | [ticket/11642] Use $parse_flagsBruno Ais2013-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11642
| * | | | | | | | | | | | | [ticket/11642] Fixed typo in the variable name.Bruno Ais2013-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11642
| * | | | | | | | | | | | | [ticket/11642] generate_text_for_display on mcp/mcp_post.phpBruno Ais2013-07-161-11/+1
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11642
* | | | | | | | | | | | | Merge remote-tracking branch 'brunoais/ticket/11643' into developJoas Schilling2013-08-031-11/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/11643: [ticket/11643] Use $parse_flags [ticket/11643] Fixed typo in the variable name. [ticket/11643] generate_text_for_display on mcp/mcp_queue.php
| * | | | | | | | | | | | | [ticket/11643] Use $parse_flagsBruno Ais2013-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11643
| * | | | | | | | | | | | | [ticket/11643] Fixed typo in the variable name.Bruno Ais2013-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11643
| * | | | | | | | | | | | | [ticket/11643] generate_text_for_display on mcp/mcp_queue.phpBruno Ais2013-07-161-11/+1
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11643
* | | | | | | | | | | | | Merge remote-tracking branch 'brunoais/ticket/11641' into developJoas Schilling2013-08-031-10/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/11641: [ticket/11641] Use $parse_flags [ticket/11641] generate_text_for_display on mcp/mcp_pm_reports.php
| * | | | | | | | | | | | | [ticket/11641] Use $parse_flagsBruno Ais2013-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11641
| * | | | | | | | | | | | | [ticket/11641] generate_text_for_display on mcp/mcp_pm_reports.phpBruno Ais2013-07-161-10/+1
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11641
* | | | | | | | | | | | | Merge remote-tracking branch 'Elsensee/ticket/11763' into developJoas Schilling2013-08-031-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/11763: [ticket/11763] Add missing variable when reporting a PM to avoid SQL Error
| * | | | | | | | | | | | | [ticket/11763] Add missing variable when reporting a PM to avoid SQL ErrorOliver Schramm2013-08-031-3/+4
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11763
* | | | | | | | | | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-08-032-2/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11762] Added call to test class's parent::setUp(). [ticket/11762] Fixed test's filename [ticket/11762] Use the === operator to distinguish "0" from ""
| * | | | | | | | | | | | Merge remote-tracking branch 's9e/ticket/11762' into develop-olympusJoas Schilling2013-08-032-2/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * s9e/ticket/11762: [ticket/11762] Added call to test class's parent::setUp(). [ticket/11762] Fixed test's filename [ticket/11762] Use the === operator to distinguish "0" from ""
| | * | | | | | | | | | | | [ticket/11762] Added call to test class's parent::setUp().s9e2013-08-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added call to test class's parent::setUp(). Updated copyright year. PHPBB3-11762
| | * | | | | | | | | | | | [ticket/11762] Fixed test's filenames9e2013-08-031-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11762
| | * | | | | | | | | | | | [ticket/11762] Use the === operator to distinguish "0" from ""s9e2013-08-032-2/+38
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11762
* | | | | | | | | | | | | Merge remote-tracking branch 'rechosen/ticket/9550' into developJoas Schilling2013-08-0233-50/+155
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rechosen/ticket/9550: [ticket/9550] Break up a long ugly line in subsilver2 viewtopic_body.html [ticket/9550] Improve template event descriptions in phpBB/docs/events.md [ticket/9550] Improve template event descriptions in phpBB/docs/events.md [ticket/9550] Add the new template events to phpBB/docs/events.md [ticket/9550] Add template event memberlist_body_username_prepend [ticket/9550] Add template event memberlist_body_username_append [ticket/9550] Add template event ucp_pm_viewmessage_custom_fields_after [ticket/9550] Add template event ucp_pm_viewmessage_custom_fields_before [ticket/9550] Add template event viewtopic_body_postrow_custom_fields_after [ticket/9550] Add template event viewtopic_body_postrow_custom_fields_before [ticket/9550] Add template event viewtopic_body_post_buttons_before [ticket/9550] Add template event viewtopic_body_post_buttons_after [ticket/9550] Add template event memberlist_view_user_statistics_after [ticket/9550] Add template event memberlist_view_user_statistics_before [ticket/11759] Change lowercase to uppercase [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC2.
| * | | | | | | | | | | | | [ticket/9550] Break up a long ugly line in subsilver2 viewtopic_body.htmlrechosen2013-08-021-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per request of nickvergessen, break up the long post buttons line in viewtopic_body.html of subsilver2 into nicely indented parent and child elements. Keep the whitespace in such a way that browsers display the buttons pixel-perfectly equal to the old code. In the process, move the viewtopic_body_post_buttons_before event to a more logical (though possibly less intuitive) place (only in subsilver2). PHPBB3-9550
| * | | | | | | | | | | | | [ticket/9550] Improve template event descriptions in phpBB/docs/events.mdrechosen2013-08-021-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the custom_fields template events descriptions according to nickvergessen's suggestions. PHPBB3-9550
| * | | | | | | | | | | | | [ticket/9550] Improve template event descriptions in phpBB/docs/events.mdrechosen2013-08-021-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per suggestion of nickvergessen, stick to "before" and "after" in the template event descriptions instead of "at the top of" and "at the bottom of". PHPBB3-9550
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-21 00:44:08 +0000