11959 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel O'Connor	d11e6f484a	Pin leaflet-rails for the moment, until we fix tests	2017-02-13 17:19:40 +13:00
Daniel O'Connor	9218a03e2b	Upgrade only geocoder	2017-02-13 17:19:40 +13:00
Daniel O'Connor	da760a8a4c	Revert "Update geocoder, leaflet-rails" ... This reverts commit ecd2bb1c01.	2017-02-13 17:19:40 +13:00
Daniel O'Connor	9ccecf0e04	Update i18n-tasks bootstrap_form font-awesome-sass	2017-02-13 17:19:40 +13:00
Daniel O'Connor	5ec105ad19	Upgrade sidekiq	2017-02-13 17:19:40 +13:00
Daniel O'Connor	5c1f5f4312	Update poltergeist	2017-02-13 17:19:40 +13:00
Daniel O'Connor	48d3a64e7b	Update cancancan	2017-02-13 17:19:40 +13:00
Daniel O'Connor	decd48a970	Update geocoder, leaflet-rails	2017-02-13 17:19:40 +13:00
Daniel O'Connor	540ac7b034	Update warden	2017-02-13 17:19:40 +13:00
Daniel O'Connor	8112133cf2	Update unicorn	2017-02-13 17:19:40 +13:00
Daniel O'Connor	55f00ed0f8	Update newrelic	2017-02-13 17:19:40 +13:00
Daniel O'Connor	d0999c2f9a	Update activemerchant	2017-02-13 17:19:40 +13:00
Daniel O'Connor	47150a8ad8	Update selenium-webdriver	2017-02-13 17:19:40 +13:00
Daniel O'Connor	9301688763	Update guard	2017-02-13 17:19:40 +13:00
Daniel O'Connor	248b89a564	Update elasticsearch	2017-02-13 17:19:40 +13:00
Daniel O'Connor	8e9ffac64e	Pin to hashie 3.4.* for https://github.com/intridea/hashie/issues/408	2017-02-13 17:19:40 +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
Brenda Wallace	9ebe830402	Haml clean up for scientific names views	2017-02-13 07:32:43 +13:00
Brenda Wallace	9a0adadc9a	Haml clean up for seeds views	2017-02-13 07:32:43 +13:00
Brenda Wallace	92c3976f0a	Haml clean up for shared views	2017-02-13 07:32:43 +13:00
Brenda Wallace	01c25df8cf	haml-lint all views	2017-02-13 07:32:43 +13:00
pozorvlak	9ae35ca6eb	Merge pull request #1200 from Br3nda/bw/planting_slug ... Simplified logic in planting.planting_slug	2017-02-12 15:46:22 +00:00
pozorvlak	43f9707c11	Merge branch 'dev' into bw/planting_slug	2017-02-12 15:21:41 +00: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
pozorvlak	4bd50ca433	Merge branch 'dev' into bw/planting_slug	2017-02-12 15:19:55 +00:00
pozorvlak	a2dd675717	Merge pull request #1199 from Br3nda/time-zones ... Use timezone when creating dates	2017-02-12 15:19:38 +00: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	4dd99f54db	Removed deprecation notice from controller spec	2017-02-12 20:55:06 +13:00
Brenda Wallace	b8e06a1d1d	Specs for deleting someone else's like	2017-02-12 20:50:50 +13:00
Brenda Wallace	f7b8113af1	Fixed spec, now requests json response	2017-02-12 20:36:24 +13:00
Brenda Wallace	b0394d1028	checks json returned by likes controller	2017-02-12 17:42:24 +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	a507eb47bf	Removed trailing white space	2017-02-12 17:26:34 +13:00
Brenda Wallace	865f323f97	controller specs for likes controller	2017-02-12 15:35:15 +13:00
Brenda Wallace	c82f47bdda	Pass the ID from link to likesdestroy	2017-02-12 15:34:28 +13:00