yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-08 08:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,532 Commits 113 Branches 488 Tags
Commit Graph

352 Commits

Author SHA1 Message Date
HichamELBSI
a672b66b7f Fix filters and allowed types 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-10 14:06:09 +02:00
cyril lopez
6fa4d9060f
Merge pull request #5738 from strapi/media-lib/pagination-ui 
Media lib pagination alignment
 2020-04-07 19:38:37 +02:00
cyril lopez
4581a4cf35
Merge pull request #5737 from strapi/fix/media-lib-ui 
Fix the modal list view in the Media Library
 2020-04-07 19:35:59 +02:00
Ky
1de70d9292 theme borderRadius 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-07 19:35:19 +02:00
HichamELBSI
ba8116dcdd Fix overflow 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-07 19:29:37 +02:00
Ky
3a5f44bb02 selected card border-radius 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-07 19:29:21 +02:00
Ky
a0e0ee1cbd pagination alignment 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-07 19:13:58 +02:00
HichamELBSI
af369e9a54 Fix the modal list view in the Media Library 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-07 18:41:48 +02:00
soupette
ade27c830f Fix ref edit 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-07 18:40:53 +02:00
Ky
2619bfd5f5 Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/size-fix 2020-04-07 18:09:08 +02:00
Ky
a50244afdd update unit tests 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-07 17:49:47 +02:00
Ky
d65633d881 convert size format 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-07 17:39:08 +02:00
HichamELBSI
fe8d4c88d7 Fix preview URL on selected asset 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-07 17:25:16 +02:00
cyril lopez
64d74c8707
Merge pull request #5734 from strapi/media-lib/ui-fix 
Fix UI in the Media Library
 2020-04-07 16:59:43 +02:00
HichamELBSI
ca0084ace6 Fix UI in the Media Library 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-07 16:48:59 +02:00
soupette
c5441f1d61 Fix init request 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-07 15:47:35 +02:00
soupette
e7f4f8bfa1 Fix edit file when lib not initialized 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-07 14:24:12 +02:00
soupette
341bb9a209 Disable buttons when in uploading state 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-07 10:57:59 +02:00
ELABBASSI Hicham
0576bbc2d1
Merge pull request #5720 from strapi/media-lib/last-ui-fixes 
Media lib UI
 2020-04-06 17:35:48 +02:00
Ky
d96ae81348 clean 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-06 17:14:20 +02:00
Ky
de91f8c43c some ui fixes 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-06 16:26:30 +02:00
soupette
e73e11971d Add emit event in back button in upload plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-06 14:24:57 +02:00
virginieky
a940bbc8c0
Merge pull request #5705 from strapi/media-lib/ui-fixes 
Some ui fixes
 2020-04-06 12:08:04 +02:00
Ky
64fbf03eeb apply code review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-06 11:24:19 +02:00
cyril lopez
2ab7d0de68
Merge pull request #5704 from strapi/media-lib/fix-ui 
Fix some UI issues in the ML
 2020-04-06 11:23:41 +02:00
HichamELBSI
8096746555 Fix PR review 2020-04-06 11:11:40 +02:00
Ky
5e184c2784 Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/ui-fixes 2020-04-03 18:27:55 +02:00
Ky
6c0c0ae607 some ui fixes 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-03 17:29:08 +02:00
HichamELBSI
c285c2a88e Fix some UI issues in the ML 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-03 17:15:09 +02:00
soupette
cb0eb350ee Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/add-back-button 2020-04-03 16:45:07 +02:00
soupette
7260b02cbe Add back button in ctm modals 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-03 15:58:11 +02:00
soupette
1953e5957a Fix date formats 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-03 11:28:11 +02:00
Ky
22d3c4d0ca remove useless headers 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-03 10:34:01 +02:00
Ky
c567ab55eb Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/edit-error-state 2020-04-03 10:30:39 +02:00
cyril lopez
81aa54f003
Merge pull request #5691 from strapi/media-lib/ui-fix-1 
Fix some UI issue in the media library
 2020-04-03 10:20:54 +02:00
HichamELBSI
92ff39d450 Fix PR review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-03 10:18:19 +02:00
Ky
55c4962b77 clean 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-02 22:12:55 +02:00
Ky
c25694d465 Error states 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-02 21:53:25 +02:00
HichamELBSI
05af24b6d3 Fix some UI issue in the media library 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-02 18:27:28 +02:00
soupette
c057bdbfca Fix date filter 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-02 16:32:15 +02:00
Ky
a271cd72c3 ListView prefixFile 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-02 12:55:56 +02:00
Ky
d6cf77132a apply PR review 2 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-02 11:40:04 +02:00
Ky
106587ac97 apply PR review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-02 10:39:48 +02:00
Ky
fb8b6853e3 Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/listview-fixes 2020-04-02 10:28:55 +02:00
soupette
5c7992544a Add timestamps to sort picker 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-02 09:10:10 +02:00
soupette
1c02b1302b Prevent from cropping gif 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-02 08:20:40 +02:00
soupette
1efa9af27c Fix accept for replacing media 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-01 21:59:35 +02:00
soupette
ae8b3171fb Fix filters 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-01 19:22:44 +02:00
Ky
c76769ee3d Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/listview-fixes 2020-04-01 18:49:58 +02:00
Ky
4344c787a2 list alignment with static value 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-01 18:49:16 +02:00