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
12,790 Commits 122 Branches 499 Tags
Commit Graph

1337 Commits

Author SHA1 Message Date
Alexandre Bodin
a27d5f210d v3.0.0-beta.20.2 2020-05-05 14:56:13 +02:00
Alexandre Bodin
6a6d53b402 v3.0.0-beta.20.1 2020-04-28 10:00:23 +02:00
cyril lopez
c0e065f259
Merge branch 'develop' into chore/redux 2020-04-23 09:14:40 +02:00
soupette
a34c0ca7d9 Remove react-datetime dep and Date compo in helper plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:11 +02:00
soupette
71eec181fe Upagrade react helmet 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:10 +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
virginieky
091281b53c
Merge branch 'develop' into front/global-improvements 2020-04-21 14:42:22 +02:00
Ky
bf21c7614f UI fixes 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-21 14:33:03 +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
soupette
5d57fcc1b5 Fix date display in ctm 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-16 13:56:07 +02:00
soupette
2b8cae78c6 Fix date display 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-16 13:46:36 +02:00
Ky
d798b49353 update tests titles 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-15 13:49:47 +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
c4e07b2606 CM listview extension 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-14 00:22:40 +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
cyril lopez
1c88e38df1
Fix request helper (#5740) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-07 21:01:29 +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
Alexandre Bodin
76b6549ee4 Merge branch 'master' into develop 2020-04-07 20:21:37 +02:00
Ky
a0e0ee1cbd pagination alignment 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-07 19:13:58 +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
19af1482af Fix errors 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-07 13:23:08 +02:00
soupette
6bd863b563 Merge branch 'features/media-lib' of github.com:strapi/strapi into ml/fix-count 2020-04-06 14:23:04 +02:00
soupette
bdbec4e3f0 Fix count endpoint with filters 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-06 14:22:50 +02:00
soupette
836d016a73 Add back button event 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-06 13:36:04 +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
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
67a2e6ab4b Fix video preview and other small bugs 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-01 15:43:15 +02:00
Alexandre Bodin
8d56e0c12f v3.0.0-beta.19.5 2020-04-01 11:27:56 +02:00
Ky
b5f930d3fa Unit tests and remove useDeepCompare hook 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-03-31 11:57:03 +02:00
Virginie Ky
0b1b3f2a59 pagination default value 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-30 15:19:17 +02:00
Virginie Ky
6e060d18d8 PR review apply 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-30 14:13:11 +02:00
Virginie Ky
4fde5d4d63 Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/front-fixes 2020-03-30 12:04:55 +02:00
Alexandre Bodin
50df7365d6 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 12:04:04 +02:00
Alexandre Bodin
1ff48a8e60 Merge branch 'master' into develop 2020-03-30 11:27:20 +02:00
Alexandre Bodin
24bd311678 v3.0.0-beta.19.4 2020-03-30 09:57:05 +02:00
soupette
123704024c Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-30 07:43:15 +02:00
Virginie Ky
cec4875f43 play icon and size filter 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-28 14:13:20 +01:00
soupette
0ba62386c1 Use thumbnail url when available and fix ml preview in ctm 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-27 14:54:03 +01:00
Virginie Ky
3c5cb15c31 lockApp on deleteAll 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-27 12:13:19 +01:00
soupette
f8f4f82693 Remove input file from helper plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-27 06:32:57 +01:00
soupette
86f6ad6d45 Fix delete media 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 12:34:43 +01:00
soupette
7d9dbb84a9 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-24 15:47:54 +01:00
soupette
2302ee4ca6 Add delete logic from edit modal 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-24 15:19:49 +01:00
Virginie Ky
278b708449 Merge branch 'features/media-lib-frontend' of github.com:strapi/strapi into front/media-lib-listview 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-24 15:17:09 +01:00
HichamELBSI
998bfa9360 Merge branch 'features/media-lib-frontend' into media-lib/cm-modal 2020-03-24 09:56:55 +01:00
soupette
dfb9530128 Merge branch 'features/media-lib-frontend' of github.com:strapi/strapi into front/media-lib-listview 2020-03-24 05:41:02 +01:00