aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | [ticket/13073] Use just one regex in helper route()Marc Alexander2014-09-191-1/+1
| * | [ticket/13073] Properly place comments in helperMarc Alexander2014-09-191-2/+1
| * | [ticket/13073] Add phpbb root path with mod rewrite enabled for proper routesMarc Alexander2014-09-181-2/+10
* | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-182-18/+1
|\ \ \ | |/ /
| * | [ticket/12963] Revert back to "migrations" folder name for extensionsJoas Schilling2014-09-182-18/+1
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-171-18/+1
|\ \ \ | |/ /
| * | [ticket/13064] Revert "[ticket/13064] Validate the migrations provided to ..."Joas Schilling2014-09-171-18/+1
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-172-40/+4
|\ \ \ | |/ /
| * | Merge pull request #2948 from Nicofuma/ticket/13061Joas Schilling2014-09-172-40/+4
| |\ \
| | * | [ticket/13061] Replace the service event.subscriber_loader by a compiler passTristan Darricau2014-09-132-40/+4
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-171-1/+18
|\ \ \ \ | |/ / /
| * | | Merge pull request #2951 from Nicofuma/ticket/13064Joas Schilling2014-09-171-1/+18
| |\ \ \
| | * | | [ticket/13064] Validate the migrations provided to migrator::set_migrations()Tristan Darricau2014-09-141-1/+18
| | |/ /
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-171-3/+10
|\ \ \ \ | |/ / /
| * | | Merge pull request #2922 from Nicofuma/ticket/13036Marc Alexander2014-09-171-3/+10
| |\ \ \
| | * | | [ticket/13036] Add unit testsTristan Darricau2014-09-161-0/+5
| | * | | [ticket/13036] Make the reference type configurable when generating a routeTristan Darricau2014-09-161-3/+5
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-172-5/+25
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2932 from Nicofuma/ticket/12963Marc Alexander2014-09-172-5/+25
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [ticket/12963] Edit deprecation messageTristan Darricau2014-09-162-2/+2