3889 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brenda Wallace	035b2399ca	DRY seeds controller	2017-02-20 20:54:06 +13:00
pozorvlak	b19a991106	Merge pull request #1226 from Br3nda/scinames-controller ... DRY scientific names controller	2017-02-16 23:00:29 +00:00
pozorvlak	88e019a19f	Merge branch 'dev' into scinames-controller	2017-02-16 22:52:07 +00:00
pozorvlak	e954ba801b	Merge pull request #1225 from Br3nda/comments-controller ... DRY comments controller	2017-02-16 22:51:42 +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	d15eb32133	Added some utf8, kōrero mai (te reo māori)	2017-02-17 09:47:12 +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	403a8814e1	Merge pull request #1222 from Br3nda/forums-controller ... Small clean ups on forums controller	2017-02-16 13:26:38 +00:00
pozorvlak	22905235c1	Merge branch 'dev' into forums-controller	2017-02-16 12:41:20 +00:00
pozorvlak	4d3b94b7f0	Merge pull request #1216 from Br3nda/more-rubocop ... Rubocop fix for MultilineHashBraceLayout	2017-02-16 12:41:10 +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
pozorvlak	28a6cfe25c	Merge pull request #1223 from Br3nda/posts-controller ... DRY the posts controller	2017-02-16 12:28:47 +00:00
pozorvlak	630d539f7d	Merge branch 'dev' into more-rubocop	2017-02-16 12:24:20 +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
Daniel O'Connor	bcc89674d4	Upgrade to current Hashie	2017-02-16 17:18:44 +13:00
Shiny	e1dab634a2	Merge branch 'dev' into more-rubocop	2017-02-16 13:23:07 +13:00
Daniel O'Connor	e06e002282	Merge pull request #1218 from Br3nda/UnneededInterpolation ... Fix up all UnneededInterpolation	2017-02-16 10:29:19 +10:30
Daniel O'Connor	23ed7f91ba	Merge pull request #1220 from Br3nda/ReversibleMigration ... Marked our one ReversibleMigration as okay	2017-02-16 10:29:02 +10:30
Daniel O'Connor	aa511aedb4	Merge pull request #1219 from Br3nda/TrailingCommas ... Removed trailing commas	2017-02-16 10:28:43 +10:30
Brenda Wallace	2b03381a24	Removed trailing commas	2017-02-15 23:33:06 +00:00
Brenda Wallace	6017c4ba23	Marked our one ReversibleMigration as okay	2017-02-16 12:32:37 +13:00
Brenda Wallace	a46b8ebe76	Fix up all UnneededInterpolation	2017-02-16 12:26:47 +13:00
Brenda Wallace	a4f8b3a0e6	Rubocop fix for MultilineHashBraceLayout	2017-02-16 12:20:32 +13:00
Daniel O'Connor	1b8c413b90	Merge pull request #1215 from Br3nda/likeable-dry ... Likeable even more dry	2017-02-14 10:27:51 +10:30
Shiny	7a334abf1d	Merge branch 'dev' into likeable-dry	2017-02-14 12:40:05 +13:00
pozorvlak	5c067c87b8	Merge pull request #1201 from Br3nda/bw/harvest-planting-link ... Linking existing harvests to a planting	2017-02-13 23:02:04 +00: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	01415fd04f	Merge pull request #1214 from Br3nda/authentication-scoping ... User can only sign out their own session	2017-02-13 22:38:40 +00:00
pozorvlak	e0def646ce	Merge branch 'dev' into authentication-scoping	2017-02-13 22:22:47 +00:00
pozorvlak	a52731dc4b	Merge pull request #1198 from Br3nda/bw/grand-haml-cleanup-of-2017 ... All the haml clean up	2017-02-13 22:20:16 +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
Shiny	f8c56cc217	Merge branch 'dev' into bw/grand-haml-cleanup-of-2017	2017-02-13 17:19:58 +13:00
Daniel O'Connor	d11e6f484a	Pin leaflet-rails for the moment, until we fix tests	2017-02-13 17:19:40 +13:00