364 Commits

Author	SHA1	Message	Date
soupette	688defca70	Fix conflict	2018-08-10 12:52:11 +02:00
Jim LAURIE	9c17701163	Merge branch 'master' into block-user	2018-08-10 10:02:52 +02:00
Jim LAURIE	86828d731a	Merge branch 'master' into auth-microsoft	2018-08-09 16:59:00 +02:00
Jim LAURIE	eec423a2cd	Add confirmation email	2018-08-08 17:57:02 +02:00
Aurelsicoko	3532b20ecf	Remove pre-checked checkbox	2018-08-08 16:34:17 +02:00
Jim LAURIE	012cb0332b	Merge branch 'master' into rate-limit	2018-08-08 14:36:42 +02:00
Pierre Burgy	1d2de999dd	Tick remember me by default #1716	2018-08-08 11:31:12 +02:00
Jim LAURIE	3f2576cb68	Can block a user	2018-08-06 17:46:58 +02:00
Jim LAURIE	90041a5fba	Merge branch 'master' into master	2018-08-06 09:43:14 +02:00
Jim LAURIE	1dbbea458d	Merge branch 'master' into translation/fr	2018-08-06 09:27:28 +02:00
David Thomas	27c88e3a1a	Merge branch 'master' into auth-microsoft	2018-08-05 12:20:05 -04:00
soupette	ccb4fe0270	Pull enhancement/sortable-input because master is too buggy with my modifications	2018-08-02 15:51:10 +02:00
Jim LAURIE	738cbf656a	Add rate limit on auth routes	2018-08-01 14:56:31 +02:00
Jim LAURIE	7f0159f547	Merge branch 'master' into fix-users-advanced-settings	2018-08-01 14:35:15 +02:00
soupette	97e8bd46e2	Fix bug data sent	2018-08-01 13:42:31 +02:00
Chris	78e8cb96ea	Added the Dutch (NL) language	2018-08-01 09:17:53 +02:00
Basile Bong	260a9bf69b	Add > FR translation keys	2018-07-31 19:26:51 +02:00
Jim LAURIE	f559bcc82c	Merge branch 'master' into discordProvider	2018-07-31 16:18:04 +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
soupette	ac382484b3	Fix path for advanced settings	2018-07-31 13:33:45 +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
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
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
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
David Thomas	06b741f322	Add Microsoft auth provider ... Closes #1385	2018-07-22 22:03:29 -04: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
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
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	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	6f156144b5	Merge branch 'master' into add-loader	2018-06-20 15:15:34 +02:00
Özgür ERSOY	d6b6beb3c4	fix missing translations	2018-06-18 13:46:05 +03:00
Özgür ERSOY	eab84232eb	fix spaces	2018-06-18 13:45:26 +03:00
soupette	da865168e8	Fix css	2018-06-18 12:27:57 +02:00
soupette	372842ef5c	Merge branch 'master' of github.com:strapi/strapi into add-loader	2018-06-18 11:11:38 +02:00
Salem	4a4d151cf4	Rename sa.json to ar.json	2018-06-17 16:06:46 +03:00
Salem	c2bd9ac4e5	Rename ar.json to sa.json	2018-06-17 16:04:02 +03:00
Jim LAURIE	e8d435989c	Merge branch 'master' into master	2018-06-17 14:16:33 +02:00
Salem	7b4af48154	Create ar.json	2018-06-17 13:22:10 +03:00