yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-10 15:43:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,511 Commits 107 Branches 503 Tags
Commit Graph

1172 Commits

Author SHA1 Message Date
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
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
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
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 2020-03-06 10:02:36 +01:00
Virginie Ky
b69d3f807d Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-05 19:18:35 +01:00
virginieky
2634d0ace8
Merge branch 'features/media-lib' into front/img-preview 2020-03-05 17:59:22 +01: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
Virginie Ky
0deb976d81 code review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-05 17:02:50 +01:00
Virginie Ky
1ea86fb158 search query with state 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-05 16:51:42 +01:00
soupette
307fcb5b41 Merge branch 'features/media-lib' of github.com:strapi/strapi into core/admin-field-api 2020-03-05 16:21:46 +01:00
Virginie Ky
aaead39d38 homepage reducer unit tests and some code review apply 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-05 16:13:44 +01:00
Virginie Ky
8f24f1537c Merge branch 'features/media-lib' of github.com:strapi/strapi into front/img-preview 2020-03-05 15:15:04 +01:00
virginieky
7583b035a9
Merge branch 'features/media-lib' into front/media-library-filter 2020-03-05 14:48:55 +01:00
soupette
3f8a487fab Created field API and added it to the content manager 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 14:43:00 +01:00
Virginie Ky
c250984631 todo comment for file types api 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-05 14:40:17 +01:00
Alexandre Bodin
e1a7074a4e Merge branch 'develop' into features/media-lib 2020-03-05 14:39:29 +01:00
Virginie Ky
0efc25bb90 img description as text compo 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-05 14:38:51 +01:00
Virginie Ky
1bac7e3d87 Code review apply 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-05 14:34:05 +01:00
Alexandre Bodin
b3e18e1de6 v3.0.0-beta.19.2 2020-03-05 14:32:42 +01:00
Alexandre Bodin
c722b0db00 Implement file replace 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-05 13:51:15 +01:00
soupette
02dc3640d8 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 12:15:11 +01:00
Virginie Ky
d425afd90b code review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-05 11:21:23 +01:00
soupette
4855f244bc Add file info 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 10:56:05 +01:00
Alexandre Bodin
7cd34b725a wip 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-05 10:29:08 +01:00
Alexandre Bodin
b084cb1c65 Return type list and mimeTypes for filters 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-05 10:29:08 +01:00
Alexandre Bodin
196160dc1c Add allowedType in ctb and init getMediaTypes api 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-05 10:29:07 +01:00
soupette
f1de079d77 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 10:22:49 +01:00
Alexandre Bodin
8e91e5abaf v3.0.0-beta.19.1 2020-03-04 18:42:31 +01:00
Alexandre BODIN
634faa8333
Merge pull request #5395 from strapi/media-lib/upload-with-infos 
Media lib/upload with infos
 2020-03-04 18:40:55 +01:00
Virginie Ky
c6a577b2ff clean code 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-04 17:29:31 +01:00
Virginie Ky
14e7e07c23 Merge branch 'features/media-lib' of github.com:strapi/strapi into front/media-library-filter 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-04 17:17:36 +01:00
Virginie Ky
0301861f74 use Text compo 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-04 17:08:35 +01:00
Virginie Ky
dbcb66d98b Fetch data 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-04 15:46:02 +01:00
soupette
6efcd1c48f Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-add-field-to-ctm 2020-03-04 14:54:40 +01:00
soupette
d6bc4e1941 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 14:52:29 +01:00
Alexandre Bodin
e222792181 v3.0.0-beta.19 2020-03-04 14:24:23 +01:00
HichamELBSI
b5947621fc Merge branch 'master' into develop 2020-03-04 09:32:13 +01:00
Virginie Ky
f266baa396 PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-03 17:49:30 +01:00
Alexandre Bodin
70c336cfe9 Add tests and update old tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-03 16:41:37 +01:00
soupette
eaf210e081 Add dummy field API 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-03 16:40:02 +01:00
Alexandre Bodin
dd93ccd590 Init test for upload service 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-03 16:33:48 +01:00