From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 23 Jun 2016 13:31:56 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/next' into next
X-Git-Tag: 3.0.0_Beta_1~1376
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cec1c15b86b98d960d9bb9ec258224eb3bb74a64;p=GitHub%2FWoltLab%2FWCF.git

Merge remote-tracking branch 'origin/next' into next

# Conflicts:
#	com.woltlab.wcf/objectType.xml
---

cec1c15b86b98d960d9bb9ec258224eb3bb74a64
diff --cc com.woltlab.wcf/objectType.xml
index 27a33f2368,434855c361..d1b6f8fe4b
--- a/com.woltlab.wcf/objectType.xml
+++ b/com.woltlab.wcf/objectType.xml
@@@ -1024,15 -1024,21 +1024,28 @@@
  			<definitionname>com.woltlab.wcf.boxController</definitionname>
  			<classname>wcf\system\box\ArticleCategoriesBoxController</classname>
  		</type>
+ 		<type>
+ 			<name>com.woltlab.wcf.articleList</name>
+ 			<definitionname>com.woltlab.wcf.boxController</definitionname>
+ 			<classname>wcf\system\box\ArticleListBoxController</classname>
+ 		</type>
  		<!-- /box controllers -->
  		
 +		<!-- pages -->
 +		<type>
 +			<name>com.woltlab.wcf.page</name>
 +			<definitionname>com.woltlab.wcf.acl.simple</definitionname>
 +		</type>
 +		<!-- /pages -->
 +		
+ 		<!-- article list box condition -->
+ 		<type>
+ 			<name>com.woltlab.wcf.articleCategory</name>
+ 			<definitionname>com.woltlab.wcf.box.articleList.condition</definitionname>
+ 			<classname>wcf\system\condition\article\ArticleCategoryCondition</classname>
+ 		</type>
 -		<!-- /thread list box condition -->
++		<!-- /article list box condition -->
+ 		
  		<!-- deprecated -->
  		<type>
  			<name>com.woltlab.wcf.page.controller</name>