533 Commits

Author	SHA1	Message	Date
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
pozorvlak	cc59c4f49b	Merge branch 'dev' into bw/rubocop	2017-01-17 16:47:07 +00:00
Brenda Wallace	0fa9f54c9c	Rename member.has_role? to role?	2017-01-14 20:54:43 +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
Shiny	15de4ac08c	Merge branch 'dev' into bw/active-plantings	2017-01-08 11:16:19 +13:00
Shiny	5ca8829727	Merge branch 'dev' into bw/active-plantings	2017-01-05 16:35:39 +13:00
Shiny	d40eccdb63	Merge branch 'dev' into bw/harvests-linkto-plantings	2017-01-05 16:31:22 +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
Brenda Wallace	ab75f830fb	Controller garden specs for member doing what they shouldn't	2016-12-25 10:38:07 +13:00
Brenda Wallace	ca7868b79a	Use guard clauses	2016-12-14 21:28:35 +00:00
Brenda Wallace	4f465d808c	We don't need to load the resource again	2016-12-07 23:54:03 +00:00
Brenda Wallace	e695d5646a	FIX Gardens query was running twice in contoller	2016-12-07 22:27:17 +00:00
Shiny	bb0eb25dd3	Merge branch 'dev' into bw/useless-assignments	2016-12-02 14:04:30 +13:00
Brenda Wallace	03cb4a8dee	use find_or_initialize_by	2016-12-02 00:23:46 +00:00
Mackenzie Morgan	7b2be73c88	code climate	2016-12-01 00:22:52 -05:00
Mackenzie Morgan	cd0fbc80d8	Merge remote-tracking branch 'origin/photo_concern' into photo_concern	2016-12-01 00:19:42 -05:00
Mackenzie Morgan	31bbf42ad0	define valid models for photos in a constants file ... remove all hardcoded model names from photo.rb and photos_controller.rb	2016-12-01 00:19:33 -05:00
Shiny	b454132cae	Merge branch 'dev' into bw/useless-assignments	2016-12-01 12:51:13 +13:00
Mackenzie	ba4d85538c	Merge branch 'dev' into scopify	2016-11-30 16:47:22 -05:00
Brenda Wallace	178c181cf5	Merge remote-tracking branch 'upstream/dev' into bw/useless-assignments ... Conflicts: app/controllers/crops_controller.rb app/models/crop.rb spec/models/scientific_name_spec.rb	2016-11-30 10:32:02 +13:00
Brenda Wallace	9aa4fa8031	Fixes for two calls to deprecated methods	2016-11-30 10:25:23 +13:00
Mackenzie Morgan	4857fd8d2e	return from conditional	2016-11-29 12:20:17 -05:00
Mackenzie Morgan	99c8db72d6	syntax	2016-11-29 12:14:16 -05:00
Mackenzie Morgan	53849a26e5	merge	2016-11-29 12:11:52 -05:00
Mackenzie Morgan	9dc02cd3d8	make changes from code review	2016-11-29 12:10:48 -05:00
Mackenzie Morgan	c93fd78aa8	Merge branch 'dev' of gitmaco:Growstuff/growstuff into scopify	2016-11-29 09:58:02 -05:00
Mackenzie Morgan	832719b01a	merge from upstream dev	2016-11-29 09:37:25 -05:00
Mackenzie Morgan	e1e9a52186	use a guard clause	2016-11-28 22:08:14 -05:00
Mackenzie Morgan	66c8ce78bc	further DRY up crops controller	2016-11-28 22:04:32 -05:00
Mackenzie Morgan	e1a2b168c9	rename scientific_names.scientific_name to scientific_names.name ... this mirrors alternate_names.name and allows making code more DRY	2016-11-28 21:57:51 -05:00
Brenda Wallace	8c7fcd9d49	Fixed all useless assignments	2016-11-26 19:36:59 +13:00
Brenda Wallace	d60dcfbddd	Use request.referer instead of request.referrer	2016-11-26 17:26:44 +13:00
Brenda Wallace	07c135eeb5	before_filter is now before_action	2016-11-26 17:20:13 +13:00
Brenda Wallace	bcdd2a9167	Changed called to rails dynamic find_by	2016-11-26 15:55:38 +13:00
Brenda Wallace	723ebff923	Spacing fixes	2016-11-26 12:13:17 +13:00
Brenda Wallace	62e7c716dd	Removed extra empty blank lines	2016-11-26 12:06:02 +13:00
Brenda Wallace	e62adc297a	Aligning end on branches	2016-11-26 11:55:54 +13:00
Brenda Wallace	2e46cccd21	Hash alignment	2016-11-26 11:52:10 +13:00
Brenda Wallace	bbc19a5436	Array indentation fixed	2016-11-26 11:49:51 +13:00
Brenda Wallace	d268d2b09e	Fixed indentation on comments	2016-11-26 11:45:25 +13:00
Brenda Wallace	c878baa886	Indented parameters cleanup	2016-11-26 11:41:07 +13:00
Brenda Wallace	2eddaf90cf	Fixed access modifier indentation	2016-11-26 11:00:04 +13:00