aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-021-4/+42
|\
| * Merge pull request #2947 from rxu/ticket/13059Joas Schilling2014-10-021-4/+42
| |\
| | * [ticket/13059] Add core event to generate_page_link()rxu2014-10-011-4/+42
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-011-14/+2
|\ \ \ | |/ /
| * | [ticket/11224] Revert "Merge pull request #2460 from Nicofuma/ticket/11224"Joas Schilling2014-10-011-14/+2
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-011-0/+51
|\ \ \ | |/ /
| * | Merge pull request #3013 from VSEphpbb/ticket/13121Joas Schilling2014-10-011-0/+51
| |\ \
| | * | [ticket/13121] Fix migration fileMatt Friedman2014-10-011-3/+3
| | * | [ticket/13121] Remove cache mode from style management moduleMatt Friedman2014-10-011-0/+51
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-011-2/+14
|\ \ \ \ | |/ / /
| * | | Merge pull request #2460 from Nicofuma/ticket/11224Joas Schilling2014-10-011-2/+14
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-011-2/+2
|\ \ \ \ | |/ / /
| * | | Merge pull request #2545 from ptitlazy/ticket/12657Joas Schilling2014-10-011-2/+2
| |\ \ \
| | * | | [ticket/12657] Add a test file for base caseLEZY Thomas2014-09-191-2/+2
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-011-2/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2888 from Nicofuma/ticket/12993Joas Schilling2014-10-011-2/+5
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | [ticket/12993] Return an array instead of reference passingTristan Darricau2014-08-191-1/+4
| | * | | [ticket/12993] Fix includes of functions_displayTristan Darricau2014-08-191-1/+1
| | * | | [ticket/12993] Rename to phpbb_get_user_rankTristan Darricau2014-08-181-1/+1
| | * | | [ticket/12993] Fix user_loader and memberlistTristan Darricau2014-08-181-1/+1
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-301-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3008 from nickvergessen/ticket/13111Andreas Fischer2014-09-301-1/+1
| |\ \ \ \
| | * | | | [ticket/13111] Dropdown options are already an array in the field dataJoas Schilling2014-09-301-1/+1
* | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-301-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3007 from nickvergessen/ticket/13118Andreas Fischer2014-09-301-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/13118] Correctly use the provided datetime classJoas Schilling2014-09-301-1/+1
| | |/ / / /
* | | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-09-301-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3003 from nickvergessen/ticket/13117Nils Adermann2014-09-301-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysqlJoas Schilling2014-09-291-1/+1
| | |/ / / /
* | | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-09-291-7/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/13113] Updates the base url only when the front-end isn't app.phpTristan Darricau2014-09-281-7/+10
| |/ / / /
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-251-18/+21
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2995 from nickvergessen/ticket/13105Andreas Fischer2014-09-251-18/+21
| |\ \ \ \
| | * | | | [ticket/13105] Do not display future dates 2+ days ahead as "tomorrow"Joas Schilling2014-09-251-18/+21
* | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-251-67/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/13106] Remove \phpbb\di\pass\kernel_pass.phpJakub Senko2014-09-251-67/+0
| |/ / / /
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-242-2/+97
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2954 from rxu/ticket/13055Joas Schilling2014-09-242-2/+97
| |\ \ \ \
| | * | | | [ticket/13055] Add string profile fields validation options to support unicoderxu2014-09-182-2/+97
* | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-231-3/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #2985 from nickvergessen/ticket/13048Andreas Fischer2014-09-231-3/+4
| |\ \ \ \ \
| | * | | | | [ticket/13048] Only do not update the session page for ajax requestsJoas Schilling2014-09-231-3/+4
| | | |_|_|/ | | |/| | |
* | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-231-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/13070] Use old 'template' class for template class hookMarc Alexander2014-09-221-3/+3
| |/ / / /
* | | | | Merge branch 'develop-ascraeus' into developDhruv2014-09-211-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/13085] Fix typo in oauth.phpn-aleha2014-09-211-1/+1
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-201-0/+32
|\ \ \ \ \ | |/ / / /
| * | | | [prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4Joas Schilling2014-09-191-0/+32
* | | | | Merge branch 'ticket/13073' into ticket/13073-developMarc Alexander2014-09-191-2/+9
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/13073] Add path regex to get_preg_expression() and add unit testsMarc Alexander2014-09-191-1/+1