1251 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	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
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	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
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
Brenda Wallace	ff50ec65d0	Merge remote-tracking branch 'upstream/dev' into HEAD	2017-01-22 18:26:29 +13:00
Shiny	714b2580a3	Merge branch 'dev' into bw/bar_graphs	2017-01-18 11:15:09 +13:00
pozorvlak	cc59c4f49b	Merge branch 'dev' into bw/rubocop	2017-01-17 16:47:07 +00:00
Shiny	f8dda12de6	Merge branch 'dev' into bw/active-plantings	2017-01-15 17:36:32 +13:00
Shiny	ab332976da	Merge branch 'dev' into bw/rubocop	2017-01-15 17:36:17 +13:00
Brenda Wallace	0fa9f54c9c	Rename member.has_role? to role?	2017-01-14 20:54:43 +13:00
Brenda Wallace	f214f608ff	Rename member.is_paid? to paid?	2017-01-14 20:51:22 +13:00
Brenda Wallace	477f9669bd	Added nav for plantings	2017-01-14 16:54:37 +13:00
Brenda Wallace	6bdfe5a669	Moved plantings nav bar to own file and simplified	2017-01-14 16:32:03 +13:00
Brenda Wallace	405dfe4bc9	Merge remote-tracking branch 'upstream/dev' into bw/description-photo-links	2017-01-08 21:35:59 +13:00
Shiny	15de4ac08c	Merge branch 'dev' into bw/active-plantings	2017-01-08 11:16:19 +13:00
Shiny	6e535f2403	Merge branch 'dev' into bw/bar_graphs	2017-01-08 11:10:21 +13:00
Brenda Wallace	7f30ce04e0	Garden name (truncated) on front page link	2017-01-07 13:09:35 +13:00
Brenda Wallace	5b633b484b	Fixes link to seeds, and spec for link to seeds	2017-01-07 12:22:28 +13:00
Brenda Wallace	5319d23ee3	Using translations on links from photo page	2017-01-07 12:03:31 +13:00
Brenda Wallace	350c1d4c08	Descriptive links from photo page	2017-01-06 22:25:13 +13:00
Brenda Wallace	283bb76a9e	Link a harvest to a planting, and display	2017-01-04 22:45:49 +13:00
Brenda Wallace	b27b361e2f	Show active plantings by default	2017-01-04 16:25:19 +13:00
Shiny	a95fca3682	Merge branch 'dev' into bw/bar_graphs	2017-01-03 22:42:58 +13:00
Brenda Wallace	881acdccc9	Shortening long garden names on a user's page	2017-01-02 20:54:22 +13:00
Brenda Wallace	3b1753d3d5	Garden's name in link	2017-01-02 20:36:25 +13:00
Daniel O'Connor	fef272e30f	Merge remote-tracking branch 'upstream/dev' into likeable	2016-12-09 11:42:32 +10:30