yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 02:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,756 Commits 121 Branches 507 Tags
Commit Graph

8203 Commits

Author SHA1 Message Date
Alexandre Bodin
fd3511b511 Use strapi.plugins.upload.config for provider config 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 16:46:44 +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
bff34ad023 Fix missing lib in users-permissions 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 09:59:33 +01:00
soupette
93d1594d2b Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-settings-view 2020-03-02 09:32:04 +01:00
soupette
431b935203 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-02 09:31:40 +01:00
soupette
476d5d10eb Add Settings 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-02 09:31:05 +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
soupette
efe0b1a424 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-settings-view 2020-02-29 07:59:42 +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
Alexandre BODIN
6cfcd99d8e
Merge pull request #5334 from strapi/media-lib/settings 
Add new media lib settings. Remove db provider config
 2020-02-28 13:53:36 +01:00
soupette
d3fc7ad835 Refacto ListPluginsPage 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 13:43:45 +01:00
Alexandre Bodin
2382332a4d Update to a more recent CI os version 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-28 12:06:44 +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
c8da68c3bd Merge branch 'develop' of github.com:strapi/strapi into chore/remove-saga-admin 2020-02-28 10:42:09 +01:00
cyril lopez
1bc1ea2563
Merge pull request #5333 from strapi/front/media-library-filter 
Front/media library filter
 2020-02-28 10:41: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
cyril lopez
65c1dd5582
Merge branch 'develop' into fix/autocomplete 2020-02-28 09:35:58 +01:00
cyril lopez
d5d5c0fb4f
Merge pull request #5344 from strapi/ctb/prevent-polymorph-relations 
Fixes #3864
 2020-02-28 09:35:45 +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
soupette
ba61ba87ae Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-settings-view 2020-02-28 07:30:31 +01:00
soupette
aef0086337 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-02-28 07:29:58 +01:00
Alexandre Bodin
84a9d2902d Only load the right directories 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-28 01:13:33 +01:00
Alexandre Bodin
d7fd4ced2a Move test folder to fix import issue 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-27 22:31:30 +01:00
Virginie Ky
8b4bf7eba0 media lib utils tests 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-27 20:35:18 +01:00
Alexandre Bodin
68fbf77b30 Add new media lib settings. Remove db provider config 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-27 20:26:05 +01:00
virginieky
39f941fe44
Merge branch 'features/media-lib' into front/media-library-filter 2020-02-27 19:51:20 +01:00
Virginie Ky
2118650d5c page as start param 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-27 19:41:20 +01:00
soupette
725a0940ab Fixes #5343 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-27 17:10:20 +01:00
soupette
6e24c526f9 Fixes #3864 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-27 16:55:34 +01:00
virginieky
a60a209234
Merge branch 'features/media-lib' into front/media-lib-filters 2020-02-27 15:08:03 +01:00
Virginie Ky
24c07727da Replace carret with buffet icon 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-27 14:39:10 +01:00
cyril lopez
e2d54bf907
Merge branch 'develop' into fix/ctm-related-redirect 2020-02-27 12:04:43 +01:00
soupette
4c8fc44832 Fix redirect url when navigating between views 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-27 11:56:27 +01:00
Virginie Ky
81cc30680a apply PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-27 11:55:51 +01:00
soupette
caeeb97f7d Fixes #3247 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-27 11:35:35 +01:00
soupette
9c638f5351 Fixes #5053 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-27 11:20:04 +01:00