aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/config
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2013-02-253-0/+60
| |\ \
| * | | [ticket/10714] Use new core.adm_relative_path to create the object.Joas Schilling2013-01-161-0/+1
| * | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2013-01-161-0/+11
| |\ \ \
| * \ \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2012-12-142-9/+17
| |\ \ \ \
| * | | | | [ticket/10714] Use dependencies instead of globalsJoas Schilling2012-12-092-0/+12
* | | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386-3Nathaniel Guse2013-03-042-0/+76
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'remotes/marc/feature/avatars' into developNathaniel Guse2013-03-042-0/+63
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-044-0/+347
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-02-073-0/+58
| | |\ \ \ \ \ \
| | * | | | | | | [feature/avatars] Move definition of driver_collection to avatars.ymlMarc Alexander2013-01-152-7/+7
| | * | | | | | | [feature/avatars] Remove the obsolete request argument for avatar driversMarc Alexander2013-01-151-4/+0
| | * | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-01-041-0/+11
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatarsMarc Alexander2012-12-241-0/+1
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | Merge branch 'develop' into feature/avatarsMarc Alexander2012-12-093-0/+77
| | |\ \ \ \ \ \ \
| | * | | | | | | | [feature/avatars] Call set_name() method in avatars.ymlMarc Alexander2012-12-091-0/+8
| | * | | | | | | | [feature/avatars] Removed unneeded dependenciesMarc Alexander2012-12-011-4/+0
| | * | | | | | | | [feature/avatars] Shorten avatar driver's class nameMarc Alexander2012-11-161-8/+8
| | * | | | | | | | [feature/avatars] Add service containers for avatarsMarc Alexander2012-11-152-0/+63
| * | | | | | | | | Merge remote-tracking branch 'remotes/nickv/ticket/10411-2' into developNathaniel Guse2013-03-041-0/+13
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| | * | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2Joas Schilling2013-02-254-16/+94
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | * | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2Joas Schilling2012-12-062-0/+71
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | * | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2Joas Schilling2012-11-151-0/+2
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | * | | | | | | | [ticket/10411] Use DIC to get the groupposition classesJoas Schilling2012-11-141-0/+13
* | | | | | | | | | [ticket/11386] Send list of migrations instead of using load_migrationsNathaniel Guse2013-03-032-4/+1
|/ / / / / / / / /
* | | | | | | | | [ticket/11386] Fix circular reference error & serialize errorNathaniel Guse2013-03-021-1/+2
* | | | | | | | | [ticket/11386] Use finder to find migration filesNathaniel Guse2013-03-022-1/+3
* | | | | | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2013-02-261-0/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | [feature/migrations] Inject Migrator instead of using the container to fetchNathaniel Guse2013-02-091-0/+1
| * | | | | | | | [feature/migrations] Make the container available to extension installersNathan Guse2013-02-061-0/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2013-02-113-0/+58
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | [feature/migrations] Migrations now somewhat worksNathan Guse2013-01-093-39/+51
| * | | | | | | [feature/migrations] Move migrator to service containerNathan Guse2013-01-092-0/+46
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | [ticket/11103] Including the set call in the declaration throws errorsNathan Guse2013-01-151-34/+0
* | | | | | | [ticket/11103] Fix some various issues, better commentsNathan Guse2013-01-151-0/+49
* | | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2013-01-151-0/+11
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | [ticket/11305] Define hook finder as a service on the container.Oleg Pudeyev2013-01-021-0/+7
| * | | | | | [ticket/11037] Update services.yml.Oleg Pudeyev2012-12-261-0/+4
| | |_|_|_|/ | |/| | | |
* | | | | | [ticket/11103] Move is_enabled to a separate table for better performanceNathan Guse2012-12-152-0/+2
* | | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2012-12-121-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'p/feature/template-events' into developDavid King2012-12-101-0/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | [feature/template-events] Inject extension manager into template class.Oleg Pudeyev2012-11-171-0/+1
| | | |/ / | | |/| |
* | | | | [ticket/11103] Use scope: prototypeNathan Guse2012-12-091-0/+17
* | | | | Merge branch 'ticket/11257' of github.com:EXreaction/phpbb3 into ticket/11103Nathan Guse2012-12-081-0/+16
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/11257] Do not require set_name() method to existNathan Guse2012-12-071-0/+16
* | | | | [ticket/11103] Newlines at end of filesNathan Guse2012-12-081-1/+1
* | | | | Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathan Guse2012-12-071-9/+0
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/11256] Remove unused controller.provider serviceIgor Wiedler2012-12-071-3/+0
| * | | | [ticket/11256] Remove unused service with non-existent classIgor Wiedler2012-12-071-6/+0
| | |_|/ | |/| |
* | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathan Guse2012-11-202-0/+70
|\ \ \ \ | |/ / /
| * | | [feature/controller] Update routing documentation for using query stringDavid King2012-11-181-2/+2