aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | | | | [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-201-9/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/10590] Remove confirmation page after posting
| * | | | | | | | [ticket/10590] Remove confirmation page after postingOliver Schramm2014-03-161-9/+3
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10590
* | | | | | | | Merge remote-tracking branch 'netdeamon/ticket/12198-Language-issue' into ↵Joas Schilling2014-03-191-2/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop * netdeamon/ticket/12198-Language-issue: [ticket/12198] Language issue in en/common.php
| * | | | | | | | [ticket/12198] Language issue in en/common.phpnetdeamon2014-03-181-2/+0
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deleted lines as they are not needed anymore. PHPBB3-12198
* | | | | | | | Merge branch 'develop-olympus' into developJoas Schilling2014-03-191-1/+7
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11766] Hide edit, quote and delete buttons if topic is locked Conflicts: phpBB/viewtopic.php
| * | | | | | [ticket/11766] Hide edit, quote and delete buttons if topic is lockedOliver Schramm2014-03-191-1/+7
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | But show quote button to guests if topic isn't locked PHPBB3-11766
* | | | | | Merge remote-tracking branch 'prototech/ticket/12160' into developJoas Schilling2014-03-184-36/+71
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prototech/ticket/12160: [ticket/12160] Use phpbb_check_installation_exists() in the other modules. [ticket/12160] Move phpbb_check_installation_exists() to functions_install.php [ticket/12160] Check if phpBB is installed before creating phpBB container. [ticket/12160] Add function to check if phpBB is installed.
| * | | | | | [ticket/12160] Use phpbb_check_installation_exists() in the other modules.Cesar G2014-02-222-17/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12160
| * | | | | | [ticket/12160] Move phpbb_check_installation_exists() to functions_install.phpCesar G2014-02-222-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12160
| * | | | | | [ticket/12160] Check if phpBB is installed before creating phpBB container.Cesar G2014-02-151-19/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12160
| * | | | | | [ticket/12160] Add function to check if phpBB is installed.Cesar G2014-02-151-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12160
* | | | | | | Merge remote-tracking branch 'rxu3/ticket/12278' into developJoas Schilling2014-03-181-0/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rxu3/ticket/12278: [ticket/12278] Add mcp.php core event to allow to modify modules display option
| * | | | | | | [ticket/12278] Add mcp.php core event to allow to modify modules display optionrxu2014-03-171-0/+17
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This event allows extensions to set display option for custom MCP modules for extensions which add custom MCP modules and some of them should be displayed conditionally. PHPBB3-12278
* | | | | | | Merge remote-tracking branch 'VSEphpbb/ticket/12284' into developAndreas Fischer2014-03-171-6/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * VSEphpbb/ticket/12284: [ticket/12284] Improve readability of extension manager details
| * | | | | | | [ticket/12284] Improve readability of extension manager detailsMatt Friedman2014-03-171-6/+6
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use span tags like the rest of the ACP does, instead of P tags. There is no semantic need to use P tags here. These are not paragraphs. PHPBB3-12284
* | | | | | | Merge remote-tracking branch 'rxu3/ticket/12279' into developJoas Schilling2014-03-173-0/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rxu3/ticket/12279: [ticket/12279] Add memberlist_view.html template event to add custom info