Virginie Ky
|
eb5c303564
|
Merge branch 'front/checkbox-description' of github.com:strapi/strapi into front/checkbox-description
|
2020-02-13 19:03:57 +01:00 |
|
Virginie Ky
|
904f013672
|
update snapshots
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-13 19:03:41 +01:00 |
|
virginieky
|
10ba8df9db
|
Merge branch 'front/ui-improvements' into front/checkbox-description
|
2020-02-13 18:21:10 +01:00 |
|
Virginie Ky
|
054afad9e4
|
align the entire DOM
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-13 17:20:57 +01:00 |
|
virginieky
|
b56d255b8c
|
Merge pull request #5228 from strapi/front/font-weight
Generalize font-weight
|
2020-02-13 15:54:54 +01:00 |
|
Virginie Ky
|
453171d842
|
Merge branch 'front/font-weight' of github.com:strapi/strapi into front/font-weight
|
2020-02-13 14:27:13 +01:00 |
|
Virginie Ky
|
22e797ad27
|
update snapshots
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-13 14:26:37 +01:00 |
|
virginieky
|
8d36b69507
|
Merge branch 'front/ui-improvements' into front/font-weight
|
2020-02-13 13:46:49 +01:00 |
|
cyril lopez
|
021f88c88f
|
Merge pull request #5241 from strapi/front/trash-icon
Generalize all trash icon
|
2020-02-13 13:31:07 +01:00 |
|
Virginie Ky
|
fb55ce3426
|
clean
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-13 11:36:19 +01:00 |
|
Virginie Ky
|
138bbae981
|
generalize all trash icons
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-13 11:29:01 +01:00 |
|
Virginie Ky
|
8e1fe9cfe5
|
update snapshots
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-13 10:36:09 +01:00 |
|
Virginie Ky
|
25f83878da
|
upload list trash icon
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-12 16:22:25 +01:00 |
|
Virginie Ky
|
7e5a0fb665
|
update snapshots
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-12 15:55:27 +01:00 |
|
Virginie Ky
|
8269f71bb6
|
Merge branch 'front/ui-improvements' into front/font-weight
|
2020-02-12 13:55:46 +01:00 |
|
Virginie Ky
|
f152ea9af9
|
Merge branch 'develop' into front/ui-improvements
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-12 13:55:13 +01:00 |
|
Virginie Ky
|
540830a7a6
|
Merge branch 'develop' of github.com:strapi/strapi into develop
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-12 13:53:51 +01:00 |
|
Virginie Ky
|
6e4dbf6394
|
Merge branch 'develop' of github.com:strapi/strapi into front/font-weight
|
2020-02-12 13:51:27 +01:00 |
|
Virginie Ky
|
d75247f441
|
trash icons ip
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-12 12:24:35 +01:00 |
|
Virginie Ky
|
6bf218abbf
|
clean
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-11 17:18:12 +01:00 |
|
Virginie Ky
|
45ecaec15c
|
font-weight and alignment
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-11 17:12:40 +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 |
|
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 |
|