aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [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
| * | | | | | Merge remote-tracking branch 'bantu/ticket/12176' into develop-olympusJoas Schilling2014-03-131-2/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/12176: [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.
| | * | | | | | [ticket/12176] Display correct message when trying to delete founder.Andreas Fischer2014-02-151-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12176
* | | | | | | | Merge pull request #2104 from nickvergessen/ticket/12261Nathan Guse2014-03-121-2/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12261] Remove web root path from login redirect url
| * | | | | | | | [ticket/12261] Add a functional test for redirect after using login_box()Joas Schilling2014-03-101-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12261
| * | | | | | | | [ticket/12261] Remove web root path from login redirect urlJoas Schilling2014-03-101-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The redirect url must be relative to the ucp.php and not relative to the current page. PHPBB3-12261
* | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2014-03-121-1/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10549] using correct variable in includes/functions_module.php too [ticket/10549] changed "right" to "incorrect" Conflicts: phpBB/includes/functions_module.php
| * | | | | | | [ticket/10549] using correct variable in includes/functions_module.php tooCrizzo2014-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10549
| * | | | | | | Merge remote-tracking branch 'dhruvgoel92/ticket/11288' into develop-olympusJoas Schilling2014-03-111-0/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11288: [ticket/11288] Handle +,- without preceeding whitespace characters
| | * | | | | | | [ticket/11288] Handle +,- without preceeding whitespace charactersDhruv2013-10-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11288
* | | | | | | | | Merge remote-tracking branch 'rxu3/ticket/12260' into developJoas Schilling2014-03-111-8/+59
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * rxu3/ticket/12260: [ticket/12260] Add core events to delete_posts() function.
| * | | | | | | | [ticket/12260] Add core events to delete_posts() function.rxu2014-03-111-8/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Events for extensions to perform additional actions on posts deletion. PHPBB3-12260
* | | | | | | | | Merge branch 'develop-olympus' into developNathan Guse2014-03-101-3/+3
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10549] Adds language variables Conflicts: phpBB/includes/functions_module.php
| * | | | | | | | [ticket/10549] Adds language variablesCrizzo2014-03-101-3/+3
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | PHPBB3-10549
| * | | | | | | [ticket/10945] Fix return values for split_keywords functionDhruv2014-03-081-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function now returns false if all the words are common words and true otherwise. PHPBB3-10945
| * | | | | | | [ticket/10945] Display search query when search fails in native searchDhruv2014-03-081-18/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If search fails and common words are present, split_keywords returns false and search.php file prints appropriate message of common words. If search fails and there are no common words, split_keywords returns true and keyword_search returns false so that the search query is displayed in search box. PHPBB3-10945
| * | | | | | | [ticket/12205] Do not display 0 for empty integers when show_novalue is offJoas Schilling2014-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12205
| * | | | | | | [ticket/12210] dbtools::sql_create_table incorrectly throws errorNathaniel Guse2014-02-171-1/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related to auto-increment length on non auto-increment fields PHPBB3-12210
* | | | | | | Merge pull request #2101 from nickvergessen/ticket/10763Nathan Guse2014-03-103-22/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/10763] Do not call non-static functions statically
| * | | | | | | [ticket/10763] Do not call messenger::error() staticallyJoas Schilling2014-03-091-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10763
| * | | | | | | [ticket/10763] Do not call non-static transfer() staticallyJoas Schilling2014-03-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10763
| * | | | | | | [ticket/10763] Fix static calls to non static methods in colour_managerJoas Schilling2014-03-091-16/+16
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-10763
* | | | | | | Merge pull request #2092 from nickvergessen/ticket/12090Nathan Guse2014-03-101-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [ticket/12090] Pass route name to url() instead of the url itself
| * | | | | | [ticket/12090] Split finding routes and returning routes into 2 methodsJoas Schilling2014-03-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12090
| * | | | | | [ticket/12090] Make provider a service and inject it into the helperJoas Schilling2014-03-081-4/+4
| | |_|/ / / | |/| | | | | | | | | | | | | | | | PHPBB3-12090
* | | | | | Merge pull request #2074 from Crizz0/ticket/12240Nathan Guse2014-03-081-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Ticket/12240 - Adds specific class to BBCode-Buttons in Template incl. Custom-BBCode support