4522 Commits

Author	SHA1	Message	Date
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
Shiny	26b3e28171	Merge branch 'dev' into bw/garden-display-fix	2017-01-23 09:41:37 +13:00
Brenda Wallace	370938c9f9	change deliver_later to deliver_now, so we don't sys.exit() crash	2017-01-22 21:22:30 +13:00
Brenda Wallace	08d407f041	Fix display of gardens on smaller screens	2017-01-22 20:33:37 +13:00
Shiny	d6de147661	Merge branch 'dev' into bw/bar_graphs	2017-01-22 18:39:53 +13:00
Brenda Wallace	5e61be9853	Merge remote-tracking branch 'upstream/dev' into HEAD	2017-01-22 18:26:38 +13:00
Brenda Wallace	ff50ec65d0	Merge remote-tracking branch 'upstream/dev' into HEAD	2017-01-22 18:26:29 +13:00
Brenda Wallace	a1c74bfdfb	Translations for members controller	2017-01-22 17:36:48 +13:00
Brenda Wallace	2f9453780e	Translations for harvests controller	2017-01-22 17:28:49 +13:00
Brenda Wallace	725ae817d4	Translations for gardens controller	2017-01-22 17:26:30 +13:00
Brenda Wallace	40a981c94d	Removed unnecesary braces on hash args	2017-01-22 15:10:11 +13:00
Shiny	6121a9bc6e	Merge branch 'dev' into bw/translations	2017-01-20 21:05:31 +11:00
Brenda Wallace	b198305d36	Translations for account controller	2017-01-20 22:48:04 +13:00
Brenda Wallace	7d7f5bfda3	Translations for account types	2017-01-20 22:46:12 +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	39888d44e2	Rubocop compliance for the account model	2017-01-14 21:11:02 +13:00
Brenda Wallace	b603bae1a7	Rubocop compliance for the notification model	2017-01-14 21:09:47 +13:00
Brenda Wallace	05db5f3109	Rubocop compliance for the order_item model	2017-01-14 21:08:47 +13:00
Brenda Wallace	ad72ab0ba8	Rubocop compliance for the role model	2017-01-14 21:04:19 +13:00
Brenda Wallace	3beb3974fc	Rubocop compliance for the product model	2017-01-14 21:03:01 +13:00
Brenda Wallace	fa15fd2912	Rubocop compliance for the photo model	2017-01-14 21:01:46 +13:00
Brenda Wallace	78ed7869c5	Rubocop compliance for the member model	2017-01-14 20:57:18 +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	eb70f6dc57	Rubocop compliance for the seed model	2017-01-14 20:48:19 +13:00
Brenda Wallace	43c4b154f9	Rubocop compliance for the follow model	2017-01-14 20:45:54 +13:00
Brenda Wallace	832a20eac9	Rubocop compliance for order model	2017-01-14 20:42:32 +13:00
Brenda Wallace	f6cc0f3e13	rubocop compliance in post model	2017-01-14 20:34:08 +13:00
Brenda Wallace	5be5585084	Rubocop disable Rails/HasAndBelongsToMany	2017-01-14 20:31:34 +13:00
Brenda Wallace	989f176fb7	Crop model adhering to rubocop	2017-01-14 20:09:54 +13:00
Brenda Wallace	be07b5fd0e	Only check values.zero? if they are present	2017-01-14 20:09:09 +13:00
Brenda Wallace	d07509f9e4	Rubocop compliance for comment model	2017-01-14 17:23:39 +13:00
Brenda Wallace	0c1220d11f	Rubocop compliance for harvest model	2017-01-14 17:22:33 +13:00
Brenda Wallace	f889b112fe	Rubocop compliance for garden model	2017-01-14 17:20:21 +13:00
Brenda Wallace	477f9669bd	Added nav for plantings	2017-01-14 16:54:37 +13:00
Brenda Wallace	c1da5e4dc8	Split plantings#index into two methods to simplify	2017-01-14 16:47:29 +13:00
Brenda Wallace	6bdfe5a669	Moved plantings nav bar to own file and simplified	2017-01-14 16:32:03 +13:00
Brenda Wallace	eba397117c	Planting needs to calculate slugs before model is valid	2017-01-14 11:41:48 +13:00
Miles Gould	7ca371ae43	Merge remote-tracking branch 'mine/bw/bar_graphs' into bw/bar_graphs	2017-01-09 15:19:18 +00:00
Miles Gould	7fa0d22583	Graph real crop sunninesses from server ... Works for me in superficial manual testing, but needs automated tests. Also currently does two server round trips (one for planting locations and one for sunninesses); it would be better to combine these into one, or alternatively to create a "crop stats" API endpoint and calculate sunniness stats in SQL.	2017-01-09 15:13:55 +00: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	062ff16acf	Put garden.to_s back to garden.name	2017-01-07 13:17:53 +13:00
Brenda Wallace	7f30ce04e0	Garden name (truncated) on front page link	2017-01-07 13:09:35 +13:00
Brenda Wallace	90b19d52bb	Don't rely on to_s for slug. Fragile with translations	2017-01-07 12:49:57 +13:00