972 Commits

Author	SHA1	Message	Date
Pierre Burgy	6a7ff7ff6d	Pluralize routes	2018-08-08 14:59:10 +02:00
Jim LAURIE	012cb0332b	Merge branch 'master' into rate-limit	2018-08-08 14:36:42 +02:00
Jim LAURIE	0afe2eceac	Add rate limit configs	2018-08-08 14:29:10 +02:00
Jim LAURIE	f75fb40e78	Merge branch 'master' into fix-lodash-version	2018-08-08 11:33:36 +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	70e9523ba8	Fix policy error	2018-08-06 16:59:14 +02:00
Jim LAURIE	1fc9513d80	Change lodash version	2018-08-06 16:03:09 +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
Aurelsicoko	6a4a07428a	Split component and put logic into the reducer	2018-08-02 15:27:30 +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
Jim LAURIE	4dc4db24bf	Merge branch 'master' into security-patch	2018-08-01 10:21:51 +02:00
Jim LAURIE	57d5a6afd9	Remove relations	2018-08-01 09:53:30 +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
Aurelsicoko	120f515e5e	Better design many-to-many and add jump link	2018-07-31 16:57:16 +02:00
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
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