yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-09 17:26:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,897 Commits 115 Branches 488 Tags
Commit Graph

748 Commits

Author SHA1 Message Date
Virginie Ky
76f41a6ec0 Upload modal card 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-06 17:19:20 +01:00
virginieky
2634d0ace8
Merge branch 'features/media-lib' into front/img-preview 2020-03-05 17:59:22 +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
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
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
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
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
Alexandre Bodin
e5b319d81e Update file creation process with fileInfo 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-03 16:33:48 +01:00
soupette
9f4757459b Rename InputFile 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-03 16:19:53 +01:00
Virginie Ky
f50a5b1b66 Merge branch 'features/media-lib' of github.com:strapi/strapi into front/media-library-filter 2020-03-03 14:44:07 +01:00
Virginie Ky
aa628f3dc7 Merge branch 'features/media-lib' of github.com:strapi/strapi into front/img-preview 2020-03-03 14:41:40 +01:00
Virginie Ky
b634d557ea apply code review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-02 23:19:40 +01:00
Virginie Ky
abfc1d3287 Apply some PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-02 17:35:44 +01:00
Alexandre Bodin
27cf7f9077 Fix graphql upload size 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 16:46:47 +01:00
Alexandre Bodin
7ba6348149 Remove useless test 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 16:46:46 +01:00
Alexandre Bodin
924c45e9c0 Fix testing missing config 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 16:46:46 +01:00
Alexandre Bodin
9159bb1c65 Migrate upload providers to new config system 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 16:46:44 +01:00
Alexandre Bodin
fd3511b511 Use strapi.plugins.upload.config for provider config 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 16:46:44 +01:00
Alexandre Bodin
7a8c865051 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 15:18:08 +01:00
virginieky
6186f1287a
Merge branch 'features/media-lib' into front/img-preview 2020-03-02 14:46:54 +01:00
Virginie Ky
ab6daa8cc6 clean 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-02 14:37:36 +01:00
Virginie Ky
e804824077 Card with checkbox 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-02 14:33:16 +01:00
soupette
3a695aeaac Merge branch 'develop' of github.com:strapi/strapi into chore/remove-saga-admin 2020-03-02 11:34:01 +01:00
Virginie Ky
7563078124 controls ui 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-02 10:00:51 +01:00
soupette
476d5d10eb Add Settings 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-02 09:31:05 +01:00
Virginie Ky
cd103ba332 Card component with card img wrapper UI 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-02 00:21:43 +01:00
Virginie Ky
98b305c481 url update fix and avoid several identical filters 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-01 21:28:26 +01:00