1307 Commits

Author	SHA1	Message	Date
Brenda Wallace	17236a4a8a	Garden thumbnail display cleanup	2017-04-16 13:48:22 +12: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	63cee1edc9	Back to reading @garden.plantings	2017-03-29 08:21:02 +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	1601e966ad	Planting.interesting is in a scope	2017-03-24 16:59:09 +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
Daniel O'Connor	4a20f68d3a	Merge branch 'dev' into plantings-harvests	2017-03-16 09:40:56 +10:30
Daniel O'Connor	12254fe0ca	Merge pull request #1275 from Br3nda/bw/discourse-removal ... Removing references to Discourse (talk.growstuff.org)	2017-03-16 09:36:29 +10:30
Shiny	8d04d4b223	Merge branch 'dev' into plantings-harvests	2017-03-15 23:10:15 +13:00
Thomas Countz	fa49234669	remove "add new garden" on other member's page (#1283) ... * update garden#show view logic * added name to contributors Closes #1167	2017-03-15 23:06:32 +13:00
Brenda Wallace	c89c20e842	View harvests for a planting	2017-03-12 14:44:11 +13:00
Brenda Wallace	8267b7d16d	Removing references to Discource (talk.growstuff.org) ... and adding one link to github issues.	2017-03-12 10:51:25 +13:00
pozorvlak	7c0d6c04df	Merge branch 'dev' into bw/harvest-planting-link	2017-02-13 22:39:15 +00:00
Brenda Wallace	06ea3db252	Use .field to format planting options on harvests	2017-02-13 17:30:41 +13:00
Brenda Wallace	8d24ffbffb	spec for harvesting from a planting	2017-02-13 17:21:11 +13:00
Brenda Wallace	cce9f513db	Linking existing harvests to a planting	2017-02-13 17:21:11 +13:00
Brenda Wallace	c37ba9f041	Use @harvest.planting, instead of @planting	2017-02-13 17:21:11 +13:00
Brenda Wallace	65024d8f83	Moved hash in haml onto one line, for clarity and glory	2017-02-12 20:41:25 +00:00
Brenda Wallace	8b4491d0ab	Tabulation on wrapped form_for	2017-02-13 07:38:26 +13:00
Brenda Wallace	93202fc13c	haml clean up for devise views	2017-02-13 07:34:41 +13:00
Brenda Wallace	0f520c0928	More haml clean up for home views	2017-02-13 07:34:31 +13:00
Brenda Wallace	21c989989c	add missing new line at end of haml file	2017-02-13 07:34:13 +13:00
Brenda Wallace	123c34b6d1	Haml cleanup for layout	2017-02-13 07:33:48 +13:00
Brenda Wallace	f5e786401d	fixed typo	2017-02-13 07:32:43 +13:00
Brenda Wallace	6ecb919f34	haml clean ups for members views	2017-02-13 07:32:43 +13:00
Brenda Wallace	c89d1ae94e	Haml clean ups for plantings views	2017-02-13 07:32:43 +13:00
Brenda Wallace	9b7a7d3e8f	Haml clean up for product views	2017-02-13 07:32:43 +13:00
Brenda Wallace	9ebe830402	Haml clean up for scientific names views	2017-02-13 07:32:43 +13:00
Brenda Wallace	9a0adadc9a	Haml clean up for seeds views	2017-02-13 07:32:43 +13:00
Brenda Wallace	92c3976f0a	Haml clean up for shared views	2017-02-13 07:32:43 +13:00
Brenda Wallace	c82f47bdda	Pass the ID from link to likesdestroy	2017-02-12 15:34:28 +13:00
Brenda Wallace	6afb12c157	Split up big methods in like controller	2017-02-12 15:23:58 +13:00
Brenda Wallace	6b8474e01b	Checks for cancan ability before allowing like	2017-02-12 15:23:58 +13:00
Brenda Wallace	cf9e5a6652	Adding alternate names to admin menu	2017-02-11 19:45:53 +13:00
Mackenzie	36768cf384	Merge pull request #1194 from Br3nda/bw/grand-haml-cleanup-of-2017 ... More haml clean up	2017-02-08 22:46:34 -05:00
Brenda Wallace	c8405830c7	Added strip_tags before processing markdown	2017-02-09 03:29:18 +00:00
Shiny	6bc9f775c2	Merge branch 'dev' into bw/grand-haml-cleanup-of-2017	2017-02-09 10:23:01 +13:00
Brenda Wallace	6f74566d47	Truncate, escape, and DRY og:description fields	2017-02-08 09:49:19 +13:00
Brenda Wallace	82ce6c8222	Haml clean up for seeds views	2017-02-08 08:52:46 +13:00
Brenda Wallace	f96f459595	Moved title logic into application helper ... For harvests, plantings, and seeds	2017-02-08 07:25:59 +13:00
Brenda Wallace	e6254da3f1	Haml clean up for Roles views	2017-02-08 07:25:59 +13:00
Brenda Wallace	acbb610e05	Haml clean up for posts views	2017-02-08 07:25:59 +13:00
Brenda Wallace	338265d9e9	Haml cleanup for plantings views	2017-02-08 07:25:59 +13:00
Brenda Wallace	706922cacf	Haml clean up for plantparts views	2017-02-08 07:25:59 +13:00
Brenda Wallace	08f2877f8e	Haml clean up for places views	2017-02-08 07:25:59 +13:00
Brenda Wallace	2c3d1848d5	Haml clean up for photos	2017-02-08 07:25:59 +13:00
Brenda Wallace	17e88778c8	Haml clean up for orders	2017-02-08 07:25:59 +13:00
Brenda Wallace	bafb0123da	Haml cleanup for notifier	2017-02-08 07:25:59 +13:00