7418 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
DMehaffy	d1fd29fbdb	one more	2019-04-05 09:41:44 -07:00
DMehaffy	246fa553da	remove _in test	2019-04-05 08:15:33 -07:00
DMehaffy	f92f76dd59	I have no idea if this is right	2019-04-05 07:45:56 -07:00
Derrick Mehaffy	88e1ce2c57	Fix return of long type	2019-04-05 06:17:20 -07:00
Derrick Mehaffy	457e689297	Add GraphQL-Type-Long to types	2019-04-05 05:51:09 -07: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
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
Jim LAURIE	b73c69076e	Merge branch 'master' into master	2019-04-03 14:01:51 +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
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	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
Jim LAURIE	f0eaa58d8d	Add PR merge pause	2019-04-02 20:02:09 +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
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
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
Jim LAURIE	656fa21450	Merge branch 'master' into stm/remove-react-select	2019-03-29 10:20:02 +01:00
Jim LAURIE	ae097ab2a2	Remove console.log	2019-03-29 10:19:30 +01:00
Alexandre Bodin	b08c5bf3d2	Fix relation bug	2019-03-28 23:04:23 +01:00
Siddhartha Crypto	e968e89d03	Fix community link to strapi community	2019-03-28 10:41:50 -08:00
Alexandre BODIN	af66edddf1	Merge branch 'master' into feature/deep-filtering-mongoose-bookshelf	2019-03-28 18:02:22 +01:00
Jim LAURIE	4041e2de4a	Merge branch 'master' into fix/3000	2019-03-28 17:56:49 +01:00
Alexandre Bodin	e435201de4	Move basic type cast to the root buildQuery in strapi-utils	2019-03-28 17:12:43 +01:00
Jim LAURIE	a2b537e90e	Merge pull request #3030 from strapi/fix/generators ... Fix front-end generators plugin	2019-03-28 16:48:49 +01:00
Alexandre Bodin	32254e5aaa	Add bookshelf buildQuery comments	2019-03-28 16:15:25 +01:00
Alexandre Bodin	b93b4e105d	Cleanup tests	2019-03-28 15:10:32 +01:00
Alexandre Bodin	3c70b18451	Update filtering documentation	2019-03-28 14:55:27 +01:00
Alexandre Bodin	b8dc116ff6	Fix relations and graphql nested lookups for both mongo and sql	2019-03-28 12:13:32 +01:00
Alexandre Bodin	aa0ee1b56a	Refactor relations update to fix many to many append ... - Fix loaders / resolvers graphql	2019-03-27 21:32:24 +01:00
soupette	003b9a7ef8	Fixes #1325	2019-03-27 19:30:47 +01:00
Aurélien Georget	b81ba84401	Run the database event if the connection is established	2019-03-27 18:55:18 +01:00
Siddhartha Crypto	41d0b9b45c	Community link is broken ... Couldn't see a community.html file. Maybe you meant to link to Slack?	2019-03-26 21:43:16 -08:00
soupette	ebbe352d90	Fix front-end generators plugin	2019-03-26 21:29:10 +01:00