aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developJoas Schilling2014-03-111-2/+5
|\
| * Merge remote-tracking branch 'EXreaction/ticket/12259-olympus' into develop-o...Joas Schilling2014-03-111-2/+7
| |\
| | * [ticket/12259] Reduce the size of our test matrixNathan Guse2014-03-101-2/+7
* | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathan Guse2014-03-101-1/+1
|\ \ \ | |/ /
| * | Merge pull request #2105 from Crizz0/ticket/12106Nathan Guse2014-03-101-1/+1
| |\ \
| | * | [ticket/12106] Combined first and second sentenceCrizzo2014-03-101-1/+1
| | * | [ticket/12106] Adds a explaination that admin/mods still able to use the boardCrizzo2014-03-101-1/+1
| | |/
* | | Merge branch 'develop-olympus' into developNathan Guse2014-03-102-3/+6
|\ \ \ | |/ /
| * | Merge pull request #2100 from Crizz0/ticket/10549Nathan Guse2014-03-102-3/+6
| |\ \ | | |/ | |/|
| | * [ticket/10549] Adds language variablesCrizzo2014-03-102-3/+6
| |/
* | Merge pull request #2107 from VSEphpbb/ticket/12117Nathan Guse2014-03-102-0/+42
|\ \
| * | [ticket/12117] Select all fields instead of item_basic_dataMatt Friedman2014-03-101-3/+1
| * | [ticket/12117] Add get_all_tree_data method to tree classMatt Friedman2014-03-102-0/+44
* | | Merge pull request #2101 from nickvergessen/ticket/10763Nathan Guse2014-03-104-25/+29
|\ \ \
| * | | [ticket/10763] Do not call messenger::error() staticallyJoas Schilling2014-03-091-4/+8
| * | | [ticket/10763] Do not call non-static transfer() staticallyJoas Schilling2014-03-091-2/+2
| * | | [ticket/10763] Fix static calls to non static methods in colour_managerJoas Schilling2014-03-091-16/+16
| * | | [ticket/10763] Do not call set_post_visibility() staticallyJoas Schilling2014-03-091-3/+3
* | | | Merge pull request #2092 from nickvergessen/ticket/12090Nathan Guse2014-03-1021-251/+305
|\ \ \ \
| * | | | [ticket/12090] Comment out broken testJoas Schilling2014-03-091-0/+3
| * | | | [ticket/12090] Move find() call to container and fix testsJoas Schilling2014-03-094-30/+36
| * | | | [ticket/12090] Split finding routes and returning routes into 2 methodsJoas Schilling2014-03-094-10/+25
| * | | | [ticket/12090] Fix parameter list of controller helper constructorJoas Schilling2014-03-091-2/+3
| * | | | [ticket/12090] Make provider a service and inject it into the helperJoas Schilling2014-03-087-35/+28
| * | | | [ticket/12090] Fix pagination for routesJoas Schilling2014-03-087-45/+93
| * | | | [ticket/12090] Fix helper usage in functional controller testsJoas Schilling2014-03-071-27/+3
| * | | | [ticket/12090] Change redirect tests to use route()Joas Schilling2014-03-074-40/+23
| * | | | [ticket/12090] Pass route name to url() to allow admins to change the routesJoas Schilling2014-03-0710-133/+162
* | | | | Merge remote-tracking branch 'rxu3/ticket/12224' into developJoas Schilling2014-03-104-0/+68
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | [ticket/12224] Add assign_block_vars_array() test.rxu2014-03-101-0/+34
| * | | | [ticket/12224] Add template wrapper method to assign block arraysrxu2014-02-233-0/+34
* | | | | Merge pull request #2089 from nickvergessen/ticket/12251Nathan Guse2014-03-0910-28/+62
|\ \ \ \ \
| * | | | | [ticket/12251] Remove leading whitespace on doc blocksJoas Schilling2014-03-096-6/+6
| * | | | | [ticket/12251] Add string validation for a-zA-Z0-9 and underscoreJoas Schilling2014-03-063-14/+18
| * | | | | [ticket/12251] Load profile fields by default on posts, pms and memberlistJoas Schilling2014-03-061-0/+30
| * | | | | [ticket/12251] Enable displaying profile fields on memberlist, posts and pmsJoas Schilling2014-03-061-3/+3
| * | | | | [ticket/12251] Deactivate outdated profile fields by defaultJoas Schilling2014-03-061-6/+6
| * | | | | [ticket/12251] Sort IM profile fields alphabeticallyJoas Schilling2014-03-061-4/+4
| | |/ / / | |/| | |
* | | | | Merge pull request #2099 from bantu/ticket/12256Nathan Guse2014-03-091-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | [ticket/12256] Selecting founders is fetching $sql instead of $resultForumhulp.com2014-03-091-1/+1
* | | | | Merge branch 'develop-olympus' into developNathan Guse2014-03-090-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/10945' into develop-...Nathan Guse2014-03-092-29/+10
| |\ \ \ \
* | \ \ \ \ Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/10945-develop' into ...Nathan Guse2014-03-096-48/+16
|\ \ \ \ \ \
| * | | | | | [ticket/10945] Remove mark test incomplete for native search backendDhruv2014-03-081-5/+0
| * | | | | | [ticket/10945] Fix Unit Tests as per new changes to split_keywordsDhruv2014-03-081-6/+6
| * | | | | | [ticket/10945] Remove mark test incomplete for mysql and postgresDhruv2014-03-082-8/+0
| * | | | | | Merge branch 'ticket/10945' into ticket/10945-developDhruv2014-03-082-29/+10
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | [ticket/10945] Fix return values for split_keywords functionDhruv2014-03-081-14/+8
| | * | | | | [ticket/10945] Display search query when search fails in native searchDhruv2014-03-081-18/+11
| | * | | | | [ticket/10945] remove trigger_error callDhruv Goel2014-03-081-6/+0
| | |/ / / /