yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,264 Commits 127 Branches 497 Tags
Commit Graph

1859 Commits

Author SHA1 Message Date
soupette
f1de079d77 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 10:22:49 +01:00
Mariusz Wachowski
7c8885d031 added custom scrollbar styles 
Signed-off-by: Mariusz Wachowski <wachowski.mariusz@gmail.com>
 2020-03-04 21:27:09 +01:00
Mariusz Wachowski
da328f7c96 fix: separate menu sections + fit sections to available space 
Signed-off-by: Mariusz Wachowski <wachowski.mariusz@gmail.com>
 2020-03-04 21:27:09 +01:00
Alexandre Bodin
8e91e5abaf v3.0.0-beta.19.1 2020-03-04 18:42:31 +01:00
soupette
80cedb9014 Add fix for previous app using config.js override 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 17:46:55 +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
soupette
d6bc4e1941 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 14:52:29 +01:00
Alexandre Bodin
e222792181 v3.0.0-beta.19 2020-03-04 14:24:23 +01:00
cyril lopez
2bdd29fe1f
Merge branch 'develop' into fix/plugins-page 2020-03-04 10:18:17 +01:00
HichamELBSI
b5947621fc Merge branch 'master' into develop 2020-03-04 09:32:13 +01:00
soupette
467afcb7e6 Fix baseline 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-03 18:46:43 +01:00
Virginie Ky
f266baa396 PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-03 17:49:30 +01:00
Alexandre Bodin
4b6220bffd Merge branch 'develop' into features/media-lib 2020-03-03 08:42:24 +01:00
soupette
21539f4a28 Upgrade buffet.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-02 17:27:32 +01:00
Alexandre Bodin
d79053c6bc Remove file that was deleted in develop branch 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 16:46:25 +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
soupette
63c284cc64 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-02 11:38:55 +01:00
soupette
3a695aeaac Merge branch 'develop' of github.com:strapi/strapi into chore/remove-saga-admin 2020-03-02 11:34:01 +01:00
Alexandre BODIN
3ba0d7aed3
Merge branch 'develop' into features/single-types 2020-03-02 09:20:32 +01:00
helabbassi
7363cc01a8 Fix snapshot tests 
Signed-off-by: helabbassi <helabbassi@kilix.fr>
 2020-03-02 08:47:05 +01:00
HichamELBSI
d243aced6c Merge branch 'develop' into features/single-types 2020-02-28 16:46:17 +01:00
HichamELBSI
f34bd32025 Update Buffet.js dependencies 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-28 16:32:42 +01:00
HichamELBSI
92632be70d Fix all single types feedback 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-28 16:03:38 +01:00
soupette
185e1adc40 Fix tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 14:35:25 +01:00
soupette
ca93021bd0 Remove saga in admin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 14:15:56 +01:00
soupette
8b25ad614b Add tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 13:56:06 +01:00
soupette
d3fc7ad835 Refacto ListPluginsPage 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 13:43:45 +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
soupette
8b883ba8b7 Created common useFetchPlugins 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 10:59:42 +01:00
soupette
f3fa43b9d4 Add tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 10:41:10 +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
56caadc3c2 update snapshots 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-28 09:54:37 +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
soupette
0388705816 Remove old files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 09:32:00 +01:00
soupette
b7c09a816d Remove sage from Marketplace 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 09:29:12 +01:00
virginieky
39f941fe44
Merge branch 'features/media-lib' into front/media-library-filter 2020-02-27 19:51:20 +01:00
virginieky
a60a209234
Merge branch 'features/media-lib' into front/media-lib-filters 2020-02-27 15:08:03 +01:00
soupette
2f307a007e Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib 2020-02-27 08:28:59 +01:00
soupette
77e0e83b27 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-02-27 08:28:09 +01:00
soupette
94bab08947 Update buffetjs dep 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-26 18:05:04 +01:00
HichamELBSI
6821fe8d63 Fix PR feedbacks 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-26 17:33:18 +01:00
HichamELBSI
e8b9017219 Merge branch 'features/single-types' into single-types/uid-ctm 2020-02-26 14:56:27 +01:00
HichamELBSI
ff870e7aa0 Merge branch 'develop' into features/single-types 2020-02-26 14:54:33 +01:00
Alexandre Bodin
3bcbde8f0b v3.0.0-beta.18.8 2020-02-26 12:01:37 +01:00
soupette
23710b5fc2 Update Buffet.js so we can test the single types feature 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-26 08:05:37 +01:00
Virginie Ky
83fb72736f 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 03:34:04 +01:00
Virginie Ky
ba23fa4cf8 fix lint 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-25 22:12:03 +01:00
Virginie Ky
45c8deac4d 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-25 22:09:01 +01:00
HichamELBSI
e450d3613b Add UID in CTM 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-25 21:44:02 +01:00
virginieky
85cf0468d1
Merge branch 'features/media-lib' into front-media-lib-search 2020-02-25 21:16:52 +01:00