11333 Commits

Author SHA1 Message Date
cyril lopez
1f928eb322
Merge branch 'master' into doc/plugin-development 2020-02-04 00:26:55 +01:00
cyril lopez
d16db60dad
Merge pull request #5169 from strapi/fix/remove-snapshots
Remove snapshots
2020-02-04 00:26:20 +01:00
soupette
24630ebd02 Remove snapshots
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-03 16:51:35 +01:00
Robin
72ef115ceb Remove empty code block from migration guide
Signed-off-by: robin <almigod0718@gmail.com>
2020-02-02 15:27:53 +08:00
cyril lopez
a6ca664ab8
Merge branch 'master' into master 2020-01-31 18:33:31 +01:00
Alexandre Bodin
283a0db1ed Upgrade rimraf
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-31 16:56:50 +01:00
Alexandre Bodin
58338821b4 Fix chokidar version conflicts
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-31 16:54:29 +01:00
cyril lopez
8d4234b44e
Merge pull request #5041 from strapi/webhooks/tests
Webhooks unit tests
2020-01-31 15:04:36 +01:00
Virginie Ky
15eabaff39 add index to editview utils
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-31 14:37:28 +01:00
Ily Trevino
225b48b955 Fixed mispelled word restaurant
Signed-off-by: Ily Trevino <ily.trevino@gmail.com>
2020-01-30 18:07:59 -06:00
Virginie Ky
2af7111289 invert values in EventInput formatValue unit test
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-30 18:44:01 +01:00
Virginie Ky
896a15ca84 Merge branch 'webhooks/tests' of github.com:strapi/strapi into webhooks/tests 2020-01-30 18:00:52 +01:00
virginieky
5acbb26573
Merge branch 'master' into webhooks/tests 2020-01-30 17:03:27 +01:00
Virginie Ky
3fc527712b eventinput methods tests
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-30 17:02:11 +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
virginieky
8b62d3c34d
Merge branch 'master' into webhooks/tests 2020-01-30 15:52:46 +01:00
cyril lopez
eb6fc3578d
Merge branch 'master' into fix/5038 2020-01-30 15:41:27 +01:00
Virginie Ky
ec0e6252a4 apply code review
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-30 15:32:47 +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
Virginie Ky
6ac7a96ef8 apply PR review
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-29 19:27:26 +01:00
Virginie Ky
2631cd3c49 standardise code style
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-29 17:44:51 +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
fce0d64ef0 update snapshot
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-29 10:51:23 +01:00
Virginie Ky
5a9e17e0c0 rename HeadersInput tests
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-29 10:12:54 +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
Virginie Ky
baf74d41b3 Merge branch 'master' into webhooks/tests
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-28 18:20:21 +01:00
Virginie Ky
46948346c6 update yarn.lock to disgard conflicts
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-28 18:09:47 +01:00
Virginie Ky
dd96bc90fa Snapshots
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-28 16:07:01 +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
Virginie Ky
b25daf2163 Snapshots with globalcontext and translation
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-27 18:32:57 +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