mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-06 21:22:49 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 102 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace f2b88a94ef Merge branch 'charts' into upgrade/rails-5 2018-01-11 09:32:31 +13:00
Brenda Wallace 26a5ba70ef Merge branch 'charts' into timeline 2018-01-11 09:32:14 +13:00
Brenda Wallace 7dab57f9ba Removed d3 graph tests 2018-01-11 09:31:59 +13:00
Brenda Wallace 0d35b4ca6d Updating rubocop todo 2018-01-11 09:26:48 +13:00
Awesome Code 1a4e0bd48a Auto corrected by following Style/RescueStandardError 2018-01-10 20:18:17 +00:00
Awesome Code e865e93665 Auto corrected by following Style/ParallelAssignment 2018-01-10 20:18:10 +00:00
Awesome Code bd32647178 Auto corrected by following Style/OrAssignment 2018-01-10 20:17:58 +00:00
Shiny a931f26b00 Merge branch 'dev' into awesomecode-factorybot/dynamicattributedefinedstatically-7220 2018-01-11 09:15:00 +13:00
Brenda Wallace 350787d4e4 Merge branch 'charts' into upgrade/rails-5 2018-01-11 09:12:20 +13:00
Brenda Wallace 7b59480928 Merge branch 'charts' into timeline 2018-01-11 09:12:06 +13:00
Brenda Wallace 390282f9f2 Added Harvested for chart 2018-01-11 09:03:13 +13:00
Brenda Wallace 8e0b7d9ded Merge branch 'charts' into upgrade/rails-5 
Conflicts:
	app/assets/javascripts/crops.js.erb
	spec/controllers/comments_controller_spec.rb
	spec/controllers/harvests_controller_spec.rb
	spec/controllers/photos_controller_spec.rb
	spec/controllers/plantings_controller_spec.rb
	spec/models/post_spec.rb
	spec/views/home/_crops.html.haml_spec.rb
 2018-01-11 08:34:20 +13:00
Brenda Wallace 56a76004df Merge branch 'charts' into timeline 2018-01-11 08:31:09 +13:00
Brenda Wallace 4af36f68b4 Merge remote-tracking branch 'origin/charts' into charts 2018-01-11 08:30:38 +13:00
Brenda Wallace ad6601b356 Add planted_from chart 2018-01-11 08:29:20 +13:00
Brenda Wallace 15594c0209 Wrapped thre crops show js in a document.ready 2018-01-11 08:26:59 +13:00
Shiny 34715b5a2a Merge branch 'dev' into charts 2018-01-10 16:37:32 +13:00
Shiny 6641ae8257 Merge pull request #1519 from Growstuff/awesomecode-rspec/emptylineafterfinallet-7220 
Auto corrected by following RSpec/EmptyLineAfterFinalLet
 2018-01-10 16:37:07 +13:00
Shiny ca860db074 Merge branch 'dev' into awesomecode-rspec/emptylineafterfinallet-7220 2018-01-09 21:52:49 +13:00
Shiny 5230dec20e Merge branch 'dev' into awesomecode-factorybot/dynamicattributedefinedstatically-7220 2018-01-09 19:00:04 +13:00
Shiny 3029bdcb0d Merge pull request #1517 from Growstuff/awesomecode-emptyline-7220 
Auto corrected by following EmptyLine
 2018-01-09 18:53:28 +13:00
Brenda Wallace 6d56f3f655 Merge branch 'charts' into upgrade/rails-5 
Conflicts:
	app/views/layouts/application.html.haml
 2018-01-09 15:55:28 +13:00
Brenda Wallace dc86404b6f Fix predictions, it wasn't showing nil 2018-01-09 15:53:40 +13:00
Awesome Code e46f530dc3 Auto corrected by following RSpec/EmptyLineAfterFinalLet 2018-01-09 02:00:40 +00:00
Awesome Code 3ece584390 Auto corrected by following FactoryBot/DynamicAttributeDefinedStatically 2018-01-09 01:59:43 +00:00
Brenda Wallace a2e4863f00 Fixing up prediction specs 2018-01-09 14:37:21 +13:00
Brenda Wallace 2d58099f2d Merge remote-tracking branch 'origin/charts' into charts 2018-01-09 14:33:50 +13:00
Brenda Wallace c5c6f7ad47 Removed ignore of highcharts 2018-01-09 14:31:03 +13:00
Brenda Wallace 2c3fe3c204 updated prediction spec 2018-01-09 13:18:58 +13:00
Brenda Wallace 1fbbc50940 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 2018-01-09 13:11:33 +13:00
Shiny b0afbe571f Merge branch 'dev' into charts 2018-01-09 13:09:52 +13:00
Brenda Wallace 74ff648f90 Moved chart includes to application.js, attempting to fix json parse error 2018-01-09 12:51:21 +13:00
Awesome Code a5fa033f2d Auto corrected by following EmptyLine 2018-01-08 23:46:57 +00:00
Awesome Code 29a9643f00 trigger awesomecode.io notification 2018-01-08 23:46:00 +00:00
Brenda Wallace 9172d21f1d Merge branch 'charts' into upgrade/rails-5 
Conflicts:
	app/assets/stylesheets/predictions.sass
 2018-01-08 18:14:24 +13:00
Brenda Wallace f3ec7e0c4e Add a green border around predictions boxes 2018-01-08 18:12:57 +13:00
Brenda Wallace 59122d6938 Merge branch 'charts' into timeline 2018-01-08 18:03:40 +13:00
Brenda Wallace d8cce280e2 Remove highcharts.js, we're not using it 2018-01-08 18:03:20 +13:00
Brenda Wallace c569961029 Add timeline to gardens 2018-01-08 11:30:06 +13:00
Brenda Wallace 34280123e5 Convert to use chartkick gem 
Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/assets.rb
 2018-01-08 11:28:59 +13:00
Brenda Wallace 865fe106ad Unique member name on notifications spec 2018-01-07 22:10:27 +13:00
Brenda Wallace 386dc5ad7f Use factory bot in specs 2018-01-07 19:37:03 +13:00
Brenda Wallace 8e59e68dd7 Add valid DNS entry to feature spec, so it doesn't fail 2018-01-07 19:30:52 +13:00
Brenda Wallace 52e3f03bb5 Add timeline to gardens 2018-01-07 19:25:05 +13:00
Brenda Wallace 73ffbb0272 crop creator is optional 
doesn't get set when crop has just been requested
 2018-01-07 18:44:03 +13:00
Brenda Wallace 9e5aba75d8 Added full path to jpeg in spec, so does'nt throw asset pipeline errors 2018-01-07 18:35:28 +13:00
Brenda Wallace ac16347f0d Small change to plantings model, so feature spec passes again 2018-01-07 18:23:42 +13:00
Brenda Wallace bf34feacba Convert to use chartkick gem 2018-01-07 17:25:16 +13:00
Brenda Wallace 482d15e36d Fixed spec to specify login name before checking 2018-01-06 16:48:28 +13:00
Brenda Wallace ca40d07148 Fixed up crops view spec 2018-01-06 16:42:18 +13:00