1099 Commits

Author	SHA1	Message	Date
cyril lopez	a2ebbfab9e	Handle any api errors in ctm	2017-12-06 15:58:20 +01:00
cyril lopez	ac102e88e5	Fix conflict	2017-12-06 15:15:43 +01:00
cyril lopez	59872ac890	Handle backend errors in ctm	2017-12-06 15:11:55 +01:00
Aurelsicoko	4444d806d6	Replace PNG logo to SVG & handle email/password type in Content Manager list	2017-12-06 13:44:58 +01:00
Aurelsicoko	110c209431	Be able to create an user from the Content Manager	2017-12-05 15:28:31 +01:00
Jim Laurie	80e4c1087c	Fix conflict	2017-12-05 10:28:53 +01:00
cyril lopez	48d4150df2	Fix notif ctm	2017-12-04 17:52:16 +01:00
cyril lopez	4cb45e48be	Fix design	2017-12-04 15:03:53 +01:00
Aurelsicoko	b195ae0ef8	Merge branch 'alpha.7' of github.com:strapi/strapi into user-permissions	2017-12-04 11:43:53 +01:00
cyril lopez	a7b56b484f	Fix conflict	2017-11-29 19:00:51 +01:00
Aurelsicoko	d620a0745d	Remove routing policy from /models route	2017-11-29 16:13:27 +01:00
Aurelsicoko	191092fca9	Redirect CM action to plugin's controller for User plugin	2017-11-29 16:10:13 +01:00
Aurelsicoko	8f8fa6b158	Update doc and generated template	2017-11-29 15:46:28 +01:00
Aurelsicoko	c971f9c054	Allow redirect action in CM & harmonize pre/post event with Promises	2017-11-29 15:00:50 +01:00
Aurelsicoko	904484df37	Use state for source and fix create form	2017-11-29 12:24:23 +01:00
cyril lopez	f6d243a4df	Fix add header to request helper	2017-11-29 11:43:38 +01:00
Aurelsicoko	3cf999c8a6	Add layout user and apply design change	2017-11-28 16:20:39 +01:00
Aurelsicoko	b63cd80a13	Add type email & password, and fix layout system	2017-11-28 16:01:50 +01:00
Aurelsicoko	362f7badb0	Add type password	2017-11-28 13:51:50 +01:00
Aurelsicoko	311862dbb1	Handle delete plugin entry using Content Manager	2017-11-27 17:45:21 +01:00
Aurelsicoko	eceede450b	Handle plugin model in Content Manager	2017-11-27 17:27:16 +01:00
Jim Laurie	f719d7f1fb	Fix conflict	2017-11-23 15:05:05 +01:00
Rob Styles	c6d333e2f0	minor fix to translation	2017-11-21 15:38:05 +00:00
cyril lopez	ac5f20a000	Add reset-password view and fix PR feedbacks	2017-11-20 14:21:08 +01:00
cyril lopez	51194f28b5	Fix conflict	2017-11-17 17:22:41 +01:00
cyril lopez	31523b3f5d	Update branch ... Merge branch 'master' of github.com:strapi/strapi into user-permissions	2017-11-17 17:18:28 +01:00
Aurelsicoko	bcc9a652aa	Clear cache before loading configuration files	2017-11-17 17:12:55 +01:00
Aurelsicoko	b2603aab4d	Update path to use local strapi-helper-plugin	2017-11-17 16:05:47 +01:00
Jim Laurie	7a0d05346b	Fix conflict	2017-11-15 12:16:27 +01:00
Aurelsicoko	6f4086be2e	Merge from master	2017-11-14 11:53:51 +01:00
Jim Laurie	5148f10b12	Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-11-14 11:12:22 +01:00
cyril lopez	9e4fe1b7d3	Run setup	2017-11-14 09:11:31 +01:00
Aurelsicoko	f80b54f1e0	Avoid to rebuild admin during installation and remove useless dependencies	2017-11-13 19:24:29 +01:00
Aurelsicoko	0eab3d1219	Remove useless dependencies and silent strapi.log during test	2017-11-13 17:58:48 +01:00
Aurelsicoko	87a083134a	Change variable name	2017-11-13 12:45:39 +01:00
Aurelsicoko	d0c3f7f8b5	Avoid to rebuild on path change and override build configuration	2017-11-11 22:14:05 +01:00
cyril lopez	2604dafafa	Update branch ... Merge branch 'master' of github.com:strapi/strapi into fix/ctm-editView	2017-11-11 10:30:16 +01:00
cyril lopez	be14886b79	Fix ctm enter key press bug	2017-11-10 18:14:18 +01:00
Aurelsicoko	650e7dd6cb	Add remote and backend URLs and update global variable	2017-11-08 17:40:47 +01:00
Jim Laurie	790cee753e	3.0.0-alpha.6.7	2017-11-08 15:46:28 +01:00
Jim Laurie	ef601d6e9a	3.0.0-alpha.6.6	2017-11-07 17:20:06 +01:00
Jim Laurie	30e39254a6	Change strapi version to alpha.6.5	2017-11-06 15:52:36 +01:00
Jim LAURIE	5ccc49066d	Merge pull request #322 from strapi/list-plugins ... List plugins	2017-11-03 15:01:38 +01:00
Jim Laurie	b57382aa6f	New version and manifest build	2017-11-03 12:40:14 +01:00
Jim Laurie	8b8115bac1	Merge branch 'alpha.7' of https://github.com/strapi/strapi into alpha.7	2017-11-03 12:13:20 +01:00
Jim LAURIE	bf50390bb6	Merge pull request #316 from strapi/fix/api-relations-mongoose ... Fix api relations	2017-11-03 12:05:39 +01:00
Jim Laurie	77013bc4b2	Fix conflicts	2017-11-03 12:00:08 +01:00
Jim Laurie	6c376456fb	Fix conflicts	2017-11-03 11:51:55 +01:00
cyril lopez	c40c4c5013	Add plugin description to all plugins packages and pass it to the app context	2017-11-02 11:36:38 +01:00
cyril lopez	15fc39029e	Clean content manager image with svgo	2017-11-02 10:19:38 +01:00