1295 Commits

Author	SHA1	Message	Date
Jim LAURIE	6ec8c627c0	Merge branch 'master' into patch-3	2018-07-31 13:53:29 +02:00
DMehaffy	fb0e848ee0	Merge branch 'master' into discordProvider	2018-07-31 04:52:54 -07:00
Jim LAURIE	a66c3d8eb0	Merge branch 'master' into translation/de	2018-07-31 13:42:51 +02:00
Jim LAURIE	ba99e0f24d	Merge branch 'master' into feature/spanishTranslation	2018-07-31 13:38:18 +02:00
soupette	ac382484b3	Fix path for advanced settings	2018-07-31 13:33:45 +02:00
Aurélien GEORGET	72274cb3ff	Merge branch 'master' into master	2018-07-30 16:38:32 +02:00
Aurelsicoko	d8e5d0403b	Update design, behavior and add link for selectMany	2018-07-30 16:33:50 +02:00
soupette	3db2cc1ca1	Merge branch 'master' of github.com:strapi/strapi into settings-ctm-edit-view	2018-07-30 14:40:05 +02:00
soupette	6bf3ddeea9	Update displayed fields when removing a field from the content type builder	2018-07-30 13:59:25 +02:00
Aurélien GEORGET	3b4a604ee0	Apply users-permissions policy on the admin routes	2018-07-30 10:53:44 +02:00
Jim LAURIE	bc3e756e6e	Fix multi API controller	2018-07-30 10:10:43 +02:00
DMehaffy	b8adba1e23	Finish adding Discord to Providers.js ... Thanks to synth3tk for your help! Note that with Discord the username is not unique so I combined the username and discriminator in order to store a unique "username"	2018-07-29 17:43:45 -07:00
DMehaffy	a2aefab312	Merge remote-tracking branch 'strapi/master' into discordProvider	2018-07-29 12:30:41 -07:00
Jim LAURIE	3e956670a9	Merge branch 'master' into fix/1609	2018-07-29 14:25:49 +02:00
David Thomas	2113384e70	Merge branch 'master' into auth-microsoft	2018-07-28 15:14:25 -04:00
soupette	54aef15b75	Handle add attr logic	2018-07-27 17:24:58 +02:00
Basile Bong	f10064e06c	Change > DE translation keys > use familiar form	2018-07-27 17:05:44 +02:00
soupette	be73140600	Use toggle and fix editPage render loop	2018-07-27 16:15:26 +02:00
soupette	d7b12f1871	Merge branch 'master' of github.com:strapi/strapi into settings-ctm-edit-view	2018-07-27 12:19:19 +02:00
Marianelli Michele	f998c5cf96	Plugin users permission admin - ITA	2018-07-27 11:05:57 +02:00
Basile Bong	757875245c	Add > DE translation keys > strapi-plugin-users-permissions	2018-07-26 16:44:54 +02:00
Jim LAURIE	a0c49e3340	Fix package conflicts	2018-07-26 16:19:28 +02:00
Jim LAURIE	09a2a4b73d	3.0.0-alpha.13.0.1	2018-07-26 16:12:17 +02:00
David Thomas	2b9fc1a8b9	Merge branch 'master' into auth-microsoft	2018-07-25 21:06:29 -04:00
Alberto Maturano	1cf5dac2a6	Improve spanish translation ... - Fix minor errors and improve translation after review it in context (comments from PR #1566) - Missing ES translations (issue #1621) - Normalize tone using a formal style	2018-07-25 12:18:58 -05:00
Jim LAURIE	927a900f5b	3.0.0-alpha.13	2018-07-25 17:31:16 +02:00
Aurelsicoko	37b9c2ee4c	Remove front-end dependency from marketplace.strapi.io	2018-07-24 19:37:27 +02:00
Aurélien GEORGET	06bcac7ee2	Disconnect projects from marketplace.strapi.io	2018-07-24 18:54:50 +02:00
DMehaffy	1b0579db22	Updating purest config	2018-07-24 07:04:25 -07:00
DMehaffy	02d5a8386c	Merge remote-tracking branch 'origin/master' into discordProvider	2018-07-24 06:47:52 -07:00
soupette	4e05bd6359	Use the layout from the core_store in Manager.js	2018-07-24 15:16:47 +02:00
Jim LAURIE	fcebf4fc6e	Merge branch 'master' into language/es	2018-07-23 17:32:58 +02:00
Jim LAURIE	87a051e712	Move layout files in core store	2018-07-23 15:12:33 +02:00
DMehaffy	4c64168cda	Add base structure for discord	2018-07-23 05:07:17 -07:00
cyril lopez	26c53c977e	Handle remove logic when removing the edited relation	2018-07-23 12:34:35 +02:00
David Thomas	06b741f322	Add Microsoft auth provider ... Closes #1385	2018-07-22 22:03:29 -04:00
Kati Frantz	f108494cd9	update connect function to check for duplicate email and not provider	2018-07-20 11:36:34 +01:00
cyril lopez	2a419dd92e	Created Manager class for dnd fields	2018-07-19 02:37:12 +02:00
Jim LAURIE	1dfd671c32	Merge branch 'master' into fix-user-roles-and-permissions	2018-07-17 12:08:09 +02:00
soupette	2407e8cb4a	Merge branch 'master' of github.com:strapi/strapi into settings-ctm-edit-view	2018-07-17 11:11:47 +02:00
Jim LAURIE	ea00d491aa	Merge branch 'master' into fix-update-providers-issue	2018-07-16 16:07:30 +02:00
soupette	6cc063e98c	Add new key in schema to display the editView fields ... Design the relation drag & sort	2018-07-16 12:29:57 +02:00
Anshul Kushwaha	18e8d69775	Lowercase email on local auth register	2018-07-13 20:29:41 +05:30
soupette	3890bc1211	Fix conflict	2018-07-13 12:33:52 +02:00
Alexis Vassilopoulos	7e94324189	Spanish Translations	2018-07-12 19:32:34 +02:00
Jim LAURIE	fa94d12e4f	3.0.0-alpha.12.7.1	2018-07-10 18:10:42 +02:00
Jim LAURIE	a6d48caad9	3.0.0-alpha.12.7	2018-07-10 15:37:47 +02:00
Taihoon Kim	414453e02e	fixed typos in Korean language	2018-07-10 14:13:13 +09:00
kishu	5edf9111cf	fixed typos	2018-07-08 15:12:00 +09:00
Taihoon Kim	5cfb9e9439	Korean Language Support	2018-07-06 15:34:20 +09:00