560 Commits

Author	SHA1	Message	Date
Zhuang	e69dcc433b	reload grant value to db when add/delete provider	2018-04-21 12:29:00 +08:00
Jim Laurie	ebd144fddb	3.0.0-alpha.12	2018-04-18 12:03:16 +02:00
Jim LAURIE	c0ea8fa807	Merge branch 'master' into graphql	2018-04-16 16:39:50 +02:00
Jim LAURIE	23978a3da7	Merge branch 'master' into master	2018-04-16 09:49:58 +02:00
Jim LAURIE	ab238dca61	Remove space	2018-04-16 09:48:43 +02:00
cece95	32aefbe5be	fixed issue #923	2018-04-16 08:49:41 +02:00
Administrator	0168b9ffe5	Russian language for User Permission plugin	2018-04-15 21:42:05 +03:00
Aurelsicoko	87b07c8eeb	Resolve conflicts	2018-04-13 18:04:03 +02:00
Jim LAURIE	950122dbdb	Merge branch 'master' into poly-cm	2018-04-12 17:58:51 +02:00
Aurelsicoko	0ac7c435f3	Merge branch 'master' of github.com:strapi/strapi into graphql	2018-04-12 16:37:23 +02:00
Aurelsicoko	78e69cebd5	Add description to explain specificities of the roles query	2018-04-12 15:57:25 +02:00
Aurelsicoko	73764d6ae0	Add containss in Bookshelf filters	2018-04-12 15:44:04 +02:00
Jim Laurie	bb114a592d	Clean model	2018-04-12 14:19:22 +02:00
Aurelsicoko	17c46b331d	Make GraphQL polymorphic relationships working with Bookshelf	2018-04-11 12:53:07 +02:00
Jim Laurie	bdd1583543	Handle polymorphic in admin ... Only for collection: * poly side	2018-04-10 14:46:36 +02:00
Aurelsicoko	3daf7523c8	Apply policy for each query and use generated API business logic	2018-04-10 11:47:01 +02:00
soupette	81109f558e	Fix conflict	2018-04-10 11:18:04 +02:00
Jan Brach	0efdd3a0b4	Merge branch 'master' into master	2018-04-06 17:25:00 +02:00
Jan Brachhold	51b7a93832	Improve german translation	2018-04-06 15:54:02 +02:00
Jim Laurie	ee12536e84	3.0.0-alpha.11.3	2018-04-05 14:13:50 +02:00
soupette	ff4253aeea	Fix conflict and fix focus bug in WYSIWYG	2018-04-04 17:51:41 +02:00
Abdón Rodríguez Davila	64a1d69e51	Fix typo: extra spaces	2018-04-03 20:36:56 +02:00
soupette	1cb8de307a	Fix conflict	2018-03-30 18:05:42 +02:00
Jim Laurie	8390106f59	3.0.0-alpha.11.2	2018-03-27 17:59:16 +02:00
Jim Laurie	5d03c350e4	Clean user model	2018-03-27 16:44:25 +02:00
Aurelsicoko	0803b021c2	Improve preview style	2018-03-26 16:28:21 +02:00
cyril lopez	5d5d5d1097	Add fullscreen live preview	2018-03-22 18:19:49 +01:00
cyril lopez	9354b7eeb1	Merge branch 'master' of github.com:strapi/strapi into wysiwyg	2018-03-20 16:13:27 +01:00
Aurélien GEORGET	11c68bebf2	Update User.js	2018-03-19 17:31:04 +01:00
Aurélien GEORGET	c7fdd84340	Update styles.scss	2018-03-19 14:07:02 +01:00
cyril lopez	06760f7dfd	Fixes #799	2018-03-19 10:25:21 +01:00
cyril lopez	63575565b1	Merge branch 'master' of github.com:strapi/strapi into wysiwyg	2018-03-15 22:20:54 +01:00
Jim LAURIE	e0501b5adf	Merge branch 'master' into fix-users	2018-03-15 12:02:25 +01:00
Jim Laurie	54af44901b	Remove useless clone object	2018-03-15 12:01:10 +01:00
cyril lopez	01278f017b	Merge branch 'wysiwyg' of github.com:strapi/strapi into wysiwyg	2018-03-14 22:21:55 +01:00
Jim LAURIE	19fdb4d279	Merge branch 'master' into role-registered	2018-03-14 17:13:57 +01:00
Jim Laurie	489aefba06	Rename role registered to authenticated	2018-03-14 16:56:12 +01:00
Jim Laurie	e1b727ee09	Write appearance in layout.json file	2018-03-14 16:24:11 +01:00
Aurelsicoko	94dc9305b1	Update URL	2018-03-14 16:08:33 +01:00
Aurelsicoko	d89888bb47	Add keep me updated checkbox on register	2018-03-14 13:18:05 +01:00
Aurelsicoko	0a2fd6dfcf	Update domain	2018-03-14 10:29:11 +01:00
Aurelsicoko	1e9e684eb5	Remove no-cors from register request	2018-03-13 18:25:27 +01:00
Aurelsicoko	1304a5cde0	Fix config policies aggregation & improve post-install script	2018-03-13 17:14:33 +01:00
Jim Laurie	72877c3074	Rename Guest to Public role	2018-03-12 16:37:20 +01:00
Jim Laurie	88afad1502	Use default role on register action	2018-03-12 16:06:54 +01:00
Jim Laurie	9b7a216411	Add default role in advanced settings	2018-03-12 15:56:25 +01:00
Jim Laurie	2b0ab41a66	Add registered role and fix update role name & description	2018-03-12 14:04:43 +01:00
Jim Laurie	6cd0ec730e	3.0.0-alpha.11.1	2018-03-11 15:54:56 +01:00
Jim Laurie	932bf6da23	3.0.0-alpha.11	2018-03-08 17:31:25 +01:00
Aurelsicoko	8b9ed724e8	Update tab title	2018-03-07 14:48:44 +01:00