11408 Commits

Author SHA1 Message Date
HichamELBSI
4f5cd5a209 Reskin and refacto the left admin menu and add Single type section
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
2020-02-11 17:13:31 +01:00
Alexandre Bodin
de9521ce6b Merge branch 'develop' into features/single-types
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-02-10 21:09:50 +01:00
Alexandre Bodin
8a970562c9 Merge branch 'master' into develop
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-02-10 19:15:20 +01:00
Jim LAURIE
9c68285594
Merge pull request #5205 from bartduisters/patch-1
Grammar + corrections of the three first sections
2020-02-10 17:26:54 +01:00
Jim LAURIE
acfcd68e2a
Merge branch 'master' into patch-1 2020-02-10 17:25:53 +01:00
Jim LAURIE
608bd9f426
Merge pull request #5021 from strapi/doc/plugin-development
Add plugin development doc
2020-02-10 17:18:26 +01:00
Jim LAURIE
befdbc8631
Merge branch 'master' into doc/plugin-development 2020-02-10 17:18:02 +01:00
Jim LAURIE
032f98a567
Merge pull request #5208 from cotyhamilton/patch-1
Fix typos in third party client doc
2020-02-10 15:57:58 +01:00
Jim LAURIE
f6826032fe
Merge branch 'master' into patch-1 2020-02-10 15:57:51 +01:00
Alexandre BODIN
c88cc6be95
Merge pull request #5217 from strapi/feat-expose-mongoose-connection
Expose mongoose connections
2020-02-10 15:53:07 +01:00
Jim LAURIE
489d2e33fd feat: expose mongoose connections
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
2020-02-10 15:09:59 +01:00
Jim LAURIE
0f64aec794
Merge pull request #5079 from strapi/fix/self-referencing-many-way
Create realted_col for self referencing many ways
2020-02-10 14:14:31 +01:00
cyril lopez
85d0fd093e Merge pull request #5198 from strapi/fix/displayed-date
Improve filter for date types
2020-02-10 11:22:08 +01:00
cyril lopez
722e7a192d Merge pull request #5201 from strapi/fix/#3914
Fixes #3914
2020-02-10 10:40:03 +01:00
soupette
b86b584539 Fix PR feedback
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-10 10:24:12 +01:00
Alexandre BODIN
c52966f4e1 Merge branch 'master' into fix/self-referencing-many-way 2020-02-10 09:02:47 +01:00
Coty
27ca0841b3 [Docs] Fix typos in third party client doc
Signed-off-by: Coty <cotyhamilton@gmail.com>
2020-02-08 23:41:44 -06:00
Bart Duisters
7c3e869e2e
Merge branch 'master' into patch-1 2020-02-08 20:03:38 +01:00
Bart Duisters
74b0d5a951 Fix merge conflicts 2020-02-08 20:02:08 +01:00
Bart Duisters
76caff32db Grammar and punctuation of webhooks.md
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:58:12 +01:00
Bart Duisters
b5d5fb47b4 Grammar and punctuation of plugins.md
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:58:12 +01:00
Bart Duisters
22df0d85a1 Grammar and punctuation of logging.md
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:58:12 +01:00
Bart Duisters
e18408d4ba Grammar and punctuation of middlewares.md
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:58:12 +01:00
Bart Duisters
ff0ef9a204 Grammar and punctuation of hooks.md
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:58:12 +01:00
Bart Duisters
b12c965efc Grammar and punctuation of public-assets.md
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:58:12 +01:00
Bart Duisters
9fe015c5f8 Grammar and punctuation of policies.md
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:58:12 +01:00
Bart Duisters
6ead09f92f Grammar and punctuation of parameters.md
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:58:12 +01:00
Bart Duisters
75ea7c51f0 Grammar and punctuation of services.md
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:58:12 +01:00
Bart Duisters
4a49510d2d Grammar and punctuation of models.md
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:58:12 +01:00
Bart Duisters
788ee8cc26 Grammar of controllers.md
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:58:12 +01:00
Bart Duisters
f679e7d218 Grammar and punctuation of routing.md
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:58:12 +01:00
Bart Duisters
e303178150 Grammar and punctuation of customization.md
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:58:12 +01:00
Bart Duisters
d24a94d44e Grammar and punctuation of configurations.md
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:58:12 +01:00
Bart Duisters
f9411d72be Punctuation file-structure.md
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:58:12 +01:00
Bart Duisters
06add573f2 Grammar and correction of incorrect information
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:58:12 +01:00
Bart Duisters
e27a727380 Grammar
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:58:12 +01:00
Bart Duisters
2d720516a2 Grammar and consitent punctuation
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:58:12 +01:00
Bart Duisters
3f62ac0998 Consistent use of punctuation in lists
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:58:12 +01:00
Bart Duisters
4a9536fea8 Grammar and punctuation
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:58:12 +01:00
Alexandre Bodin
f28efd907f Upgrade rimraf
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:58:12 +01:00
Alexandre Bodin
8869be3c23 Fix chokidar version conflicts
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:58:12 +01:00
Virginie Ky
fcf0de56c7 add index to editview utils
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:56:41 +01:00
Virginie Ky
4973685f36 invert values in EventInput formatValue unit test
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:56:41 +01:00
Virginie Ky
a8e87295ee eventinput methods tests
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:56:41 +01:00
Virginie Ky
5d5b63ef83 apply code review
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:56:41 +01:00
Virginie Ky
a2ce3f6d4e apply PR review
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:56:41 +01:00
Virginie Ky
46dabd0b4d standardise code style
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:56:41 +01:00
Virginie Ky
5558b7efe9 update snapshot
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:56:41 +01:00
Virginie Ky
75e3ba4bb9 rename HeadersInput tests
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:56:41 +01:00
Virginie Ky
cbe7119418 update yarn.lock to disgard conflicts
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
2020-02-08 19:56:41 +01:00