yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-14 11:48:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,892 Commits 116 Branches 489 Tags
Commit Graph

506 Commits

Author SHA1 Message Date
cyril lopez
087226b5e4
Merge branch 'master' into styled-components/email 2019-09-12 17:41:05 +02:00
Abdón Rodríguez Davila
54c383fd44
Merge branch 'master' into eslint-update 2019-09-12 15:05:53 +02:00
Alexandre Bodin
e20d781383 Merge branch 'master' into chore/routing-x-forwarded 2019-09-12 09:59:11 +02:00
Alexandre Bodin
7207184648 v3.0.0-beta.16.2 2019-09-11 19:22:05 +02:00
soupette
2077e3d782 Fix PR feedback 2019-09-11 18:56:37 +02:00
soupette
91d33163d2 Merge branch 'master' of github.com:strapi/strapi into styled-components/upload 2019-09-11 11:17:24 +02:00
soupette
ce2575151e Migrate plugin to styled compo 2019-09-11 11:00:40 +02:00
soupette
ff184ec200 Merge branch 'master' of github.com:strapi/strapi into styled-components/upload 2019-09-11 10:19:22 +02:00
Daniel Kvistgaard
e6e96dcc3a
Merge branch 'master' into bugfix/cloudinary-delete-resource-type 2019-09-10 16:52:44 +02:00
soupette
0289a7a3d3 Start removing sass in upload components 2019-09-10 16:34:43 +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
2530606e47 Merge branch 'master' into chore/routing-x-forwarded 2019-09-09 14:29:07 +02:00
Alexandre Bodin
05597970fa v3.0.0-beta.16 2019-09-09 13:35:57 +02:00
Alexandre Bodin
a22f2cefef Remove x-forwarded-host. 
- set security defaults for development mode that are standard
- refactor error messages to work without ctx.request.admin
- remove mask middleware and add a sanitization layer to the core-api to
hide private fileds
 2019-09-06 14:33:24 +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
7c5f1484ba Use koa-router and fix graphql-uploads 2019-08-22 15:04: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
2a780ea10a Clear _id now that queries return an id everytime 2019-08-13 17:40:31 +02:00
soupette
857ec1ca70 Rename lifecycle hooks 2019-08-13 11:31:10 +02:00
soupette
d52d4f603f Upgrade react deps 2019-08-13 11:22:36 +02:00
Alexandre Bodin
3b47457f4f make boostrap functions async only 2019-08-12 15:35:40 +02:00
Alexandre Bodin
ebf3922905 Merge branch 'master' into develop 2019-08-12 09:39:59 +02:00
Alexandre Bodin
fe2c2dccb3 v3.0.0-beta.15 2019-08-12 09:35:27 +02:00
Alexandre Bodin
8f24eff499 Merge branch 'master' into develop 2019-08-08 14:30:25 +02:00
soupette
62c367f024 Fixes #3738 2019-08-08 12:47:32 +02:00
Alexandre Bodin
bb036333a2 Init upload plugin e2e tests 2019-08-06 10:46:53 +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
Alexandre BODIN
3060703b25
Merge branch 'develop' into chore/support-file-upload-cm-core-api 2019-08-01 17:31:09 +02:00
virginieky
49aa6954f2
Merge branch 'develop' into ctm/repeatable-edit-view 2019-08-01 16:52:23 +02:00
Alexandre Bodin
f99e2ab683 Support upload multipart in content manager creation and edition of data 2019-08-01 12:20:28 +02:00
Alexandre Bodin
184490a07d Upgrade koa-body version to latest 2019-08-01 07:50:06 +02:00
soupette
7d0394070f Fix side effects for upload 2019-07-30 17:25:18 +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
04d4b60056 Merge branch 'master' into develop 2019-07-25 15:05:07 +02:00
Alexandre Bodin
6a34fe519c v3.0.0-beta.14 2019-07-25 12:00:42 +02:00
Alexandre Bodin
a62f73fe5f Merge branch 'develop' into feature/groups 2019-07-18 19:37:09 +02:00
Alexandre Bodin
45e6533941 Cleanup and remove upload plugin queries 2019-07-16 17:23:37 +02:00
Alexandre Bodin
59c7ef9651 Finish upload plugin refactoring and add custom queries 2019-07-16 17:23:26 +02:00
Alexandre Bodin
239c065972 remove content-manager call in upload services 2019-07-16 17:23:25 +02:00
Alexandre Bodin
078d677526 Implement CM fetch, fetchAll, create, update, delete 2019-07-16 17:23:25 +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
Alexandre Bodin
9c1a834e27 v3.0.0-beta.9 2019-07-02 15:14:44 +02:00