11408 Commits

Author SHA1 Message Date
soupette
1af0941392 Merge branch 'fix/5038' of github.com:strapi/strapi into fix/5038 2020-01-27 09:44:26 +01:00
soupette
0b81207d74 Merge branch 'master' of github.com:strapi/strapi into fix/5038 2020-01-27 09:43:49 +01:00
Derrick Mehaffy
1edd2f9442 Fix cron reference documentation
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>

Based on the Cron-Style listed in `node-schedule`: https://www.npmjs.com/package/node-schedule#cron-style-scheduling
2020-01-27 00:56:09 -07:00
Ky
5a3d8b8dec Editview snapshot test
Signed-off-by: Ky <virginie.ky@gmail.com>
2020-01-27 00:00:31 +01:00
Batuhan Kök
3329fba10d
Merge branch 'master' into strapi-tr 2020-01-24 13:17:15 +03:00
cyril lopez
226adbff33
Merge branch 'master' into fix/5038 2020-01-24 10:56:59 +01:00
soupette
6dfde6b1f4 Fix PR feedback
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-24 10:47:22 +01:00
soupette
5ba0f5b88a Merge branch 'master' of github.com:strapi/strapi into doc/plugin-development 2020-01-24 10:46:20 +01:00
cyril lopez
7828986b44
Merge pull request #5073 from strapi/chore/improve-ctm-dom-perf
Fixes #5054
2020-01-24 10:44:41 +01:00
cyril lopez
723ba1baa3
Merge branch 'master' into chore/improve-ctm-dom-perf 2020-01-24 10:12:03 +01:00
cyril lopez
93060bf3be
Merge pull request #5076 from strapi/core/admin-change-load-plugin
Change the way we load plugins in the admin
2020-01-24 10:11:48 +01:00
Batuhan Kök
574b618fea
Merge branch 'master' into strapi-tr 2020-01-24 08:24:45 +03:00
Jim LAURIE
6dc5617fff
Merge pull request #5035 from DaiAoki/chore/fix-docs-tutorial
Typo fix quick-start-tutorial.md document
2020-01-24 00:06:49 +01:00
Jim LAURIE
904eadc8fa
Merge branch 'master' into chore/fix-docs-tutorial 2020-01-24 00:06:37 +01:00
Jim LAURIE
b730fd11db
Merge pull request #5043 from aplr/patch-1
Fix production.html
2020-01-23 23:59:36 +01:00
Jim LAURIE
8beb92f8c9
Merge branch 'master' into patch-1 2020-01-23 23:58:31 +01:00
Alexandre Bodin
e8f5d46d06 Create realted_col for self referencing many ways
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-23 23:34:28 +01:00
soupette
96e092b300 Change the way we load plugins
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-23 16:46:50 +01:00
soupette
2f9eeee0c2 Update buffet
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-23 15:56:38 +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
virginieky
87b62706f9
Merge branch 'master' into webhooks/tests 2020-01-23 15:17:37 +01:00
Virginie Ky
4666339f88 apply review
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-23 15:03:46 +01:00
Batuhan Kök
96bd2c8d41
Merge branch 'master' into strapi-tr 2020-01-23 11:05:03 +03:00
Alexandre Bodin
1106c07795 v3.0.0-beta.18.6 v3.0.0-beta.18.6 2020-01-23 08:13:13 +01:00
Andreas Pfurtscheller
9634962a78
Merge branch 'master' into patch-1 2020-01-22 22:49:00 +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
Batuhan Kök
2d0ac17c34 Turkish translations updated
Signed-off-by: Batuhan Kök <batuhankok@gmail.com>
2020-01-22 23:21:27 +03:00
Alexandre BODIN
5cfc584e63
Merge pull request #5058 from strapi/fix/dz-delete-mongo-issue
Fix mongoose dz delete query
2020-01-22 19:34:42 +01:00
Virginie Ky
ab85b7642e Merge branch 'webhooks/tests' of github.com:strapi/strapi into webhooks/tests
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-22 18:11:12 +01:00
Alexandre BODIN
11582918b4
Merge branch 'master' into fix/dz-delete-mongo-issue 2020-01-22 18:04:43 +01:00
Alexandre Bodin
77e5b8233d Fix mongoose dz delete query
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-22 17:54:59 +01:00
Virginie Ky
22fa1a963a snapshots
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-22 17:47:09 +01:00
cyril lopez
51c33144c6
Merge branch 'master' into webhooks/tests 2020-01-22 17:26:29 +01:00
virginieky
b4a04724cd
Merge pull request #5042 from strapi/webhooks/leftmenu-scrollbar
Helper-plugin Leftmenu scrollbar
2020-01-22 15:34:43 +01:00
Alexandre BODIN
9fdf3b170f
Merge pull request #5052 from strapi/single-types/generate-single-type-api
generate single type api routes
2020-01-22 15:03:10 +01:00
Alexandre Bodin
0528827b5f Remove unwanted code
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-22 14:32:58 +01:00
virginieky
a501cc817d
Merge branch 'master' into webhooks/leftmenu-scrollbar 2020-01-22 14:28:41 +01:00
soupette
0632698912 Merge branch 'master' of github.com:strapi/strapi into fix/5038 2020-01-22 12:14:53 +01:00
soupette
a9c9549458 Fixes #5038
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-22 12:14:17 +01:00
Alexandre Bodin
929eea0f55 Merge branch 'features/single-types' into single-types/generate-single-type-api 2020-01-22 12:05:57 +01:00
Alexandre Bodin
7a9c481d59 Merge branch 'develop' into features/single-types 2020-01-22 12:05:46 +01:00
Alexandre Bodin
7392d7f573 Merge branch 'master' of github.com:strapi/strapi 2020-01-22 12:04:57 +01:00
Alexandre Bodin
be97c8b4f0 Allow codecov comments on master and develop
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-22 12:04:46 +01:00
Alexandre Bodin
958db137df Generate route.json based on content type kind
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-22 11:29:37 +01:00
Alexandre Bodin
8afc962df1 Support generate api inside of other api
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-22 10:51:33 +01:00
cyril lopez
27c3cf7a91
Merge pull request #4995 from strapi/chore/ctb-front-end-tests
Chore/ctb front end tests
2020-01-22 10:51:28 +01:00
Alexandre Bodin
9c96b180fe Merge branch 'develop' into features/single-types 2020-01-22 10:39:42 +01:00
soupette
be64adaa1c Fix conflicts
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-22 10:29:36 +01:00
virginieky
941f14a074
Merge pull request #5039 from strapi/chore/eslint-config-front
Improve eslint configuration for front-end files
2020-01-22 10:06:55 +01:00
DaiAoki
d868233003 fix quick-start-tutorial.md document.
Signed-off-by: DaiAoki <a.dai.0814ap@gmail.com>
2020-01-22 09:25:32 +09:00