33691 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
cyril lopez	957b92692a	Sort functions by name	2017-12-07 15:27:11 +01:00
cyril lopez	cba9cac629	Delete useless request file in ctm and order Auth controller by function s name	2017-12-07 15:21:54 +01:00
Jim Laurie	cbc0cf73dd	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-12-07 14:57:45 +01:00
Jim Laurie	3f15a5b618	Fix bookshelf fetch for auth	2017-12-07 14:56:25 +01:00
Aurelsicoko	f5023b2fdc	Use private data instead of state to send source to actions in Content Manager	2017-12-07 14:37:09 +01:00
cyril lopez	f3184590d7	Fix typo	2017-12-07 14:35:35 +01:00
Aurelsicoko	94c153dd5f	Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-12-07 14:31:13 +01:00
Aurelsicoko	3056736ca9	Use get default value in LeftMenuLinkContainer	2017-12-07 14:30:31 +01:00
Aurelsicoko	6f0396ea04	Remove unnecessary backend url from sagas' urls	2017-12-07 14:28:55 +01:00
cyril lopez	ce94f85a50	Update branch ... Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-12-07 14:17:23 +01:00
cyril lopez	592a7cb58c	Fix request helper	2017-12-07 14:16:21 +01:00
cyril lopez	795950c7cb	Remove X-Forwarded-Host header in strapi-generate-new	2017-12-07 14:11:06 +01:00
cyril lopez	d09b3e3312	Pass object to redirect the user	2017-12-07 14:07:37 +01:00
Aurelsicoko	48c9670240	Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-12-07 14:05:47 +01:00
Aurelsicoko	d20c349276	Optimize i18n functions	2017-12-07 14:05:10 +01:00
cyril lopez	2b82bdf388	Remove 404 in AdminPage container	2017-12-07 13:50:43 +01:00
cyril lopez	cb1dbc8333	Fix PopUpForm close button position	2017-12-07 13:41:02 +01:00
cyril lopez	4b71c2b140	Fix ctb notification id	2017-12-07 13:31:32 +01:00
cyril lopez	efc37c4b24	Fix ctm notification id	2017-12-07 13:26:25 +01:00
cyril lopez	342ced6ed0	Update branch ... Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-12-07 13:18:44 +01:00
cyril lopez	f352a27e8f	Fix admin notification id	2017-12-07 13:17:39 +01:00
Aurelsicoko	9c7b09716c	Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-12-07 12:09:00 +01:00
Aurelsicoko	d050e4df28	Fix redirect and load custom middleware	2017-12-07 12:08:13 +01:00
cyril lopez	768aeed0bf	Created Row Component to handle listPlugin PopUpWarning bug	2017-12-07 10:57:39 +01:00
cyril lopez	a19e6eaf15	Fix roles.json bug	2017-12-07 10:16:36 +01:00
cyril lopez	1a56f117ee	Update doc plugins => UI-components => Input	2017-12-06 18:14:12 +01:00
cyril lopez	6474841abc	Handle 404 in users-permissions	2017-12-06 17:45:38 +01:00
cyril lopez	9b5be00115	Add 404 in content type builder	2017-12-06 17:23:14 +01:00