4522 Commits

Author	SHA1	Message	Date
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
Awesome Code	46267b2a1d	Auto corrected by following Style/MutableConstant	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
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
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
Brenda Wallace	b1096cd021	Moved chart includes to application.js, attempting to fix json parse error	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	87708f1765	Tabulation and jsdoc fixes	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	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	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
Brenda Wallace	8cdefb6fcc	Scope js variables so they are not global	2018-01-21 18:39:00 +13:00
Shiny	16c54d1c61	Merge branch 'dev' into awesomecode-style/mutableconstant-7391	2018-01-15 14:25:05 +13:00
Awesome Code	7fb2690306	Auto corrected by following Style/MutableConstant	2018-01-13 22:51:04 +00:00
Shiny	6efdcb74d3	Merge branch 'dev' into charts-with-specs	2018-01-13 22:58:57 +13:00
Brenda Wallace	3a4443a4fe	Permissions (and specs) for charts json	2018-01-13 22:15:27 +13:00
pozorvlak	723c4d4345	Merge branch 'dev' into awesomecode-style/orassignment-7269	2018-01-12 11:22:08 +00:00
pozorvlak	c7a3911694	Merge branch 'dev' into awesomecode-style/parallelassignment-7269	2018-01-12 09:57:26 +00:00
Brenda Wallace	b831c29c97	Use .presence to find finished ts in timeline	2018-01-12 09:27:09 +13:00
Brenda Wallace	cc1d3b4f43	Use predicted finish times to put current plantings on the timeline	2018-01-12 08:07:38 +13:00
Brenda Wallace	29be61c790	Merge branch 'timeline' into upgrade/rails-5	2018-01-12 07:56:09 +13:00
Brenda Wallace	c442bdbd45	add google js to gardens#show	2018-01-12 07:53:34 +13:00
Shiny	cba0a40246	Merge branch 'dev' into awesomecode-style/parallelassignment-7269	2018-01-11 16:13:24 +13:00
Shiny	dd536d607b	Merge branch 'dev' into awesomecode-style/orassignment-7269	2018-01-11 16:13:10 +13:00
Brenda Wallace	f4e87a974d	Merge remote-tracking branch 'origin/timeline' into upgrade/rails-5 ... Conflicts: app/views/gardens/show.html.haml spec/controllers/photo_associations_controller_spec.rb	2018-01-11 16:10:36 +13:00
Brenda Wallace	2d813e49de	add google js to gardens#show	2018-01-11 15:36:27 +13:00
Shiny	fb00f6a23a	Merge branch 'dev' into timeline	2018-01-11 13:12:29 +13:00
Shiny	01d6232bcf	Merge branch 'dev' into charts	2018-01-11 13:11:32 +13:00
Daniel O'Connor	b172c5f242	Merge branch 'dev' into awesomecode-style/orassignment-7269	2018-01-11 10:01:38 +10:30
Awesome Code	1a4e0bd48a	Auto corrected by following Style/RescueStandardError	2018-01-10 20:18:17 +00:00