soupette
|
4153fe9b7b
|
Fix PR feedback
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-30 18:18:35 +01:00 |
|
soupette
|
9c53fcaccc
|
Fix select relations
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-30 18:09:55 +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 |
|
soupette
|
f6d8f51df3
|
Fix link default message
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-30 17:38:25 +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 |
|
soupette
|
adc06abf06
|
Merge branch 'develop' of github.com:strapi/strapi into core/admin-settings-api
|
2020-01-30 14:46:16 +01:00 |
|
soupette
|
12d59c4b91
|
Merge branch 'master' of github.com:strapi/strapi into develop
|
2020-01-30 14:45:52 +01:00 |
|
soupette
|
0a33e3ade5
|
Add documentation about the settings api
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-30 14:42:53 +01:00 |
|
soupette
|
091f00d500
|
Add front-end config for example plugin
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-30 13:59:48 +01:00 |
|
soupette
|
22aed6c934
|
Made settingsBaseURL global constant
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-30 13:51:52 +01:00 |
|
soupette
|
a49d696c51
|
Fix routing and menu highlight
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-30 12:32:29 +01:00 |
|
soupette
|
144d07cdbe
|
Improve plugin left menu for trads and enable settings api
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-30 11:50:34 +01:00 |
|
soupette
|
b94d1a6a08
|
Prevent plugin with no mainComponent from being injected into the left menu
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-30 10:31:52 +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
|
940b1ebec5
|
Merge branch 'develop' of github.com:strapi/strapi into develop
|
2020-01-29 14:03:11 +01:00 |
|
Alexandre Bodin
|
576279626b
|
Merge branch 'develop' into features/single-types
|
2020-01-29 11:59:53 +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 |
|
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 |
|
Hicham EL ABBASSI
|
81c5537d7f
|
Merge branch 'develop' into features/single-types
|
2020-01-29 10:09:46 +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 |
|