9273 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
soupette	c17538d2a4	Merge branch 'master' of github.com:strapi/strapi into improve/ctb	2019-03-27 18:53:35 +01:00
soupette	61e5e85730	Remove Cypress test because we will need to rewrite them for the repeatable fields	2019-03-27 18:50:24 +01:00
soupette	77115d93a1	Fix PR feedback	2019-03-27 18:37:53 +01:00
soupette	b98905a394	Test RelationForm	2019-03-27 18:24:51 +01:00
soupette	a3419da594	Fix order and update on relations	2019-03-27 15:20:45 +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
soupette	f327143ec7	Fixes #3000	2019-03-26 20:54:16 +01:00
soupette	0938c73e60	Fix attributes order	2019-03-26 18:50:07 +01:00
Jim LAURIE	114ac4a30d	Merge pull request #3027 from strapi/update/readme ... Update README to remove confusion on GitHub issues	2019-03-26 17:36:21 +01:00
DMehaffy	0f61590423	Update ReadMe to remove confusion on Github issues	2019-03-26 08:35:28 -07:00
Alexandre Bodin	3098309369	Use mongoose.find on simple queries for a perf boost	2019-03-26 14:57:02 +01:00
Alexandre Bodin	aee779c751	Try to use mongo 3.6.6 on travis to allow for new lookup feature	2019-03-26 08:57:50 +01:00
soupette	d2f50f7bae	Fix relations	2019-03-25 19:08:17 +01:00
Alexandre Bodin	ed0181b733	Avoid test failure on sql until we rework the graphql plugin	2019-03-25 18:04:18 +01:00
Alexandre Bodin	853e76884a	Remove moved cypress test files for now	2019-03-25 16:44:40 +01:00
Alexandre Bodin	0c5b255e75	Fix graphql loaders and add some e2e graphql tests	2019-03-25 16:37:46 +01:00
soupette	618d8afa4d	Fix edit attr	2019-03-25 13:02:00 +01:00
soupette	cde09a20e8	Allow to set values per line in the enum field	2019-03-25 12:36:04 +01:00
soupette	2b4396151c	Fix build	2019-03-25 12:15:44 +01:00
soupette	a861ee2fb5	Remove all useless files and add more tests to the app reducer	2019-03-23 13:50:20 +01:00
soupette	bd71c698bb	Finish relations	2019-03-23 12:11:56 +01:00
soupette	be9d94da53	Fix enumeration field	2019-03-23 09:18:11 +01:00
soupette	c1464f73be	Apply desgin feedback	2019-03-23 08:15:06 +01:00