yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-08 16:59:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,361 Commits 115 Branches 488 Tags
Commit Graph

519 Commits

Author SHA1 Message Date
soupette
aa6d83669f Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dz-post-data 2019-12-09 14:06:29 +01:00
Alexandre Bodin
c5d57b32fe Merge branch 'develop' into features/dynamic-zones 2019-12-09 11:48:46 +01:00
Alexandre BODIN
8c8dc98112
Merge branch 'master' into file-size-type-integer 2019-12-09 10:12:24 +01:00
soupette
305ed06634 Change trash icon 2019-12-06 17:11:17 +01:00
Alexandre Bodin
29c06e10a3 Merge branch 'develop' into features/dynamic-zones 2019-12-06 12:35:35 +01:00
harimkims
5f62dbc9a5 Update KO translation 2019-12-04 17:08:08 +09: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
Virginie Ky
c47985cf9b Merge branch 'features/dynamic-zones' into front/dynamic-zones-ctm-ui 2019-11-28 15:57:06 +01:00
Alexandre Bodin
63abfc6db9 Merge branch 'develop' into features/dynamic-zones 2019-11-27 15:28:33 +01:00
Alexandre Bodin
62237bcd08 Mongoose fix populate and support dynamic zone populate 2019-11-26 17:01:58 +01:00
Alexandre Bodin
9aff9af165 v3.0.0-beta.17.6 2019-11-25 18:54:50 +01:00
Virginie Ky
c640f6872b Icons grid adjustments 2019-11-25 15:56:44 +01:00
Virginie Ky
11ccb5e7f3 Dynamic zone edit view ui 2019-11-20 17:46:53 +01:00
Long Nguyen
8bec836388 Add Vietnamese translation (#4414) 
* Add Vietnamese translation

* chore: tweak vietnamese admin's translations

* chore: vietnamese placeholder

* feat: vietnamese content manager's translations

* chore: plugin documentation's vietnamese translations

* chore: plugin email's vietnamese translations

* chore: plugin upload's vietnamese translations

* chore: plugin users-permissions's vietnamese translations

* chore: register vietnamese to language switcher

* chore: add vietnamese welcome message
 2019-11-20 11:58:35 +01:00
Alexandre Bodin
b2e0ec5d1f v3.0.0-beta.17.5 2019-11-04 17:52:02 +01:00
Jim LAURIE
fd2aaecac1 Load scoped providers 2019-10-26 15:50:31 +02:00
Chris Winch
1849a6c915 update upload e2e test to expect number value for size in response 2019-10-24 15:07:02 +01:00
Chris Winch
6e5eb9d724 update upload size type to decimal 2019-10-24 13:58:05 +01:00
Chris Winch
c9fd4535bc update upload file size type to integer so that graphQl can sort as expected 2019-10-24 09:44:52 +01:00
Alexandre Bodin
7a61db7285 v3.0.0-beta.17.4 2019-10-23 15:11:30 +02:00
Alexandre BODIN
7b1cef1974
Merge branch 'master' into enhancement-async-provider 2019-10-22 16:17:52 +02:00
Jim LAURIE
6b5c0baf4e Apply PR feedback 2019-10-22 16:14:34 +02:00
Jim LAURIE
a42811489f Make init config async 
Now you will be able to run async script in the plugin provider init function.
 2019-10-22 16:07:51 +02:00
Alexandre Bodin
9280cf9cd7 Merge branch 'master' into develop 2019-10-22 11:15:09 +02:00
Alexandre Bodin
3ddd383c30 v3.0.0-beta.17.3 2019-10-22 11:05:52 +02:00
Alexandre Bodin
61b7c28d1e Merge branch 'master' into develop 2019-10-21 09:13:39 +02:00
Alexandre BODIN
3c4f377e60
Merge branch 'master' into bugfix/missing-globalPolicy-middleware 2019-10-21 09:06:36 +02:00
Veit Bjarsch
3a8c3055e4 added resolverOf and plugin key to graphql schema 2019-10-21 00:12:04 +02:00
soupette
6a852ad6cb Fix conflicts 2019-10-18 15:51:44 +02:00
Alexandre Bodin
b6feabf689 v3.0.0-beta.17.2 2019-10-18 13:42:22 +02:00
Alexandre Bodin
f0ad2ab52c Merge branch 'master' into develop 2019-10-16 14:16:52 +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
soupette
beef6e5510 Fix conflicts 2019-10-10 06:34:31 +02:00
Virginie Ky
953f5b8ba3 upload plugin UI 2019-10-08 10:53:01 +02:00
Alexandre BODIN
7c16991f14
Merge branch 'master' into releases/3.0.0-beta.17 2019-10-07 10:23:04 +02:00
websocket98765
6a787d9c0c
Update README.md 2019-10-05 21:00:14 +00:00
Samuel Durkin
ffdde168c5 only add backend host as prefix if local server upload when getting singular upload 2019-10-04 19:06:01 +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
cyril lopez
39988b3efb
Merge branch 'master' into develop 2019-10-03 10:47:25 +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
cyril lopez
3a4bb7fda5
Merge branch 'develop' into front/context-api 2019-09-27 15:44:15 +02:00
Alexandre Bodin
6305bee43b v3.0.0-beta.16.6 2019-09-26 14:35:06 +02:00
cyril lopez
83a6fe44e4
Merge branch 'master' into front/context-api 2019-09-23 09:38:26 +02:00
Alexandre Bodin
bf7870de3b Merge branch 'master' of github.com:strapi/strapi into chore/routing-x-forwarded 2019-09-18 17:29:09 +02:00
Alexandre Bodin
84adbf3bcf v3.0.0-beta.16.5 2019-09-18 14:00:21 +02:00
Alexandre BODIN
7a94d9dad9
Merge branch 'master' into chore/routing-x-forwarded 2019-09-18 13:27:39 +02:00