693 Commits

Author	SHA1	Message	Date
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
Aurelsicoko	fdb37a101b	Update copied link style and update menu link Users & Permissions	2018-03-07 14:45:09 +01:00
Aurelsicoko	cc1ec5c1ea	Make CSS improvements on upload plugin	2018-03-06 15:49:11 +01:00
Jim Laurie	be7e95b48c	Add createdAt updatedAt for mongoose	2018-03-05 17:26:55 +01:00
Aurelsicoko	d7aa3eef7e	Resolve conflicts	2018-03-02 14:21:51 +01:00
Jim LAURIE	9852794ee4	Merge branch 'master' into Chinese-Translation	2018-03-01 13:03:18 +01:00
Jim LAURIE	d67d09ef90	Merge branch 'master' into alpha.10.3	2018-03-01 11:37:05 +01:00
Joseph Wang	f35b2519ba	language hot fix	2018-03-01 16:30:44 +08:00
Joseph Wang	a6bf74c622	finish adding traditional chinese translations	2018-03-01 11:50:33 +08:00
Aurelsicoko	85fb0f5919	Fix non-polymorphic relations in strapi-bookshelf	2018-02-28 18:10:30 +01:00
Adrien Lepoutre	1110fe7df2	ISSUE 689 - Fix /user/me and ctx.state.user doesn't return OneToMany relations properly	2018-02-28 10:35:28 -05:00
Aurelsicoko	19b1574f00	Start to handle polymorphic association update in Content Manager (mongoose only)	2018-02-28 12:33:32 +01:00
Jim LAURIE	f0706d474c	Merge branch 'master' into alpha.10.3	2018-02-26 18:15:49 +01:00
Jim Laurie	99559e20ea	3.0.0-alpha.10.3	2018-02-26 17:57:23 +01:00
Aurelsicoko	e63a1f19fc	Handle empty relationships on morph side	2018-02-26 11:12:49 +01:00
Jim Laurie	443d6b81fb	Fix remove user on role update	2018-02-24 17:42:33 +01:00
Jim Laurie	6c4e837c7c	Hotfix users models relations	2018-02-24 14:35:12 +01:00
Jim LAURIE	acfbd8bcaf	Merge branch 'master' into relations/polymorphic	2018-02-23 15:29:29 +01:00