From: Marcel Werk Date: Wed, 7 May 2014 13:32:12 +0000 (+0200) Subject: Merge branch '2.0' X-Git-Tag: 2.1.0_Alpha_1~841 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8737655bb0cb57b433b1ec6da7324dc73b874416;hp=18d204018a29c183821e1b4d372b42c667de5295;p=GitHub%2FWoltLab%2FWCF.git Merge branch '2.0' --- diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b1e71ac8e7..21ac539f69 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,8 +3,11 @@ CONTRIBUTING First of all: Thanks for your interest in contributing to WoltLab Community Framework! However, you have to meet some requirements in order to get your changes accepted. +**Notice:** This is the unstable development tree of WCF, if you wish to submit pull requests for WCF 2.0.x, please select the branch "2.0". + General requirements -------------------- +- **API changes are undesirable**, we want to maintain full backwards compatibility to WCF 2.0.x - Testing is the key, you MUST try out your changes before submitting pull requests. It saves us and yourself a lot of time. - The code SHOULD be written by yourself, otherwise you have to check the license beforehand with regard to compatibility and give the proper credit to the original author. diff --git a/README.md b/README.md index 66b050da5d..4d395cd869 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -WoltLab Community Framework 2.0 +WoltLab Community Framework 2.1 =============================== WoltLab Community Framework is a free web-framework, designed and developed for complex community applications. The framework applies the latest and most modern technologies, it is structured completly object-oriented, constantly enhanced and forms the base for all WoltLab products. @@ -6,7 +6,18 @@ WoltLab Community Framework is a free web-framework, designed and developed for Version notes ------------- -This is the stable tree of WCF, changes will be rejected unless they fix an existing issue without changing the API. +This is the **unstable development** tree of WCF! You SHOULD NOT use it in an production environment. + +If you wish to access the **stable WCF 2.0.x** branch, please see here: [WCF 2.0.x](https://github.com/WoltLab/WCF/tree/2.0) + +About Redactor +-------------- + +Redactor is a WYSIWYG-editor created by Imperavi LLC., Copyright (c) 2009-2014. You can make use of Redactor in any plugin or application for WCF 2.1 free of charge. You are not allowed to extract or re-use the editor (in entirety or in potions) for any other use unless you own a license for Redactor. + +Please see http://imperavi.com/redactor/license/ for more information. + +Redactor is **NOT** free software! Contribution ------------ diff --git a/com.woltlab.wcf/acpMenu.xml b/com.woltlab.wcf/acpMenu.xml index 58dd4a9f47..228bd5e3f4 100644 --- a/com.woltlab.wcf/acpMenu.xml +++ b/com.woltlab.wcf/acpMenu.xml @@ -129,6 +129,12 @@ wcf.acp.menu.link.log admin.system.canViewLog + + + + wcf.acp.menu.link.log + admin.system.canViewLog + diff --git a/com.woltlab.wcf/bbcode.xml b/com.woltlab.wcf/bbcode.xml index 92b358fa76..5d889f89ce 100644 --- a/com.woltlab.wcf/bbcode.xml +++ b/com.woltlab.wcf/bbcode.xml @@ -95,7 +95,7 @@ - quote.png + fa-quote-left wcf.bbcode.button.quote @@ -107,7 +107,7 @@ 1 - code.png + fa-code wcf.bbcode.button.code @@ -156,7 +156,7 @@ - spoiler.png + fa-eye-slash wcf.bbcode.button.spoiler @@ -164,7 +164,7 @@ code none 1 - inlineCode.png + fa-font wcf.bbcode.button.inlineCode diff --git a/com.woltlab.wcf/clipboardAction.xml b/com.woltlab.wcf/clipboardAction.xml index df5d5b74b1..f897023084 100644 --- a/com.woltlab.wcf/clipboardAction.xml +++ b/com.woltlab.wcf/clipboardAction.xml @@ -25,15 +25,23 @@ - - + + + 4 + + + + + + + 5 - + 6 @@ -41,16 +49,17 @@ - - - 4 + + + 7 - - - 5 + + + + 8 diff --git a/com.woltlab.wcf/cronjob.xml b/com.woltlab.wcf/cronjob.xml index e4e3b1dbcd..de2e28988d 100644 --- a/com.woltlab.wcf/cronjob.xml +++ b/com.woltlab.wcf/cronjob.xml @@ -123,7 +123,22 @@ - + + + 0 + 1 + * + * + * + 1 + 1 + 1 + + + + + + 0 1 * diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml index 0824bfb07d..95d095a02f 100644 --- a/com.woltlab.wcf/objectType.xml +++ b/com.woltlab.wcf/objectType.xml @@ -45,6 +45,12 @@ 1 + + com.woltlab.wcf.user + com.woltlab.wcf.moderation.report + wcf\system\moderation\queue\report\UserModerationQueueReportHandler + + com.woltlab.wcf.user.UserPage @@ -304,6 +310,41 @@ 100 + + com.woltlab.wcf.statDaily + com.woltlab.wcf.rebuildData + + 110 + + + + + com.woltlab.wcf.user + com.woltlab.wcf.statDailyHandler + + 1 + + + com.woltlab.wcf.attachment + com.woltlab.wcf.statDailyHandler + + + + com.woltlab.wcf.attachment.diskUsage + com.woltlab.wcf.statDailyHandler + + + + com.woltlab.wcf.like + com.woltlab.wcf.statDailyHandler + + + + com.woltlab.wcf.dislike + com.woltlab.wcf.statDailyHandler + + + \ No newline at end of file diff --git a/com.woltlab.wcf/objectTypeDefinition.xml b/com.woltlab.wcf/objectTypeDefinition.xml index 8f4baff22b..aa717e42fb 100644 --- a/com.woltlab.wcf/objectTypeDefinition.xml +++ b/com.woltlab.wcf/objectTypeDefinition.xml @@ -143,5 +143,10 @@ com.woltlab.wcf.rebuildData + + + com.woltlab.wcf.statDailyHandler + + diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml index e22db648d6..51f038fd66 100644 --- a/com.woltlab.wcf/option.xml +++ b/com.woltlab.wcf/option.xml @@ -238,6 +238,13 @@ 1 + + + @@ -1129,6 +1141,12 @@ DESC:wcf.global.sortOrder.descending]]> boolean 0 +