aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Merge pull request #2100 from Crizz0/ticket/10549Nathan Guse2014-03-102-3/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | [ticket/10549] Adds language variables to Error messages MODULE...
| | * | | | | | | [ticket/10549] Adds language variablesCrizzo2014-03-102-3/+6
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10549
* | | | | | | | Merge pull request #2107 from VSEphpbb/ticket/12117Nathan Guse2014-03-102-0/+42
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12117] Add get_all_tree_data method to tree class
| * | | | | | | | [ticket/12117] Select all fields instead of item_basic_dataMatt Friedman2014-03-101-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12117
| * | | | | | | | [ticket/12117] Add get_all_tree_data method to tree classMatt Friedman2014-03-102-0/+44
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12117
* | | | | | | | Merge pull request #2101 from nickvergessen/ticket/10763Nathan Guse2014-03-104-25/+29
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [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
| * | | | | | | | [ticket/10763] Do not call set_post_visibility() staticallyJoas Schilling2014-03-091-3/+3
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | PHPBB3-10763
* | | | | | | | Merge pull request #2092 from nickvergessen/ticket/12090Nathan Guse2014-03-1021-251/+305
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12090] Pass route name to url() instead of the url itself
| * | | | | | | | [ticket/12090] Comment out broken testJoas Schilling2014-03-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12090
| * | | | | | | | [ticket/12090] Move find() call to container and fix testsJoas Schilling2014-03-094-30/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12090
| * | | | | | | | [ticket/12090] Split finding routes and returning routes into 2 methodsJoas Schilling2014-03-094-10/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12090
| * | | | | | | | [ticket/12090] Fix parameter list of controller helper constructorJoas Schilling2014-03-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12090
| * | | | | | | | [ticket/12090] Make provider a service and inject it into the helperJoas Schilling2014-03-087-35/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12090
| * | | | | | | | [ticket/12090] Fix pagination for routesJoas Schilling2014-03-087-45/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No clickable "jump to" at the moment, as we can not get the route url by the route name in js yet. Need to find another solution later. PHPBB3-12090
| * | | | | | | | [ticket/12090] Fix helper usage in functional controller testsJoas Schilling2014-03-071-27/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12090
| * | | | | | | | [ticket/12090] Change redirect tests to use route()Joas Schilling2014-03-074-40/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12090
| * | | | | | | | [ticket/12090] Pass route name to url() to allow admins to change the routesJoas Schilling2014-03-0710-133/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12090
* | | | | | | | | Merge remote-tracking branch 'rxu3/ticket/12224' into developJoas Schilling2014-03-104-0/+68
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rxu3/ticket/12224: [ticket/12224] Add assign_block_vars_array() test. [ticket/12224] Add template wrapper method to assign block arrays
| * | | | | | | | [ticket/12224] Add assign_block_vars_array() test.rxu2014-03-101-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests, also change return value to null. PHPBB3-12224
| * | | | | | | | [ticket/12224] Add template wrapper method to assign block arraysrxu2014-02-233-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add one more wrapper template method for the function assign_block_vars() which takes a 2-dimensional array as a parameter and calls assign_block_vars() in a loop to assign the whole block loop at once. This can make the core a little bit more expendable from the point of developing extensions as it allows to pass the data to events before it's being assigned to template. PHPBB3-12224
* | | | | | | | | Merge pull request #2089 from nickvergessen/ticket/12251Nathan Guse2014-03-0910-28/+62
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [ticket/12251] Clean up and Enhancement of Custom Profile Fields
| * | | | | | | | | [ticket/12251] Remove leading whitespace on doc blocksJoas Schilling2014-03-096-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12251
| * | | | | | | | | [ticket/12251] Add string validation for a-zA-Z0-9 and underscoreJoas Schilling2014-03-063-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12251
| * | | | | | | | | [ticket/12251] Load profile fields by default on posts, pms and memberlistJoas Schilling2014-03-061-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12251
| * | | | | | | | | [ticket/12251] Enable displaying profile fields on memberlist, posts and pmsJoas Schilling2014-03-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12251
| * | | | | | | | | [ticket/12251] Deactivate outdated profile fields by defaultJoas Schilling2014-03-061-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12251
| * | | | | | | | | [ticket/12251] Sort IM profile fields alphabeticallyJoas Schilling2014-03-061-4/+4
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12251
* | | | | | | | | Merge pull request #2099 from bantu/ticket/12256Nathan Guse2014-03-091-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | [ticket/12256] Selecting founders is fetching $sql instead of $result
| * | | | | | | | [ticket/12256] Selecting founders is fetching $sql instead of $resultForumhulp.com2014-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12256
* | | | | | | | | Merge branch 'develop-olympus' into developNathan Guse2014-03-090-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | * develop-olympus:
| * | | | | | | | Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/10945' into ↵Nathan Guse2014-03-092-29/+10
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * remotes/dhruvgoel92/ticket/10945: [ticket/10945] Fix return values for split_keywords function [ticket/10945] Display search query when search fails in native search [ticket/10945] remove trigger_error call
* | \ \ \ \ \ \ \ \ Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/10945-develop' into ↵Nathan Guse2014-03-096-48/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop * remotes/dhruvgoel92/ticket/10945-develop: [ticket/10945] Remove mark test incomplete for native search backend [ticket/10945] Fix Unit Tests as per new changes to split_keywords [ticket/10945] Remove mark test incomplete for mysql and postgres [ticket/10945] Fix return values for split_keywords function [ticket/10945] Display search query when search fails in native search [ticket/10945] remove trigger_error call
| * | | | | | | | | | [ticket/10945] Remove mark test incomplete for native search backendDhruv2014-03-081-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10945
| * | | | | | | | | | [ticket/10945] Fix Unit Tests as per new changes to split_keywordsDhruv2014-03-081-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10945
| * | | | | | | | | | [ticket/10945] Remove mark test incomplete for mysql and postgresDhruv2014-03-082-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10945
| * | | | | | | | | | Merge branch 'ticket/10945' into ticket/10945-developDhruv2014-03-082-29/+10
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/10945: [ticket/10945] Fix return values for split_keywords function [ticket/10945] Display search query when search fails in native search [ticket/10945] remove trigger_error call Conflicts: phpBB/phpbb/search/fulltext_native.php
| | * | | | | | | | | [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/10945] remove trigger_error callDhruv Goel2014-03-081-6/+0
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removes trigger_error call incase no search results are found or start variable exceeds the amount. So that search query is displayed in the search box even if no results are returned. PHPBB3-10945
* | | | | | | | | | Merge pull request #2074 from Crizz0/ticket/12240Nathan Guse2014-03-083-27/+28
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Ticket/12240 - Adds specific class to BBCode-Buttons in Template incl. Custom-BBCode support
| * | | | | | | | | | [ticket/12240] fontsize => size; fontcolor => color and added bbcode- in96Crizzo2014-03-032-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12240
| * | | | | | | | | | [ticket/12240] Added template changes for subsilver2, tooCrizzo2014-03-021-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12240
| * | | | | | | | | | [ticket/12240] Added class code for custom bbcodes based on bbcode_tagCrizzo2014-03-022-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12240
| * | | | | | | | | | [ticket/12240] Added specific class name to posting buttonsCrizzo2014-03-021-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12240
* | | | | | | | | | | Merge pull request #2094 from dhruvgoel92/ticket/11938Nathan Guse2014-03-082-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | [ticket/11938] remove deprecated sql_attr_str2ordinal and use sql_attr_string
| * | | | | | | | | | [ticket/11938] Fix whitespace charactersDhruv2014-03-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11938
| * | | | | | | | | | [ticket/11938] use sql_attr_string instead of sql_attr_str2ordinalDhruv2014-03-092-2/+2
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11938