2171 Commits

Author	SHA1	Message	Date
pozorvlak	3ac4fbcdb8	Merge branch 'dev' into seeds-controller	2017-02-20 13:36:50 +00:00
pozorvlak	25a1f0da9a	Merge branch 'dev' into gardens-controller	2017-02-20 13:11:18 +00:00
pozorvlak	837934167b	Merge branch 'dev' into harvests-controller	2017-02-20 13:02:58 +00:00
Brenda Wallace	035b2399ca	DRY seeds controller	2017-02-20 20:54:06 +13:00
Brenda Wallace	1a3e976ba5	DRY the gardens controller	2017-02-20 02:36:51 +00:00
Brenda Wallace	d31739f86a	Further code clarity on the harvest csv filename	2017-02-20 10:07:14 +13:00
Brenda Wallace	0f523381f0	DRY the harvest controller	2017-02-20 09:58:36 +13:00
Brenda Wallace	550848a513	ParenthesesAroundCondition fixup	2017-02-19 16:20:45 +13:00
Brenda Wallace	50624fb2cb	Style/MultilineBlockLayout fix	2017-02-19 16:17:03 +13:00
Brenda Wallace	e184503caa	Fix up to match rubocop's MultilineMethodCallBraceLayout recommendation	2017-02-19 16:17:03 +13:00
pozorvlak	88e019a19f	Merge branch 'dev' into scinames-controller	2017-02-16 22:52:07 +00:00
Brenda Wallace	be23bfc419	DRY scientific names controller	2017-02-17 10:18:34 +13:00
Shiny	5e984ce04a	Merge branch 'dev' into comments-controller	2017-02-17 09:57:29 +13:00
Brenda Wallace	21f11a4d5d	highest MethodLength is now 34	2017-02-17 09:26:30 +13:00
Brenda Wallace	ae398f1a63	Spec checks you can't change post id in comments#update	2017-02-17 09:20:15 +13:00
Brenda Wallace	cd3cee5d5f	DRY comments controller and add more spec scenarios	2017-02-17 09:14:01 +13:00
pozorvlak	22905235c1	Merge branch 'dev' into forums-controller	2017-02-16 12:41:20 +00:00
pozorvlak	9e19aae0ca	Merge branch 'dev' into forums-controller	2017-02-16 12:33:55 +00:00
pozorvlak	d8c3f7ed34	Merge branch 'dev' into more-rubocop	2017-02-16 12:30:38 +00:00
Brenda Wallace	4704bd89f8	DRY the posts controller	2017-02-16 22:15:30 +13:00
Brenda Wallace	076695d349	Added name presence validation to forum	2017-02-16 21:52:28 +13:00
Brenda Wallace	3925a54340	DRY the forums controller	2017-02-16 21:52:07 +13:00
Brenda Wallace	6c566c56d8	removed unnecesary reloads of @forum	2017-02-16 20:16:13 +13:00
Brenda Wallace	a4f8b3a0e6	Rubocop fix for MultilineHashBraceLayout	2017-02-16 12:20:32 +13:00
Shiny	7a334abf1d	Merge branch 'dev' into likeable-dry	2017-02-14 12:40:05 +13:00
Brenda Wallace	87bc1becb0	Reduced repeating code in likes controller	2017-02-14 11:52:20 +13:00
pozorvlak	7c0d6c04df	Merge branch 'dev' into bw/harvest-planting-link	2017-02-13 22:39:15 +00:00
pozorvlak	e0def646ce	Merge branch 'dev' into authentication-scoping	2017-02-13 22:22:47 +00:00
Shiny	cd2500c99a	Merge branch 'dev' into bw/harvest-planting-link	2017-02-14 00:19:28 +13:00
Shiny	c9a197bc61	Merge branch 'dev' into bw/grand-haml-cleanup-of-2017	2017-02-14 00:18:53 +13:00
Mackenzie Morgan	c5439c8650	use symbols for status codes	2017-02-13 20:56:22 +13:00
Brenda Wallace	6d0a7ebc8f	Only show plantings with overlapping date ranges on harvest options	2017-02-13 20:41:43 +13:00
Brenda Wallace	0d1bab04d5	don't load the record again	2017-02-13 20:28:29 +13:00
Brenda Wallace	e6b23262da	User can only sign out their own session	2017-02-13 20:08:31 +13: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
Shiny	8ab70a1c1c	Merge branch 'dev' into bw/grand-haml-cleanup-of-2017	2017-02-13 08:04:41 +13:00
Brenda Wallace	2c871abd03	don't allow owner in params	2017-02-13 07:41:53 +13: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