Virginie Ky
|
33ce7dc7cd
|
Merge branch 'develop' into front/ui-improvements
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-05 16:05:50 +01:00 |
|
Virginie Ky
|
3bef28a36b
|
Merge branch 'master' into develop
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-05 10:07:46 +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 |
|
Ky
|
8bd33e9282
|
Merge branch 'develop' into front/ui-improvements
|
2020-02-02 22:41:59 +01:00 |
|
Alexandre Bodin
|
349b28c291
|
Merge branch 'master' into develop
|
2020-01-31 18:21:42 +01:00 |
|
Virginie Ky
|
0922d2389d
|
Merge branch 'develop' into front/ui-improvements
|
2020-01-31 17:16:43 +01:00 |
|
soupette
|
063443b94d
|
Merge branch 'master' of github.com:strapi/strapi into develop
|
2020-01-31 17:10:43 +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 |
|
virginieky
|
da6462f2ad
|
Merge branch 'develop' into front/ui-improvements
|
2020-01-31 15:43:55 +01:00 |
|
Virginie Ky
|
9c67340e42
|
Merge branch 'master' into develop
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-01-31 15:19:53 +01:00 |
|
Virginie Ky
|
6fd12e0c8a
|
Merge branch 'front/ui-improvements' of github.com:strapi/strapi into front/ui-improvements
|
2020-01-31 15:15:31 +01:00 |
|
virginieky
|
a51fd884f1
|
Merge branch 'develop' into front/ui-improvements
|
2020-01-31 15:14:51 +01:00 |
|
Virginie Ky
|
fdfd49a805
|
Merge branch 'develop' into front/ui-improvements
|
2020-01-31 15:10:28 +01:00 |
|
Virginie Ky
|
bb9ff9e47a
|
Merge branch 'master' into develop
|
2020-01-31 15:10:07 +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 |
|
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 |
|
soupette
|
12d59c4b91
|
Merge branch 'master' of github.com:strapi/strapi into develop
|
2020-01-30 14:45: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 |
|
cyril lopez
|
2f72e9071e
|
Merge pull request #5127 from strapi/front/auth-forms
Auth forms UI
|
2020-01-29 17:33:22 +01:00 |
|
Virginie Ky
|
962602a1e7
|
Register form ui
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-01-29 15:36:32 +01:00 |
|
Virginie Ky
|
ed19a44d55
|
auth pages grid
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-01-29 15:29:59 +01:00 |
|
Virginie Ky
|
eeb789346e
|
Merge branch 'develop' into front/ui-improvements
|
2020-01-29 14:04:33 +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 |
|
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 |
|