Brenda Wallace 641d227a87 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 ...

Conflicts:
	app/assets/javascripts/application.js
	package-lock.json

2018-01-06 08:46:52 +13:00

..

comfy/admin/cms

adding CMS via comfortable mexican sofa gem

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

graphs

Fixed up tabulation

2018-01-04 15:11:36 +13:00

append_date.js.coffee

Removed all trailing white space

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

application.js

Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5

2018-01-06 08:46:52 +13: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

Updated code for Rail 5

2018-01-03 17:12:17 +13:00

finish_planting.js.coffee

Remove trailing whitespace

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

members.js.erb

Updated code for Rail 5

2018-01-03 17:12:17 +13:00

places.js.erb

Updated code for Rail 5

2018-01-03 17:12:17 +13:00

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

posts.js

converted variable to camel case

2018-01-03 12:42:20 +13:00

seeds.js.coffee

Run the linters etc from overcommit

2017-03-01 20:48:15 +00:00