11194 Commits

Author SHA1 Message Date
Virginie Ky
bb9ff9e47a Merge branch 'master' into develop 2020-01-31 15:10:07 +01:00
Alexandre Bodin
5d1565bdd3 Merge branch 'master' of github.com:strapi/strapi 2020-01-30 16:19:21 +01:00
Alexandre Bodin
761ad68392 v3.0.0-beta.18.7 v3.0.0-beta.18.7 2020-01-30 16:15:25 +01:00
Alexandre BODIN
2b63b6307b
Merge pull request #5050 from strapi/fix/5038
Fixes Content Type builder when the autoReload feature is disabled
2020-01-30 15:52:55 +01:00
cyril lopez
eb6fc3578d
Merge branch 'master' into fix/5038 2020-01-30 15:41:27 +01:00
Alexandre BODIN
6e2a7d934b
Merge pull request #5116 from AntoninBeaufort/typo-upload-plugin-doc
Fix typo in upload plugin
2020-01-30 15:22:17 +01:00
Alexandre BODIN
29af05c4d4
Merge branch 'master' into typo-upload-plugin-doc 2020-01-30 15:22:06 +01:00
Alexandre BODIN
f900e36afb
Merge pull request #5137 from JelmerV-WFC/fix/#5129
Check if ref is set before checking toJSON
2020-01-30 15:20:28 +01:00
Alexandre BODIN
cb6a72d33a
Merge pull request #5109 from strapi/fix/graphql-multi-query-issues
Clone response to to avoid inconsistencies in muti query responses
2020-01-30 15:19:40 +01:00
Alexandre BODIN
c039b595c7
Merge branch 'master' into fix/graphql-multi-query-issues 2020-01-30 15:19:27 +01:00
Jelmer Visser
66d9971d1b Check if ref is set before checking toJSON
Signed-off-by: Jelmer Visser <jelmer@weflycheap.nl>
2020-01-30 15:08:22 +01:00
soupette
12d59c4b91 Merge branch 'master' of github.com:strapi/strapi into develop 2020-01-30 14:45:52 +01:00
cyril lopez
817618417e
Merge pull request #5119 from leocaseiro/pt-br-form-messages
adding pt-br missing keys for form validation
2020-01-29 17:35:52 +01:00
Virginie Ky
940b1ebec5 Merge branch 'develop' of github.com:strapi/strapi into develop 2020-01-29 14:03:11 +01:00
Alexandre Bodin
b999bea3a9 Merge branch 'master' into develop 2020-01-29 11:59:41 +01:00
Virginie Ky
4ff189ac00 Merge branch 'master' into develop 2020-01-29 11:35:55 +01:00
Leo Caseiro
952f80f234 adding pt-br missing keys
Signed-off-by: leocaseiro <leobok@gmail.com>
2020-01-29 18:38:09 +11:00
Alexandre BODIN
355365eed0 [Docs] Fix typo in upload plugin
Signed-off-by: antonin.beaufort <antonin.beaufort@gmail.com>
2020-01-28 20:33:37 +01:00
Alexandre BODIN
64747e8a1e
Merge branch 'master' into fix/graphql-multi-query-issues 2020-01-28 13:48:47 +01:00
Alexandre Bodin
6c738dd7c9 Clone response too to avoid inconsistencies in muti query responses
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-27 23:12:15 +01:00
Alexandre BODIN
b37b62b6bc
Merge pull request #5098 from strapi/fix/5092
Fix cron reference documentation
2020-01-27 16:50:24 +01:00
Alexandre BODIN
a8fbccafdf
Merge branch 'master' into fix/5092 2020-01-27 16:50:11 +01:00
Alexandre BODIN
9383be5e2c
Merge pull request #5102 from Atinux/patch-1
[Docs] Fix typo in webhooks
2020-01-27 16:50:00 +01:00
Alexandre BODIN
3f85987631
Merge branch 'master' into fix/5092 2020-01-27 16:48:52 +01:00
Sébastien Chopin
6a85969adb [Docs] Fix typo in webhooks
Signed-off-by: Sébastien Chopin <seb@nuxtjs.com>
2020-01-27 16:17:28 +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
bd86969270
Merge pull request #5085 from strapi/chore/eslint
Cleanup eslint configs
2020-01-27 11:07:12 +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
cyril lopez
d96603e488
Merge branch 'master' into fix/5038 2020-01-27 10:17:56 +01:00
Alexandre BODIN
c4898aa803
Merge pull request #5062 from batuhankok/strapi-tr
Turkish translations updated
2020-01-27 10:11:28 +01:00
soupette
b318f77050 Fix PR feedback
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-27 09:55:40 +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
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
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
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
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
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