1295 Commits

Author	SHA1	Message	Date
DMehaffy	56de235297	Modify template for english	2018-08-27 08:11:23 -07:00
Jim LAURIE	cecef7385f	3.0.0-alpha.14	2018-08-27 16:30:16 +02:00
Jim LAURIE	cee9fe2811	Merge branch 'master' into email-validation	2018-08-23 18:46:48 +02:00
Jim LAURIE	7fdccc62ee	PR feedback	2018-08-23 18:28:13 +02:00
Aurélien GEORGET	e8b7bd478a	Update bootstrap.js	2018-08-23 12:00:46 +02:00
soupette	8003982b08	Fix conflicts	2018-08-22 14:17:09 +02:00
soupette	38c4fd6a47	Fix first part of PR feedback	2018-08-21 14:01:15 +02:00
Jim LAURIE	f27b2ae2f6	Merge branch 'master' into email-validation	2018-08-21 11:54:22 +02:00
Jim LAURIE	ed3f7d9018	Merge branch 'master' into fix-it-users-permissions	2018-08-21 11:40:31 +02:00
Jim LAURIE	e97fa20ba3	Merge branch 'master' into master	2018-08-21 11:25:22 +02:00
Jim LAURIE	ef97f72ff7	Merge branch 'master' into improvement/remember-me	2018-08-21 09:00:41 +02:00
soupette	f120413d26	Fixes 1741	2018-08-20 17:54:00 +02:00
Jim LAURIE	df49f3b8e8	Merge branch 'master' into fix/rgpd	2018-08-20 17:42:27 +02:00
Jim LAURIE	fbc98ed4bb	Merge branch 'master' into master	2018-08-20 15:30:41 +02:00
Aurelsicoko	4f16144ee9	Update & enhance CSS	2018-08-20 14:18:37 +02:00
Jan Brachhold	cef161bc28	Update DE translations - strapi-plugin-users-permissions	2018-08-16 14:34:27 +02:00
Chris Dekker	96d1eeb70b	Fix for issue https://github.com/strapi/strapi/issues/1589	2018-08-16 14:17:54 +02:00
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	b4d97fb9db	3.0.0-alpha.13.1	2018-08-09 13:39:34 +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
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