cyril lopez
|
89ee8df680
|
Merge branch 'develop' into core/admin-settings-api
|
2020-02-03 11:39:10 +01:00 |
|
Ky
|
8bd33e9282
|
Merge branch 'develop' into front/ui-improvements
|
2020-02-02 22:41:59 +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
|
a2b021f7d0
|
Merge branch 'master' into fix/select-relations
|
2020-01-31 21:06:45 +01:00 |
|
Virginie Ky
|
995ba8d8b3
|
popup warning snapshots
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-01-31 19:04:49 +01:00 |
|
cyril lopez
|
a6ca664ab8
|
Merge branch 'master' into master
|
2020-01-31 18:33:31 +01:00 |
|
Alexandre Bodin
|
349b28c291
|
Merge branch 'master' into develop
|
2020-01-31 18:21:42 +01:00 |
|
soupette
|
86a411812f
|
Update snapshots required since new component logic
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-31 17:30:42 +01:00 |
|
Virginie Ky
|
dacbff0dfa
|
Merge branch 'front/ui-improvements' into front/popupwarning
|
2020-01-31 17:17:28 +01:00 |
|
Virginie Ky
|
0922d2389d
|
Merge branch 'develop' into front/ui-improvements
|
2020-01-31 17:16:43 +01:00 |
|
cyril lopez
|
c8be386e6e
|
Merge pull request #5146 from strapi/single-types/create-action
Single types creation
|
2020-01-31 17:16:24 +01:00 |
|
soupette
|
3473143813
|
Fix conflicts
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-31 17:14:24 +01:00 |
|
HichamELBSI
|
9e9d7382c4
|
Single types creation
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
|
2020-01-31 17:13:12 +01:00 |
|
soupette
|
063443b94d
|
Merge branch 'master' of github.com:strapi/strapi into develop
|
2020-01-31 17:10:43 +01:00 |
|
cyril lopez
|
bd9ac97116
|
Merge pull request #5123 from strapi/single-types/types-builder
Single types/types builder
|
2020-01-31 17:06:20 +01:00 |
|
HichamELBSI
|
3770999193
|
Fix content type modal
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
|
2020-01-31 17:02:40 +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 |
|
Virginie Ky
|
37657e1811
|
Merge branch 'front/ui-improvements' into front/popupwarning
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-01-31 15:51:02 +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
|
6d5a4042b1
|
Merge branch 'front/ui-improvements' into front/popupwarning
|
2020-01-31 15:17:33 +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 |
|
Hicham EL ABBASSI
|
73db8d428b
|
Single types list in CTB
Signed-off-by: Hicham EL ABBASSI <hichamelabbassi@MacBook-Pro-de-Hicham.local>
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
|
2020-01-31 09:59:11 +01:00 |
|
Hicham EL ABBASSI
|
90a60879c5
|
Update all translations
Signed-off-by: Hicham EL ABBASSI <hichamelabbassi@MacBook-Pro-de-Hicham.local>
|
2020-01-31 09:59:10 +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 |
|
cyril lopez
|
d684e24d97
|
Merge pull request #5103 from strapi/single-types/messages
Update all translations
|
2020-01-30 18:36:26 +01:00 |
|
HichamELBSI
|
7622874fb0
|
Fix translations
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
|
2020-01-30 18:26:35 +01:00 |
|
Hicham EL ABBASSI
|
597a88a650
|
Update all translations
Signed-off-by: Hicham EL ABBASSI <hichamelabbassi@MacBook-Pro-de-Hicham.local>
|
2020-01-30 18:26:35 +01:00 |
|
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 |
|