102 Commits

Author SHA1 Message Date
Alexandre Bodin
761ad68392 v3.0.0-beta.18.7 2020-01-30 16:15:25 +01:00
Alexandre Bodin
1106c07795 v3.0.0-beta.18.6 2020-01-23 08:13:13 +01:00
Alexandre Bodin
2ee13c0a12 v3.0.0-beta.18.5 2020-01-21 15:44:44 +01:00
Virginie Ky
4aeb5399ee Merge branch 'features/webhooks' of github.com:strapi/strapi into front/webhooks-editview 2020-01-09 11:11:32 +01:00
Virginie Ky
d0650f1884 Conflicts resolved 2020-01-09 11:05:46 +01:00
Jim LAURIE
df1fed99ec docs: update copyright date to 2020 2020-01-08 15:41:08 +01:00
Alexandre Bodin
f0028241c8 v3.0.0-beta.18.4 2020-01-07 17:00:28 +01:00
KULDIP PIPALIYA
0663fbecc3
Update README.md 2020-01-04 17:50:16 +05:30
Alexandre Bodin
c2650b085c v3.0.0-beta.18.3 2019-12-23 10:17:40 +01:00
Alexandre Bodin
8586b3dd39 v3.0.0-beta.18.2 2019-12-19 11:17:14 +01:00
Alexandre Bodin
8e2fb1ff1a v3.0.0-beta.18.1 2019-12-18 09:05:32 +01:00
Alexandre Bodin
09629c11e8 v3.0.0-beta.18 2019-12-17 14:55:58 +01:00
Alexandre Bodin
cf6ecbff4f v3.0.0-beta.17.8 2019-12-01 23:20:50 +01:00
Jim LAURIE
8199f2d59c v3.0.0-beta.17.7 2019-11-29 17:36:51 +01:00
Alexandre Bodin
9aff9af165 v3.0.0-beta.17.6 2019-11-25 18:54:50 +01:00
Alexandre Bodin
b2e0ec5d1f v3.0.0-beta.17.5 2019-11-04 17:52:02 +01:00
Alexandre Bodin
7a61db7285 v3.0.0-beta.17.4 2019-10-23 15:11:30 +02:00
Alexandre Bodin
3ddd383c30 v3.0.0-beta.17.3 2019-10-22 11:05:52 +02:00
Alexandre Bodin
b6feabf689 v3.0.0-beta.17.2 2019-10-18 13:42:22 +02:00
Alexandre Bodin
9f0713649b v3.0.0-beta.17.1 2019-10-16 11:42:54 +02:00
Alexandre Bodin
7c8eda443e v3.0.0-beta.17 2019-10-16 10:40:18 +02:00
Alexandre BODIN
1a49d1a51e
Merge pull request #3691 from DKvistgaard/bugfix/cloudinary-delete-resource-type
Fix Cloudinary deletion of other files than images
2019-10-04 14:44:09 +02:00
Alexandre Bodin
2d04d25097 v3.0.0-beta.16.8 2019-10-04 11:57:46 +02:00
Daniel Kvistgaard
66cdd9d068
Merge branch 'master' into bugfix/cloudinary-delete-resource-type 2019-10-02 09:34:20 +02:00
Alexandre Bodin
dbd621e6d8 v3.0.0-beta.16.7 2019-10-01 12:15:48 +02:00
Alexandre Bodin
6305bee43b v3.0.0-beta.16.6 2019-09-26 14:35:06 +02:00
Alexandre Bodin
84adbf3bcf v3.0.0-beta.16.5 2019-09-18 14:00:21 +02:00
Alexandre Bodin
df236d0642 v3.0.0-beta.16.4 2019-09-17 12:14:39 +02:00
cyril lopez
8657453ea2
Merge branch 'master' into eslint-update 2019-09-17 10:11:11 +02:00
Alexandre Bodin
36e4e73ad3 v3.0.0-beta.16.3 2019-09-13 15:08:44 +02:00
Abdón Rodríguez Davila
54c383fd44
Merge branch 'master' into eslint-update 2019-09-12 15:05:53 +02:00
Alexandre Bodin
7207184648 v3.0.0-beta.16.2 2019-09-11 19:22:05 +02:00
Daniel Kvistgaard
e6e96dcc3a
Merge branch 'master' into bugfix/cloudinary-delete-resource-type 2019-09-10 16:52:44 +02:00
Alexandre Bodin
7d51b8625d v3.0.0-beta.16.1 2019-09-10 16:33:22 +02:00
Daniel Kvistgaard
96345d9f38 Merge remote-tracking branch 'upstream/master' into bugfix/cloudinary-delete-resource-type 2019-09-10 16:04:02 +02:00
Abdón Rodríguez Davila
187a669d1e Merge branch 'master' into eslint-update
# Conflicts:
#	.eslintrc.js
#	package.json
#	packages/strapi-admin/admin/src/containers/HomePage/CommunityContent.js
#	packages/strapi-admin/admin/src/containers/HomePage/WelcomeContent.js
#	packages/strapi-helper-plugin/lib/src/components/InputTextWithErrors/index.js
#	packages/strapi-hook-bookshelf/lib/index.js
#	packages/strapi-hook-bookshelf/lib/utils/graphql.js
#	packages/strapi-hook-bookshelf/lib/utils/index.js
#	packages/strapi-plugin-content-manager/admin/src/components/FilterOptions/InputWithAutoFocus.js
#	packages/strapi-plugin-content-manager/admin/src/components/SelectMany/index.js
#	packages/strapi-plugin-content-manager/admin/src/components/SelectOne/index.js
#	packages/strapi-plugin-content-manager/admin/src/components/TableHeader/index.js
#	packages/strapi-plugin-content-manager/admin/src/containers/ListPage/index.js
#	packages/strapi-plugin-content-manager/admin/src/containers/SettingPage/index.js
#	packages/strapi-plugin-content-manager/config/policies/routing.js
#	packages/strapi-plugin-content-manager/services/ContentManager.js
#	packages/strapi-plugin-content-type-builder/admin/src/components/TableListRow/index.js
#	packages/strapi-plugin-content-type-builder/admin/src/containers/AttributesPickerModal/index.js
#	packages/strapi-utils/lib/models.js
#	yarn.lock
2019-09-09 15:26:35 +02:00
Alexandre Bodin
05597970fa v3.0.0-beta.16 2019-09-09 13:35:57 +02:00
Abdón Rodríguez Davila
21a14ee737 Remove definitions for rules were not found 2019-08-28 12:20:27 +02:00
Alexandre BODIN
abad80795c
Merge branch 'master' into bugfix/cloudinary-delete-resource-type 2019-08-13 17:47:22 +02:00
Alexandre Bodin
fe2c2dccb3 v3.0.0-beta.15 2019-08-12 09:35:27 +02:00
Daniel Kvistgaard
0ab5a8a407 Setting up provider_metadata field.
To store necessary metadata for upload providers. In this case it's used
for public_id and resource_type for Cloudinary.
2019-08-05 13:05:54 +02:00
Daniel Kvistgaard
04b91d9b34 Fix Cloudinary deletion of other files than images
Fixed by adding a resource_type on the file which is required for the
detroy method. It defaults to 'image', so if it isn't defined then it
will try to remove an image with the passed public_id.
2019-07-29 15:45:46 +02:00
Alexandre Bodin
6a34fe519c v3.0.0-beta.14 2019-07-25 12:00:42 +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
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
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