Merge branch 'notifications'
authorAlexander Ebert <ebert@woltlab.com>
Thu, 26 Jun 2014 15:28:11 +0000 (17:28 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 26 Jun 2014 15:28:11 +0000 (17:28 +0200)
1  2 
com.woltlab.wcf/userNotificationEvent.xml
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml

index 6f63a1939400ab10d7d4e997a9672d24842e8e7d,944eb44d2b3e411e66f98be646ba8101d5cb0c74..9e6b8db102176d2725aa4c50470c11518e70b308
                        <objecttype>com.woltlab.wcf.user.profileComment.response.notification</objecttype>
                        <classname><![CDATA[wcf\system\user\notification\event\UserProfileCommentResponseOwnerUserNotificationEvent]]></classname>
                        <preset>1</preset>
 +                      <options>module_user_profile_wall</options>
                </event>
+               
+               <event>
+                       <name>like</name>
+                       <objecttype>com.woltlab.wcf.user.profileComment.like.notification</objecttype>
+                       <classname><![CDATA[wcf\system\user\notification\event\UserProfileCommentUserNotificationEvent]]></classname>
+                       <preset>1</preset>
+               </event>
+               <event>
+                       <name>like</name>
+                       <objecttype>com.woltlab.wcf.user.profileComment.response.like.notification</objecttype>
+                       <classname><![CDATA[wcf\system\user\notification\event\UserProfileCommentResponseUserNotificationEvent]]></classname>
+                       <preset>1</preset>
+               </event>
        </import>
  </data>
Simple merge
Simple merge