5599 Commits

Author	SHA1	Message	Date
Virginie Ky	c60d5308da	apply review	2019-06-12 15:22:59 +02:00
Virginie Ky	84ecec8140	merge from develop	2019-06-11 18:34:09 +02:00
Alexandre BODIN	e39fb395d2	Merge branch 'master' into tech/handle-health-bad-status-code	2019-06-11 18:16:54 +02:00
Alexandre Bodin	2311f7de3d	Done	2019-06-11 17:53:01 +02:00
Alexandre Bodin	d9b396821d	Fix primaryKey not found for custom resolvers	2019-06-11 15:01:46 +02:00
Alexandre Bodin	3104204e20	Fix amountLimit in graphql queries	2019-06-11 13:56:24 +02:00
Virginie Ky	c4fc84fac9	ModelPage clean	2019-06-11 12:29:02 +02:00
Virginie Ky	6ae5ffdeb0	merge develop	2019-06-11 12:18:11 +02:00
Virginie Ky	e54aa64d4a	delete old snapshot	2019-06-11 11:49:54 +02:00
Virginie Ky	761cf5eb1f	Clean	2019-06-11 11:07:04 +02:00
Virginie Ky	8fc4e8d54e	LeftMenu unit test	2019-06-10 18:22:20 +02:00
Virginie Ky	b961ef38b7	ModelPage Unit tests with context	2019-06-10 18:02:14 +02:00
Virginie Ky	7db8366492	CTB LeftMenu refont with groups	2019-06-10 17:38:10 +02:00
Alexandre BODIN	d16c4ddffb	Merge branch 'master' into fix/sqlite-non-constant-default-timestamp	2019-06-10 17:08:22 +02:00
Alexandre BODIN	dba2876080	Merge branch 'master' into fix/ignore-marketplace-plugin-list-errors	2019-06-10 16:22:06 +02:00
Alexandre BODIN	c62a6e9a83	Merge branch 'master' into tech/link-helper	2019-06-10 12:00:23 +02:00
Alexandre BODIN	2514f009fe	Merge branch 'master' into fix/russian_welcome_again	2019-06-10 09:13:15 +02:00
Alexandre Bodin	41b9a72e95	Init link helper to work on a project outside of the workspace	2019-06-08 18:51:16 +02:00
Alexandre Bodin	e9160867a6	Fix wrong param name in getType bookshelf hook	2019-06-08 18:51: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
soupette	c4033b7e39	Created fixtures and init groups for homepage and leftmenu	2019-06-07 14:19:20 +02:00
grom194	7e840e1b8b	fix: ru welome.again text	2019-06-05 14:37:02 +03:00
Alexandre Bodin	7d63600e21	v3.0.0-beta.2	2019-06-04 17:03:17 +02:00
grom194	c814c5dc46	fix: remove graphql special condition for delete request	2019-06-04 15:22:31 +03:00
Alexandre Bodin	30908ce649	v3.0.0-beta.1	2019-06-03 14:09:14 +02:00
Alexandre BODIN	d36f36a8d3	Merge branch 'master' into fix/install-plugin	2019-06-03 12:53:04 +02:00
soupette	2c97d52b21	Fix install plugin when env is different than development	2019-06-03 12:31:02 +02:00
Jim LAURIE	6dd78863e9	Rename docs version name	2019-06-01 18:41:38 -07:00
Alexandre Bodin	5ca7513c45	v3.0.0-beta.0	2019-05-31 17:48:31 +02:00
Jim LAURIE	dff2ae63d5	Merge branch 'beta' into patch-2	2019-05-29 11:39:20 -07:00
Jim LAURIE	a535fe3f7b	Merge branch 'beta' into patch-1	2019-05-29 10:40:51 -07:00
Alexandre Bodin	7d01234e80	Fix and set warning in eslint error to fix later in the front	2019-05-29 17:25:56 +02:00
Alexandre Bodin	31a222ecb1	Start lint fixes	2019-05-29 17:25:56 +02:00
Alexandre Bodin	518e7d60dd	Fix model rename not using the right api name to persist files	2019-05-29 16:20:16 +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	42e0bf8fed	Refactor strapi-admin services and controllers	2019-05-24 17:03:01 +02:00
Alexandre Bodin	6aa3ddc408	Add strapi.query / plugin.queries doc	2019-05-24 16:31:20 +02:00
Alexandre Bodin	7d130cad3d	Add core service docs	2019-05-24 16:31:20 +02:00
Alexandre Bodin	da7b9ad66d	Add controller customization doc	2019-05-24 16:31:20 +02:00
Alexandre BODIN	a3b56e3009	Merge branch 'beta' into update/depends	2019-05-24 14:30:19 +02:00
Alexandre Bodin	51300f4a4f	Fix Add image upload in content type and add image in example app	2019-05-23 10:21:41 +02:00
Alexandre Bodin	87e479173a	Merge branch 'beta' into update/depends	2019-05-23 10:21:22 +02:00
Alexandre Bodin	0b4096a045	Add _q param to GET /users	2019-05-23 10:18:44 +02:00
Alexandre Bodin	ea5cdc78d8	Remove not null on sqlite alter as the table is recreated afterwards	2019-05-23 10:17:03 +02:00
Alexandre Bodin	232afd983e	Merge branch 'beta' into update/depends	2019-05-23 09:35:21 +02:00
Hoàng Phúc	2a00de34d2	Fix ip filter middleware	2019-05-22 11:35:03 +07:00
Alexandre Bodin	06fed3a5e2	Merge branch 'beta' into update/depends	2019-05-21 11:55:44 +02:00
Alexandre Bodin	ecde29fa8b	Add yarn dev to strapi-admin for dev workflow	2019-05-20 17:13:14 +02:00