aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Merge remote-tracking branch 'marshalrusty/ticket/12310' into develop-olympusNils Adermann2014-03-262-3/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marshalrusty/ticket/12310: [ticket/12310] Don't autocomplete SMTP user/pass on install
| | * | | | | | | | | [ticket/12310] Don't autocomplete SMTP user/pass on installYuriy Rusko2014-03-262-3/+4
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12310
* | | | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-03-252-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | / / / / / / / / | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12302] Added `--no-dev` to composer call in build.xml [ticket/12302] Updated composer.phar to 1.0.0-alpha8
| * | | | | | | | Merge pull request #2183 from s9e/ticket/12302Andreas Fischer2014-03-252-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade all composer.phar to 1.0.0-alpha8 * s9e/ticket/12302: [ticket/12302] Added `--no-dev` to composer call in build.xml [ticket/12302] Updated composer.phar to 1.0.0-alpha8
| | * | | | | | | [ticket/12302] Added `--no-dev` to composer call in build.xmls9e2014-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12302
| | * | | | | | | [ticket/12302] Updated composer.phar to 1.0.0-alpha8s9e2014-03-251-0/+0
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wget -N https://getcomposer.org/download/1.0.0-alpha8/composer.phar PHPBB3-12302
* | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-03-242-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10174] Rename "Ban usernames" to "Ban users" in ACP
| * | | | | | | Merge remote-tracking branch 'schosser/ticket/10174' into develop-olympusJoas Schilling2014-03-242-3/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * schosser/ticket/10174: [ticket/10174] Rename "Ban usernames" to "Ban users" in ACP
| | * | | | | | | [ticket/10174] Rename "Ban usernames" to "Ban users" in ACPDaniel Schosser2014-03-232-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing the language string from "Ban usernames" to "Ban users" to clarify its use. It bans users by their name and not the username itself PHPBB3-10174
* | | | | | | | | Merge remote-tracking branch 'Elsensee/ticket/12297' into develop-ascraeusJoas Schilling2014-03-241-0/+47
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/12297: [ticket/12297] Delete user_from column on update
| * | | | | | | | [ticket/12297] Delete user_from column on updateOliver Schramm2014-03-231-0/+47
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12297
* | | | | | | | Merge remote-tracking branch 'VSEphpbb/ticket/12292' into develop-ascraeusCesar G2014-03-221-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * VSEphpbb/ticket/12292: [ticket/12292] Fix syntax error in admin.css
| * | | | | | | | [ticket/12292] Fix syntax error in admin.cssMatt Friedman2014-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12292
* | | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/12268' into develop-ascraeusDhruv2014-03-232-5/+38
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/12268: [ticket/12268] Do not use substr but just compare the character [ticket/12268] Rename class file to recursive_dot_prefix_filter_iterator.php [ticket/12268] Move class out of extension namespace and rename it [ticket/12268] Do not search in folders starting with a dot [ticket/12268] Use FilesystemIterator::SKIP_DOTS [ticket/12268] Extension finder should not crawl through .git/ of extensions
| * | | | | | | | | [ticket/12268] Do not use substr but just compare the characterJoas Schilling2014-03-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12268
| * | | | | | | | | [ticket/12268] Rename class file to recursive_dot_prefix_filter_iterator.phpJoas Schilling2014-03-141-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12268
| * | | | | | | | | [ticket/12268] Move class out of extension namespace and rename itJoas Schilling2014-03-142-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12268
| * | | | | | | | | [ticket/12268] Do not search in folders starting with a dotJoas Schilling2014-03-141-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12268
| * | | | | | | | | [ticket/12268] Use FilesystemIterator::SKIP_DOTSJoas Schilling2014-03-141-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12268
| * | | | | | | | | [ticket/12268] Extension finder should not crawl through .git/ of extensionsJoas Schilling2014-03-132-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new filter ignores .svn and .git directories. When searching for php classes and template files of extensions we don't need to look inside these directories. PHPBB3-12268
* | | | | | | | | | Merge remote-tracking branch 'rxu/ticket/12289' into develop-ascraeusJoas Schilling2014-03-223-0/+20
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rxu/ticket/12289: [ticket/12289] Add viewtopic template events for posts specific custom notices
| * | | | | | | | | | [ticket/12289] Add viewtopic template events for posts specific custom noticesrxu2014-03-223-0/+20
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These events allow extensions to add own posts specific notices-alike info. PHPBB3-12289
* | | | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-03-222-1/+15
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12035] Correcting the condition [ticket/12035] Adding necessary conditions [ticket/12035] Adding link to user posts to ACP page Conflicts: phpBB/adm/style/acp_users_overview.html
| * | | | | | | | | Merge remote-tracking branch 'geetakshi/ticket/12035' into develop-olympusJoas Schilling2014-03-222-1/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * geetakshi/ticket/12035: [ticket/12035] Correcting the condition [ticket/12035] Adding necessary conditions [ticket/12035] Adding link to user posts to ACP page
| | * | | | | | | | | [ticket/12035] Correcting the conditiongeetakshi2014-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12035
| | * | | | | | | | | [ticket/12035] Adding necessary conditionsgeetakshi2014-03-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12035
| | * | | | | | | | | [ticket/12035] Adding link to user posts to ACP pagegeetakshi2014-03-172-1/+2
| | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding link of posts behind displayed number of posts of the user PHPBB3-12035
* | | | | | | | | | Merge remote-tracking branch 'vsephpbb/ticket/11904' into develop-ascraeusJoas Schilling2014-03-221-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/11904: [ticket/11904] Update explanation for what Allow CDN does
| * | | | | | | | | | [ticket/11904] Update explanation for what Allow CDN doesMatt Friedman2014-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11904
* | | | | | | | | | | Merge remote-tracking branch 'geetakshi/ticket/11357' into develop-ascraeusJoas Schilling2014-03-222-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * geetakshi/ticket/11357: [ticket/11357] Correcting invalid markup
| * | | | | | | | | | | [ticket/11357] Correcting invalid markupgeetakshi2014-03-192-2/+2
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11357
* | | | | | | | | | | Merge remote-tracking branch 'vsephpbb/ticket/12292' into develop-ascraeusJoas Schilling2014-03-223-12/+11
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/12292: [ticket/12292] Improve style details page
| * | | | | | | | | | [ticket/12292] Improve style details pageMatt Friedman2014-03-203-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://tracker.phpbb.com/browse/PHPBB3-12292 Gave style details page a proper heading and back button. Also removed a few obsolete code leftovers in the style and CSS. PHPBB3-12292
* | | | | | | | | | | Merge pull request #2169 from bantu/ticket/12293Andreas Fischer2014-03-221-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12293] Add missing compact() call to phpBB/phpbb/log/log.php eve... * bantu/ticket/12293: [ticket/12293] Add missing compact() call to phpBB/phpbb/log/log.php events.
| * | | | | | | | | | [ticket/12293] Add missing compact() call to phpBB/phpbb/log/log.php events.Forumhulp.com2014-03-221-4/+4
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12293
* | | | | | | | | | Merge pull request #2137 from geetakshi/ticket/8309Dhruv Goel2014-03-208-12/+11
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | [ticket/8309] Rename "Last visited" to "Last activity" on memberlist/viewprofile
| * | | | | | | | | [ticket/8309] Changing $last_activity to $last_activegeetakshi2014-03-203-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8309
| * | | | | | | | | [ticket/8309] Removing key with similar function to avoid redundancygeetakshi2014-03-177-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8309
| * | | | | | | | | [ticket/8309] Moving key to get keys in alphabetical ordergeetakshi2014-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8309
| * | | | | | | | | [ticket/8309] Rename $last_visit to $last_activitygeetakshi2014-03-163-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8309
| * | | | | | | | | [ticket/8309] Renaming "Last visit" to "Last activity"geetakshi2014-03-167-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8309
* | | | | | | | | | Merge remote-tracking branch 'vsephpbb/ticket/12285' into developJoas Schilling2014-03-191-2/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/12285: [ticket/12285] Fix mult-lingual issues between extensions
| * | | | | | | | | | [ticket/12285] Fix mult-lingual issues between extensionsMatt Friedman2014-03-191-2/+4
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12285
* | | | | | | | | | Merge remote-tracking branch 'Elsensee/ticket/11169' into developJoas Schilling2014-03-192-1/+78
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/11169: [ticket/11169] Skip migration if "Users" category has been deleted [ticket/11169] Move module 'prune users' to users category
| * | | | | | | | | | [ticket/11169] Skip migration if "Users" category has been deletedOliver Schramm2014-03-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | or the module has already been moved to that category PHPBB3-11169
| * | | | | | | | | | [ticket/11169] Move module 'prune users' to users categoryOliver Schramm2014-03-162-1/+76
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11169
* | | | | | | | | | Merge pull request #2145 from Elsensee/ticket/10590Dhruv Goel2014-03-202-19/+13
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/10590] Remove confirmation page after posting
| * \ \ \ \ \ \ \ \ \ 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
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10590
| * | | | | | | | | | [ticket/10590] Remove confirmation page after postingOliver Schramm2014-03-161-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10590