1295 Commits

Author	SHA1	Message	Date
Alexandre Bodin	1658b48aa0	Refactor users-permissions to use the new strapi.query	2019-07-16 17:23:38 +02:00
Alexandre BODIN	cd634fc038	Merge branch 'master' into patch-1	2019-07-15 18:47:51 +02:00
Alexandre Bodin	1720445986	v3.0.0-beta.13	2019-07-15 17:07:07 +02:00
Jim LAURIE	de2604cf80	Fix var instead of const	2019-07-15 13:32:41 +02:00
Abdón Rodríguez Davila	857cd6111a	Update engines configuration from all files	2019-07-15 11:16:38 +02:00
Alexandre Bodin	b087cbab34	v3.0.0-beta.12	2019-07-15 10:24:28 +02:00
Alexandre Bodin	63a6452830	Merge branch 'develop' into feature/groups	2019-07-15 10:21:22 +02:00
Jim LAURIE	2b9e03f3de	Fix Google auth	2019-07-12 19:46:09 +02:00
Alexandre BODIN	2d13dcf0f1	Merge branch 'master' into fix-documentation-typo	2019-07-10 18:16:48 +02:00
Derrick Mehaffy	004c5f3bd3	Testing updating Koa2-Ratelimit to latest	2019-07-10 08:12:48 -07:00
Louis Augry	08e2f47800	Merge branch 'master' into fix-documentation-typo	2019-07-10 15:11:52 +02:00
Alexandre Bodin	3a94c7ea90	v3.0.0-beta.11	2019-07-10 15:09:03 +02:00
Alexandre Bodin	3759582ccc	Test node v12 engine	2019-07-10 10:21:12 +02:00
Alexandre Bodin	abef483bc4	v3.0.0-beta.10	2019-07-09 09:05:35 +02:00
Louis Augry	a3fe9d5a38	Fix documention typo	2019-07-08 15:10:17 +02:00
soupette	61fc2ca7dc	fix lint	2019-07-08 10:20:44 +02:00
soupette	61fb728986	Fix conflicts	2019-07-04 18:43:30 +02:00
soupette	2d8f520ba7	Init SettingsView	2019-07-04 11:32:51 +02:00
Alexandre Bodin	0f565022b3	Merge branch 'master' into chore/strapi-new-improvments	2019-07-02 17:29:00 +02:00
Alexandre Bodin	9c1a834e27	v3.0.0-beta.9	2019-07-02 15:14:44 +02:00
Alexandre Bodin	6cad390d97	Merge branch 'master' into chore/strapi-new-improvments	2019-07-02 15:09:59 +02:00
soupette	6d7c1b90ac	Fix lint	2019-07-02 14:44:13 +02:00
Alexandre BODIN	5230efe52f	Merge branch 'master' into fix/koa-grant-new-release-breaking	2019-06-29 15:04:51 +02:00
Alexandre Bodin	0112a9726a	v3.0.0-beta.8	2019-06-27 19:40:33 +02:00
Alexandre Bodin	44a382149f	Fix grant-koa breaking with strapi on grant-koa v4.6.0	2019-06-27 18:24:04 +02:00
Alexandre Bodin	eee69452ea	v3.0.0-beta.7	2019-06-21 14:34:56 +02:00
Alexandre Bodin	04b4003bf2	chore: replace koa-router-joi (strapi fork) by original and maintained ... koa-joi-router Upgrade some dependencies	2019-06-20 18:28:53 +02:00
cyril lopez	ecf0a0ae64	Merge branch 'master' into fix/ui-bugs	2019-06-20 08:50:39 +02:00
soupette	b92eb09a42	Fix conflicts	2019-06-19 11:52:35 +02:00
soupette	37ed213b6d	Fixes #3472	2019-06-19 11:51:44 +02:00
Alexandre Bodin	754acd0280	Fix user routes using _id instead of id ... - Add database.js and DB env to example app to test on different dbs quickly	2019-06-18 18:33:53 +02:00
Alexandre Bodin	76d9fe8060	v3.0.0-beta.6	2019-06-18 14:54:45 +02:00
ta7sudan	7b3737c90c	fix(strapi-plugin-users-permissions): fix when connecting to marketplace error cause app crash	2019-06-17 00:02:27 +08:00
Alexandre Bodin	4ec50ca3fc	v3.0.0-beta.5	2019-06-13 17:19:33 +02:00
Alexandre Bodin	bbf5a405ec	v3.0.0-beta.4	2019-06-12 20:30:45 +02:00
Alexandre Bodin	864a6ecaea	Refactor middleware loading	2019-06-11 18:22:07 +02:00
Alexandre Bodin	4a21a75d53	Fix error not ignored getPlugins	2019-06-08 18:50:54 +02:00
Alexandre Bodin	0414e9f25b	v3.0.0-beta.3	2019-06-07 15:45:00 +02:00
Alexandre Bodin	2b3c8d6628	Fix permission policy mixing users jwt and admin jwt	2019-06-07 15:44:06 +02:00
Alexandre Bodin	7d63600e21	v3.0.0-beta.2	2019-06-04 17:03:17 +02:00
Alexandre Bodin	30908ce649	v3.0.0-beta.1	2019-06-03 14:09:14 +02:00
Alexandre Bodin	5ca7513c45	v3.0.0-beta.0	2019-05-31 17:48:31 +02:00
soupette	5a087173a7	Prevent the users from uninstalling a core plugin. ... Prevent the user from adding/removing a plugin with the UI if the env is not development	2019-05-24 17:03:01 +02:00
Alexandre Bodin	0b4096a045	Add _q param to GET /users	2019-05-23 10:18:44 +02:00
Alexandre Bodin	a1878617a2	Set node engines to v10 only	2019-05-15 16:02:17 +02:00
Alexandre Bodin	3657094b1b	Init end to end api tests in users-permissions plugin	2019-05-14 12:42:03 +02:00
Alexandre Bodin	9c2a90246b	Fix Role CRUD with users	2019-05-14 12:42:03 +02:00
Jim LAURIE	e3dd066d28	Merge branch 'beta' into patch-1	2019-05-05 14:55:02 +02:00
Alexandre Bodin	918fc8b05d	Fix test:front	2019-05-03 16:49:10 +02:00
Alexandre Bodin	ce1a327ef2	Merge branch 'master' into tech/build-process	2019-05-03 11:37:01 +02:00