11333 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Toms Burgmanis	31a9e88a4d	Merge branch 'master' into patch-1	2020-02-20 16:10:53 +02:00
Alexandre BODIN	38da84e5b9	Merge pull request #5276 from strapi/template-pr ... Delete labels from the PR body	2020-02-20 11:37:08 +01:00
Jim LAURIE	d3e05d80fc	enhancement: update pr temaplate ... Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>	2020-02-19 22:38:58 +01:00
Toms Burgmanis	26d6687940	Merge branch 'master' into patch-1	2020-02-19 01:41:06 +02:00
Jim LAURIE	063caa5bbc	Merge pull request #5251 from vitaliytv/patch-1 ... Update RU translations	2020-02-18 16:36:11 +01:00
Jim LAURIE	a28eadf67f	Merge branch 'master' into patch-1	2020-02-18 16:35:59 +01:00
Toms Burgmanis	430505b032	Merge branch 'master' into patch-1	2020-02-18 17:22:23 +02:00
Alexandre BODIN	5164da2191	Merge pull request #5235 from jeremh2/admin-watcher-improvement ... chore(admin): Improve admin file watcher	2020-02-18 11:01:45 +01:00
Alexandre BODIN	92de9e56dd	Merge branch 'master' into admin-watcher-improvement	2020-02-18 11:01:10 +01:00
virginieky	f25caacb1e	Merge branch 'master' into patch-1	2020-02-17 10:20:04 +01:00
cyril lopez	ffe2d80e4c	Merge pull request #5229 from okandas/center-plugin-icons ... enhancement(Row\Content.js): align plugin icons to the center	2020-02-17 08:03:40 +01:00
Toms Burgmanis	b55ce1949e	Fixed incorrect variable being used for left-hand side menu ... Signed-off-by: Toms Burgmanis <toms.burgmanis@gmail.com>	2020-02-16 23:02:29 +02:00
Toms Burgmanis	809432255c	Fix hardcoded styles ... Fixed LeftMenuLinkContainer/Wrapper.js using hardcoded values, instead of the ones defined in Themes/Sizes.js. Signed-off-by: Toms Burgmanis <toms.burgmanis@gmail.com>	2020-02-16 16:49:14 +02:00
Vitalii Tverdokhlib	d4d83fcd56	update ru.json ... sync with last en ( jq -s '.[0] * .[1]' en.json ru.json) Signed-off-by: vitaliytv <vitaliytv@nitralabs.com>	2020-02-16 16:31:42 +02:00
okandas	6c0568909b	enhancement(Row\Content.js): align plugin icons to the center ... Signed-off-by: okandas <okandasjr@gmail.com>	2020-02-14 23:07:42 +02:00
Jeremy Hermelin	db2fdbe102	admin watcher improvement ... Signed-off-by: Jeremy Hermelin <jerem@pukka.io>	2020-02-12 13:39:28 -05: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
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