aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11959] List the last user with "and" instead of a comma.Cesar G2014-03-192-6/+22
| | | | PHPBB3-11959
* [ticket/11959] Use the plurals system for the untrimmed language strings.Cesar G2014-03-192-4/+15
| | | | PHPBB3-11959
* [ticket/11959] Fix the NOTIFICATION_QUOTE_TRIMMED text.Cesar G2014-03-191-1/+1
| | | | PHPBB3-11959
* [ticket/11959] Use plurals for the language strings.Cesar G2014-03-191-3/+9
| | | | PHPBB3-11959
* Merge remote-tracking branch 'prototech/ticket/12160' into developJoas Schilling2014-03-184-36/+71
|\ | | | | | | | | | | | | | | * prototech/ticket/12160: [ticket/12160] Use phpbb_check_installation_exists() in the other modules. [ticket/12160] Move phpbb_check_installation_exists() to functions_install.php [ticket/12160] Check if phpBB is installed before creating phpBB container. [ticket/12160] Add function to check if phpBB is installed.
| * [ticket/12160] Use phpbb_check_installation_exists() in the other modules.Cesar G2014-02-222-17/+3
| | | | | | | | PHPBB3-12160
| * [ticket/12160] Move phpbb_check_installation_exists() to functions_install.phpCesar G2014-02-222-19/+19
| | | | | | | | PHPBB3-12160
| * [ticket/12160] Check if phpBB is installed before creating phpBB container.Cesar G2014-02-151-19/+49
| | | | | | | | PHPBB3-12160
| * [ticket/12160] Add function to check if phpBB is installed.Cesar G2014-02-151-0/+19
| | | | | | | | PHPBB3-12160
* | Merge remote-tracking branch 'rxu3/ticket/12278' into developJoas Schilling2014-03-181-0/+17
|\ \ | | | | | | | | | | | | * rxu3/ticket/12278: [ticket/12278] Add mcp.php core event to allow to modify modules display option
| * | [ticket/12278] Add mcp.php core event to allow to modify modules display optionrxu2014-03-171-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | This event allows extensions to set display option for custom MCP modules for extensions which add custom MCP modules and some of them should be displayed conditionally. PHPBB3-12278
* | | Merge remote-tracking branch 'VSEphpbb/ticket/12284' into developAndreas Fischer2014-03-171-6/+6
|\ \ \ | | | | | | | | | | | | | | | | * VSEphpbb/ticket/12284: [ticket/12284] Improve readability of extension manager details
| * | | [ticket/12284] Improve readability of extension manager detailsMatt Friedman2014-03-171-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use span tags like the rest of the ACP does, instead of P tags. There is no semantic need to use P tags here. These are not paragraphs. PHPBB3-12284
* | | | Merge remote-tracking branch 'rxu3/ticket/12279' into developJoas Schilling2014-03-173-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * rxu3/ticket/12279: [ticket/12279] Add memberlist_view.html template event to add custom info
| * | | | [ticket/12279] Add memberlist_view.html template event to add custom inforxu2014-03-173-0/+12
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Template event to ddd custom content to the user profile view after the main content. PHPBB3-12279
* | | | Merge remote-tracking branch 'dragooon/ticket/9040' into developJoas Schilling2014-03-171-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * dragooon/ticket/9040: [ticket/9040] Minor cleanup in the unit test file [ticket/9040] Count HTML entities as single in custom profile fields
| * | | | [ticket/9040] Count HTML entities as single in custom profile fieldsShitiz Garg2014-03-171-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when an user adds a HTML entity to a custom profile field, the length gets incremented by 4 since the code reads &gt; instead of <. However, the length is presentational and not DB storage so it should be treated as a single character even if it takes four lengths in the DB by being stored as a HTML entity. Work around this by decoding html entities before counting. Also, added unit tests for string field type PHPBB3-9040
* | | | Merge branch 'ticket/12269' of github.com:netdeamon/phpbb into developJoas Schilling2014-03-171-0/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | # By netdeamon # Via netdeamon * 'ticket/12269' of github.com:netdeamon/phpbb: [ticket/12269] Delete folder mods in language
| * | | [ticket/12269] Delete folder mods in languagenetdeamon2014-03-171-0/+0
| |/ / | | | | | | | | | | | | | | | Deleted mods folder in phpbb/language/en/. PHPBB3-12269
* | | Merge branch 'ticket/11239' of github.com:geetakshi/phpbb into developJoas Schilling2014-03-161-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By geetakshi # Via geetakshi * 'ticket/11239' of github.com:geetakshi/phpbb: [ticket/11239] Removing hard-coded, language specific possessive [ticket/11239] Including username before Overview title
| * | | [ticket/11239] Removing hard-coded, language specific possessivegeetakshi2014-03-161-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11239
| * | | [ticket/11239] Including username before Overview titlegeetakshi2014-03-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding username to the page title to avoid confusion while managing multiple users in ACP PHPBB3-11239
* | | | Merge remote-tracking branch 'vsephpbb/ticket/12274' into developJoas Schilling2014-03-162-4/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/12274: [ticket/12274] Add core.js to the install footer [ticket/12274] Fix broke/missing jQuery asset paths in update script [ticket/12274] Load correct T_TEMPLATE_PATH during update
| * | | | [ticket/12274] Add core.js to the install footerMatt Friedman2014-03-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Required so phpbb var is defined, as it is used in admin.js. PHPBB3-12274
| * | | | [ticket/12274] Fix broke/missing jQuery asset paths in update scriptMatt Friedman2014-03-161-4/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-12274
| * | | | [ticket/12274] Load correct T_TEMPLATE_PATH during updateMatt Friedman2014-03-151-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-12274
* | | | [ticket/11071] Add fallback if requested style don't existOliver Schramm2014-03-151-0/+13
| |/ / |/| | | | | | | | PHPBB3-11071
* | | [prep-release-3.1.0-b1] Update build version to 3.1.0-b2-devJoas Schilling2014-03-152-2/+2
| | |
* | | [prep-release-3.1.0-b1] Add changelog for 3.1.0-b1Joas Schilling2014-03-151-0/+145
| | |
* | | [prep-release-3.1.0-b1] Prepare ChangelogJoas Schilling2014-03-151-24/+27
| | |
* | | [prep-release-3.1.0-b1] Add migration for 3.1.0-b1Joas Schilling2014-03-151-0/+33
| | |
* | | [prep-release-3.1.0-b1] Update version to 3.1.0-b1Joas Schilling2014-03-155-7/+7
| | |
* | | Merge pull request #2111 from nickvergessen/ticket/12262Andreas Fischer2014-03-151-14/+39
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12262] Fix event exporter * nickvergessen/ticket/12262: [ticket/12262] Do not use inline assignments [ticket/12262] Do not use getExtension() [ticket/12262] Fix location list for acp events with "Locations:" [ticket/12262] Also find vars array when it's defined in the trigger_event()
| * | | [ticket/12262] Do not use inline assignmentsJoas Schilling2014-03-151-4/+7
| | | | | | | | | | | | | | | | PHPBB3-12262
| * | | [ticket/12262] Do not use getExtension()Joas Schilling2014-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The method is php 5.3.6+ only. PHPBB3-12262
| * | | [ticket/12262] Fix location list for acp events with "Locations:"Joas Schilling2014-03-111-2/+13
| | | | | | | | | | | | | | | | PHPBB3-12262
| * | | [ticket/12262] Also find vars array when it's defined in the trigger_event()Joas Schilling2014-03-111-8/+19
| | | | | | | | | | | | | | | | PHPBB3-12262
* | | | [ticket/12272] Fix hardcoded colons in subforums.Maël Soucaze2014-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In subforums list, under the parent forum description, there are two harcoded colons instead of {L_COLON}. PHPBB3-12272
* | | | [ticket/12272] Fix hardcoded colons in subforums.Maël Soucaze2014-03-152-2/+2
| |/ / |/| | | | | | | | | | | | | | | | | In subforums list, under the parent forum description, there are two harcoded colons instead of {L_COLON}. PHPBB3-12272
* | | Merge pull request #2128 from nickvergessen/ticket/12271Dhruv Goel2014-03-147-25/+31
|\ \ \ | | | | | | | | [ticket/12271] Decouple dropdown header and footer from #notifications_list
| * | | [ticket/12271] Decouple dropdown header and footer from #notifications_listJoas Schilling2014-03-147-25/+31
| | | | | | | | | | | | | | | | PHPBB3-12271
* | | | Merge branch 'develop-olympus' into developJoas Schilling2014-03-141-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * develop-olympus: [ticket/12072] Fix comment about NEW MEMBERS permission
| * | | Merge remote-tracking branch 'Elsensee/ticket/12072' into develop-olympusJoas Schilling2014-03-141-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/12072: [ticket/12072] Fix comment about NEW MEMBERS permission
| | * | | [ticket/12072] Fix comment about NEW MEMBERS permissionOliver Schramm2014-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12072
| * | | | Merge remote-tracking branch 'marcosbc/ticket/12247' into develop-olympusJoas Schilling2014-03-141-2/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marcosbc/ticket/12247: [ticket/12247] Makes static usernames work [ticket/12247] Add ['username'] to mcp_queue.php's user_notification()
| | * | | | [ticket/12247] Makes static usernames workMarcos Bjorkelund2014-03-141-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relative to the last ticket, this allows static usernames to work correctly (those inserted in the post-column post_username) when sending the e-mail, instead of showing just "Anonymous". PHPBB3-12247
| | * | | | [ticket/12247] Add ['username'] to mcp_queue.php's user_notification()Marcos Bjorkelund2014-03-131-2/+2
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It includes the poster's username in the email notifications of posts that get approved by moderators. This is done by adding the username to every user_notification() function located in /phpBB/includes/mcp/mcp_queue.php. PHPBB3-12247
* | | | | Merge remote-tracking branch 'vsephpbb/ticket/11429' into developJoas Schilling2014-03-141-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/11429: [ticket/11429] Increment asset version on Ext enable
| * | | | | [ticket/11429] Increment asset version on Ext enableMatt Friedman2014-03-131-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11429
* | | | | | Merge remote-tracking branch 'EXreaction/ticket/9871-2' into developJoas Schilling2014-03-149-171/+358
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/9871-2: [ticket/9871] Can set current version to use instead of the phpBB version [ticket/9871] Fix indentation on comment [ticket/9871] Fix test name [ticket/9871] Split fast and slow version tests [ticket/9871] Option to force the stability when checking for updates [ticket/9871] Allow setting the host/file to load for the version class [ticket/9871] Restore get_remote_file_test [ticket/9871] Fix tests [ticket/9871] Typehint and comment on var types [ticket/9871] Mark test as slow [ticket/9871] Restore phpbb_version_compare [ticket/9871] Restore get_remote_file [ticket/9871] Use $request->variable instead of request_var [ticket/9871] Update version check file to use json format