aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11825] Move schema_data.php into includes/ instead of phpbb/Dhruv2013-09-033-2/+2
* 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-026-34/+95
|\ \ \
| * | | [ticket/11215] Remove unnecessary commentDavid King2013-09-021-4/+0
| * | | [ticket/11215] Fix helper_url_test.php testsDavid King2013-09-021-1/+1
| * | | [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-025-4/+15
| |\ \ \ | | |/ /
| * | | [ticket/11215] Everything appears to be working...David King2013-08-311-19/+9
| * | | Merge branch 'develop' into ticket/11215David King2013-08-31350-2426/+1904
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'develop' into ticket/11215David King2013-07-141-1/+1
| |\ \ \
| * \ \ \ Merge branch 'develop' into ticket/11215David King2013-07-1311-38/+120
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' into ticket/11215David King2013-07-13111-1580/+3615
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' into ticket/11215David King2013-07-132-14/+191
| |\ \ \ \ \ \
| * | | | | | | [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-1327-252/+577
| |\ \ \ \ \ \ \
| * | | | | | | | [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-1156-2154/+2579
| |\ \ \ \ \ \ \ \
| * | | | | | | | | [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
* | | | | | | | | | [ticket/11812] Fix empty defineNathan Guse2013-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
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [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
| * | | | | | | | | [ticket/11821] Fix comma usage next to "You are receiving this notification".Andreas Fischer2013-09-023-3/+3
* | | | | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11724' into developJoas Schilling2013-08-301-3/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ticket/11724] Handle ELSE IF separatelyNathan Guse2013-08-281-5/+7
| * | | | | | | | | | [ticket/11724] Replace spaces with tabsNathan Guse2013-07-281-1/+1
| * | | | | | | | | | [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same wayNathan Guse2013-07-271-1/+2
* | | | | | | | | | | [ticket/11628] Create base template class with common functionsNathan Guse2013-08-282-179/+149
* | | | | | | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628Nathan Guse2013-08-28122-584/+742
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'remotes/brunoais/ticket/11803' into developNathan Guse2013-08-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0brunoais2013-08-261-1/+1
| * | | | | | | | | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-08-261-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | [ticket/11799] Send anti abuse headers in "new password" emails.Andreas Fischer2013-08-231-0/+2
| | * | | | | | | | | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-201-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |