yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-20 14:00:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,807 Commits 123 Branches 496 Tags
Commit Graph

14807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cyril lopez
8d7580178c
Merge pull request #5694 from strapi/media-lib/edit-error-state 
Edit Error states
 2020-04-03 10:38:03 +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
4149ec2256 Apply code review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-03 10:05:24 +02:00
cyril lopez
1b9f4c12e7
Merge pull request #5689 from strapi/fix/datepicker 
Fix date filter
 2020-04-03 09:58:27 +02:00
Alexandre BODIN
f54cdfdd21
Merge pull request #5698 from diogotcorreia/patch-1 
Update Node LTS version on BUG_REPORT.md to v12
 2020-04-03 08:43:15 +02:00
Diogo Correia
356fe6bf2b
Update Node LTS version on BUG_REPORT.md to v12 2020-04-03 00:16:36 +01: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
Alexandre Bodin
e3b34580b5 extract params from ctx before caling services 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-02 19:51:24 +02:00
Alexandre Bodin
c4aee53f82 proxy to fetch url 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-02 19:16:06 +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
ELABBASSI Hicham
790cfc71d8
Merge pull request #5687 from strapi/media-lib/default-sort 
Add default sort to media library
 2020-04-02 14:45:16 +02:00
HichamELBSI
c244665634 Merge branch 'features/media-lib' into media-lib/default-sort 2020-04-02 14:44:18 +02:00
HichamELBSI
e729621d31 Fix review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-02 14:34:48 +02:00
cyril lopez
c08a0b1b8b
Merge pull request #5680 from strapi/media-lib/listview-fixes 
Listview fixes
 2020-04-02 13:31:30 +02:00
Ky
a271cd72c3 ListView prefixFile 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-02 12:55:56 +02:00
HichamELBSI
c946129a27 Add default sort to media library 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-02 12:21:09 +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
ELABBASSI Hicham
96b2bc7921
Merge pull request #5683 from strapi/fix/toggle-refetch 
Fix refetch files on toggle
 2020-04-02 10:17:23 +02:00
ELABBASSI Hicham
f6f23735fb
Merge pull request #5684 from strapi/fix/replace-upload 
Allow only same type when replacing asset
 2020-04-02 10:17:08 +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
49b3664455 Fix isMounted effetct 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-02 08:35:06 +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
soupette
9e74c1ceaf Fix toggle refetch 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-01 18:08:22 +02:00
cyril lopez
d5a9240605
Merge pull request #5681 from strapi/fix/buffet-bug 
Fix Buffet.js related bugs
 2020-04-01 17:36:58 +02:00
soupette
9cbc24c438 Fix filters 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-01 17:14:45 +02:00
Ky
561421968d clean 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-01 16:52:00 +02:00
Ky
9dfc5c90ea ListView responsive 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-01 16:49:17 +02:00
soupette
3462dcac8b Fix useIsMounted hook usage 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-01 16:44:34 +02:00
Jim LAURIE
0a522b3795
Merge pull request #5635 from chinhdo/fix/5555-quickStartGuide 
Fix issue #5555 - outdated references to "content-type" in Quick Start Guide/Tutorial
 2020-04-01 16:33:40 +02:00
Jim LAURIE
343a1bab38
Merge branch 'master' into fix/5555-quickStartGuide 2020-04-01 16:33:29 +02:00
soupette
18db8bd7f2 Merge branch 'features/media-lib' of github.com:strapi/strapi into fix/buffet-bug 2020-04-01 16:30:21 +02:00
cyril lopez
351fee255b
Merge pull request #5679 from strapi/media-lib/custom-timestamps 
Custom timestamps
 2020-04-01 16:30:13 +02:00
soupette
f2426b0c31 Update buffet version 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-01 16:29:51 +02:00
Jim LAURIE
6344fc622c
Merge pull request #5615 from strapi/docs/faq_update 
Add development flow to FAQ
 2020-04-01 16:21:59 +02:00
Jim LAURIE
97c2664ed9
Merge branch 'master' into docs/faq_update 2020-04-01 16:21:18 +02:00
HichamELBSI
829bf7c390 Custom timestamps 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-01 16:15:57 +02:00
ELABBASSI Hicham
6190dee74f
Merge pull request #5678 from strapi/chore/media-lib-fix 
ML small fixes
 2020-04-01 16:02:51 +02:00
soupette
67a2e6ab4b Fix video preview and other small bugs 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-01 15:43:15 +02:00
Ky
165d39196b date format and filters alignment 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-01 15:38:31 +02:00