11408 Commits

Author SHA1 Message Date
Jim LAURIE
811cd73a22
Merge pull request #5154 from imrobinized/patch-1
Remove empty code block from beta.18 migration guide
2020-02-05 13:52:07 +01:00
Jim LAURIE
f780617f7c
Merge branch 'master' into patch-1 2020-02-05 13:51:57 +01:00
Jim LAURIE
ebe76c4dea
Merge pull request #5173 from strapi/docs/alphaWarning
Add warning messages to Alpha docs
2020-02-04 19:24:05 +01:00
Jim LAURIE
13078d851b docs: remove queries section
Since this section is no more interesting I remove it.
Related to close #5106
Signed-off-by: lauriejim <j.laurie6993@gmail.com>
2020-02-04 17:22:59 +01:00
virginieky
7904c171dc
Merge branch 'master' into fix/select-relations 2020-02-04 14:08:05 +01:00
Derrick Mehaffy
1680fd0d81
Add warning messages to Alpha docs
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
2020-02-04 01:39:53 -07:00
ruibaby
ff489ce051 feat: updated zh-Hans translations.
Signed-off-by: ruibaby <i@ryanc.cc>
2020-02-04 15:55:02 +08:00
cyril lopez
5a3f04a71b
Merge branch 'master' into master 2020-02-04 08:32:12 +01:00
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
soupette
6cf54385ca Fix conflicts
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-03 16:43:12 +01:00
soupette
b6d0c5dc7b Add snaps back
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-03 16:06:16 +01:00
soupette
c86e1dfb18 Update front-end jest config
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-03 16:03:36 +01:00
soupette
451589f875 Upgrade buffet.js with the next version
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-03 15:43:44 +01:00
soupette
f74082af33 Upgrade to styled-compo v5
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-03 15:36:59 +01:00
soupette
5e9af4c36c Remove styled-compo dependency from content manager
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-03 15:34:44 +01:00
soupette
c91254b1aa Remove snapshots
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-03 15:31:08 +01:00
soupette
f3c6472f4a Update snap
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-03 11:51:23 +01:00
cyril lopez
89ee8df680
Merge branch 'develop' into core/admin-settings-api 2020-02-03 11:39:10 +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
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
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
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
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