yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-30 10:53:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,044 Commits 122 Branches 499 Tags
Commit Graph

653 Commits

Author SHA1 Message Date
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
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
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
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
Virginie Ky
f266baa396 PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-03 17:49:30 +01:00
soupette
eaf210e081 Add dummy field API 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-03 16:40:02 +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
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
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
soupette
efe0b1a424 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-settings-view 2020-02-29 07:59:42 +01:00
soupette
ccc92b90a5 Add required info into the plugin object and update plugin generator 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 11:40:55 +01:00
Virginie Ky
5b4185ec42 Merge branch 'front/media-lib-filters' of github.com:strapi/strapi into front/media-library-filter 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-28 10:16:23 +01:00
Virginie Ky
1f470c0947 Clean filters compos 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-28 09:34:05 +01:00
Virginie Ky
8b4bf7eba0 media lib utils tests 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-27 20:35:18 +01:00
Virginie Ky
2118650d5c page as start param 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-27 19:41:20 +01:00
Virginie Ky
24c07727da Replace carret with buffet icon 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-27 14:39:10 +01:00
Virginie Ky
81cc30680a apply PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-27 11:55:51 +01:00
Virginie Ky
a6f73e0647 Merge branch 'features/media-lib' of github.com:strapi/strapi into front/img-preview 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-27 11:33:27 +01:00
soupette
23746e8ad7 Handle side effects 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-27 10:55:24 +01:00
soupette
d9a05672fe Add tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-27 10:12:00 +01:00
soupette
6e3ca74aee Created settings page 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-27 09:53:50 +01:00
Virginie Ky
357e197605 Merge branch 'front/media-lib-filters' of github.com:strapi/strapi into front/media-library-filter 2020-02-26 17:45:02 +01:00
Virginie Ky
87cbcc8f58 Merge branch 'features/media-lib' of github.com:strapi/strapi into front/media-lib-filters 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-26 17:32:07 +01:00
Virginie Ky
efc34d5c20 sort button color as props 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-26 16:57:34 +01:00
Virginie Ky
87f32f3f71 Merge branch 'front/media-lib-filters' of github.com:strapi/strapi into front/media-library-filter 2020-02-26 16:23:29 +01:00
Virginie Ky
2d63d2015a Merge branch 'front-media-lib-search' of github.com:strapi/strapi into front/media-lib-filters 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-26 16:22:40 +01:00
Virginie Ky
6160e89475 SortButton as Text compo 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-26 16:19:25 +01:00
Virginie Ky
8da7bd21a0 Merge branch 'front-media-lib-search' of github.com:strapi/strapi into front/media-lib-filters 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-26 15:58:02 +01:00
Virginie Ky
23e4ab38bd PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-26 15:52:19 +01:00
Virginie Ky
22cd052a90 sortlistitem extract 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-26 15:50:12 +01:00
Virginie Ky
5dee34b4c4 Filter size UI and default values 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-26 15:07:47 +01:00
Virginie Ky
2dac5e4141 Merge branch 'front/media-lib-filters' of github.com:strapi/strapi into front/media-library-filter 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-26 11:27:06 +01:00
Virginie Ky
cfc4473c6e Merge branch 'front-media-lib-search' of github.com:strapi/strapi into front/media-lib-filters 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-26 11:25:03 +01:00