2070 Commits

Author	SHA1	Message	Date
Brenda Wallace	1db30d98ce	Haml clean up for members	2017-02-07 15:35:34 +13:00
Brenda Wallace	23f8c24ef4	Haml clean up for notifications	2017-02-07 14:33:20 +13:00
Brenda Wallace	c8fa54591a	Haml clean for shop	2017-02-07 07:53:34 +13:00
Brenda Wallace	64f11793c9	Fixed typo in link	2017-02-06 16:31:57 +13:00
Brenda Wallace	05a9d498a7	More forums haml clean up	2017-02-06 14:50:49 +13:00
Brenda Wallace	16145599ce	Haml clean up for (most) garden views	2017-02-06 14:46:19 +13:00
Brenda Wallace	af8527aa5b	Haml clean up of forum views	2017-02-06 14:46:19 +13:00
Brenda Wallace	8408fdc845	Moved popular plant plarts calculation into sql	2017-02-06 13:22:18 +13:00
Brenda Wallace	f37c9152af	Simplified the "grown for" view	2017-02-06 11:21:33 +13:00
Brenda Wallace	4ee789ca06	Popular plant parts are now sorted by popularity	2017-02-06 10:59:40 +13:00
Brenda Wallace	80371c835c	Moved long line (ebay url) to helper	2017-02-06 10:40:58 +13:00
Brenda Wallace	6478d9cb1b	Haml clean up for crops views	2017-02-06 10:31:45 +13:00
pozorvlak	f8b84f390d	Calculate "count_uses_of_property" using DB query (#1183) ... * Refactor 'count_uses_of_property' method in crop model * Add check for nil column value * Add @alran to CONTRIBUTORS.md * Reformat Crop#count_uses_of_property * Remove unnecessary string interpolation	2017-02-05 13:23:47 +13:00
Shiny	9deed09d36	Merge branch 'dev' into bw/grand-haml-cleanup-of-2017	2017-02-05 11:01:46 +13:00
Brenda Wallace	2b7144c1fd	Fixed trailing quote in haml	2017-02-04 15:07:18 +13:00
Brenda Wallace	8ddf36fed9	Haml clean up for (some of) crops views	2017-02-04 15:04:07 +13:00
Brenda Wallace	785ae33a42	Haml clean up for comments views	2017-02-04 14:07:59 +13:00
Brenda Wallace	c43c1686a3	Haml clean up for alternate_names views	2017-02-04 13:50:04 +13:00
Brenda Wallace	65a8bde467	Haml clean up for admin views	2017-02-04 12:00:42 +13:00
Brenda Wallace	3647f67538	Haml clean up for accounts views	2017-02-04 11:52:15 +13:00
Brenda Wallace	6c4f7eff92	Haml clean up for account_types views	2017-02-04 11:50:33 +13:00
Brenda Wallace	e5d826e8c3	Further simplified newsletter subscription logic	2017-02-04 11:28:37 +13:00
Brenda Wallace	77c01d4f66	BUGFIX: Added missing if	2017-02-04 11:23:27 +13:00
Brenda Wallace	33b7952ed3	Simplified OmniauthCallbacksController	2017-02-04 11:21:15 +13:00
Brenda Wallace	1217ba5b48	Reduce complexity of ApplicationController.store_location	2017-02-04 11:19:11 +13:00
Brenda Wallace	ffee6ada83	Simplify member.update_newsletter_subscription	2017-02-04 11:18:00 +13:00
pozorvlak	3e81419e78	Merge branch 'dev' into bw/plantingshelper-simplify	2017-02-03 12:08:54 +00:00
Brenda Wallace	19aa3a1ca4	PlantingsHelper simplification	2017-02-03 20:42:15 +13:00
Shiny	e574ee166c	Merge branch 'dev' into bw/seeds-controller-complexity	2017-02-03 20:32:29 +13:00
pozorvlak	909164ea70	Merge branch 'dev' into bw/inactive-gardens	2017-02-02 22:40:21 +00:00
Shiny	2424e7de87	Merge branch 'dev' into bw/inactive-gardens	2017-02-02 14:48:31 +13:00
Shiny	d367b44da1	Merge branch 'dev' into bw/plantings-controller-complexity	2017-02-02 14:48:14 +13:00
Shiny	fe999d7170	Merge branch 'dev' into bw/seeds-controller-complexity	2017-02-02 14:47:10 +13:00
Brenda Wallace	355419b6cb	Reduce complexity of seeds controller	2017-02-02 00:01:48 +00:00
Brenda Wallace	dfa23a6564	Simplified harvest.to_s	2017-02-01 23:55:45 +00:00
Brenda Wallace	9099ee5779	Reduce complexity of plantings controller	2017-02-01 23:51:14 +00:00
Brenda Wallace	666394906b	Active gardens only on profiles	2017-02-01 17:37:03 +13:00
Brenda Wallace	150393b1c3	Show only active gardens by default	2017-02-01 17:37:03 +13:00
Daniel O'Connor	15106a051c	Merge branch 'dev' into likeable	2017-01-27 12:05:13 +10:30
Daniel O'Connor	43519809f5	Merge branch 'dev' into bw/bar_graphs	2017-01-27 11:54:12 +10:30
Shiny	7731623397	Merge branch 'dev' into likeable	2017-01-27 14:21:53 +13:00
Daniel O'Connor	271242eca9	Merge branch 'dev' into bw/bar_graphs	2017-01-25 13:00:25 +10:30
Daniel O'Connor	a607fdc6ec	Merge branch 'dev' into likeable	2017-01-25 12:58:55 +10:30
Daniel O'Connor	6d1bdf9ae1	Merge branch 'dev' into bw/pending-crops	2017-01-25 12:55:13 +10:30
Shiny	b80e7f677c	Merge branch 'dev' into likeable	2017-01-24 19:44:42 +13:00
Shiny	76af02f2a5	Merge branch 'dev' into bw/bar_graphs	2017-01-23 20:18:19 +13:00
Shiny	346970b471	Merge branch 'dev' into bw/pending-crops	2017-01-23 20:17:44 +13:00
Shiny	e6d3c257e8	Merge branch 'dev' into bw/link-from-harvest-to-planting	2017-01-23 20:17:34 +13:00
Brenda Wallace	dd9a0071d2	Link from harvest to planting, instead of garden	2017-01-23 09:58:25 +13:00
Brenda Wallace	4fedc7f23f	Member can see crops they have requested	2017-01-23 09:49:47 +13:00