aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'dragooon/ticket/9040' into developJoas Schilling2014-03-172-1/+117
|\
| * [ticket/9040] Minor cleanup in the unit test fileShitiz Garg2014-03-171-10/+9
| * [ticket/9040] Count HTML entities as single in custom profile fieldsShitiz Garg2014-03-172-1/+118
* | Merge branch 'ticket/12269' of github.com:netdeamon/phpbb into developJoas Schilling2014-03-171-0/+0
|\ \ | |/ |/|
| * [ticket/12269] Delete folder mods in languagenetdeamon2014-03-171-0/+0
* | Merge branch 'ticket/11239' of github.com:geetakshi/phpbb into developJoas Schilling2014-03-161-1/+2
|\ \
| * | [ticket/11239] Removing hard-coded, language specific possessivegeetakshi2014-03-161-1/+1
| * | [ticket/11239] Including username before Overview titlegeetakshi2014-03-161-1/+2
* | | Merge remote-tracking branch 'vsephpbb/ticket/12274' into developJoas Schilling2014-03-162-4/+7
|\ \ \
| * | | [ticket/12274] Add core.js to the install footerMatt Friedman2014-03-161-0/+1
| * | | [ticket/12274] Fix broke/missing jQuery asset paths in update scriptMatt Friedman2014-03-161-4/+6
| * | | [ticket/12274] Load correct T_TEMPLATE_PATH during updateMatt Friedman2014-03-151-1/+1
| |/ /
* | | Merge pull request #2136 from Elsensee/ticket/11071Nathan Guse2014-03-161-0/+13
|\ \ \ | |_|/ |/| |
| * | [ticket/11071] Add fallback if requested style don't existOliver Schramm2014-03-151-0/+13
* | | Merge pull request #2144 from nickvergessen/travis/disable-redisNathan Guse2014-03-161-2/+3
|\ \ \ | |/ / |/| |
| * | [ticket/12281] Disable redis on travis until its fixed againJoas Schilling2014-03-161-2/+3
|/ /
* | Merge branch 'prep-release-3.1.0-b1' into developJoas Schilling2014-03-158-34/+215
|\ \
| * | [prep-release-3.1.0-b1] Update build version to 3.1.0-b2-devJoas Schilling2014-03-153-5/+5
| * | [prep-release-3.1.0-b1] Add changelog for 3.1.0-b1Joas Schilling2014-03-151-0/+145
| * | [prep-release-3.1.0-b1] Prepare ChangelogJoas Schilling2014-03-151-24/+27
| * | [prep-release-3.1.0-b1] Add migration for 3.1.0-b1Joas Schilling2014-03-151-0/+33
| * | [prep-release-3.1.0-b1] Update version to 3.1.0-b1Joas Schilling2014-03-156-10/+10
|/ /
* | Merge pull request #2111 from nickvergessen/ticket/12262Andreas Fischer2014-03-151-14/+39
|\ \
| * | [ticket/12262] Do not use inline assignmentsJoas Schilling2014-03-151-4/+7
| * | [ticket/12262] Do not use getExtension()Joas Schilling2014-03-151-1/+1
| * | [ticket/12262] Fix location list for acp events with "Locations:"Joas Schilling2014-03-111-2/+13
| * | [ticket/12262] Also find vars array when it's defined in the trigger_event()Joas Schilling2014-03-111-8/+19
* | | Merge remote-tracking branch 'maelsoucaze/develop' into developJoas Schilling2014-03-153-3/+3
|\ \ \ | |_|/ |/| |
| * | [ticket/12272] Fix hardcoded colons in subforums.Maël Soucaze2014-03-151-1/+1
| * | [ticket/12272] Fix hardcoded colons in subforums.Maël Soucaze2014-03-152-2/+2
|/ /
* | Merge pull request #2128 from nickvergessen/ticket/12271Dhruv Goel2014-03-147-25/+31
|\ \
| * | [ticket/12271] Decouple dropdown header and footer from #notifications_listJoas Schilling2014-03-147-25/+31
* | | Merge branch 'develop-olympus' into developJoas Schilling2014-03-141-1/+1
|\ \ \ | |/ / |/| |
| * | Merge remote-tracking branch 'Elsensee/ticket/12072' into develop-olympusJoas Schilling2014-03-141-1/+1
| |\ \
| | * | [ticket/12072] Fix comment about NEW MEMBERS permissionOliver Schramm2014-03-141-1/+1
* | | | Merge remote-tracking branch 'vsephpbb/ticket/11429' into developJoas Schilling2014-03-141-0/+5
|\ \ \ \
| * | | | [ticket/11429] Increment asset version on Ext enableMatt Friedman2014-03-131-0/+5
* | | | | Merge remote-tracking branch 'EXreaction/ticket/9871-2' into developJoas Schilling2014-03-1411-171/+734
|\ \ \ \ \
| * | | | | [ticket/9871] Can set current version to use instead of the phpBB versionNathan Guse2014-03-141-3/+23
| * | | | | [ticket/9871] Fix indentation on commentNathan Guse2014-03-141-2/+2
| * | | | | [ticket/9871] Fix test nameNathan Guse2014-03-141-1/+1
| * | | | | [ticket/9871] Split fast and slow version testsNathan Guse2014-03-132-26/+58
| * | | | | [ticket/9871] Option to force the stability when checking for updatesNathan Guse2014-03-111-1/+31
| * | | | | [ticket/9871] Allow setting the host/file to load for the version classNathan Guse2014-03-102-3/+45
| * | | | | [ticket/9871] Restore get_remote_file_testNathan Guse2014-03-101-0/+75
| * | | | | [ticket/9871] Fix testsNathan Guse2014-03-081-3/+11
| * | | | | [ticket/9871] Typehint and comment on var typesNathan Guse2014-03-051-1/+6
| * | | | | [ticket/9871] Mark test as slowNathan Guse2014-03-051-0/+3
| * | | | | [ticket/9871] Restore phpbb_version_compareNathan Guse2014-03-052-15/+11
| * | | | | [ticket/9871] Restore get_remote_fileNathan Guse2014-03-053-139/+73