yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-27 02:05:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,371 Commits 116 Branches 490 Tags
Commit Graph

15371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre BODIN
4c9e5b5185
Merge pull request #5358 from strapi/media-lib/provider-settings 
Media lib/provider settings
 2020-03-02 17:03:04 +01:00
Alexandre Bodin
27cf7f9077 Fix graphql upload size 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 16:46:47 +01:00
Alexandre Bodin
7ba6348149 Remove useless test 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 16:46:46 +01:00
Alexandre Bodin
924c45e9c0 Fix testing missing config 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 16:46:46 +01:00
Alexandre Bodin
b4e2554a5a Add doc to local and rackspace providers 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 16:46:45 +01:00
Alexandre Bodin
9159bb1c65 Migrate upload providers to new config system 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 16:46:44 +01:00
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
HichamELBSI
14120fd98b Fix single types modal title 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-02 15:50:15 +01:00
Derrick Mehaffy
cd87f0ed22
Fix enumeration on SQL databases 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-02 07:30:33 -07: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
virginieky
6186f1287a
Merge branch 'features/media-lib' into front/img-preview 2020-03-02 14:46:54 +01:00
Virginie Ky
ab6daa8cc6 clean 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-02 14:37:36 +01:00
Virginie Ky
e804824077 Card with checkbox 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-02 14:33:16 +01:00
Alexey Murz Korepov
cb71cc5940 Replaced false to ! 
Signed-off-by: Alexey Murz Korepov <murznn@gmail.com>
 2020-03-02 15:42:50 +03:00
cyril lopez
0a81d532a7
Merge pull request #5352 from strapi/chore/remove-saga-admin 
Remove saga in stapi-admin
 2020-03-02 12:36:31 +01:00
cyril lopez
280b158f3b
Merge pull request #5338 from strapi/features/media-lib-settings-view 
Media lib settings view
 2020-03-02 11:40:16 +01:00
soupette
06d9e4188b Merge branch 'chore/remove-saga-admin' of github.com:strapi/strapi into chore/remove-saga-admin 2020-03-02 11:39:16 +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
virginieky
755cae4095
Merge branch 'develop' into chore/remove-saga-admin 2020-03-02 11:27:38 +01:00
Virginie Ky
7563078124 controls ui 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-02 10:00:51 +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
Alexandre BODIN
f6058666fd
Merge pull request #5361 from strapi/features/single-types 
Features/single types
 2020-03-02 09:52:21 +01:00
virginieky
c099a89efa
Merge branch 'develop' into chore/remove-saga-admin 2020-03-02 09:36:01 +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
cyril lopez
5a96f593ba
Merge pull request #5377 from strapi/fix/snapshot 
Fix snapshot tests
 2020-03-02 09:20:22 +01:00
Alexey Murz Korepov
540a72af8e replace JSON.stringify to lodash isEqual 
Signed-off-by: Alexey Murz Korepov <murznn@gmail.com>
 2020-03-02 11:09:52 +03:00
helabbassi
7363cc01a8 Fix snapshot tests 
Signed-off-by: helabbassi <helabbassi@kilix.fr>
 2020-03-02 08:47:05 +01:00
Virginie Ky
cd103ba332 Card component with card img wrapper UI 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-02 00:21:43 +01:00
Virginie Ky
98b305c481 url update fix and avoid several identical filters 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-01 21:28:26 +01:00
Nathan Waelkens
8f223c6277 Fixed two broken links 
Signed-off-by: Nathan Waelkens <nathan@imigo.nl>
 2020-02-29 23:11:13 +01:00
Alexey Murz Korepov
5f9cbe527e Suppress rewrite config in db without changes 
Now Strapi rewrite all 'plugin_content_manager_configuration_content_types' keys in "core_store" database table on each restart.
I add comparison of stored config with generated, and skip unnecessary write config to database, when there are no changes.

Signed-off-by: Alexey Murz Korepov <murznn@gmail.com>
 2020-02-29 19:08:57 +03:00
Gambhiro
47bc549f82 standard or flexible environment 2020-02-29 13:12:49 +00: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
Virginie Ky
ebc17bc957 Merge branch 'front/media-library-filter' of github.com:strapi/strapi into front/media-library-filter 2020-02-28 17:08:58 +01:00
HichamELBSI
d243aced6c Merge branch 'develop' into features/single-types 2020-02-28 16:46:17 +01:00
ELABBASSI Hicham
25fad6f4fa
Merge pull request #5359 from strapi/admin/buffet-update 
Update Buffet.js dependencies
 2020-02-28 16:44:53 +01:00
HichamELBSI
f34bd32025 Update Buffet.js dependencies 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-28 16:32:42 +01:00
ELABBASSI Hicham
61fa264e4a
Merge pull request #5357 from strapi/fix/single-types 
Fix all single types feedback
 2020-02-28 16:26:03 +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
Virginie Ky
4c6e50439d override dateFormats and getFilterType tests 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-28 12:44:15 +01:00