613 Commits

Author	SHA1	Message	Date
Shiny	7f592579cd	Merge branch 'dev' into plantings-harvests	2017-03-16 15:35:06 +13:00
Brenda Wallace	998befb30f	Limited plantings to member's own garden, and approved crops	2017-03-16 15:29:25 +13:00
Daniel O'Connor	4a20f68d3a	Merge branch 'dev' into plantings-harvests	2017-03-16 09:40:56 +10:30
Brenda Wallace	195d1bbdbb	order gardens by recently updated	2017-03-12 20:12:28 +13:00
Brenda Wallace	c89c20e842	View harvests for a planting	2017-03-12 14:44:11 +13:00
Brenda Wallace	882d641683	Photo changes expire homepage too	2017-03-03 08:49:24 +13:00
Brenda Wallace	ce03b4efde	DRY the photos controller	2017-02-26 17:03:29 +13:00
Brenda Wallace	5698a78d9b	DRY the accounts controller	2017-02-23 09:45:57 +13:00
Brenda Wallace	d500c9093d	DRY the account types controller	2017-02-22 13:21:59 +13:00
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
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	9e19aae0ca	Merge branch 'dev' into forums-controller	2017-02-16 12:33:55 +00:00
Brenda Wallace	4704bd89f8	DRY the posts controller	2017-02-16 22:15:30 +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
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
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	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	2c871abd03	don't allow owner in params	2017-02-13 07:41:53 +13:00
Mackenzie	4fa423bcab	Merge pull request #1205 from Br3nda/dry-notifications ... DRY for the notifications controller	2017-02-12 10:21:31 -05:00
Mackenzie	97d0bb6752	Merge pull request #1207 from Br3nda/DRY-plantparts ... DRY the plant parts controller	2017-02-12 10:20:30 -05:00
Mackenzie	b9edd2f89b	Merge pull request #1203 from Br3nda/access ... Added cancan ability for likes (and DRY-ed)	2017-02-12 10:20:03 -05:00
Brenda Wallace	1275aa0102	DRY the plant parts controller	2017-02-12 22:58:17 +13:00
Brenda Wallace	f40ff18949	You can only reply to messages that were sent to you.	2017-02-12 22:15:50 +13:00
Brenda Wallace	f25d4dbf8c	DRY for the notifications controller	2017-02-12 21:52:22 +13:00
Brenda Wallace	b8e06a1d1d	Specs for deleting someone else's like	2017-02-12 20:50:50 +13:00
Brenda Wallace	fa0c00aa9c	Named arg (liked_by_member) fixed ... cos i was writing python when this is meant to be ruby	2017-02-12 17:37:32 +13:00
Brenda Wallace	72d0514e75	Further checks in likes controller	2017-02-12 15:33:54 +13:00
Brenda Wallace	dc62365c7d	DRY likes controller further	2017-02-12 15:23:58 +13:00