29765 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexandre BODIN	0d480fe11d	Merge branch 'master' into tech/middleware-load	2019-06-12 18:34:35 +02:00
Alexandre BODIN	238adabaf7	Merge pull request #3417 from strapi/fix/issue-3411 ... Load extensions in graphql schemas	2019-06-12 18:34:18 +02:00
Alexandre Bodin	34f56ee937	trying stuff	2019-06-12 18:17:38 +02:00
Alexandre Bodin	29d799810c	init	2019-06-12 18:15:45 +02:00
soupette	d0a494f906	Merge branch 'front/ctb-modal-ui' of github.com:strapi/strapi into front/repeatable-homepage	2019-06-12 16:07:27 +02:00
soupette	57493d2629	Fix conflicts	2019-06-12 16:07:19 +02:00
Virginie Ky	a308503b07	Modal Header & Footer UI refont	2019-06-12 15:50:40 +02:00
cyril lopez	f701742223	Merge pull request #3419 from strapi/front/repeatable-fields-leftmenu ... Front/repeatable fields leftmenu	2019-06-12 15:49:30 +02:00
Virginie Ky	c60d5308da	apply review	2019-06-12 15:22:59 +02:00
soupette	732cc1a22d	Fix List box shadow	2019-06-12 15:19:28 +02:00
soupette	a7bf58e4b4	Fix conflicts	2019-06-12 14:41:43 +02:00
Alexandre Bodin	50fc3a127f	Add example in getstarted	2019-06-12 14:35:03 +02:00
Alexandre Bodin	c37ba583ba	Load extensions	2019-06-12 14:35:03 +02:00
Jonas Broms	02ba3b0a7a	Update package.json	2019-06-12 15:32:47 +03:00
Alexandre BODIN	dc1594f856	Merge branch 'master' into tech/middleware-load	2019-06-12 14:20:40 +02:00
Alexandre BODIN	15daa6212c	Merge pull request #3432 from strapi/fix/3424 ... Fixes #3224	2019-06-12 11:48:18 +02:00
soupette	32dbeb3467	Fixes #3224	2019-06-12 11:24:20 +02:00
Virginie Ky	84ecec8140	merge from develop	2019-06-11 18:34:09 +02:00
Virginie Ky	844b140a18	CTB modals Footer	2019-06-11 18:29:52 +02:00
Alexandre Bodin	864a6ecaea	Refactor middleware loading	2019-06-11 18:22:07 +02:00
Alexandre BODIN	9d8025ed27	Merge pull request #3426 from strapi/tech/handle-health-bad-status-code ... Add status code handler to health checks	2019-06-11 18:17:02 +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	e79e110add	Merge pull request #3416 from strapi/fix/custom-graphql-query ... Fix primaryKey not found for custom resolvers	2019-06-11 18:16:14 +02:00
soupette	6c99392747	Update HP to display both groups ans cts	2019-06-11 18:12:57 +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	243f425fe9	Merge pull request #3422 from strapi/fix/graphql-amount-limiting ... Fix amountLimit in graphql queries	2019-06-11 14:59:09 +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
soupette	0038505775	Fix leftmenui link active	2019-06-11 12:26:58 +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	33cbe98b5f	Merge pull request #3401 from strapi/fix/sqlite-non-constant-default-timestamp ... Fix wrong param name in getType bookshelf hook	2019-06-10 17:31:01 +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	47e3f94d6c	Merge pull request #3407 from strapi/fix/ignore-marketplace-plugin-list-errors ... Fix error not ignored getPlugins	2019-06-10 17:08:01 +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	435a784973	Merge pull request #3414 from strapi/tech/link-helper ... Init link helper to work on a project outside of the workspace	2019-06-10 14:20:21 +02:00
Alexandre BODIN	c62a6e9a83	Merge branch 'master' into tech/link-helper	2019-06-10 12:00:23 +02:00
Alexandre BODIN	429b6f54e9	Merge pull request #3379 from grom194/fix/russian_welcome_again ... Fix: ru welcome.again text	2019-06-10 11:06:55 +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	649df34583	Merge pull request #3404 from tonikarppi/patch-1 ... Documentation improvments	2019-06-08 16:39:41 +02:00
Toni Karppi	6653343212	Fix typo ... Changed "every where" to "everywhere"	2019-06-08 01:16:38 +02:00
Alexandre BODIN	41d9b449e0	Merge pull request #3402 from MichaelDono/patch-1 ... Improved clarity in plugin-architecture.md	2019-06-07 21:08:38 +02:00