Commit Graph
13034 Commits
Author SHA1 Message Date
Shiny 6f613635d2 Update crop_detail_page_spec.rb 2018-01-23 09:00:34 +13:00
Awesome Code 46267b2a1d Auto corrected by following Style/MutableConstant 2018-01-23 09:00:34 +13:00
Awesome Code 8c8d549cb1 Auto corrected by following RSpec/NotToNot 2018-01-23 09:00:34 +13:00
Awesome Code d9cc1dcae8 Auto corrected by following RSpec/MultipleSubjects 2018-01-23 09:00:34 +13:00
Brenda Wallace 9db4736229 Permissions (and specs) for charts json 2018-01-23 09:00:34 +13:00
pozorvlak 04a7c41f63 Only deploy from the Elasticsearch build job
Fixes #1099, or at least works around it, though a better solution would
be to rewrite our deployment system using Travis build stages or Heroku
build pipelines.

The Elasticsearch job was picked because it's the one most likely to
fail, and I can't work out how to deploy only if all three jobs pass.
2018-01-23 09:00:34 +13:00
Brenda Wallace 78b8be1fc2 Use .presence to find finished ts in timeline 2018-01-23 09:00:34 +13:00
Brenda Wallace b6e9539127 Use predicted finish times to put current plantings on the timeline 2018-01-23 09:00:34 +13:00
Brenda Wallace 33276874a8 add google js to gardens#show 2018-01-23 09:00:34 +13:00
Brenda Wallace 9adb3d1e4e Removed d3 graph tests 2018-01-23 09:00:34 +13:00
Awesome Code 3391f6c392 Auto corrected by following Style/RescueStandardError 2018-01-23 09:00:34 +13:00
Awesome Code a13acbe087 Auto corrected by following Style/ParallelAssignment 2018-01-23 09:00:34 +13:00
Awesome Code 0c8240d4e8 Auto corrected by following Style/OrAssignment 2018-01-23 09:00:34 +13:00
Brenda Wallace 5ea7ae8af0 Added Harvested for chart 2018-01-23 09:00:34 +13:00
Brenda Wallace eb1b890eec Add planted_from chart 2018-01-23 09:00:34 +13:00
Brenda Wallace 4821bf3b07 Wrapped thre crops show js in a document.ready 2018-01-23 09:00:34 +13:00
Brenda Wallace b83db1d4e7 Fix predictions, it wasn't showing nil 2018-01-23 09:00:34 +13:00
Awesome Code dea7ce241b Auto corrected by following RSpec/EmptyLineAfterFinalLet 2018-01-23 09:00:34 +13:00
Awesome Code 8d166f1fe6 Auto corrected by following FactoryBot/DynamicAttributeDefinedStatically 2018-01-23 09:00:34 +13:00
Brenda Wallace 49253b59ee Fixing up prediction specs 2018-01-23 09:00:34 +13:00
Brenda Wallace ca16b2c407 Removed ignore of highcharts 2018-01-23 09:00:34 +13:00
Brenda Wallace 427a0187e1 updated prediction spec 2018-01-23 09:00:34 +13:00
Brenda Wallace b1096cd021 Moved chart includes to application.js, attempting to fix json parse error 2018-01-23 09:00:34 +13:00
Awesome Code 020d024e4b Auto corrected by following EmptyLine 2018-01-23 09:00:34 +13:00
Brenda Wallace 070a4605d0 Add a green border around predictions boxes 2018-01-23 09:00:34 +13:00
Brenda Wallace 1f8413bf3e Remove highcharts.js, we're not using it 2018-01-23 09:00:34 +13:00
Brenda Wallace 59c3edcf82 Add timeline to gardens 2018-01-23 09:00:34 +13:00
Brenda Wallace 1bf05f81ab Convert to use chartkick gem
Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/assets.rb
2018-01-23 09:00:34 +13:00
Brenda Wallace e6e88fa0c7 Fixed up tabulation 2018-01-23 09:00:34 +13:00
Brenda Wallace 308e834713 Wrap long line 2018-01-23 09:00:34 +13:00
Brenda Wallace 121deb4f48 Fix ordering of crops' parent on form 2018-01-23 09:00:34 +13:00
Brenda Wallace 4b65f28461 Added new line at end of file 2018-01-23 09:00:34 +13:00
Brenda Wallace 87708f1765 Tabulation and jsdoc fixes 2018-01-23 09:00:34 +13:00
Brenda Wallace 2cf335a064 Removed unused variables in js 2018-01-23 09:00:34 +13:00
Brenda Wallace b205f35399 Wrapped a long line 2018-01-23 09:00:34 +13:00
Brenda Wallace a4c06207e3 more JSDoc 2018-01-23 09:00:34 +13:00
Brenda Wallace 580fac6aa1 removed 2 unused variable in js 2018-01-23 09:00:34 +13:00
Brenda Wallace 4a696af9ba Fix up JSDoc 2018-01-23 09:00:34 +13:00
Brenda Wallace d2a060ad49 added JSDoc 2018-01-23 09:00:34 +13:00
Brenda Wallace d898f926d5 added JSDoc 2018-01-23 09:00:34 +13:00
Brenda Wallace 49444edc61 contributors/commits update 2018-01-23 09:00:34 +13:00
Brenda Wallace a4c7de381e converted variable to camel case 2018-01-23 09:00:34 +13:00
Brenda Wallace 61408d7e4e Some js cleanups 2018-01-23 09:00:34 +13:00
Brenda Wallace 9906036faf Add bootstrap js to codeclimate excludes 2018-01-23 09:00:34 +13:00
Brenda Wallace e009d9532a Updating javascript style 2018-01-23 09:00:34 +13:00
Brenda Wallace 9f1c064900 Use the old "var" syntax, and max line 120 2018-01-23 09:00:34 +13:00
Brenda Wallace 8d3d8f3c91 Adding package lock, and eslint 2018-01-23 09:00:34 +13:00
deppbot 0feed2d359 Bundle Update on 2017-12-24 2018-01-23 09:00:34 +13:00
Brenda Wallace d9bdc46099 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
Conflicts:
	app/assets/javascripts/members.js.erb
2018-01-21 21:20:43 +13:00
Daniel O'Connor ed18932a5d Merge pull request #1544 from Br3nda/fix/scope-js
Scope js variables so they are not global
2018-01-21 16:35:54 +10:30