yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-31 18:08:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,868 Commits 121 Branches 507 Tags
Commit Graph

1115 Commits

Author SHA1 Message Date
Ky
4cd1b6c124 Merge branch 'front/ui-improvements' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-26 18:55:03 +02:00
Ky
9384a00a96 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-26 18:13:20 +02:00
soupette
5a41f68f2b Merge branch 'master' of github.com:strapi/strapi into develop 2020-04-24 15:34:45 +02:00
soupette
c44dd2dbd8 Add front-end media lib usage events 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-23 14:18:58 +02:00
soupette
81454df46f Fix lint 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:12 +02:00
soupette
6d9bc79726 Upgrade react-intl dependency to latest 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:08 +02:00
soupette
b71647a7d7 Remove unneeded packages 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:07 +02:00
soupette
bf1040f9b9 Upgrade reactstrap dependency. Fixes #5837 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-17 14:00:53 +02:00
Alexandre Bodin
9d8944ebfe v3.0.0-beta.20 2020-04-16 15:10:53 +02:00
HichamELBSI
2f7f9f5f25 Allow deselect files 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-16 12:43:55 +02:00
soupette
0e3fdfc0ca Change format in input file 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-16 11:52:51 +02:00
Alexandre Bodin
b44a57d408 Use path.extname if mime-type doesnt find extension 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-16 10:50:18 +02:00
HichamELBSI
bbd4fcb7e3 Fix toggle all 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-16 10:29:25 +02:00
Alexandre Bodin
e8bac9c9a9 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib 2020-04-15 19:15:26 +02:00
Alexandre Bodin
7123f68737 Allow to create the media.update webhook + fix default width and height 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-15 19:15:21 +02:00
virginieky
94eca0a21e
Merge pull request #5810 from strapi/media-lib/cm-delete-file 
Fix input media delete
 2020-04-15 19:04:09 +02:00
Ky
82347ba913 fix input media delete 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-15 18:42:10 +02:00
Ky
a09e92ea3a fix pagination count 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-15 17:01:14 +02:00
Ky
9b46ff9ce6 toString lodash import 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-15 16:48:34 +02:00
Alexandre Bodin
d615bf9b7f Fix svg and gif formatting 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-15 14:54:33 +02:00
soupette
8da7154e46 Fix copy link 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-15 14:41:08 +02:00
Ky
7be8dbf1dd apply pr review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-15 14:34:19 +02:00
Ky
1d9609806c prevent the admin from breaking on two tabs actions 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-15 14:17:39 +02:00
HichamELBSI
b3efa146b7 Fix pagination 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-15 12:09:51 +02:00
Ky
6ac5d191e1 generate extension from name 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-15 12:01:00 +02:00
Ky
8773343e48 getFileExtension tests 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-15 11:39:23 +02:00
Ky
e4e54c49d5 extension 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-15 11:32:11 +02:00
Ky
7f7958ba3f remove log 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-14 11:29:58 +02:00
Ky
5b759c952a list scrollbar visibility on Firefox 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-14 11:13:24 +02:00
Ky
c4e07b2606 CM listview extension 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-14 00:22:40 +02:00
Ky
34326f63b5 modal list selection 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-13 23:59:05 +02:00
Ky
78ec19977b use small url instead of thumbnail 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-13 23:33:21 +02:00
Ky
01055f7ee8 Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/front-fix 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-13 23:05:52 +02:00
Ky
08f8ab53f1 modal list tab 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-13 22:58:19 +02:00
Ky
79e4e3eb24 input media confirm alert 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-12 23:56:35 +02:00
Ky
888b731f8a Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/front-fix 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-10 15:31:02 +02:00
Ky
d5af9c8c9f display icon in CM input file 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-10 15:29:29 +02:00
soupette
3553025d59 Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/wysiwyg 2020-04-10 14:14:34 +02:00
HichamELBSI
a672b66b7f Fix filters and allowed types 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-10 14:06:09 +02:00
Ky
352c35e576 CM edit modal pagination alignment 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-10 12:18:52 +02:00
Ky
eae5dfbdf6 autocomplete search 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-10 11:09:58 +02:00
Ky
092509512a some ui fixes 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-09 23:46:45 +02:00
soupette
e32dbdfa59 Hide nav in modal when needed 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-09 18:24:53 +02:00
soupette
d773d692b8 Add ML compo to WYSIWYG 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-09 17:09:03 +02:00
soupette
87f8965579 Fix FieldApi getField 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-09 15:06:27 +02:00
Alexandre Bodin
cc9d23c3ac Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-07 20:24:39 +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