Merge branch 'version/1.15' into feature/capabilities-1.15

Conflicts: assets/css/admin-global.css assets/css/scss/admin-global.scss includes/class-gravityview-roles-capabilities.php
GravityKit · Oct 8, 2015 · 00e34be · 00e34be
2 parents f65637e + 1cc2586
commit 00e34be
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/assets/css/scss/admin-global.scss b/assets/css/scss/admin-global.scss
@@ -12,6 +12,7 @@
 
 @import "font";
 @import "admin-members-plugin";
+@import "beacon";
 
 /* add gravityview menu icon */
 #toplevel_page_gravityview_settings .wp-menu-image:before,

diff --git a/includes/class-gravityview-roles-capabilities.php b/includes/class-gravityview-roles-capabilities.php
@@ -223,6 +223,7 @@ public static function all_caps( $role = '' ) {
 
 			// GF caps
 			'gravityview_edit_others_entries',
+			'gravityview_view_others_entry_notes',
 			'gravityview_moderate_entries',
 			'gravityview_delete_others_entries',
 			'gravityview_view_others_entry_notes',
@@ -244,7 +245,7 @@ public static function all_caps( $role = '' ) {
 			'edit_gravityviews', // Affects if you're able to see the Views menu in the Admin
 			'delete_gravityview',
 			'delete_gravityviews',
-			
+
 			'gravityview_support_port', // Display GravityView Help beacon
 		);