Merge branch 'master' of github.com:owncloud/news

5 files changed, 122 insertions, 1 deletions

diff --git a/controller/exportcontroller.php b/controller/exportcontroller.php
index d1e6f017d..006335486 100644
--- a/controller/exportcontroller.php
+++ b/controller/exportcontroller.php
@@ -38,6 +38,11 @@ class ExportController extends Controller {
 	}
 
 
+	/**
+	 * @IsAdminExemption
+	 * @IsSubAdminExemption
+	 * @Ajax
+	 */
 	public function opml(){
 		
 	}
diff --git a/controller/feedcontroller.php b/controller/feedcontroller.php
index 70f110a4a..89a7d7f69 100644
--- a/controller/feedcontroller.php
+++ b/controller/feedcontroller.php
@@ -31,7 +31,7 @@ use \OCA\AppFramework\Http\Request;
 use \OCA\AppFramework\Db\DoesNotExistException;
 use \OCA\AppFramework\Db\MultipleObjectsReturnedException;
 
-use \OCA\Bl\FeedBl;
+use \OCA\News\Bl\FeedBl;
 
 
 class FeedController extends Controller {
@@ -44,36 +44,71 @@ class FeedController extends Controller {
 	}
 
 
+	/**
+	 * @IsAdminExemption
+	 * @IsSubAdminExemption
+	 * @Ajax
+	 */
 	public function feeds(){
 		
 	}
 
 
+	/**
+	 * @IsAdminExemption
+	 * @IsSubAdminExemption
+	 * @Ajax
+	 */
 	public function active(){
 
 	}
 
 
+	/**
+	 * @IsAdminExemption
+	 * @IsSubAdminExemption
+	 * @Ajax
+	 */
 	public function create(){
 		
 	}
 
 
+	/**
+	 * @IsAdminExemption
+	 * @IsSubAdminExemption
+	 * @Ajax
+	 */
 	public function delete(){
 		
 	}
 
 
+	/**
+	 * @IsAdminExemption
+	 * @IsSubAdminExemption
+	 * @Ajax
+	 */
 	public function update(){
 		
 	}
 
 
+	/**
+	 * @IsAdminExemption
+	 * @IsSubAdminExemption
+	 * @Ajax
+	 */
 	public function move(){
 		
 	}
 
 
+	/**
+	 * @IsAdminExemption
+	 * @IsSubAdminExemption
+	 * @Ajax
+	 */
 	public function read(){
 		
 	}
diff --git a/controller/foldercontroller.php b/controller/foldercontroller.php
index 3e631eb63..80451fb3e 100644
--- a/controller/foldercontroller.php
+++ b/controller/foldercontroller.php
@@ -61,8 +61,44 @@ class FolderController extends Controller {
 	 * @IsSubAdminExemption
 	 * @Ajax
 	 */
+	public function open(){
+	}
+
+
+	/**
+	 * @IsAdminExemption
+	 * @IsSubAdminExemption
+	 * @Ajax
+	 */
 	public function collapse(){
 	}
 
 
+	/**
+	 * @IsAdminExemption
+	 * @IsSubAdminExemption
+	 * @Ajax
+	 */
+	public function create(){
+	}
+
+
+	/**
+	 * @IsAdminExemption
+	 * @IsSubAdminExemption
+	 * @Ajax
+	 */
+	public function delete(){
+	}
+
+
+	/**
+	 * @IsAdminExemption
+	 * @IsSubAdminExemption
+	 * @Ajax
+	 */
+	public function rename(){
+	}
+
+
 }
\ No newline at end of file
diff --git a/controller/itemcontroller.php b/controller/itemcontroller.php
index 11dd84ecc..f5f6d2a4b 100644
--- a/controller/itemcontroller.php
+++ b/controller/itemcontroller.php
@@ -42,31 +42,61 @@ class ItemController extends Controller {
 	}
 
 
+	/**
+	 * @IsAdminExemption
+	 * @IsSubAdminExemption
+	 * @Ajax
+	 */
 	public function items(){
 		
 	}
 
 
+	/**
+	 * @IsAdminExemption
+	 * @IsSubAdminExemption
+	 * @Ajax
+	 */
 	public function starred(){
 		
 	}
 
 
+	/**
+	 * @IsAdminExemption
+	 * @IsSubAdminExemption
+	 * @Ajax
+	 */
 	public function star(){
 		
 	}
 
 
+	/**
+	 * @IsAdminExemption
+	 * @IsSubAdminExemption
+	 * @Ajax
+	 */
 	public function unstar(){
 		
 	}
 
 
+	/**
+	 * @IsAdminExemption
+	 * @IsSubAdminExemption
+	 * @Ajax
+	 */
 	public function read(){
 		
 	}
 
 
+	/**
+	 * @IsAdminExemption
+	 * @IsSubAdminExemption
+	 * @Ajax
+	 */
 	public function unread(){
 		
 	}
diff --git a/controller/usersettingscontroller.php b/controller/usersettingscontroller.php
index f912487a7..7bdcda51d 100644
--- a/controller/usersettingscontroller.php
+++ b/controller/usersettingscontroller.php
@@ -38,16 +38,31 @@ class UserSettingsController extends Controller {
 	}
 
 
+	/**
+	 * @IsAdminExemption
+	 * @IsSubAdminExemption
+	 * @Ajax
+	 */
 	public function read(){
 		
 	}
 
 
+	/**
+	 * @IsAdminExemption
+	 * @IsSubAdminExemption
+	 * @Ajax
+	 */
 	public function show(){
 		
 	}
 
 
+	/**
+	 * @IsAdminExemption
+	 * @IsSubAdminExemption
+	 * @Ajax
+	 */
 	public function hide(){
 		
 	}