29765 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jim LAURIE	7aecbc3665	Merge branch 'master' into enhance/db-event	2019-04-03 15:41:08 +02:00
Jim LAURIE	c511aa6eff	Merge pull request #3003 from abdonrd/patch-2 ... Remove duplicated server	2019-04-03 15:39:41 +02:00
Jim LAURIE	f28fed0e69	Merge branch 'master' into patch-2	2019-04-03 15:39:33 +02:00
Jim LAURIE	f7fbd205f8	Merge pull request #3032 from siddhartha-crypto/patch-1 ... Community link is broken	2019-04-03 15:38:27 +02:00
Jim LAURIE	3ade552b08	Merge branch 'master' into patch-1	2019-04-03 15:38:19 +02:00
Jim LAURIE	d19cbbacf0	Merge branch 'master' into feature/deep-filtering-mongoose-bookshelf	2019-04-03 15:35:36 +02:00
soupette	d4027f7064	Pass store to the app	2019-04-03 14:18:56 +02:00
soupette	86fc4d59e3	Merge branch 'master' of github.com:strapi/strapi into front/admin-new-hook-architecture	2019-04-03 14:17:56 +02:00
soupette	5d0427e6c6	Update register plugin	2019-04-03 14:15:51 +02:00
soupette	95f936c8ce	Add Onboarding in new Admin container	2019-04-03 14:10:42 +02:00
Jim LAURIE	b73c69076e	Merge branch 'master' into master	2019-04-03 14:01:51 +02:00
Jim LAURIE	3c567e8378	Merge branch 'master' into improve/ctb	2019-04-03 13:51:03 +02:00
Jim LAURIE	a8a59678fe	Merge pull request #2999 from abdonrd/patch-1 ... Added comment to improve linting of generated service files	2019-04-03 13:47:33 +02:00
Jim LAURIE	ba1c198c5f	Merge branch 'master' into patch-1	2019-04-03 13:47:25 +02:00
Jim LAURIE	61a4d68272	Merge pull request #3010 from strapi/fix/travis-build ... Run snyk only on non fork repo	2019-04-03 13:46:57 +02:00
soupette	ea54bbd1dd	Merge branch 'improve/ctb' of github.com:strapi/strapi into improve/ctb	2019-04-03 13:28:43 +02:00
soupette	b2b5535137	Remove useless file	2019-04-03 13:28:06 +02:00
soupette	4a18512122	Fix plugins.toJS in all plugins	2019-04-03 13:22:50 +02:00
soupette	0c01ea2121	Fix menu	2019-04-03 13:18:43 +02:00
soupette	afbb2b8da1	Fix load plugin	2019-04-03 13:05:18 +02:00
Jim LAURIE	b4fc5746bb	Merge branch 'master' into fix/travis-build	2019-04-03 12:40:23 +02:00
Jim LAURIE	e2d2bd1cef	Merge branch 'master' into patch-1	2019-04-03 12:26:48 +02:00
Jim LAURIE	2c394225a0	Merge pull request #3077 from strapi/improve/ctb-feedback ... Fix CTB feedback	2019-04-03 11:23:10 +02:00
Jim LAURIE	0451b3f57a	Merge pull request #3079 from strapi/pause-pullrequests ... Add PR merge pause	2019-04-03 10:10:22 +02:00
Jim LAURIE	2fabe80c6f	Merge branch 'master' into pause-pullrequests	2019-04-03 10:10:11 +02:00
Alexandr	ede6892c5c	Possibility to configure api host ... Mailgun has two api endpoints: api.eu.mailgun.net and api.mailgun.net (default). We should have possibility to configure it.	2019-04-02 23:46:49 +03:00
soupette	d6a3184fd7	Improve fetch main data	2019-04-02 22:45:21 +02:00
soupette	661a89642b	Created Admin and PluginDispatcher containers, update the history dependency to remove the error log in the console	2019-04-02 21:23:42 +02:00
soupette	0f554234d8	Created PluginDispatcher component	2019-04-02 20:11:31 +02:00
Jim LAURIE	f0eaa58d8d	Add PR merge pause	2019-04-02 20:02:09 +02:00
soupette	51836b1471	Merge branch 'improve/ctb-feedback' of github.com:strapi/strapi into front/admin-new-hook-architecture-admin-rework	2019-04-02 19:54:50 +02:00
soupette	3494f49cfc	Fix Immutable and associated tests	2019-04-02 19:50:41 +02:00
soupette	f99850ea8d	Fix delete model	2019-04-02 18:45:47 +02:00
soupette	b8c9c0ef3e	Created the injectHooks HOC	2019-04-02 17:48:19 +02:00
soupette	e1977d28ca	Add test to App container	2019-04-02 17:44:25 +02:00
Jim LAURIE	798c6d1d5d	Merge pull request #3029 from strapi/fix/3000 ... Fix Blue button	2019-04-02 17:09:33 +02:00
Jim LAURIE	82e2079d54	Merge branch 'master' into fix/3000	2019-04-02 17:09:25 +02:00
soupette	be95294bdc	Add lifecycles to all plugins	2019-04-02 14:17:01 +02:00
soupette	55ac5d5179	Add initializer container to all plugins	2019-04-02 14:06:44 +02:00
soupette	efc889725e	Fix conflicts	2019-04-02 13:46:29 +02:00
soupette	3053a01e3b	Update generators to the new architecture	2019-04-02 13:45:00 +02:00
soupette	0cd5473675	Update generators to the new architecture	2019-04-02 13:30:35 +02:00
Nguyen Tung	5d31784918	enable Sendgrid Transactional Template	2019-04-01 15:38:10 +07:00
Shmavon Gazanchyan	b2510198c1	Update CONTRIBUTING.md with fixes of minor typos	2019-03-30 19:13:22 +00:00
Alexandre BODIN	82e6b8d52d	Merge branch 'master' into feature/deep-filtering-mongoose-bookshelf	2019-03-30 10:23:21 +01:00
Alexandre Bodin	9bc56a3535	Apply review changes	2019-03-29 16:53:25 +01:00
soupette	67099a676a	Fix PR feedback	2019-03-29 16:33:05 +01:00
soupette	4b483ce6d8	Merge branch 'master' of github.com:strapi/strapi into improve/ctb	2019-03-29 15:56:53 +01:00
Derrick Mehaffy	73f215f0ba	PR Feedback fixes	2019-03-29 06:58:32 -07:00
Jim LAURIE	1845353a02	Merge pull request #3038 from strapi/stm/remove-react-select ... Fix languages in settings manager	2019-03-29 14:33:44 +01:00