aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'vsephpbb/ticket/12285' into developJoas Schilling2014-03-191-2/+4
|\
| * [ticket/12285] Fix mult-lingual issues between extensionsMatt Friedman2014-03-191-2/+4
* | Merge remote-tracking branch 'Elsensee/ticket/11169' into developJoas Schilling2014-03-192-1/+78
|\ \
| * | [ticket/11169] Skip migration if "Users" category has been deletedOliver Schramm2014-03-191-1/+3
| * | [ticket/11169] Move module 'prune users' to users categoryOliver Schramm2014-03-162-1/+76
* | | Merge pull request #2145 from Elsensee/ticket/10590Dhruv Goel2014-03-202-19/+13
|\ \ \
| * \ \ Merge branch 'nickvergessen/ticket/elsensee/10590' into ticket/10590Oliver Schramm2014-03-181-10/+10
| |\ \ \
| | * | | [ticket/10590] Fix functional tests are post confirm message removalJoas Schilling2014-03-181-10/+10
| |/ / /
| * | | [ticket/10590] Remove confirmation page after postingOliver Schramm2014-03-161-9/+3
* | | | Merge remote-tracking branch 'netdeamon/ticket/12198-Language-issue' into dev...Joas Schilling2014-03-191-2/+0
|\ \ \ \
| * | | | [ticket/12198] Language issue in en/common.phpnetdeamon2014-03-181-2/+0
| |/ / /
* | | | Merge branch 'develop-olympus' into developJoas Schilling2014-03-191-1/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge remote-tracking branch 'Elsensee/ticket/11766' into develop-olympusJoas Schilling2014-03-191-1/+7
| |\ \ \
| | * | | [ticket/11766] Hide edit, quote and delete buttons if topic is lockedOliver Schramm2014-03-191-1/+7
| |/ / /
* | | | Merge remote-tracking branch 'prototech/ticket/12160' into developJoas Schilling2014-03-184-36/+71
|\ \ \ \
| * | | | [ticket/12160] Use phpbb_check_installation_exists() in the other modules.Cesar G2014-02-222-17/+3
| * | | | [ticket/12160] Move phpbb_check_installation_exists() to functions_install.phpCesar G2014-02-222-19/+19
| * | | | [ticket/12160] Check if phpBB is installed before creating phpBB container.Cesar G2014-02-151-19/+49
| * | | | [ticket/12160] Add function to check if phpBB is installed.Cesar G2014-02-151-0/+19
* | | | | Merge remote-tracking branch 'rxu3/ticket/12278' into developJoas Schilling2014-03-181-0/+17
|\ \ \ \ \
| * | | | | [ticket/12278] Add mcp.php core event to allow to modify modules display optionrxu2014-03-171-0/+17
| | |_|_|/ | |/| | |
* | | | | Merge remote-tracking branch 'VSEphpbb/ticket/12284' into developAndreas Fischer2014-03-171-1/+1
|\ \ \ \ \
| * | | | | [ticket/12284] Fix functional test for extension manager changesMatt Friedman2014-03-171-1/+1
* | | | | | Merge remote-tracking branch 'VSEphpbb/ticket/12284' into developAndreas Fischer2014-03-171-6/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/12284] Improve readability of extension manager detailsMatt Friedman2014-03-171-6/+6
* | | | | | Merge remote-tracking branch 'rxu3/ticket/12279' into developJoas Schilling2014-03-173-0/+12
|\ \ \ \ \ \
| * | | | | | [ticket/12279] Add memberlist_view.html template event to add custom inforxu2014-03-173-0/+12
| | |/ / / / | |/| | | |
* | | | | | Merge remote-tracking branch 'vsephpbb/ticket/7580' into developJoas Schilling2014-03-172-0/+11
|\ \ \ \ \ \
| * | | | | | [ticket/7580] Add test for IF {VAR} is defined in templatesMatt Friedman2014-03-162-0/+11
| | |/ / / / | |/| | | |
* | | | | | 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