yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-14 19:56:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,264 Commits 116 Branches 489 Tags
Commit Graph

12264 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ScottAgirs
ac1364239a Merge branch 'patch-1' of https://github.com/ScottAgirs/strapi into patch-1 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-03-07 13:08:45 -05:00
Scott Agirs
c56c3a0aae
Merge branch 'master' into patch-1 2020-03-07 13:06:30 -05:00
Derrick Mehaffy
9ab7144b18
PR Feedback 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-06 11:24:33 -07:00
Alexandre Bodin
607e87431a Move util out of service 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-06 19:20:48 +01:00
Pierre Noël
b5ec9cb1c8 handle unexpected params from koa-router 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-06 19:16:51 +01:00
Alexandre BODIN
8b50b046a1
Merge pull request #5398 from dstrants/patch-1 
Fixes typo on mongo image
 2020-03-06 17:36:41 +01:00
Alexandre BODIN
bd65a99482
Merge branch 'master' into patch-1 2020-03-06 17:36:33 +01:00
Virginie Ky
76f41a6ec0 Upload modal card 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-06 17:19:20 +01:00
Alexandre Bodin
c567616ba8 Resize only when necessary 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-06 17:01:33 +01:00
Alexandre Bodin
2e0913d5d5 Support thumbnail replacement 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-06 17:01:32 +01:00
Alexandre Bodin
b144b19372 Add thumbnail on upload and handle deletion 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-06 17:01:32 +01:00
Alexandre Bodin
8f6903ac52 Init image manipulation, add dimensions 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-06 17:01:31 +01:00
cyril lopez
12da5a4493
Merge pull request #5443 from strapi/chore/identify-doc-frontend-file-to-update 
Identify doc frontend file to update
 2020-03-06 16:01:57 +01:00
Jim LAURIE
419d1c1c5c docs: add count graphql guide 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-03-06 15:23:36 +01:00
Alexandre BODIN
ca1ecdac69
Merge pull request #5446 from strapi/update/lodash 
Update lodash to fix security issues
 2020-03-06 15:07:10 +01:00
Derrick Mehaffy
615bb166c3
Update lodash to fix security issues 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-06 06:42:35 -07:00
soupette
34bf5c43fa Merge branch 'features/media-lib' of github.com:strapi/strapi into chore/identify-doc-frontend-file-to-update 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-06 13:58:01 +01:00
soupette
faa1873003 Update doc 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-06 13:44:54 +01:00
soupette
5b5bd67e07 Use override file for dateFormats 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-06 13:36:17 +01:00
soupette
f3bcddcf89 Identify front-end core files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-06 13:33:32 +01:00
Alexandre BODIN
d867e55533
Merge pull request #5430 from strapi/media-lib/upload-allowed-type 
Add Upload allowed type parameter and option to replace an image
 2020-03-06 13:28:45 +01:00
soupette
bdc2758613 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-06 11:44:20 +01:00
cyril lopez
15a1578a2d
Merge pull request #5431 from strapi/core/admin-field-api 
Introducing the front-end Field API
 2020-03-06 11:43:20 +01:00
soupette
2676113a89 Fix lint 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-06 11:42:15 +01:00
soupette
8a8929e97c v3.0.0-beta.19.3 v3.0.0-beta.19.3 2020-03-06 10:02:36 +01:00
cyril lopez
9d155b35c8
Merge pull request #5440 from MattieBelt/fix/5439 
Fix/5439
 2020-03-06 10:00:23 +01:00
cyril lopez
06ba800a1b
Merge branch 'master' into fix/5439 2020-03-06 09:59:28 +01:00
Alexandre BODIN
29dbf11042
Merge pull request #5436 from strapi/fix/boom-middleware 
Fix boom middleware logging < 500
 2020-03-06 09:50:21 +01:00
soupette
12d12fbf08 Merge branch 'core/admin-field-api' of github.com:strapi/strapi into core/admin-field-api 2020-03-06 09:20:31 +01:00
soupette
2eef042ffd Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-06 09:11:48 +01:00
Pierre Noël
c0d9dd26d1 Fix findOne with PK as one of the params 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-06 09:08:20 +01:00
Mattias van den Belt
0f9a912aca Revert excludeEmptyString option 
Signed-off-by: Mattias van den Belt <mattias@taskhero.nl>
 2020-03-06 08:54:03 +01:00
MattieBelt
01579c21a1 Update strapi-utils yup v0.28.1 
Signed-off-by: Mattias van den Belt <mattias@taskhero.nl>
 2020-03-06 08:52:16 +01:00
MattieBelt
43e8a65957 Fixes #5439 
Signed-off-by: MattieBelt <mattias@taskhero.nl>
Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>
 2020-03-05 23:50:23 +01:00
MattieBelt
1703beff8e Fixes #5439 
Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>
 2020-03-05 23:50:23 +01:00
Alexandre Bodin
8e93b864d2 Merge branch 'fix/boom-middleware' of github.com:strapi/strapi into fix/boom-middleware 2020-03-05 20:17:19 +01:00
Alexandre Bodin
50eb322d2d Add message when necessary 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-05 20:17:07 +01:00
Dimitris
d80d7b593e fixes typo on mongo image 
Signed-off-by: Dimitrios Strantsalis <dstrants@gmail.com>
 2020-03-05 21:06:18 +02:00
Alexandre BODIN
a17352f64b
Merge branch 'master' into fix/boom-middleware 2020-03-05 19:18:38 +01:00
Alexandre BODIN
635795d424
Merge pull request #5432 from strapi/fix/plugin-generator 
Fix plugin generator
 2020-03-05 19:16:52 +01:00
Alexandre BODIN
f7530da383
Merge branch 'master' into fix/boom-middleware 2020-03-05 19:15:34 +01:00
Alexandre Bodin
10e85d6038 Fix boom middleware logging < 500 errors and delete message when not necessary 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-05 19:07:12 +01:00
Nazır Doğan
666b3c6ed8 fix typo 
Signed-off-by: Nazir Dogan <nazrdogan@gmail.com>
 2020-03-05 20:21:19 +03:00
virginieky
f3bfdb40fb
Merge pull request #5381 from strapi/front/img-preview 
Media library - Card component & Card img wrapper
 2020-03-05 18:03:45 +01:00
virginieky
2634d0ace8
Merge branch 'features/media-lib' into front/img-preview 2020-03-05 17:59:22 +01:00
ScottAgirs
7e4a892772 Merge branch 'patch-1' of https://github.com/ScottAgirs/strapi into patch-1 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-03-05 11:51:01 -05:00
ScottAgirs
8939471aec Merge branch 'patch-1' of https://github.com/ScottAgirs/strapi into patch-1 2020-03-05 11:49:23 -05:00
ScottAgirs
0a7c75d859 Typofix 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-03-05 11:44:18 -05:00
soupette
5909b2c222 Merge branch 'features/media-lib' of github.com:strapi/strapi into core/admin-field-api 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 17:41:54 +01:00
ScottAgirs
657a9f3322 Typofix 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-03-05 11:41:39 -05:00