33691 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Derrick Mehaffy	457e689297	Add GraphQL-Type-Long to types	2019-04-05 05:51:09 -07:00
soupette	4e11597e1f	Remove threshold	2019-04-05 11:39:05 +02:00
soupette	f37f740aba	Fix PR feedback	2019-04-05 00:50:14 +02:00
soupette	55d0fbfeea	Remove the modal s auto opening after the submit of an edited field	2019-04-05 00:46:25 +02:00
soupette	04e7ff65c0	Fixes #2490	2019-04-05 00:35:12 +02:00
soupette	0e3632b8b2	Fixes #3054	2019-04-05 00:10:06 +02:00
soupette	f344a1082a	Fixes #3085	2019-04-04 23:41:53 +02:00
soupette	0375cec220	Merge branch 'improve/ctb' of github.com:strapi/strapi into good-old-issues-fixing-before-the-beta	2019-04-04 23:35:08 +02:00
soupette	c62da404a5	Merge branch 'improve/ctb' of github.com:strapi/strapi into improve/ctb	2019-04-04 19:28:25 +02:00
soupette	441a140106	Fix order on edit attribute	2019-04-04 19:27:31 +02:00
Jim LAURIE	500374d6c0	Merge pull request #3070 from strapi/front/admin-new-hook-architecture-update-generators ... Front/admin new hook architecture update generators	2019-04-04 14:09:24 +02:00
soupette	1af75af8f0	Remove Loadable	2019-04-04 13:49:46 +02:00
Alexandre Bodin	865664315f	Apply feedbacks	2019-04-04 12:41:57 +02:00
Alexandre Bodin	7c6206f1a2	Remove old code	2019-04-04 12:41:57 +02:00
Alexandre Bodin	72e7d34a14	Use SQL alias to allow for the same table name multiple times in the same query	2019-04-04 12:41:57 +02:00
Jim LAURIE	196fa038bd	Merge pull request #2961 from strapi/feature/deep-filtering-mongoose-bookshelf ... Deep filtering	2019-04-04 12:40:58 +02:00
Jim LAURIE	abece404ca	Merge branch 'master' into feature/deep-filtering-mongoose-bookshelf	2019-04-04 12:06:12 +02:00
soupette	90682b9106	Fix conflicts	2019-04-03 19:37:38 +02:00
soupette	fcbd7f9ec6	Fix cypress test	2019-04-03 19:02:19 +02:00
soupette	59587d02cd	Fix forgot password views	2019-04-03 17:26:31 +02:00
soupette	c8d269aeca	Fix MarketPlace and plugin documentation proptypes error	2019-04-03 17:06:07 +02:00
soupette	44a00f9c75	Add all features to the new Admin container	2019-04-03 16:40:15 +02:00
Jim LAURIE	3ca5c28450	Merge pull request #3051 from MunGell/master ... Update CONTRIBUTING.md with fixes of minor typos	2019-04-03 15:45:47 +02:00
Jim LAURIE	bde7847a9b	Merge branch 'master' into master	2019-04-03 15:45:38 +02:00
Jim LAURIE	1a0e1d3bb8	Trim	2019-04-03 15:45:13 +02:00
Jim LAURIE	2f524b9553	Merge pull request #3037 from strapi/enhance/db-event ... Run the database event if the connection is established	2019-04-03 15:41:16 +02:00
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