734 Commits

Author	SHA1	Message	Date
Jim LAURIE	f559bcc82c	Merge branch 'master' into discordProvider	2018-07-31 16:18:04 +02:00
Jim LAURIE	44b3ae5f05	Update discord icon	2018-07-31 16:17:41 +02:00
Jim LAURIE	45671113e5	Merge branch 'master' into fix-policies-generation	2018-07-31 15:10:42 +02:00
Jim LAURIE	0b8178fa71	Merge branch 'master' into master	2018-07-31 14:17:49 +02:00
Aurélien GEORGET	065792bea6	Update User.settings.json	2018-07-31 14:16:27 +02:00
Aurélien GEORGET	8386003e47	Update permissions.js	2018-07-31 14:15:53 +02:00
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
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
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
Basile Bong	f10064e06c	Change > DE translation keys > use familiar form	2018-07-27 17:05:44 +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
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
Jim LAURIE	fcebf4fc6e	Merge branch 'master' into language/es	2018-07-23 17:32:58 +02:00
DMehaffy	4c64168cda	Add base structure for discord	2018-07-23 05:07:17 -07:00
Kati Frantz	f108494cd9	update connect function to check for duplicate email and not provider	2018-07-20 11:36:34 +01:00
Jim LAURIE	1dfd671c32	Merge branch 'master' into fix-user-roles-and-permissions	2018-07-17 12:08:09 +02:00
Jim LAURIE	ea00d491aa	Merge branch 'master' into fix-update-providers-issue	2018-07-16 16:07:30 +02:00
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
Kati Frantz	3ea2c2023f	update ctx.request.body to be ctx.request.body.providers, to ensure only permissions are saved to database with no extra keys	2018-07-05 09:57:42 +01:00
Kati Frantz	d3ef2f8e3c	fetch current actions from database ... use results for comparing if new actions have been added to controllers	2018-07-05 09:57:12 +01:00
cyril lopez	3e42d86460	Merge branch 'master' of github.com:strapi/strapi into settings-ctm	2018-07-03 18:31:41 +02:00
Carlos Guimaraes	dff877eb41	Brazilian Portuguese Language Support	2018-07-01 17:25:43 -03:00
cyril lopez	7a9b3f6d59	Fix lint	2018-06-29 15:40:55 +02:00
cyril lopez	c0c99d443a	Fix conflicts and add pt.json translation files in usr-perm plugin	2018-06-28 12:54:39 +02:00
cyril lopez	799c6c3f0f	Remove webpack warnings and react-intl errors	2018-06-28 10:01:59 +02:00
cyril lopez	039d9e5856	Front-end config in core-store	2018-06-27 19:00:19 +02:00
Jim LAURIE	157c249382	Merge branch 'master' of github.com:strapi/strapi into tests/split	2018-06-27 14:28:30 +02:00
Jim LAURIE	534b17f77f	3.0.0-alpha.12.6	2018-06-26 18:23:36 +02:00
Jim LAURIE	561e910558	Fix empty string not require	2018-06-26 17:14:42 +02:00