Aurelsicoko
							
						 
					 | 
					
						
						
						
						
							
						
						
							913410a080
							
						
					 | 
					
						
						
							
							Add clean roles.json
						
						
						
						
						
						
					 | 
					
						2017-11-28 16:47:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Aurelsicoko
							
						 
					 | 
					
						
						
						
						
							
						
						
							611a2e337a
							
						
					 | 
					
						
						
							
							Resolve conflicts
						
						
						
						
						
						
					 | 
					
						2017-11-28 16:43:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Aurelsicoko
							
						 
					 | 
					
						
						
						
						
							
						
						
							db5e72f4e3
							
						
					 | 
					
						
						
							
							Fix design
						
						
						
						
						
						
					 | 
					
						2017-11-28 16:40:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
						
						
							
						
						
							272f2689a5
							
						
					 | 
					
						
						
							
							Update branch
						
						
						
						
						
						
						
						Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions 
						
						
					 | 
					
						2017-11-28 16:38:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
						
						
							
						
						
							22b525b04e
							
						
					 | 
					
						
						
							
							Fix init roles permissions when starting app for the first time
						
						
						
						
						
						
					 | 
					
						2017-11-28 16:37:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Aurelsicoko
							
						 
					 | 
					
						
						
						
						
							
						
						
							4a510ac729
							
						
					 | 
					
						
						
							
							Fix font-weight on roles list
						
						
						
						
						
						
					 | 
					
						2017-11-28 16:24:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Aurelsicoko
							
						 
					 | 
					
						
						
						
						
							
						
						
							3cf999c8a6
							
						
					 | 
					
						
						
							
							Add layout user and apply design change
						
						
						
						
						
						
					 | 
					
						2017-11-28 16:20:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Aurelsicoko
							
						 
					 | 
					
						
						
						
						
							
						
						
							5d6f035384
							
						
					 | 
					
						
						
							
							Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions
						
						
						
						
						
						
					 | 
					
						2017-11-28 16:10:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Aurelsicoko
							
						 
					 | 
					
						
						
						
						
							
						
						
							b63cd80a13
							
						
					 | 
					
						
						
							
							Add type email & password, and fix layout system
						
						
						
						
						
						
					 | 
					
						2017-11-28 16:01:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
						
						
							
						
						
							520a2aa543
							
						
					 | 
					
						
						
							
							Update branch
						
						
						
						
						
						
						
						Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions 
						
						
					 | 
					
						2017-11-28 16:00:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
						
						
							
						
						
							341561006c
							
						
					 | 
					
						
						
							
							Fix conflict
						
						
						
						
						
						
					 | 
					
						2017-11-28 15:46:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jim Laurie
							
						 
					 | 
					
						
						
						
						
							
						
						
							44c511ad50
							
						
					 | 
					
						
						
							
							Update user bookshelf fetch query
						
						
						
						
						
						
					 | 
					
						2017-11-28 15:32:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
						
						
							
						
						
							2a27b915f8
							
						
					 | 
					
						
						
							
							Fix design
						
						
						
						
						
						
					 | 
					
						2017-11-28 15:04:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jim Laurie
							
						 
					 | 
					
						
						
						
						
							
						
						
							aecbbcf3ba
							
						
					 | 
					
						
						
							
							Handle default connection for mongoose
						
						
						
						
						
						
					 | 
					
						2017-11-28 14:28:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
						
						
							
						
						
							4d56b185bf
							
						
					 | 
					
						
						
							
							Fix login error bug
						
						
						
						
						
						
					 | 
					
						2017-11-28 14:12:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Aurelsicoko
							
						 
					 | 
					
						
						
						
						
							
						
						
							362f7badb0
							
						
					 | 
					
						
						
							
							Add type password
						
						
						
						
						
						
					 | 
					
						2017-11-28 13:51:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
						
						
							
						
						
							19b06da90e
							
						
					 | 
					
						
						
							
							Add logout
						
						
						
						
						
						
					 | 
					
						2017-11-28 13:24:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Aurelsicoko
							
						 
					 | 
					
						
						
						
						
							
						
						
							703223687f
							
						
					 | 
					
						
						
							
							Remove URL attributes and try new load attempt if plugin fails to load
						
						
						
						
						
						
					 | 
					
						2017-11-28 12:40:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jim Laurie
							
						 
					 | 
					
						
						
						
						
							
						
						
							b633558c6e
							
						
					 | 
					
						
						
							
							Use query User fetch fetchAll
						
						
						
						
						
						
					 | 
					
						2017-11-28 10:51:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jim Laurie
							
						 
					 | 
					
						
						
						
						
							
						
						
							6fe7dc82cf
							
						
					 | 
					
						
						
							
							Add beforeInitialize function for middleware
						
						
						
						
						
						
					 | 
					
						2017-11-28 10:02:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jim Laurie
							
						 
					 | 
					
						
						
						
						
							
						
						
							ddcf48d7c4
							
						
					 | 
					
						
						
							
							Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions
						
						
						
						
						
						
					 | 
					
						2017-11-28 09:20:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
						
						
							
						
						
							c7b8dec855
							
						
					 | 
					
						
						
							
							Update branch
						
						
						
						
						
						
						
						Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions 
						
						
					 | 
					
						2017-11-27 17:51:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
						
						
							
						
						
							01af64d709
							
						
					 | 
					
						
						
							
							Handle update role
						
						
						
						
						
						
					 | 
					
						2017-11-27 17:50:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Aurelsicoko
							
						 
					 | 
					
						
						
						
						
							
						
						
							311862dbb1
							
						
					 | 
					
						
						
							
							Handle delete plugin entry using Content Manager
						
						
						
						
						
						
					 | 
					
						2017-11-27 17:45:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Aurelsicoko
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ebbe42998
							
						
					 | 
					
						
						
							
							Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions
						
						
						
						
						
						
					 | 
					
						2017-11-27 17:27:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Aurelsicoko
							
						 
					 | 
					
						
						
						
						
							
						
						
							eceede450b
							
						
					 | 
					
						
						
							
							Handle plugin model in Content Manager
						
						
						
						
						
						
					 | 
					
						2017-11-27 17:27:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
						
						
							
						
						
							1177b1a343
							
						
					 | 
					
						
						
							
							Handle delete role
						
						
						
						
						
						
					 | 
					
						2017-11-27 17:02:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jim Laurie
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0a766388f
							
						
					 | 
					
						
						
							
							By pass permissions for app owner
						
						
						
						
						
						
					 | 
					
						2017-11-27 16:59:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
						
						
							
						
						
							b3574dee6e
							
						
					 | 
					
						
						
							
							Handle create role
						
						
						
						
						
						
					 | 
					
						2017-11-27 16:49:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jim Laurie
							
						 
					 | 
					
						
						
						
						
							
						
						
							637fb86670
							
						
					 | 
					
						
						
							
							Fix conflict
						
						
						
						
						
						
					 | 
					
						2017-11-27 16:48:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jim Laurie
							
						 
					 | 
					
						
						
						
						
							
						
						
							ee1ece28d8
							
						
					 | 
					
						
						
							
							Use request route to detect current action
						
						
						
						
						
						
					 | 
					
						2017-11-27 16:47:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
						
						
							
						
						
							1fe2ffdbf8
							
						
					 | 
					
						
						
							
							Get roles (frontend and backend)
						
						
						
						
						
						
					 | 
					
						2017-11-27 16:04:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
						
						
							
						
						
							950147901d
							
						
					 | 
					
						
						
							
							Update branch
						
						
						
						
						
						
						
						Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions 
						
						
					 | 
					
						2017-11-27 14:44:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
						
						
							
						
						
							5cf7c45202
							
						
					 | 
					
						
						
							
							Handle search user (frontend)
						
						
						
						
						
						
					 | 
					
						2017-11-27 14:26:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Aurelsicoko
							
						 
					 | 
					
						
						
						
						
							
						
						
							1c2f625a2b
							
						
					 | 
					
						
						
							
							Allow plugin to add link into a specific left menu section
						
						
						
						
						
						
					 | 
					
						2017-11-27 12:22:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
						
						
							
						
						
							baee801941
							
						
					 | 
					
						
						
							
							Add searchUsers and created mongoose query
						
						
						
						
						
						
					 | 
					
						2017-11-27 12:19:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jim Laurie
							
						 
					 | 
					
						
						
						
						
							
						
						
							5e2748f81f
							
						
					 | 
					
						
						
							
							Send 401 if action is not enabled
						
						
						
						
						
						
					 | 
					
						2017-11-27 12:05:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Aurelsicoko
							
						 
					 | 
					
						
						
						
						
							
						
						
							70667e0cba
							
						
					 | 
					
						
						
							
							Fix setup
						
						
						
						
						
						
					 | 
					
						2017-11-27 11:04:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jim Laurie
							
						 
					 | 
					
						
						
						
						
							
						
						
							9a801e4ac1
							
						
					 | 
					
						
						
							
							Inject authentication policy
						
						
						
						
						
						
					 | 
					
						2017-11-27 10:59:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jim Laurie
							
						 
					 | 
					
						
						
						
						
							
						
						
							a2c8e212fc
							
						
					 | 
					
						
						
							
							Use default config middleware and load plugins middlewares
						
						
						
						
						
						
					 | 
					
						2017-11-24 15:15:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
						
						
							
						
						
							b00087c157
							
						
					 | 
					
						
						
							
							Delete dynamic (front end)
						
						
						
						
						
						
					 | 
					
						2017-11-23 18:08:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
						
						
							
						
						
							76ef40448b
							
						
					 | 
					
						
						
							
							Prevent from deleting specific role (front end)
						
						
						
						
						
						
					 | 
					
						2017-11-23 17:48:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
						
						
							
						
						
							1fc0d0789a
							
						
					 | 
					
						
						
							
							Fix user-permissions homepage notification bug
						
						
						
						
						
						
					 | 
					
						2017-11-23 17:20:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
						
						
							
						
						
							38e6df838f
							
						
					 | 
					
						
						
							
							Edit role
						
						
						
						
						
						
					 | 
					
						2017-11-23 17:13:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
						
						
							
						
						
							47c375e83d
							
						
					 | 
					
						
						
							
							Add plugin icon to permissions list
						
						
						
						
						
						
					 | 
					
						2017-11-23 16:27:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
						
						
							
						
						
							6d253cef87
							
						
					 | 
					
						
						
							
							Add user to role
						
						
						
						
						
						
					 | 
					
						2017-11-23 13:09:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
						
						
							
						
						
							162e82086c
							
						
					 | 
					
						
						
							
							Fetch users dynamic for EditPage role
						
						
						
						
						
						
					 | 
					
						2017-11-23 12:43:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
						
						
							
						
						
							f4fbe455b5
							
						
					 | 
					
						
						
							
							Handle front end role post
						
						
						
						
						
						
					 | 
					
						2017-11-23 12:15:06 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
						
						
							
						
						
							97d20d5315
							
						
					 | 
					
						
						
							
							Created handler for POST role
						
						
						
						
						
						
					 | 
					
						2017-11-23 11:03:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jim Laurie
							
						 
					 | 
					
						
						
						
						
							
						
						
							ab62578fac
							
						
					 | 
					
						
						
							
							Fix API assign
						
						
						
						
						
						
					 | 
					
						2017-11-21 10:07:49 +01:00 | 
					
					
						
						
							
							
							
						
					 |