yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-15 20:27:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,264 Commits 117 Branches 489 Tags
Commit Graph

12264 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Virginie Ky
eecebb70f3 override dateFormats and getFilterType tests 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-28 10:53:08 +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
d26deaa647
Merge pull request #5340 from strapi/fix/autocomplete 
Fixes #5053
 2020-02-28 10:41:57 +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
Alexandre BODIN
7e7689c05f
Merge pull request #5346 from kubuntux/bug/fix-5266 
fix(admin): Update div wrapper for SelectWrapper
 2020-02-27 20:15:34 +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
James Alvarez
e069cb56b4 Fixed bug #5266 
When adding new content, select field was incorrectly wrapped

Signed-off-by: James Alvarez <jp@domainwink.com>
 2020-02-28 02:21:21 +08:00
Alexandre BODIN
c39447c8b9
Merge pull request #5345 from strapi/fix/enum-duplicate 
Add validations for duplicate enums
 2020-02-27 18:47:38 +01:00
soupette
725a0940ab Fixes #5343 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-27 17:10:20 +01:00
cyril lopez
a5cfe98c70
Merge pull request #5342 from strapi/fix/ctm-related-redirect 
Fixes the wrong redirection in content manager
 2020-02-27 16:56:24 +01:00
soupette
6e24c526f9 Fixes #3864 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-27 16:55:34 +01:00