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)
commite1fa3ffde56377986ca0092fdc9b03ca913e2140
treedee95078946bffbb34c0c6689f24288175a591ca
parent46dcae1fc0bb5af19b6e651ea56670b1b297c544
parentb9687d21bc4d039cb2d37146bef057c37cd7ec21
Merge branch 'next' into reactions
21 files changed:
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