Merge branch 'next' into reactions
authorMatthias Schmidt <gravatronics@live.com>
Fri, 27 Jul 2018 13:39:41 +0000 (15:39 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 27 Jul 2018 13:39:41 +0000 (15:39 +0200)
21 files changed:
1  2 
com.woltlab.wcf/acpMenu.xml
com.woltlab.wcf/objectType.xml
com.woltlab.wcf/templates/article.tpl
com.woltlab.wcf/templates/headIncludeJavaScript.tpl
wcfsetup/install/files/lib/data/comment/LikeableComment.class.php
wcfsetup/install/files/lib/data/comment/StructuredCommentList.class.php
wcfsetup/install/files/lib/data/comment/response/LikeableCommentResponse.class.php
wcfsetup/install/files/lib/data/like/Like.class.php
wcfsetup/install/files/lib/data/like/object/LikeObject.class.php
wcfsetup/install/files/lib/page/ArticlePage.class.php
wcfsetup/install/files/lib/system/acl/ACLHandler.class.php
wcfsetup/install/files/lib/system/language/I18nHandler.class.php
wcfsetup/install/files/lib/system/like/LikeHandler.class.php
wcfsetup/install/files/lib/system/menu/user/profile/content/LikesUserProfileMenuContent.class.php
wcfsetup/install/files/lib/system/user/activity/event/LikeableArticleUserActivityEvent.class.php
wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentLikeUserNotificationEvent.class.php
wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseLikeUserNotificationEvent.class.php
wcfsetup/install/files/lib/util/ClassUtil.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml
wcfsetup/setup/db/install.sql

Simple merge
Simple merge
Simple merge
index cc76ad87e310f34e1aa165c009532d1d2ae51020,2f5ea3e58df2e54b45c5f5ea7bbfe1e0e257b748..bb07b36c4f40a1b2492400d98bcfbe6da634fc7d
@@@ -1,8 -1,5 +1,7 @@@
  <?php
- declare(strict_types=1);
  namespace wcf\data\like;
 +use wcf\data\reaction\type\ReactionType;
 +use wcf\data\reaction\type\ReactionTypeCache;
  use wcf\data\DatabaseObject;
  use wcf\system\WCF;
  
index 90277b58f6fdabe875bf38005d739f0ff0db7b3c,a73280e0e099b00286aa16284b87a599aa1c8f34..23e7c66342025001220f457d00dd74267181c22d
@@@ -1,8 -1,6 +1,7 @@@
  <?php
- declare(strict_types=1);
  namespace wcf\data\like\object;
  use wcf\data\object\type\ObjectTypeCache;
 +use wcf\data\reaction\type\ReactionTypeCache;
  use wcf\data\user\User;
  use wcf\data\DatabaseObject;
  use wcf\system\WCF;
index e20c8acafb5ee2a84d5c49e0673eda4bb3c08888,2c9b2427e2ee86f23d76427b1be594be07ea76c1..205fa868e2348aed408a03164e67d80515919791
@@@ -1,8 -1,7 +1,7 @@@
  <?php
- declare(strict_types=1);
  namespace wcf\system\menu\user\profile\content;
 -use wcf\data\like\Like;
  use wcf\data\like\ViewableLikeList;
 +use wcf\system\reaction\ReactionHandler;
  use wcf\system\SingletonFactory;
  use wcf\system\WCF;
  
index 5440212b40cf4069566a5c15efcbdb5b2f487fee,550af86e26712fc9c7d6849ec30d893069f377af..7df38c9e6e87f67a32f730c76e87768c140ca38b
@@@ -1,7 -1,5 +1,6 @@@
  <?php
- declare(strict_types=1);
  namespace wcf\util;
 +use wcf\data\DatabaseObjectDecorator;
  use wcf\system\exception\SystemException;
  
  /**
index 2e75d1eda6e072a6b627dc2cae4a8f5776705037,07c41f895dac8ebb746b26714674355c1d82f680..6c219ab54352a2a4d079447cc03ffa8453bd38b8
                <item name="wcf.acp.menu.link.devtools.project.add"><![CDATA[Projekt hinzufügen]]></item>
                <item name="wcf.acp.menu.link.devtools.project.list"><![CDATA[Projekte]]></item>
                <item name="wcf.acp.menu.link.devtools.notificationTest"><![CDATA[Benachrichtigungstest]]></item>
+               <item name="wcf.acp.menu.link.log.modification"><![CDATA[Globales Veränderungsprotokoll]]></item>
 +              <item name="wcf.acp.menu.link.reactionType"><![CDATA[Reaktionen]]></item>
 +              <!-- @TODO maybe use "Reaktion" instead of "Reaktions-Typ", because its more comprehensible for users -->
 +              <item name="wcf.acp.menu.link.reactionType.list"><![CDATA[Reaktions-Typen]]></item>
 +              <item name="wcf.acp.menu.link.reactionType.add"><![CDATA[Reaktions-Typ hinzufügen]]></item>
 +              <item name="wcf.acp.menu.link.reactionType.edit"><![CDATA[Reaktions-Typ bearbeiten]]></item>
        </category>
        
+       <category name="wcf.acp.modificationLog">
+               <item name="wcf.acp.modificationLog.list"><![CDATA[Globales Veränderungsprotokoll]]></item>
+               <item name="wcf.acp.modificationLog.action"><![CDATA[Aktion]]></item>
+               <item name="wcf.acp.modificationLog.action.all"><![CDATA[Alle Aktion]]></item>
+               <item name="wcf.acp.modificationLog.affectedObject"><![CDATA[Betroffenes Objekt]]></item>
+               <item name="wcf.acp.modificationLog.affectedObject.id"><![CDATA[ID: {@$modificationLog->objectID}]]></item>
+               <item name="wcf.acp.modificationLog.affectedObject.unknown"><![CDATA[(Existiert nicht mehr)]]></item>
+               <item name="wcf.acp.modificationLog.package.all"><![CDATA[Alle Quellen]]></item>
+               <item name="wcf.acp.modificationLog.time.afterDate"><![CDATA[Ab dem Zeitpunkt]]></item>
+               <item name="wcf.acp.modificationLog.time.beforeDate"><![CDATA[Vor dem Zeitpunkt]]></item>
+               <item name="wcf.acp.modificationLog.unsupportedObjectTypes"><![CDATA[Einige Typen werden aktuell nicht unterstützt und müssen zuvor vom Hersteller angepasst werden.]]></item>
+       </category>
+       
        <category name="wcf.acp.notice">
                <item name="wcf.acp.notice.add"><![CDATA[Hinweis hinzufügen]]></item>
                <item name="wcf.acp.notice.cssClassName"><![CDATA[Darstellung]]></item>
index b296826e862ce003eadcda45e8c5751f225711b3,af2ee72c66ee4c7c80c76681b24cb6ce620ebbd1..30a7b24c3db628750eb06a69094cb66acc9a2f21
                <item name="wcf.acp.menu.link.devtools.project.add"><![CDATA[Add Project]]></item>
                <item name="wcf.acp.menu.link.devtools.project.list"><![CDATA[Projects]]></item>
                <item name="wcf.acp.menu.link.devtools.notificationTest"><![CDATA[Notification Test]]></item>
+               <item name="wcf.acp.menu.link.log.modification"><![CDATA[Global Modification Log]]></item>
 +              <item name="wcf.acp.menu.link.reactionType"><![CDATA[Reaction]]></item>
 +              <!-- @TODO maybe use "Reactions" instead of "Reaction Types", because its more comprehensible for users -->
 +              <item name="wcf.acp.menu.link.reactionType.list"><![CDATA[Reaktion Types]]></item>
 +              <item name="wcf.acp.menu.link.reactionType.add"><![CDATA[Add Reaction Type]]></item>
 +              <item name="wcf.acp.menu.link.reactionType.edit"><![CDATA[Edit Reaction Type]]></item>
        </category>
        
+       <category name="wcf.acp.modificationLog">
+               <item name="wcf.acp.modificationLog.list"><![CDATA[Global Modification Log]]></item>
+               <item name="wcf.acp.modificationLog.action"><![CDATA[Action]]></item>
+               <item name="wcf.acp.modificationLog.action.all"><![CDATA[All Actions]]></item>
+               <item name="wcf.acp.modificationLog.affectedObject"><![CDATA[Affected Object]]></item>
+               <item name="wcf.acp.modificationLog.affectedObject.id"><![CDATA[ID: {@$modificationLog->objectID}]]></item>
+               <item name="wcf.acp.modificationLog.affectedObject.unknown"><![CDATA[(Does not exist anymore)]]></item>
+               <item name="wcf.acp.modificationLog.package.all"><![CDATA[All Sources]]></item>
+               <item name="wcf.acp.modificationLog.time.afterDate"><![CDATA[After the date]]></item>
+               <item name="wcf.acp.modificationLog.time.beforeDate"><![CDATA[Before the date]]></item>
+               <item name="wcf.acp.modificationLog.unsupportedObjectTypes"><![CDATA[Some types are currently not supported and require changes to be made by the vendor.]]></item>
+       </category>
+       
        <category name="wcf.acp.notice">
                <item name="wcf.acp.notice.add"><![CDATA[Add Notice]]></item>
                <item name="wcf.acp.notice.cssClassName"><![CDATA[Appearance]]></item>
index 7781fbc07c77f4014b536f37932b442e2657d8ec,1e9cbaf46a73c3ba7729962742537a9ee221c86e..6d26f6bd37df0da4df347de8269a5f2e3ea24d15
@@@ -1444,9 -1433,7 +1445,10 @@@ CREATE TABLE wcf1_user 
        disableCoverPhoto TINYINT(1) NOT NULL DEFAULT 0,
        disableCoverPhotoReason TEXT,
        disableCoverPhotoExpires INT(10) NOT NULL DEFAULT 0,
+       articles INT(10) NOT NULL DEFAULT 0,
 +      positiveReactionsReceived MEDIUMINT(7) NOT NULL DEFAULT 0,
 +      negativeReactionsReceived MEDIUMINT(7) NOT NULL DEFAULT 0,
 +      neutralReactionsReceived MEDIUMINT(7) NOT NULL DEFAULT 0,
        
        KEY username (username),
        KEY email (email),