12724 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jim LAURIE	f65644ba64	Merge branch 'master' into master	2020-04-27 11:29:14 +02:00
Jim LAURIE	8a1aefd28f	Merge branch 'documentation'	2020-04-27 10:01:04 +02:00
domenicoven	d0eea7e8cf	remove koa-qs dependency as it is not anymore maintained (#5922) ... * remove koa-qs dependency as it is not anymore maintained Signed-off-by: domenico ventura <domenico@digitware.it> Removing dependency from koa-qs Signed-off-by: domenico ventura <domenico@digitware.it> * cleaning the code Signed-off-by: domenico ventura <domenico@digitware.it> * removed merge dependency and use object.defineProperty Signed-off-by: domenico ventura <domenico@digitware.it> * remove koa-qs dependency as it is not anymore maintained Signed-off-by: domenico ventura <domenico@digitware.it> Removing dependency from koa-qs Signed-off-by: domenico ventura <domenico@digitware.it> * cleaning the code Signed-off-by: domenico ventura <domenico@digitware.it> * removed merge dependency and use object.defineProperty Signed-off-by: domenico ventura <domenico@digitware.it> * removing arrow functions Signed-off-by: domenico ventura <domenico@digitware.it> * removing arrow functions Signed-off-by: domenico ventura <domenico@digitware.it> Co-authored-by: domenico ventura <domenico@digitware.it>	2020-04-24 14:09:27 +02:00
Daniel Schäfer	0e8dc2e917	Fix typo in documentation (#5866) ... Signed-off-by: Daniel <epegzz@gmail.com>	2020-04-24 14:08:01 +02:00
Martin Muzatko	58588e10e5	docs: DE Abbrechen does not mean reset (#5796) ... Abbrechen means cancel. Which implies the user would get back to the list view, while editing a single item. Signed-off-by: Martin Muzatko <martin@happy-css.com>	2020-04-24 10:31:36 +02:00
cyril lopez	024de9ac5e	Merge pull request #5923 from strapi/tracking/front-end-events ... Add front-end media lib usage events	2020-04-23 18:13:16 +02:00
Astraeus-	2dafb22b5e	Update authentication error documentation ... Error has a "response" property that holds the data Signed-off-by: Astraeus- <Astraeus-@users.noreply.github.com>	2020-04-23 16:56:52 +02:00
Jim LAURIE	6ef4b17262	Merge pull request #5896 from strapi/doc/upload-provider-settings ... Add a simple example of using env vars in provider config files	2020-04-23 14:46:39 +02:00
soupette	c44dd2dbd8	Add front-end media lib usage events ... Signed-off-by: soupette <cyril.lpz@gmail.com>	2020-04-23 14:18:58 +02:00
Pierre Noël	4b7fbadef5	fix shadow crud breaking build when resolvers are not defined in a plugin (#5899) ... * fix shadow crud breaking build when resolvers are not defined in a plugin Signed-off-by: Pierre Noël <pierre.noel@strapi.io> * refacto Signed-off-by: Pierre Noël <pierre.noel@strapi.io> Co-authored-by: Pierre Noël <pierre.noel@strapi.io>	2020-04-22 15:41:40 +02:00
Steven Raines	bec93f672f	updated arguments sent to role controller to (#5857) ... match the expected format Signed-off-by: Steven Raines <stevenraines@gmail.com>	2020-04-22 11:13:48 +02:00
Alexandre Bodin	c9cfc59566	Add a simple example of using env vars in provider config files ... Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>	2020-04-21 14:58:02 +02:00
Alexandre BODIN	80242c8a06	Merge pull request #5886 from strapi/fix/countResultIsNotNumber ... fix count() result not a number	2020-04-20 19:34:10 +02:00
Pierre Noël	17e8cba03e	remove useless async ... Signed-off-by: Pierre Noël <pierre.noel@strapi.io>	2020-04-20 16:49:36 +02:00
Pierre Noël	555dbda454	fix count() result not a number ... Signed-off-by: Pierre Noël <pierre.noel@strapi.io>	2020-04-20 16:43:00 +02:00
Jim LAURIE	c84c2bfcd7	Merge pull request #5626 from strapi/docs/update_userperm_build ... Add a link to build docs for custom providers	2020-04-20 16:03:24 +02:00
Jim LAURIE	05f24d93c0	Merge branch 'master' into docs/update_userperm_build	2020-04-20 16:03:15 +02:00
Jim LAURIE	d3b7ab1fae	Merge pull request #5574 from strapi/docs/clean_local_plugin ... Remove invalid plugin development tip, and revert structure comment	2020-04-20 16:01:37 +02:00
Jim LAURIE	f22c595e49	Merge branch 'master' into docs/clean_local_plugin	2020-04-20 16:01:28 +02:00
Alexandre BODIN	9dbe80e674	Merge pull request #5814 from strapi/fix/4045/missingContentTypesInPermissions ... fix missing permissions at startup	2020-04-20 15:41:56 +02:00
Jim LAURIE	42e88b6723	Merge branch 'master' of https://github.com/strapi/strapi into documentation	2020-04-20 15:37:08 +02:00
Jim LAURIE	e86890f48c	Merge pull request #5883 from strapi/docs-remove-options ... Remove options from the model documentation	2020-04-20 15:33:44 +02:00
Jim LAURIE	c4f02be4f3	docs: remove options from the model documentation ... Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>	2020-04-20 15:26:45 +02:00
Pierre Noël	40df780663	remove console.log ... Signed-off-by: Pierre Noël <pierre.noel@strapi.io>	2020-04-20 15:20:56 +02:00
Pierre Noël	134fba1229	rename DEFAULT_PERMISSIONS ... Signed-off-by: Pierre Noël <pierre.noel@strapi.io>	2020-04-20 15:19:12 +02:00
Pierre Noël	ddc5bb5ac3	fix missing permissions at startup ... Signed-off-by: Pierre Noël <pierre.noel@strapi.io>	2020-04-20 15:19:11 +02:00
Alexandre Bodin	7a6af02ce0	Update yarn.lock ... Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>	2020-04-20 14:34:03 +02:00
Alexandre BODIN	fae9b2ca4d	Merge pull request #5851 from strapi/upgrade/reactstrap ... Upgrade reactstrap dependency.	2020-04-20 11:33:56 +02:00
virginieky	259d2d90e1	Merge branch 'master' into upgrade/reactstrap	2020-04-20 10:29:58 +02:00
Alexandre BODIN	9f9eea03f0	Merge pull request #5778 from strapi/docs-upload-service ... Fix upload models name definition	2020-04-20 09:32:32 +02:00
Alexandre BODIN	d55da7d9e5	Merge pull request #5853 from epegzz/master ... Fix AWS SES not working in eu-central-1 region	2020-04-20 09:28:30 +02:00
Jim LAURIE	88402aed1f	docs: fix pr feedback ... Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>	2020-04-18 10:17:37 +02:00
Jim LAURIE	bd4b831ec3	Merge pull request #5829 from strapi/models-global-id-warning ... Add warning about changing models globalId	2020-04-17 20:02:53 +02:00
Leon	beb6e74f80	typo fixes (#5795) ... Signed-off-by: ierehon1905 <ierehon1905@gmail.com> Co-authored-by: cyril lopez <cyril.lpz@gmail.com>	2020-04-17 17:10:31 +02:00
Pierre Burgy	ef457cf93f	Fix documentation typos (#5856) ... Signed-off-by: Pierre Burgy <pierre.burgy@gmail.com>	2020-04-17 17:09:45 +02:00
cyril lopez	db39065c0c	Merge branch 'master' into upgrade/reactstrap	2020-04-17 16:59:15 +02:00
Marvin König	4e70d6665c	Fix relation detection for components (#5713) ... This fixes the deleteOldComponents function in the strapi-connector-mongoose package. This needs to be done, as the id can be either a string or a Buffer at this point. Signed-off-by: Marvin König <dev@mkqavi.com>	2020-04-17 16:51:25 +02:00
Tony Toth	2b4301ad9c	Update migration-guide-beta.19-to-beta.19.4.md (#5827)	2020-04-17 16:48:31 +02:00
Alexandre BODIN	29f5d299f6	Fix rackspace upload to use hash (#5855) ... Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>	2020-04-17 16:38:46 +02:00
Alexandre BODIN	9ad6facd09	Merge pull request #5848 from strapi/enhancement/usage ... Enhancement/usage	2020-04-17 16:35:26 +02:00
Daniel	b89eed3beb	Fix AWS SES not working in eu-central-1 region ... Signed-off-by: Daniel <epegzz@gmail.com>	2020-04-17 15:06:50 +02:00
soupette	bf1040f9b9	Upgrade reactstrap dependency. Fixes #5837 ... Signed-off-by: soupette <cyril.lpz@gmail.com>	2020-04-17 14:00:53 +02:00
cyril lopez	a82e999e88	Merge branch 'master' into enhancement/usage	2020-04-17 13:09:44 +02:00
cyril lopez	74d46da113	Merge pull request #5847 from strapi/fix/field-api ... Fix register new fields in content manager	2020-04-17 13:09:22 +02:00
cyril lopez	3426b0e3ca	Merge branch 'master' into fix/field-api	2020-04-17 12:42:05 +02:00
Aurélien Georget	06f9561f86	Check package manager ... Signed-off-by: Aurélien Georget <aurelsicoko@gmail.com>	2020-04-17 12:42:02 +02:00
Aurélien Georget	bc9ba3d2a7	Add events to improve installation process ... Signed-off-by: Aurélien Georget <aurelsicoko@gmail.com>	2020-04-17 12:42:02 +02:00
Alexandre Bodin	5882597e9d	Merge branch 'documentation'	2020-04-17 12:39:17 +02:00
soupette	68fc1e2bed	Fix register new fields in content manager ... Signed-off-by: soupette <cyril.lpz@gmail.com>	2020-04-17 12:01:55 +02:00
Alexandre BODIN	771325f691	Merge pull request #5716 from strapi/fix/5564 ... Fixes #5564	2020-04-17 11:50:19 +02:00