aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11336] Changes "leaders"-mode to "team"-mode and so in test-fileCrizzo2014-03-281-1/+1
| | | | PHPBB3-11336
* Merge remote-tracking branch 'geetakshi/ticket/11360' into develop-ascraeusJoas Schilling2014-03-282-6/+6
|\ | | | | | | | | | | | | * geetakshi/ticket/11360: [ticket/11360] Updating default value of $display_online_list [ticket/11360] Avoiding online list where not required [ticket/11360] Change second parameter in page_header function
| * [ticket/11360] Updating default value of $display_online_listgeetakshi2014-03-241-1/+1
| | | | | | | | PHPBB3-11360
| * [ticket/11360] Change second parameter in page_header functiongeetakshi2014-03-191-5/+5
| | | | | | | | PHPBB3-11360
* | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-03-221-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12035] Correcting the condition [ticket/12035] Adding necessary conditions [ticket/12035] Adding link to user posts to ACP page Conflicts: phpBB/adm/style/acp_users_overview.html
| * | [ticket/12035] Correcting the conditiongeetakshi2014-03-201-1/+1
| | | | | | | | | | | | PHPBB3-12035
| * | [ticket/12035] Adding necessary conditionsgeetakshi2014-03-201-1/+1
| | | | | | | | | | | | PHPBB3-12035
| * | [ticket/12035] Adding link to user posts to ACP pagegeetakshi2014-03-171-0/+1
| | | | | | | | | | | | | | | | | | Adding link of posts behind displayed number of posts of the user PHPBB3-12035
| * | 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
* | | | [ticket/12292] Improve style details pageMatt Friedman2014-03-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://tracker.phpbb.com/browse/PHPBB3-12292 Gave style details page a proper heading and back button. Also removed a few obsolete code leftovers in the style and CSS. PHPBB3-12292
* | | | Merge pull request #2137 from geetakshi/ticket/8309Dhruv Goel2014-03-202-3/+3
|\ \ \ \ | | | | | | | | | | [ticket/8309] Rename "Last visited" to "Last activity" on memberlist/viewprofile
| * | | | [ticket/8309] Changing $last_activity to $last_activegeetakshi2014-03-202-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-8309
| * | | | [ticket/8309] Removing key with similar function to avoid redundancygeetakshi2014-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-8309
| * | | | [ticket/8309] Rename $last_visit to $last_activitygeetakshi2014-03-162-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-8309
| * | | | [ticket/8309] Renaming "Last visit" to "Last activity"geetakshi2014-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-8309
* | | | | Merge remote-tracking branch 'Elsensee/ticket/11169' into developJoas Schilling2014-03-191-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | * Elsensee/ticket/11169: [ticket/11169] Skip migration if "Users" category has been deleted [ticket/11169] Move module 'prune users' to users category
| * | | | [ticket/11169] Move module 'prune users' to users categoryOliver Schramm2014-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11169
* | | | | Merge remote-tracking branch 'prototech/ticket/12160' into developJoas Schilling2014-03-181-0/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Move phpbb_check_installation_exists() to functions_install.phpCesar G2014-02-222-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12160
| * | | | | [ticket/12160] Add function to check if phpBB is installed.Cesar G2014-02-151-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12160
* | | | | | 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
* | | | | [prep-release-3.1.0-b1] Update build version to 3.1.0-b2-devJoas Schilling2014-03-151-1/+1
| | | | |
* | | | | [prep-release-3.1.0-b1] Update version to 3.1.0-b1Joas Schilling2014-03-151-1/+1
| | | | |
* | | | | [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
* | | | Merge remote-tracking branch 'EXreaction/ticket/9871-2' into developJoas Schilling2014-03-143-89/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Fix indentation on commentNathan Guse2014-03-141-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-9871
| * | | | [ticket/9871] Restore phpbb_version_compareNathan Guse2014-03-051-4/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-9871
| * | | | [ticket/9871] Restore get_remote_fileNathan Guse2014-03-052-68/+66
| | | | | | | | | | | | | | | | | | | | 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-195-164/+101
| | | | | | | | | | | | | | | | | | | | PHPBB3-9871
* | | | | Merge branch 'develop-olympus' into developJoas Schilling2014-03-141-2/+6
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-141-2/+6
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | | [ticket/12202] Can't call htmlspecialchars before checking for quotesNathaniel Guse2014-03-091-1/+5
| | | | | | | | | | | | | | | | | | | | 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
| * | | | | [ticket/12241] Update event name and version match our guidelinesJoas Schilling2014-03-141-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12241
| * | | | | [ticket/12241] Add submit to event variablesForumhulp.com2014-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12241
| * | | | | [ticket/12241] Move $phpbb_dispatcher to the topForumhulp.com2014-03-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12241
| * | | | | [ticket/12241] Event to add and/or modify acp_board configurationsForumhulp.com2014-03-141-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12241
* | | | | | Merge pull request #2109 from nickvergessen/ticket/11581Nathan Guse2014-03-131-0/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/11581] Hide categories on level 0 when they have no visible children
| * | | | | | [ticket/11581] Hide categories when they have no visible childrenJoas Schilling2014-03-131-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11581
* | | | | | | Merge pull request #2113 from nickvergessen/ticket/8041Andreas Fischer2014-03-131-3/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/8041] Merge item name into "Return to" string for better translations * nickvergessen/ticket/8041: [ticket/8041] Add space/tabs after => in array list [ticket/8041] Wrap forum name, topic title and pm folder name with quotes [ticket/8041] Merge item name into "Return to" string for better translations
| * | | | | | | [ticket/8041] Add space/tabs after => in array listJoas Schilling2014-03-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8041
| * | | | | | | [ticket/8041] Merge item name into "Return to" string for better translationsJoas Schilling2014-03-121-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8041
* | | | | | | | Merge branch 'develop-olympus' into developJoas Schilling2014-03-131-2/+7
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12176] Reword comment about config entries. [ticket/12176] Add newest_user_colour to config array to ensure it exists [ticket/12176] Display correct message when trying to delete founder. [ticket/12176] Add functional test for founder deletion message. Conflicts: tests/test_framework/phpbb_functional_test_case.php