yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-23 15:29:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,691 Commits 127 Branches 496 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cyril lopez
22bb8fe223
Merge pull request #5621 from strapi/ml/fix-upload-error 
ML/fix upload error
 2020-03-27 16:53:52 +01:00
Alexandre Bodin
9c2f5b5368 fix update file info whith realted 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-27 16:00:26 +01:00
Pierre Noël
f2663eb1f7 improve joinTable customization + test collectionName duplicates 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-27 15:51:23 +01:00
HichamELBSI
a17fc7eebd Content Manager - Finalization 2020-03-27 15:41:04 +01:00
soupette
7e7f1c30db Fix file size due to backend code legacy 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-27 15:28:46 +01:00
Alexandre BODIN
8ae55fd5fd
Merge pull request #5625 from strapi/fix/#5558/fixUselessCheckBadRequestLogic 
Fix checkBadrequest useless logic in user-permissions' graphql config
 2020-03-27 14:59:22 +01:00
soupette
0ba62386c1 Use thumbnail url when available and fix ml preview in ctm 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-27 14:54:03 +01:00
Convly
f171029243 Change checkBadRequest's exception shape 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-03-27 14:33:55 +01:00
soupette
80e6fb7d8b Fix bug when file is empty 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-27 14:29:04 +01:00
Derrick Mehaffy
4056f640a0
Add a link to build docs for custom providers 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-27 05:33:58 -07:00
Convly
2d8e55838e Update path to contextBody attributes in schema.graphql.js@checkBadRequest() 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-03-27 12:19:44 +01:00
Virginie Ky
3c5cb15c31 lockApp on deleteAll 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-27 12:13:19 +01:00
soupette
3da916340b Fix util prefixFileWithBackendUrl 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-27 11:55:06 +01:00
soupette
87e72fb4c6 Fix unnecessary rerender 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-27 11:49:07 +01:00
Jean-Sébastien Herbaux
4a8de29100
Fix ability to update unique constraints in mongoose (#5612) 
* Sync indexes on model mount with mongoose

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Use Mongoose.Model.syncIndexes callback arg to subscribe to Model's indexes messages. Get rid off errors-pron-promises.

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-03-27 11:39:53 +01:00
Lennart Stolz
9137233bea
Translations: Updated the 'terms' translations for 'de' (#5589) 
"Terms and Conditions" are called "Allgemeine Geschäftsbedingungen" in
German (often abbreviated as "AGB") or "Nutzungsbedingungen".

In the context of the admin sign-up of 'strapi' I'd go for the latter.
(Research results attached to the pull request)

The previous version "Begriffe" is wrong in this context as it is the
literal translation of the word "term".

Signed-off-by: Lennart Stolz <lennartstolz@me.com>
 2020-03-27 11:15:35 +01:00
Alexandre Bodin
702a544307 Merge branch 'master' into develop 2020-03-27 11:00:50 +01:00
soupette
dc9bf93a1a Merge branch 'features/media-lib' of github.com:strapi/strapi into ml/fix-upload-error 2020-03-27 10:58:02 +01:00
soupette
71f0da38f9 Fix upload error 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-27 10:56:36 +01:00
virginieky
1274645f0e
Merge pull request #5617 from strapi/features/media-lib-remove-old-files 
Clean old files
 2020-03-27 10:44:17 +01:00
Long Nguyen
77a5160d1a
Implement Graphql Aggregation Feature for Bookshelf (#5605) 
* Implement Graphql Aggregation Feature for Bookshelf

Signed-off-by: Long Nguyen <olragon@gmail.com>

* Fix no-unused-vars

Signed-off-by: Long Nguyen <olragon@gmail.com>

* Fix code to use `model.get()` instead of internal structure

Signed-off-by: Long Nguyen <olragon@gmail.com>
 2020-03-27 10:40:29 +01:00
Mariusz Wachowski
b96ed622ee
fix: short relation fields list have unnecessary scrollbar (#5438) 
Signed-off-by: Mariusz Wachowski <wachowski.mariusz@gmail.com>
 2020-03-27 09:51:57 +01:00
Virginie Ky
a5718f9eb7 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-03-27 09:44:49 +01:00
cyril lopez
7540556e62
Merge pull request #5613 from strapi/ml/thumbnail-fix 
ML front improvements
 2020-03-27 15:39:44 +07:00
soupette
2e525a7f65 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-27 07:47:17 +01:00
soupette
56349bef71 Merge branch 'master' of github.com:strapi/strapi into develop 2020-03-27 07:46:47 +01:00
soupette
f8f4f82693 Remove input file from helper plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-27 06:32:57 +01:00
soupette
3658e31dda Remove old input file and content manager 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-27 06:28:53 +01:00
soupette
bfa4d3f798 Add code source 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-27 06:25:38 +01:00
soupette
c6700f06b5 Remove OLD folder 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 19:15:54 +01:00
soupette
6577c2ee6d Merge branch 'features/media-lib' of github.com:strapi/strapi into ml/thumbnail-fix 2020-03-26 18:32:48 +01:00
cyril lopez
b57ab10340
Merge pull request #5601 from strapi/features/media-lib-fix-design 
Fix file info box baseline
 2020-03-27 00:32:37 +07:00
soupette
1720d4ce66 Created SizeBox component 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 18:27:05 +01:00
soupette
e6a271adf2 Replace dynamic size boxe 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 18:19:22 +01:00
soupette
611353785f Merge branch 'features/media-lib' of github.com:strapi/strapi into ml/thumbnail-fix 2020-03-26 18:13:23 +01:00
soupette
d25417a142 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 18:11:47 +01:00
Derrick Mehaffy
a52a2eae43 Add development flow to FAQ 2020-03-26 10:11:11 -07:00
soupette
b99f0f461d Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-fix-design 2020-03-26 18:10:35 +01:00
cyril lopez
430758eb91
Merge pull request #5609 from strapi/front/media-lib-preview-video 
Media lib preview video & player video
 2020-03-27 00:09:09 +07:00
soupette
6d5a4ddf60 Fix size box display 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 17:33:28 +01:00
Virginie Ky
972174e501 apply PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-26 17:33:14 +01:00
soupette
6d08e19fda Fix background-color 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 17:01:38 +01:00
soupette
1a22cc82ca Fix formatBytes 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 16:45:45 +01:00
soupette
33140c7ded Remove noisy notif 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 16:21:20 +01:00
soupette
620e87371c Merge branch 'features/media-lib' of github.com:strapi/strapi into ml/thumbnail-fix 2020-03-26 16:19:25 +01:00
soupette
833add6406 Use thumbnail when available 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 16:11:42 +01:00
Virginie Ky
33dbbf5498 hide play icon on CM 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-26 16:07:14 +01:00
Alexandre Bodin
5de985d724 Clear db formats on replace 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-26 15:52:56 +01:00
cyril lopez
6cdf0a7891
Merge pull request #5610 from strapi/features/media-lib-fix-bugs 
ML fix front-end bugs
 2020-03-26 21:19:25 +07:00
soupette
2f5c73dde5 Use correct url for edit 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 15:12:39 +01:00