29765 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Aurélien GEORGET	006d9f6f03	Merge pull request #360 from strapi/fix/refresh ... Fix/refresh	2017-12-05 16:56:41 +01:00
Jim Laurie	bdb5f50eab	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-12-05 16:45:58 +01:00
Jim Laurie	4e6339da1e	Fix delete user from group	2017-12-05 16:44:54 +01:00
Aurelsicoko	95409464a4	Enable init on every role$	2017-12-05 16:41:16 +01:00
Aurelsicoko	b2204e533c	Resolve conflicts	2017-12-05 16:35:28 +01:00
cyril lopez	98c54e27f4	Update branch ... Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-12-05 16:31:23 +01:00
cyril lopez	25b0c532cd	Remove useless comments and fix uninstall plugin	2017-12-05 16:29:46 +01:00
Jim LAURIE	748e11ae41	Merge pull request #361 from strapi/fix/content-manager ... Fix/content manager	2017-12-05 16:24:18 +01:00
cyril lopez	de8253a2e2	fix Install plugins design and Controller design	2017-12-05 16:08:17 +01:00
cyril lopez	f3ffab4ed8	Fix listPlugins design hide email and ctm plugins from menu and fix Editrole css	2017-12-05 15:50:24 +01:00
Aurélien GEORGET	209d1dfa28	Merge branch 'master' into fix/release	2017-12-05 15:35:14 +01:00
Aurelsicoko	c216771adb	Resolve conflicts	2017-12-05 15:30:16 +01:00
Aurelsicoko	110c209431	Be able to create an user from the Content Manager	2017-12-05 15:28:31 +01:00
cyril lopez	8920fda350	fix login bug	2017-12-05 15:16:33 +01:00
Aurelsicoko	10e509b0dd	Allow refresh in administration page	2017-12-05 14:55:08 +01:00
cyril lopez	87bbe8c210	Update branch ... Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-12-05 14:52:59 +01:00
cyril lopez	563923bb36	Fix css	2017-12-05 14:44:32 +01:00
Jim LAURIE	a4dbc278a7	Merge pull request #359 from strapi/load-order-plugin ... Fix loadOrder plugins in FIREFOX and SAFARI	2017-12-05 14:21:32 +01:00
Jim LAURIE	66fc7c0701	Merge pull request #358 from strapi/fix/webpack ... Fix babel-polyfill dependencies and improve email appearance	2017-12-05 14:20:56 +01:00
cyril lopez	ed05d62653	Fix loadOrder plugins in FIREFOX and SAFARI	2017-12-05 13:49:31 +01:00
Aurelsicoko	87350ef2f1	Fix babel-polyfill dependencies and improve email appearance	2017-12-05 12:10:08 +01:00
Jim Laurie	80e4c1087c	Fix conflict	2017-12-05 10:28:53 +01:00
Jim Laurie	28e1094b86	Update modules version	2017-12-05 10:27:05 +01:00
cyril lopez	48d4150df2	Fix notif ctm	2017-12-04 17:52:16 +01:00
Jim Laurie	a098244281	Fix permission on bootstrap	2017-12-04 17:45:58 +01:00
Jim Laurie	ea8b7a8c5c	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-12-04 17:41:39 +01:00
cyril lopez	65264cf938	Fix design	2017-12-04 17:32:45 +01:00
Jim Laurie	b54a2e087c	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-12-04 16:51:32 +01:00
Jim Laurie	df25e9dd2a	Generate uuid for jwt encryption	2017-12-04 16:43:24 +01:00
cyril lopez	4bab690f5c	Fix conflict	2017-12-04 15:52:44 +01:00
cyril lopez	6be459cf33	Fix css	2017-12-04 15:50:46 +01:00
Jim Laurie	bb00db7a44	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-12-04 15:49:49 +01:00
Jim Laurie	6eb4a5cb77	Fix user update encrypted password	2017-12-04 15:35:45 +01:00
Aurelsicoko	ef99f5095c	Build plugin email	2017-12-04 15:23:35 +01:00
cyril lopez	4cb45e48be	Fix design	2017-12-04 15:03:53 +01:00
Aurelsicoko	42af4a9aaa	Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-12-04 14:30:31 +01:00
Aurelsicoko	2b86bde1b4	Fix build due to layout	2017-12-04 14:29:16 +01:00
Jim Laurie	f852a732a3	Review email reset password template	2017-12-04 14:11:00 +01:00
Jim Laurie	2c43a856ce	Catch email error forgot password	2017-12-04 14:00:09 +01:00
Jim Laurie	74164aa38a	Remove log and fix email reset password 404	2017-12-04 13:40:07 +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	a838a704c0	Design InstallPluginPage	2017-12-02 18:46:22 +01:00
cyril lopez	521b627fd8	Created plugin card component	2017-12-02 16:10:18 +01:00
cyril lopez	8bec0273da	Fix InputSearch lib css	2017-12-02 13:54:36 +01:00
cyril lopez	046574fb45	Created InstallPluginPage container	2017-12-02 13:37:58 +01:00
cyril lopez	86a5401680	Fix deleting users associated to a role	2017-12-01 16:21:13 +01:00
Jim Laurie	fab65fdd0b	Fix conflict	2017-12-01 16:08:27 +01:00
Jim Laurie	a1ea5a2777	Link user to role	2017-12-01 16:06:16 +01:00
cyril lopez	46498ca2d7	Prevent from searching admin users	2017-12-01 15:53:54 +01:00
cyril lopez	eed26aeef7	Prevent plugins to execute the bootstrap file (frontend) if the plugin users-permissions is in the project or if the user is not logged in	2017-12-01 15:45:11 +01:00