4107 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel O'Connor	4e400cc899	Merge pull request #1295 from Growstuff/bundle-update-2017-03-30-121732 ... Bundle Update on 2017-03-30	2017-03-31 16:27:43 +10:00
Daniel O'Connor	3cead5fb6b	Pin to earlier rubocop	2017-03-31 16:15:55 +10:00
Shiny	1decf6ea11	Merge branch 'dev' into bundle-update-2017-03-30-121732	2017-03-30 21:37:57 +13:00
Harry Brodsky	23c0f901c6	Add name to CONTRIBUTORS.md	2017-03-30 19:15:48 +13:00
Harry Brodsky	78f4b3dbf3	Update irregular crop pluralizations	2017-03-30 19:15:48 +13:00
deppbot	9340b8d7e5	Bundle Update on 2017-03-30	2017-03-30 12:17:33 +08:00
pozorvlak	0094473bbe	Merge pull request #1287 from Br3nda/bw/readme-new-contributors ... Readme update for new contributors - force-merging because it only touches README.md.	2017-03-28 23:56:37 +01:00
pozorvlak	743f482818	Merge pull request #1292 from Br3nda/query-optimising ... Query optimising	2017-03-28 23:55:05 +01:00
Brenda Wallace	b8ea6116d4	Add photos to plantings to make them interesting in the spec	2017-03-29 10:46:15 +13:00
Brenda Wallace	2521e52d71	Remove test called to Planting.interesting(...) ... Interesting plantings with no photos is not used in the code. The method was converted to a scope.	2017-03-29 08:28:58 +13:00
Brenda Wallace	d44f9ef4e9	Removed assignment of useless variable	2017-03-29 08:21:34 +13:00
Brenda Wallace	63cee1edc9	Back to reading @garden.plantings	2017-03-29 08:21:02 +13:00
Brenda Wallace	3791b34fe3	One planting per owner (used for intersetingness)	2017-03-28 22:39:03 +13:00
Brenda Wallace	5d58be110e	Fixed crop.interesting, no more duplicate crops	2017-03-28 19:33:34 +13:00
Brenda Wallace	911593b480	Reduces query numbes on gardens#show	2017-03-24 21:10:45 +13:00
Shiny	b72a3d6942	Merge branch 'dev' into query-optimising	2017-03-24 18:31:18 +13:00
Brenda Wallace	804ac8662a	Rubocop fix ups	2017-03-24 17:29:39 +13:00
Brenda Wallace	1601e966ad	Planting.interesting is in a scope	2017-03-24 16:59:09 +13:00
Brenda Wallace	e7553868f2	Removed variables on homes controller ... following the comment there	2017-03-24 16:57:51 +13:00
Brenda Wallace	5e8ca392d2	Moved Member.interest near top of file	2017-03-24 16:45:55 +13:00
Brenda Wallace	815915d933	Loading child records of interesting crops	2017-03-24 16:45:36 +13:00
Brenda Wallace	6223076dae	Pull in interesting members data in controller	2017-03-24 16:30:56 +13:00
Brenda Wallace	0182a99654	Optimising Member.interesting	2017-03-24 16:28:37 +13:00
Brenda Wallace	5baa357bb3	Use bullet to find queries to optomise	2017-03-24 16:07:05 +13:00
deppbot	0fb4d74685	Bundle Update on 2017-03-24	2017-03-24 09:24:40 +13:00
Daniel O'Connor	eebaef6fde	Merge branch 'dev' into bw/readme-new-contributors	2017-03-21 14:03:22 +10:30
Daniel O'Connor	59fc550f3c	Merge pull request #1290 from Growstuff/bundle-update-2017-03-19-161121 ... Bundle Update on 2017-03-19	2017-03-20 14:15:06 +10:30
Shiny	64ffaab1ec	Merge branch 'dev' into bundle-update-2017-03-19-161121	2017-03-20 10:01:48 +13:00
Cesy	21f53e362f	Merge pull request #1279 from Br3nda/plantings-harvests ... View harvests for a planting	2017-03-19 09:46:57 +00:00
deppbot	20cfa0c5b2	Bundle Update on 2017-03-19	2017-03-19 16:11:22 +08:00
Shiny	204633d533	Merge branch 'dev' into bw/readme-new-contributors	2017-03-18 14:21:43 +13:00
Shiny	c77ed8c6d0	Merge branch 'dev' into plantings-harvests	2017-03-17 08:18:56 +13:00
Shiny	fe7ae18e7b	Merge pull request #1285 from Growstuff/add-contributor-megan ... Added Megan to contributors	2017-03-17 08:13:03 +13:00
Shiny	8746cc67e2	Merge branch 'dev' into plantings-harvests	2017-03-17 08:11:33 +13:00
Shiny	f1feb59818	Merge branch 'dev' into add-contributor-megan	2017-03-17 08:10:32 +13:00
Shiny	bb62b11070	Merge branch 'dev' into bw/readme-new-contributors	2017-03-16 21:15:30 +13:00
deppbot	1660d54c01	Bundle Update on 2017-03-16	2017-03-16 21:15:11 +13:00
Shiny	cb7715b6d9	Merge branch 'dev' into bw/readme-new-contributors	2017-03-16 15:35:22 +13:00
Shiny	a60d0faedd	Merge branch 'dev' into add-contributor-megan	2017-03-16 15:35:15 +13:00
Shiny	7f592579cd	Merge branch 'dev' into plantings-harvests	2017-03-16 15:35:06 +13:00
Brenda Wallace	998befb30f	Limited plantings to member's own garden, and approved crops	2017-03-16 15:29:25 +13:00
Shiny	ebbf6df87d	Merge branch 'dev' into plantings-harvests	2017-03-16 14:59:54 +13:00
Shiny	40e4f8df8a	Merge branch 'dev' into add-contributor-megan	2017-03-16 14:59:26 +13:00
Brenda Wallace	81d41398a2	Link to waffle from readme	2017-03-16 14:55:30 +13:00
Brenda Wallace	4f02f45ae8	Updated wiki link	2017-03-16 14:55:22 +13:00
Arun Kumar	f7ec1826b0	Use presence instead of regex validation	2017-03-16 13:27:13 +13:00
Shiny	d619cd160d	Added Megan to contributors	2017-03-16 13:04:31 +13:00
Daniel O'Connor	4a20f68d3a	Merge branch 'dev' into plantings-harvests	2017-03-16 09:40:56 +10:30
Daniel O'Connor	62d2b5e9fb	Merge pull request #1273 from Br3nda/yaml-cleanup ... Yaml file clean up	2017-03-16 09:39:33 +10:30
Daniel O'Connor	5935d2e73f	Merge pull request #1276 from Br3nda/bw/install-linters ... Install npm modules locally	2017-03-16 09:38:54 +10:30