Brenda Wallace 6e0e7e4de1 Merge remote-tracking branch 'upstream/dev' into bw/bar_graphs ...

Conflicts:
	CONTRIBUTORS.md
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/crops.js.erb
	app/views/crops/show.html.haml

2016-12-07 11:17:30 +13:00

..

comfy/admin/cms

adding CMS via comfortable mexican sofa gem

2015-02-01 00:27:04 -05:00

graphs

add comments explaining each file per pull request

2015-03-06 07:03:06 -08:00

append_date.js.coffee

Removed all trailing white space

2016-11-14 15:05:32 +13:00

application.js

switch from less to sass

2016-05-19 15:52:54 -04:00

auto_suggest.js.coffee

accept a default value in options hash of autosuggest helper

2014-09-09 21:27:21 +10:00

bootstrap-accessibility.min.js

Adding bootstrap-accessibility plugin

2015-08-12 14:17:41 +00:00

bootstrap.js.coffee

Fixed tests by getting rid of valid_session

2012-11-26 19:04:43 +11:00

crops.js.erb

Merge remote-tracking branch 'upstream/dev' into bw/bar_graphs

2016-12-07 11:17:30 +13:00

finish_planting.js.coffee

Remove trailing whitespace

2015-07-23 23:22:45 +01:00

members.js.erb

#981 Add mapbox access token (on my free 50k views account) and update to v4

2016-07-28 14:27:49 +09:30

places.js.erb

#981 Add mapbox access token (on my free 50k views account) and update to v4

2016-07-28 14:27:49 +09:30

plantings.js.coffee

make crop_suggest.js more abstract so it works for other resources, not just planting

2014-08-01 19:19:27 +10:00

seeds.js.coffee

Removed all trailing white space

2016-11-14 15:05:32 +13:00