15371 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexandre BODIN	6c0938e214	Merge pull request #4943 from jozefcipa/feature/customize-ignore-watch-files ... Add option to specify custom files to ignore in watch mode	2020-01-15 14:12:29 +01:00
Alexandre BODIN	69fe1a51a1	Merge branch 'master' into feature/customize-ignore-watch-files	2020-01-15 14:12:21 +01:00
Alexandre BODIN	a5881da622	Merge pull request #4994 from fregu/fix/readCallbackProvider ... remove querystring from ctx.path when reading provider	2020-01-15 14:10:54 +01:00
soupette	16a6975af1	Fix add compo to dz action	2020-01-15 12:35:26 +01:00
Virginie Ky	7f60f6eb57	Apply PR review	2020-01-15 12:17:44 +01:00
soupette	89568007f6	Merge branch 'master' of github.com:strapi/strapi into chore/ctb-front-end-tests	2020-01-15 12:01:33 +01:00
soupette	e13e8e242b	Add tests for internal relations	2020-01-15 12:01:05 +01:00
Fredrik Söderquist	21bbbbcfe8	Merge branch 'master' into fix/readCallbackProvider	2020-01-15 11:25:12 +01:00
Fredrik Söderquist	47a3a20654	remove querystring from ctx.path when reading provider	2020-01-15 11:18:12 +01:00
Alexandre BODIN	86c330c61d	Merge pull request #4992 from strapi/docs-provider-fix-url ... Fix providers login URLs	2020-01-15 09:58:01 +01:00
Jim LAURIE	4d608aa2e0	Fix providers login URLs ... I made some copy/past mistakes.	2020-01-14 17:35:50 +01:00
soupette	7c7813a787	Init relations tests	2020-01-14 17:14:46 +01:00
jozefcipa	9b0bd7ef01	Mention chokidar docs	2020-01-14 16:57:11 +01:00
soupette	1f85288c63	Add tests for removing a field from a content type	2020-01-14 16:01:27 +01:00
soupette	3db763340c	Add tests for all relations	2020-01-14 15:30:14 +01:00
Patai Adam	3bce61005a	Merge branch 'master' into fix/remove-auto-populate	2020-01-14 15:06:21 +01:00
soupette	dd0536e163	Merge branch 'master' of github.com:strapi/strapi into chore/ctb-front-end-tests	2020-01-14 15:02:06 +01:00
soupette	1e3c3d9736	Add test for adding a relation with another ct	2020-01-14 15:01:43 +01:00
Adam Patai	1fafec7ab8	Handle reverse relations	2020-01-14 12:44:55 +01:00
soupette	c577097994	Add test for adding a compo and a dz	2020-01-14 12:31:39 +01:00
jozefcipa	34becfed36	Remove empty watchIgnoreFiles from config	2020-01-14 12:26:16 +01:00
jozefcipa	1a194047e6	Add watchIgnoreFiles config option to docs	2020-01-14 11:55:34 +01:00
Alexandre BODIN	d04e5558e2	Merge branch 'master' into strapi-thomb-upgrade-purest	2020-01-14 11:53:52 +01:00
Alexandre BODIN	8305e2e409	Merge pull request #4969 from strapi/docs-provider-configs ... Add login provider configs in the docs	2020-01-14 11:32:07 +01:00
Alexandre BODIN	6f42e7fa95	Merge branch 'master' into docs-provider-configs	2020-01-14 11:31:48 +01:00
Jim LAURIE	d2730f31f4	Merge pull request #4985 from strapi/docs-provider-configs-patch ... Patch doc providers	2020-01-14 11:26:10 +01:00
Adam Patai	3044a7495e	Keep autoPopulate field if it was already set to true	2020-01-14 10:20:27 +01:00
soupette	0a2dffc1d4	Fix conflicts	2020-01-14 09:35:34 +01:00
Virginie Ky	e250ac81d5	Merge branch 'features/webhooks' of github.com:strapi/strapi into front/webhooks-editview	2020-01-13 18:14:27 +01:00
Alexandre BODIN	f5ab85477e	Merge pull request #4959 from krizic/bugfix/4499 ... fixed location of overrides	2020-01-13 16:39:00 +01:00
Alexandre BODIN	ff4aa8890b	Merge branch 'master' into bugfix/4499	2020-01-13 16:38:50 +01:00
Virginie Ky	cc821801a9	Buffetjs version	2020-01-13 15:18:58 +01:00
Alexandre Bodin	14d95f3de1	erge branch 'develop' into features/webhooks	2020-01-13 12:22:21 +01:00
Alexandre Bodin	0d9881cd93	Patch doc providers	2020-01-13 12:18:26 +01:00
Alexandre BODIN	724358434d	Merge branch 'master' into docs-provider-configs	2020-01-13 12:17:07 +01:00
virginieky	6fccb74c13	Merge pull request #4830 from strapi/ctm/improve-listview ... Use Buffetjs in the filter picker	2020-01-13 12:15:23 +01:00
Alexandre Bodin	9d831a4bce	Merge branch 'develop' into features/webhooks	2020-01-13 11:42:57 +01:00
soupette	f2918e1c37	Merge branch 'master' of github.com:strapi/strapi into ctm/improve-listview	2020-01-13 11:40:16 +01:00
soupette	bfe37c73c9	Fix conflicts	2020-01-13 11:39:08 +01:00
Alexandre BODIN	f45c176b1b	Merge pull request #4972 from slackr/patch-1 ... Improve error messages	2020-01-13 11:32:34 +01:00
Alexandre BODIN	52e72de47a	Merge branch 'master' into patch-1	2020-01-13 11:32:27 +01:00
Alexandre BODIN	67f94016d3	Merge pull request #4971 from Toyrone/patch-1 ... Update install-requirements.md	2020-01-13 11:32:18 +01:00
Alexandre BODIN	862f3f110e	Merge branch 'master' into patch-1	2020-01-13 11:32:11 +01:00
Alexandre BODIN	eb4cdea08b	Merge pull request #4973 from hkovacs/hkovacs ... corrected new components path to include category and be understandable	2020-01-13 11:32:01 +01:00
Alexandre BODIN	1ebd0b1760	Merge branch 'master' into patch-1	2020-01-13 11:31:34 +01:00
Alexandre BODIN	d11b1ba4a5	Merge branch 'master' into patch-1	2020-01-13 11:29:47 +01:00
Alexandre BODIN	74d4a98e04	Merge branch 'master' into hkovacs	2020-01-13 11:28:16 +01:00
Vedran Krizic	0d94114b67	removed redux-saga from dependencies	2020-01-13 11:27:32 +01:00
Virginie Ky	0bbc414a56	lint fixes	2020-01-13 10:40:10 +01:00
Virginie Ky	fb7017c3ea	Merge branch 'features/webhooks' of github.com:strapi/strapi into front/webhooks-editview	2020-01-13 10:19:14 +01:00