aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [prep-release-3.1.0-b1] Update build version to 3.1.0-b2-devJoas Schilling2014-03-153-5/+5
|
* [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-156-10/+10
|
* 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
* | Merge remote-tracking branch 'maelsoucaze/develop' into developJoas Schilling2014-03-153-3/+3
|\ \ | | | | | | | | | | | | | | | * maelsoucaze/develop: [ticket/12272] Fix hardcoded colons in subforums. [ticket/12272] Fix hardcoded colons in subforums.
| * | [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 '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-1411-171/+734
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | [ticket/9871] Can set current version to use instead of the phpBB versionNathan Guse2014-03-141-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9871
| * | | | | [ticket/9871] Fix indentation on commentNathan Guse2014-03-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9871
| * | | | | [ticket/9871] Fix test nameNathan Guse2014-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9871
| * | | | | [ticket/9871] Split fast and slow version testsNathan Guse2014-03-132-26/+58
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9871
| * | | | | [ticket/9871] Option to force the stability when checking for updatesNathan Guse2014-03-111-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9871
| * | | | | [ticket/9871] Allow setting the host/file to load for the version classNathan Guse2014-03-102-3/+45
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9871
| * | | | | [ticket/9871] Restore get_remote_file_testNathan Guse2014-03-101-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9871
| * | | | | [ticket/9871] Fix testsNathan Guse2014-03-081-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9871
| * | | | | [ticket/9871] Typehint and comment on var typesNathan Guse2014-03-051-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9871
| * | | | | [ticket/9871] Mark test as slowNathan Guse2014-03-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9871
| * | | | | [ticket/9871] Restore phpbb_version_compareNathan Guse2014-03-052-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9871
| * | | | | [ticket/9871] Restore get_remote_fileNathan Guse2014-03-053-139/+73
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9871
| * | | | | [ticket/9871] Use $request->variable instead of request_varNathan Guse2014-03-052-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9871
| * | | | | [ticket/9871] Update version check file to use json formatNathan Guse2014-02-1913-321/+739
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9871
* | | | | | Merge branch 'develop-olympus' into developJoas Schilling2014-03-140-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12247] Makes static usernames work [ticket/12247] Add ['username'] to mcp_queue.php's user_notification() Conflicts: phpBB/includes/mcp/mcp_queue.php
| * | | | | 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 branch 'develop-olympus' into developJoas Schilling2014-03-144-4/+111
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12202] Use an array in the data provider instead of exploding manually [ticket/12202] Can't call htmlspecialchars before checking for quotes [ticket/12202] Fix tests [ticket/12202] Test for parse_cfg_file [ticket/12202] Use copyright symbol in style.cfg files [ticket/12202] Apply htmlspecialchars to style.cfg data Conflicts: phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | | | | Merge remote-tracking branch 'exreaction/ticket/12202' into develop-olympusJoas Schilling2014-03-144-5/+112
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * exreaction/ticket/12202: [ticket/12202] Use an array in the data provider instead of exploding manually [ticket/12202] Can't call htmlspecialchars before checking for quotes [ticket/12202] Fix tests [ticket/12202] Test for parse_cfg_file [ticket/12202] Use copyright symbol in style.cfg files [ticket/12202] Apply htmlspecialchars to style.cfg data
| | * | | | Merge pull request #11 from nickvergessen/ticket/exreaction/12202Nathan Guse2014-03-141-38/+44
| | |\ \ \ \ | | | | | | | | | | | | | | [ticket/12202] Use an array in the data provider instead of exploding manually
| | | * | | | [ticket/12202] Use an array in the data provider instead of exploding manuallyJoas Schilling2014-03-141-38/+44
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-12202
| | * | | | [ticket/12202] Can't call htmlspecialchars before checking for quotesNathaniel Guse2014-03-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12202
| | * | | | [ticket/12202] Fix testsNathaniel Guse2014-03-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12202
| | * | | | [ticket/12202] Test for parse_cfg_fileNathan Guse2014-03-091-0/+97
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12202
| | * | | | [ticket/12202] Use copyright symbol in style.cfg filesNathan Guse2014-03-092-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12202
| | * | | | [ticket/12202] Apply htmlspecialchars to style.cfg dataNathan Guse2014-03-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12202
* | | | | | Merge pull request #2126 from nickvergessen/ticket/forumhulp/12241Dhruv Goel2014-03-141-1/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/12241] Event to add and/or modify acp_board configurations
| * | | | | | [ticket/12241] Add @var for the argumentsJoas Schilling2014-03-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12241