mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-07 23:57:07 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 60 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
deppbot
24931381af Bundle Update on 2018-02-03 2018-02-04 08:25:59 +13:00
deppbot
742c7e30a9 Bundle Update on 2018-01-31 2018-01-31 13:12:08 +13:00
Daniel O'Connor
2f3e368ede Merge branch 'dev' into awesomecode-style/andor-8234 2018-01-29 11:45:51 +10:30
Daniel O'Connor
502a20cf10 Merge pull request #1564 from Growstuff/awesomecode-rspec/leadingsubject-8234 
Auto corrected by following RSpec/LeadingSubject
 2018-01-29 11:45:07 +10:30
Brenda Wallace
b2cf022522 Removed extra blank lines 2018-01-29 13:01:49 +13:00
Shiny
3d4598e4e1 style clean up 2018-01-29 12:56:41 +13:00
Awesome Code
94db28b3a9 Auto corrected by following Style/AndOr 2018-01-28 23:47:38 +00:00
Awesome Code
767477df66 Auto corrected by following RSpec/LeadingSubject 2018-01-28 23:47:27 +00:00
Brenda Wallace
7f87ee1018 Fixed default_photo for seeds - uses own photos, not the crop 2018-01-29 09:55:06 +13:00
deppbot
093a948922 Bundle Update on 2018-01-28 2018-01-29 09:54:30 +13:00
deppbot
be1553410f Bundle Update on 2018-01-24 2018-01-29 09:54:20 +13:00
Shiny
caf41e80c9 Patching paperclip gem 2018-01-24 15:07:06 +13:00
deppbot
2eff7d6716 Bundle Update on 2018-01-21 2018-01-23 09:00:34 +13:00
Shiny
df5006c61c Disable jshint 
this is on by default
 2018-01-23 09:00:34 +13:00
Brenda Wallace
1e0565dd9b Tell hound to ignore the bootstrap plugin file 2018-01-23 09:00:34 +13:00
Brenda Wallace
3453a648fa Latest versions of bootstrap accessibility plugin 2018-01-23 09:00:34 +13:00
Awesome Code
e8d9314cff Auto corrected by following Style/Lambda 2018-01-23 09:00:34 +13:00
Brenda Wallace
92e56cfc1e Fixed up a spec, use sign_in member instead of stubing 2018-01-23 09:00:34 +13:00
Brenda Wallace
3dc356eb29 order gardens by name on plantings form 2018-01-23 09:00:34 +13:00
Brenda Wallace
56ed61b2b3 Lock pg < 1.0.0 for now 2018-01-23 09:00:34 +13:00
Brenda Wallace
16ad5384d1 Moved gardens chart to dedicated controller 2018-01-23 09:00:34 +13:00
Brenda Wallace
cf93489af7 Fixed crops chart permissions by moving to another controller 2018-01-23 09:00:34 +13:00
Brenda Wallace
86b9a3650b Move application.js loading last again 2018-01-23 09:00:34 +13:00
Brenda Wallace
625a035f44 Scope js variables so they are not global 2018-01-23 09:00:34 +13:00
Brenda Wallace
196d37dee9 Re-instated the extra fields on crop.json 2018-01-23 09:00:34 +13:00
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