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

4522 Commits

Author SHA1 Message Date
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
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
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
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
Brenda Wallace
74ff648f90 Moved chart includes to application.js, attempting to fix json parse error 2018-01-09 12:51:21 +13: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
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
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
f02d328d1c commented out a cms link 2018-01-06 15:34:51 +13:00
Brenda Wallace
987400526e Use distinct for plant parts 2018-01-06 12:32:04 +13:00
Brenda Wallace
dd980d3f41 Harvests#edit needs to respond with something 2018-01-06 12:06:26 +13:00
Brenda Wallace
e5beb066a0 Moved members.create_account_and_garden to private 2018-01-06 11:32:49 +13:00
Brenda Wallace
7bb49f337f Fixing up member's account model creation, post rails 5 upgrade 2018-01-06 11:31:04 +13:00
Brenda Wallace
fcbb57e659 Respond with data on gardens#edit, so non-html formats don't break specs 2018-01-06 10:47:04 +13:00
Brenda Wallace
a0fe19651e Plant parts model using distinct query 2018-01-06 09:31:39 +13:00
Brenda Wallace
62fd16e6b2 Notifications don't have a post if they are a message 2018-01-06 09:01:18 +13:00
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
Brenda Wallace
fefc218b4c Merge branch 'js/cleanup' of github.com:Br3nda/growstuff into js/cleanup 2018-01-04 15:12:30 +13:00
Brenda Wallace
53c9f89bc1 Fixed up tabulation 2018-01-04 15:11:36 +13:00
Brenda Wallace
090bc02269 belongs_to defaults to required. setting some to optional 2018-01-04 14:55:36 +13:00
Brenda Wallace
2fd13e9b7c Updated new path to jquery autocomplete 2018-01-04 14:44:52 +13:00
Brenda Wallace
79cf7b452c removing some cms stuff 2018-01-04 14:31:24 +13:00
Shiny
ba2e4b5dce Merge branch 'dev' into upgrade/rails-5 2018-01-04 14:03:19 +13:00
pozorvlak
965fb28ab3 Merge branch 'dev' into js/cleanup 2018-01-03 11:07:35 +00:00
Brenda Wallace
d456d045cd Changed order of photo association relationship declarations 2018-01-03 17:24:51 +13:00
Brenda Wallace
4917ab9ae8 Fixed order->member relationship, after change to paranoia gem 2018-01-03 17:21:40 +13:00
Brenda Wallace
46d56fde31 Application job for Rails 5 2018-01-03 17:20:08 +13:00
Brenda Wallace
65d5b2d61a Application mailer for rails 5 2018-01-03 17:18:41 +13:00
Brenda Wallace
b6c9b13d4d Models inherit from application record 2018-01-03 17:16:14 +13:00
Brenda Wallace
f4af682d45 Updated code for Rail 5 2018-01-03 17:12:17 +13:00
Brenda Wallace
d86de897c7 Wrap long line 2018-01-03 15:12:09 +13:00
Brenda Wallace
a39c304fac Fix ordering of crops' parent on form 2018-01-03 15:06:55 +13:00
Brenda Wallace
0a71bfe99f Tabulation and jsdoc fixes 2018-01-03 14:40:22 +13:00
Brenda Wallace
978317f47a more JSDoc 2018-01-03 14:20:01 +13:00
Brenda Wallace
4570fda384 removed 2 unused variable in js 2018-01-03 13:03:10 +13:00
Brenda Wallace
122a7f17e2 Fix up JSDoc 2018-01-03 13:01:48 +13:00