aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/config
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11852] Split filesystem and path_helper into 2 classesJoas Schilling2013-09-261-6/+10
* [ticket/11700] Get functional tests running after develop mergeNils Adermann2013-09-171-1/+1
* Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-171-3/+11
|\
| * [ticket/11832] Fix INCLUDE(JS/CSS)Nathan Guse2013-09-131-3/+3
| * [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_requestNathan Guse2013-09-131-0/+6
| * Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-131-0/+36
| |\
| * \ Merge remote-tracking branch 'remotes/imkingdavid/ticket/11824' into ticket/1...Nathan Guse2013-09-121-1/+1
| |\ \
| * \ \ Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-122-0/+44
| |\ \ \
| * | | | [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)Nathan Guse2013-09-091-0/+2
* | | | | [ticket/11700] Correctly load extensions with nonprefixed namespacesNils Adermann2013-09-171-1/+1
* | | | | [ticket/11700] Correct service definitions with namespacesNils Adermann2013-09-161-4/+4
* | | | | [ticket/11700] Fix authentication acp after develop mergeNils Adermann2013-09-161-5/+5
* | | | | [ticket/11700] Fix installation after develop mergeNils Adermann2013-09-161-2/+2
* | | | | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-164-25/+91
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'imkingdavid/ticket/11824' into developJoas Schilling2013-09-131-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | |
| | * | | [ticket/11824] Add option for mod_rewriteDavid King2013-09-031-1/+1
| | |/ /
| * | | Merge pull request #1620 from EXreaction/ticket/11745David King2013-09-121-0/+18
| |\ \ \
| | * | | [ticket/11745] Group request approved notificationNathan Guse2013-07-271-0/+18
| * | | | Merge pull request #1617 from EXreaction/ticket/11744David King2013-09-121-0/+18
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | [ticket/11744] Group join request notificationNathan Guse2013-07-261-0/+18
| * | | [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ...Joseph Warner2013-09-061-25/+11
| |\ \ \ | | | |/ | | |/|
| | * | [ticket/11215] Make controller helper url() method use correct formatDavid King2013-09-021-0/+1
| | * | [ticket/11628] Remove phpbb_style (move methods to phpbb_template)Nathaniel Guse2013-07-241-10/+1
| | * | [ticket/11628] Remove style path providerNathaniel Guse2013-07-241-11/+0
| | * | [ticket/11628] Remove style resource locatorNathaniel Guse2013-07-241-4/+0
| | |/
| | * Merge pull request #1513 from nickvergessen/ticket/11582Nathan Guse2013-07-221-0/+6
| | |\
| | | * [ticket/11582] Add event in constructor and add docsJoas Schilling2013-07-141-0/+1
| | | * [ticket/11582] Add new service for permissionsJoas Schilling2013-07-141-0/+5
| | * | [ticket/10931] Add phpbb_php_ini as a service.Andreas Fischer2013-07-161-0/+3
| | |/
| * | [feature/oauth] Fix redirectsJoseph Warner2013-08-241-0/+2
| * | [feature/oauth] Pass users_table as parameter to OAuth in constructJoseph Warner2013-08-021-0/+1
| * | [feature/oauth] Fix more errors related to sql changesJoseph Warner2013-07-231-1/+1
| * | [feature/oauth] Finalize schema changesJoseph Warner2013-07-231-2/+2
| * | [feature/oauth] Fix errors in OAuthJoseph Warner2013-07-231-0/+2
| * | [feature/oauth] Update service files + check for existing linksJoseph Warner2013-07-182-2/+4
| * | [feature/oauth] Finish clean up of removed providersJoseph Warner2013-07-181-86/+2
| * | [feature/oauth] Bitly authentication method, no user_id associationJoseph Warner2013-07-181-0/+1
| * | [feature/oauth] Fix typoJoseph Warner2013-07-141-17/+17
| * | [feature/oauth] Update auth provider oauth to take in service providersJoseph Warner2013-07-141-0/+1
| * | [feature/oauth] Add constructor arguments to services fileJoseph Warner2013-07-141-17/+51
| * | [feature/oauth] Add OAuth services to service fileJoseph Warner2013-07-141-0/+74
| * | [feature/oauth] Pass table in constructorJoseph Warner2013-07-142-0/+2
| * | [feature/oauth] Use DB for OAuth token storageJoseph Warner2013-07-141-1/+0
| * | [feature/oauth] Continue work on OAuth loginJoseph Warner2013-07-141-0/+1
| * | [feature/oauth] OAuth as a symfony serviceJoseph Warner2013-07-141-0/+9
| |/
* | [ticket/11700] Move all recent code to namespacesNils Adermann2013-09-167-87/+87
|/
* [ticket/11696] Rename db_tools.php so it can be autoloadedJoas Schilling2013-07-141-1/+0
* Merge remote-tracking branch 'phpbb/develop' into ticket/9657Joas Schilling2013-07-131-3/+3
|\
| * [feature/twig] Remove style dependency for controller helperNathan Guse2013-07-051-1/+0
| * Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-042-0/+38
| |\