yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-17 12:27:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,370 Commits 121 Branches 494 Tags
Commit Graph

1964 Commits

Author SHA1 Message Date
Alexey Murz Korepov
cb71cc5940 Replaced false to ! 
Signed-off-by: Alexey Murz Korepov <murznn@gmail.com>
 2020-03-02 15:42:50 +03: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
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
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
3bcbde8f0b v3.0.0-beta.18.8 2020-02-26 12:01:37 +01:00
Jim LAURIE
638ddd201e
Merge branch 'master' into update-zh-hans-translations 2020-02-07 09:56:09 +01:00
cyril lopez
8745d2373a
Merge branch 'master' into feat/update-pl-translations 2020-02-06 14:39:05 +01:00
ruibaby
ff489ce051 feat: updated zh-Hans translations. 
Signed-off-by: ruibaby <i@ryanc.cc>
 2020-02-04 15:55:02 +08:00
Alexandre Bodin
761ad68392 v3.0.0-beta.18.7 2020-01-30 16:15:25 +01:00
Alexandre BODIN
3c59a05154
Merge pull request #5100 from strapi/fix/main-field-exclude-id 
Fix main field set to id on mongo
 2020-01-27 12:14:16 +01:00
Alexandre Bodin
4f5a0e7679 Cleanup eslint configs 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-27 10:49:57 +01:00
Alexandre Bodin
d0c26fef67 Fix main field set to id on mongo 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-27 09:53:19 +01:00
soupette
af4bee9b8e Fixes #5054 
Signed-off-by: soupette <>
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-23 15:44:47 +01:00
Alexandre Bodin
1106c07795 v3.0.0-beta.18.6 2020-01-23 08:13:13 +01:00
Mariusz Wachowski
4e5326490e feat: updated pl translations 
Signed-off-by: Mariusz Wachowski <wachowski.mariusz@gmail.com>
 2020-01-22 21:54:08 +01:00
soupette
d0c3a0ddb7 Merge branch 'chore/eslint-config-front' of github.com:strapi/strapi into chore/eslint-config-front 2020-01-21 18:36:20 +01:00
soupette
489c7b2324 Fix lint 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 18:34:27 +01:00
cyril lopez
b5f2824f6d
Merge branch 'master' into chore/eslint-config-front 2020-01-21 18:00:52 +01:00
soupette
cd03d672c2 Fix lint 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 17:53:21 +01:00
soupette
ca1e82337c Fixes #5019 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 17:09:03 +01:00
soupette
eb00b7e0ea Add newline-before-return rule 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 16:31:05 +01:00
soupette
2a4351794b Fix lint webhooks 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 16:25:14 +01:00
soupette
b3ba8c27ef Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 16:12:46 +01:00
soupette
f50f89f0a8 Update eslint configuration 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 16:03:31 +01:00
Alexandre Bodin
2ee13c0a12 v3.0.0-beta.18.5 2020-01-21 15:44:44 +01:00
Alexandre BODIN
1d05cc01b2
Merge branch 'develop' into features/webhooks 2020-01-20 17:21:14 +01:00
soupette
3d5b224183 Rename prop to isNested for better understanding 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-20 16:22:43 +01:00
soupette
8147a188ed Fix icons when error state, improve drag experience 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-20 15:16:55 +01:00
cyril lopez
b76cdb10bb
Merge pull request #5014 from strapi/front/webhooks-editview 
Front/webhooks editview
 2020-01-20 10:25:21 +01:00
Ky
588d472ee2 layout icon fix 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-01-19 17:58:41 +01:00
Virginie Ky
bc0d0afcd1 eslint dep disable fix 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-17 20:32:50 +01:00
cyril lopez
7ccd012ada
Merge pull request #4962 from strapi/front/webhooks-editview 
Front/webhooks editview
 2020-01-17 18:59:50 +01:00
Alexandre Bodin
ab8d2c5d77 Merge branch 'develop' into features/webhooks 2020-01-16 16:55:27 +01:00
Alexandre Bodin
3bca612ac1 Refactor tests and add codecov 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-16 14:06:03 +01:00
Virginie Ky
7f60f6eb57 Apply PR review 2020-01-15 12:17:44 +01:00
Virginie Ky
e250ac81d5 Merge branch 'features/webhooks' of github.com:strapi/strapi into front/webhooks-editview 2020-01-13 18:14:27 +01:00
Alexandre Bodin
14d95f3de1 erge branch 'develop' into features/webhooks 2020-01-13 12:22:21 +01:00
soupette
bfe37c73c9 Fix conflicts 2020-01-13 11:39:08 +01:00
Virginie Ky
fb7017c3ea Merge branch 'features/webhooks' of github.com:strapi/strapi into front/webhooks-editview 2020-01-13 10:19:14 +01:00
Alexandre Bodin
dcc29b361b Merge branch 'develop' into features/webhooks 2020-01-13 09:41:20 +01:00
virginieky
50643f94b3
Merge branch 'master' into chore/eslint-config 2020-01-10 17:44:43 +01:00
Virginie Ky
4aeb5399ee Merge branch 'features/webhooks' of github.com:strapi/strapi into front/webhooks-editview 2020-01-09 11:11:32 +01:00
Alexandre Bodin
f28292b384 Merge branch 'develop' into features/webhooks 2020-01-09 11:09:26 +01:00
Virginie Ky
d0650f1884 Conflicts resolved 2020-01-09 11:05:46 +01:00
Alexandre BODIN
a427c27cfd
Merge pull request #4947 from strapi/fix/use-strapi-service 
Use strapi.services instead of requires to allow overrides
 2020-01-09 10:13:05 +01:00
Alexandre Bodin
7c94a2316d Init strapi.service and use it where services where required 2020-01-08 17:57:53 +01:00
Virginie Ky
47e1031e29 Reviex apply in progress 2020-01-08 16:08:58 +01:00
Jim LAURIE
df1fed99ec docs: update copyright date to 2020 2020-01-08 15:41:08 +01:00
Jim LAURIE
2b2295ee78
Merge branch 'master' into feature/adminTranslationCs 2020-01-08 15:34:16 +01:00
Alexandre Bodin
a0718d7643 Fix delete many 2020-01-08 13:25:44 +01:00