29765 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Paolo Ragone	09530e11cd	Merge branch 'master' into update_knex	2019-01-21 22:24:41 +13:00
Ahmed El Sayegh	632814caa4	Add public/uploads folder to generated gitignore	2019-01-21 01:12:05 +02:00
soupette	4a160b04fd	Fixes #1960	2019-01-20 14:21:38 +01:00
soupette	7e79864259	Split content-manager setting view into tabs. ... Allow to change the textarea type so the wysiwyg can be displayed without having to set it back in the content type builder. Fixes #2307	2019-01-20 12:52:08 +01:00
Jim LAURIE	80d13dff9c	Merge pull request #2655 from strapi/funnel ... Add listeners to events	2019-01-18 18:58:11 +01:00
Aurélien Georget	f534340ca2	Add listeners to events	2019-01-18 16:08:15 +01:00
Divyansh Batham	c9e48860b1	Update controllers.md (Grammatical Mistake) ... "... the server will *called* the index action..." => "... the server will **call** the index action..."	2019-01-18 03:04:42 +05:30
tthenne	ebef2ec0f0	added attachment option to mailgun msg object in order to send attachments	2019-01-17 10:55:29 -06:00
soupette	925438d7b5	Fixes #2541	2019-01-17 17:18:54 +01:00
Paolo Ragone	239835f0ae	Requested change	2019-01-17 22:24:09 +13:00
Paolo Ragone	c72e4bd1e5	Merge branch 'master' into update_knex	2019-01-17 22:19:15 +13:00
Paolo Ragone	d39031605c	Merge branch 'master' into lint_improvement	2019-01-17 22:18:33 +13:00
Roman Ponomarev	c9145ae690	Update webhooks.md	2019-01-16 19:28:18 +03:00
Aurélien Georget	176aa52df0	Avoid duplicate loaders	2019-01-16 17:26:15 +01:00
Abdón Rodríguez Davila	b337a82748	Update graphql dependency to v14.1.0	2019-01-16 15:41:14 +01:00
Abdón Rodríguez Davila	37c942915e	Avoid write files if production mode	2019-01-16 14:58:50 +01:00
Aurélien Georget	c8a0e51729	Fix where constraint in GraphQL query	2019-01-16 12:24:29 +01:00
Jim LAURIE	94c2f0e999	Merge pull request #2634 from strapi/3.0.0-alpha.19 ... 3.0.0 alpha.19	2019-01-16 11:53:49 +01:00
Jim LAURIE	c3c24ca7ad	3.0.0-alpha.19 v3.0.0-alpha.19	2019-01-16 11:49:16 +01:00
Jim LAURIE	72d0f771ed	Add migration guide alpha.19	2019-01-16 11:48:21 +01:00
Jim LAURIE	f83c0f760f	Merge pull request #2632 from projik/master ... Incorrect params variable name in user update	2019-01-16 10:53:16 +01:00
David Baxter	c01124388d	Incorrect params variable name in user update	2019-01-16 14:39:24 +11:00
Jim LAURIE	0f33ace567	Merge pull request #2589 from denisinvader/admin-russian-locale-fixes ... Update RU translations	2019-01-15 20:29:30 +01:00
Jim LAURIE	712e997c54	Merge branch 'master' into admin-russian-locale-fixes	2019-01-15 20:29:21 +01:00
Aurélien Georget	332cfdacab	Apply PR's feedback	2019-01-15 17:16:28 +01:00
Martin Muzatko	cf33f01606	fixed link	2019-01-15 13:32:23 +01:00
Martin Muzatko	dd5ebdf46f	Add note about docker to deployment	2019-01-15 13:29:39 +01:00
Jim LAURIE	6806115de9	Merge pull request #2615 from mohamead/master ... Fix connection issue with Heroku Postgres	2019-01-15 11:50:59 +01:00
Jim LAURIE	291793256e	Merge branch 'master' into master	2019-01-15 11:49:26 +01:00
Jim LAURIE	9246c856b3	Fix condition	2019-01-15 11:45:36 +01:00
Jim LAURIE	a11b4842fe	Apply the correct value by db	2019-01-15 11:26:26 +01:00
Jim LAURIE	4f664f2ea7	Merge pull request #2578 from patrickblackjr/patch-3 ... More friendly / grammar updates	2019-01-15 11:16:49 +01:00
Jim LAURIE	00cf2a848f	Merge branch 'master' into patch-3	2019-01-15 11:16:42 +01:00
Jim LAURIE	04ecaeeb2d	Merge pull request #2575 from patrickblackjr/patch-1 ... Grammar improvements to the installation docs	2019-01-15 11:16:33 +01:00
Jim LAURIE	b79b88b55c	Merge branch 'master' into patch-1	2019-01-15 11:16:24 +01:00
Paolo Ragone	2a7bc6fcd9	Merge branch 'master' into lint_improvement	2019-01-15 19:22:13 +13:00
Paolo Ragone	b393f3edea	Merge branch 'master' into update_knex	2019-01-15 19:18:12 +13:00
Aurélien Georget	410d4ba747	Remove blank space	2019-01-14 19:54:46 +01:00
Aurélien Georget	5df5933ec4	Fix loader name	2019-01-14 19:36:35 +01:00
Jim LAURIE	2b4ad00095	Merge pull request #2590 from denisinvader/admin-logout-component-intl ... Add intl support in logout component	2019-01-14 14:33:25 +01:00
Jim LAURIE	45acd75d1c	Merge branch 'master' into admin-logout-component-intl	2019-01-14 14:33:07 +01:00
Jim LAURIE	c1d4f5a1c3	Merge pull request #2612 from strapi/documentation-link ... Add Documentation and Help links	2019-01-14 09:58:00 +01:00
Jim LAURIE	071e0e0344	Merge branch 'master' into documentation-link	2019-01-14 09:57:51 +01:00
Jim LAURIE	325fe9f1bd	Merge pull request #2618 from AndroAmater/patch-1 ... Update graphql.md	2019-01-13 18:12:13 +01:00
AndroAmater	0b5421dc29	Update graphql.md ... "Lower than or equal to" repeats twice so on line 197 it says "`<field>_gte`: Lower than or equal to.	2019-01-12 19:12:46 +01:00
Paolo Ragone	69370f98a5	Merge branch 'master' into lint_improvement	2019-01-12 22:24:23 +13:00
invader	4b27e6f2e7	admin: rename 'Конструктор Типов Контента' to 'Типы контента' in left menu for Russian translation	2019-01-12 02:39:18 +03:00
invader	a85ea98e8b	admin: update Russian translations in upload plugin	2019-01-12 02:25:27 +03:00
invader	9fe2f358d4	admin: update Russian translations for settings manager plugin	2019-01-12 02:22:45 +03:00
invader	6241c58f17	admin: fix updated Russian translation in documentation plugin	2019-01-12 01:59:22 +03:00