aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ...Joseph Warner2013-09-06239-5469/+5282
|\
| * Merge remote-tracking branch 'EXreaction/ticket/11791' into developDavid King2013-09-025-5/+5
| |\
| | * [ticket/11791] Load adm/ events from styles/adm/event/Nathan Guse2013-09-025-5/+5
| * | Merge remote-tracking branch 'EXreaction/ticket/11818' into developDavid King2013-09-022-160/+349
| |\ \
| | * | [ticket/11818] Update Symfony dependencies to 2.3.*Nathan Guse2013-09-022-160/+349
| * | | Merge remote-tracking branch 'EXreaction/ticket/11755' into developDavid King2013-09-024-2786/+1456
| |\ \ \
| | * | | [ticket/11755] MySQL upgrader out of dateNathan Guse2013-09-024-2786/+1456
| | |/ /
| * | | Merge pull request #1102 from imkingdavid/ticket/11215Nathan Guse2013-09-028-54/+117
| |\ \ \
| | * | | [ticket/11215] Remove unnecessary commentDavid King2013-09-021-4/+0
| | * | | Merge branch 'develop' into ticket/11215David King2013-09-021-1/+1
| | |\ \ \
| | * | | | [ticket/11215] Fix helper_url_test.php testsDavid King2013-09-022-16/+18
| | * | | | [ticket/11215] Add newline back to .htaccess, fix wordingDavid King2013-09-021-3/+3
| | * | | | [ticket/11215] Update comment in .htaccessDavid King2013-09-021-4/+4
| | * | | | [ticket/11215] Uncomment rewrite rules in .htaccessDavid King2013-09-021-4/+4
| | * | | | [ticket/11215] Make controller helper url() method use correct formatDavid King2013-09-022-16/+18
| | * | | | [ticket/11215] Add commented-out URL rewrite capability to .htaccessDavid King2013-09-022-4/+34
| | * | | | Merge remote-tracking branch 'upstream/develop' into ticket/11215David King2013-09-026-36/+17
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | [ticket/11215] Use new URL structure for controllersDavid King2013-08-311-5/+5
| | * | | | [ticket/11215] Everything appears to be working...David King2013-08-311-19/+9
| | * | | | Merge branch 'develop' into ticket/11215David King2013-08-31448-2841/+3693
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Merge branch 'develop' into ticket/11215David King2013-07-141-1/+1
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'develop' into ticket/11215David King2013-07-1313-60/+229
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'develop' into ticket/11215David King2013-07-13128-1606/+6060
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'develop' into ticket/11215David King2013-07-134-34/+205
| | |\ \ \ \ \ \ \
| | * | | | | | | | [ticket/11215] Don't try to use when it isn't thereDavid King2013-07-131-2/+2
| | * | | | | | | | Merge branch 'develop' into ticket/11215David King2013-07-1345-304/+970
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | [ticket/11215] Don't try to correct paths during testsDavid King2013-07-121-1/+1
| | * | | | | | | | | [ticket/11215] use globalDavid King2013-07-111-2/+2
| | * | | | | | | | | Merge branch 'develop' into ticket/11215David King2013-07-1194-2708/+3110
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | [ticket/11215] Correct for different URL but same path infoDavid King2013-07-061-1/+10
| | * | | | | | | | | | [ticket/11215] A few minor optimizations for phpbb_get_web_root_path()David King2013-07-061-8/+4
| | * | | | | | | | | | [ticket/11215] Correct paths when path info is used for controller accessDavid King2013-07-063-14/+52
| * | | | | | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11812' into developAndreas Fischer2013-09-033-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | [ticket/11812] Fix empty defineNathan Guse2013-09-023-2/+4
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge remote-tracking branch 'imkingdavid/ticket/11823' into develop-olympusAndreas Fischer2013-09-021-1/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | [ticket/11823] Set up nginx server to match PHP files with characters after .phpDavid King2013-09-021-1/+1
| | |/ / / / / / / / /
| * | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-025-4/+15
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-025-5/+14
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'nickvergessen/ticket/11769' into prep-release-3...Andreas Fischer2013-09-025-5/+14
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | [ticket/11769] Allow using 0 as poster nameJoas Schilling2013-09-021-1/+1
| | | | * | | | | | | | | [ticket/11769] Allow '0' as usernameJoas Schilling2013-09-021-1/+1
| | | | * | | | | | | | | [ticket/11769] Allow '0' as username in notification mailsJoas Schilling2013-08-233-3/+3
| | | | * | | | | | | | | [ticket/11769] Fix language issues in the doc blocksJoas Schilling2013-08-232-6/+7
| | | | * | | | | | | | | [ticket/11769] Correctly supply the post author's username in posting.phpJoas Schilling2013-08-232-2/+10
| | | |/ / / / / / / / /
| * | | | | | | | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-09-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge remote-tracking branch 'bantu/ticket/11821' into develop-olympusJoas Schilling2013-09-023-3/+3
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | [ticket/11821] Fix comma usage next to "You are receiving this notification".Andreas Fischer2013-09-023-3/+3
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge remote-tracking branch 'Hardolaf/ticket/11813' into developAndreas Fischer2013-09-011-32/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | [ticket/11813] Change mock auth provider to implement base providerJoseph Warner2013-08-271-32/+2