2419 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jim Laurie	cc4e1bd762	Merge branch 'master' of https://github.com/strapi/strapi into update-getting-started-doc	2017-12-13 15:15:56 +01:00
Jim LAURIE	8cc616f6b6	Merge pull request #374 from strapi/improve-user-edit-section ... Improve UX when editing a role	2017-12-13 15:15:10 +01:00
cyril lopez	13383d9f7c	Open the application s permissions section if there are APIs	2017-12-13 13:43:36 +01:00
cyril lopez	0a2165f97f	Fix typo	2017-12-13 13:37:11 +01:00
cyril lopez	4028e5c88f	Update getting started	2017-12-13 13:24:46 +01:00
cyril lopez	a641b8ec93	Update contributing guide	2017-12-13 12:21:16 +01:00
Jim LAURIE	348b4d1b27	Merge pull request #366 from strapi/fix-login-redirect ... Prevent user from going to login page if no user is registered	2017-12-13 11:12:14 +01:00
cyril lopez	d843886696	Update branch ... Merge branch 'master' of github.com:strapi/strapi into fix-login-redirect	2017-12-13 10:59:12 +01:00
Aurélien GEORGET	0aef60b57c	Merge pull request #369 from lucaperret/master ... Fix generate-controller templates: typo on method	2017-12-13 10:44:21 +01:00
cyril lopez	09d4183f1e	Update branch ... Merge branch 'master' of github.com:strapi/strapi into fix-login-redirect	2017-12-13 10:41:06 +01:00
Luca Perret	a18434faa0	Fix generate-controller templates: typo on method	2017-12-12 18:22:07 +01:00
Jim LAURIE	58f4e4667d	Merge pull request #367 from strapi/fix/roles ... Fix auto set config if doent exist	2017-12-12 16:14:42 +01:00
cyril lopez	b1779a53fd	Refacto login redirect	2017-12-12 15:48:09 +01:00
Jim Laurie	832617159d	Fix auto set config if doent exist	2017-12-12 15:13:27 +01:00
cyril lopez	02e2016a7a	Prevent user from going to login page id no user is registered	2017-12-12 15:12:08 +01:00
Aurélien GEORGET	455ff3ed68	Merge pull request #364 from strapi/user-permissions ... 3.0.0-alpha.7	2017-12-11 16:59:21 +01:00
Jim Laurie	335ba7aeef	Merge branch 'master' of https://github.com/strapi/strapi into user-permissions	2017-12-11 16:13:33 +01:00
Jim Laurie	6d39c26568	3.0.0-alpha.7	2017-12-11 15:11:29 +01:00
Jim LAURIE	7fdbee5dd4	Merge pull request #357 from strapi/user-permissions ... User permissions	2017-12-11 15:10:08 +01:00
Jim Laurie	9831cbe393	Fix eslint	2017-12-11 14:44:58 +01:00
Jim Laurie	f404a96c5c	Fix conflicts	2017-12-11 13:51:16 +01:00
Jim Laurie	a5ef1aa0ca	Fix user fetch service with id	2017-12-11 12:31:26 +01:00
Aurelsicoko	88fb2ee89c	Fix default middleware configurations & allowed headers	2017-12-11 12:26:16 +01:00
Jim Laurie	519239c35c	Fix find one generated api mongoose	2017-12-11 12:18:14 +01:00
Jim Laurie	5f4a5971d7	Last fix PR	2017-12-11 11:14:07 +01:00
Jim Laurie	62925b9864	Add npmignore	2017-12-08 17:32:34 +01:00
cyril lopez	3da6faac05	Fix feedback PR	2017-12-08 14:40:42 +01:00
Jim Laurie	b4cae064d5	Fix conflict	2017-12-08 12:30:10 +01:00
Jim Laurie	f0393d37b6	Add documentation	2017-12-08 12:27:48 +01:00
cyril lopez	1d64d827be	Add roles key to permissions	2017-12-08 12:03:37 +01:00
cyril lopez	5ca95aac74	Remove plugins.json	2017-12-08 11:24:12 +01:00
cyril lopez	96506e5643	Fix middleware usp .policies of undefined	2017-12-08 11:21:51 +01:00
Jim LAURIE	80be255f4b	Delete plugins.json file	2017-12-08 10:50:45 +01:00
cyril lopez	247c02fd43	Update branch ... Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-12-08 10:48:26 +01:00
cyril lopez	4074846b5b	Refacto service	2017-12-08 10:42:45 +01:00
Aurelsicoko	bbde1dc125	Resolve conflicts	2017-12-07 19:15:24 +01:00
Aurelsicoko	f9cc9b504c	Delay admin load and handle relation between plugin and main models	2017-12-07 19:12:20 +01:00
cyril lopez	3ebd86b2e1	Update branch ... Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-12-07 18:42:40 +01:00
cyril lopez	f471a98f90	Fix manage user role bookshelf	2017-12-07 18:40:55 +01:00
cyril lopez	8d6cace469	Refacto InputSearch	2017-12-07 18:31:19 +01:00
Jim Laurie	729eea32c7	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-12-07 18:31:16 +01:00
cyril lopez	b01abf91f1	Add apiRoutes and fix feedback PR	2017-12-07 18:16:18 +01:00
Jim Laurie	5b4f91dcff	Fix some PR feedback	2017-12-07 18:16:15 +01:00
Jim Laurie	eec1dcff84	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-12-07 17:26:05 +01:00
Jim Laurie	b7712cf512	Fix conflicts	2017-12-07 17:04:24 +01:00
cyril lopez	4d15c74a21	Fix feedback PR	2017-12-07 16:53:30 +01:00
Jim LAURIE	015405df0d	Delete plugins.json file admin	2017-12-07 16:31:44 +01:00
Aurelsicoko	9409a39fc8	Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-12-07 16:23:59 +01:00
Jim Laurie	ad15fbd8ad	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-12-07 16:16:58 +01:00
Jim Laurie	8ed108c012	Add filter fetch content type builder queries	2017-12-07 15:44:20 +01:00