mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-16 20:49:26 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,923 Commits 58 Branches 82 Tags
bf2b32ffaa75ea55e3497eaf90df0e442d69cf49
Commit Graph

4923 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shiny
bf2b32ffaa Merge branch 'dev' into awesomecode-factorybot/dynamicattributedefinedstatically-7220 2018-01-11 16:13:34 +13:00
Shiny
091ed0e1be Merge pull request #1514 from Br3nda/charts 
Use ChartKick gem for charts
 2018-01-11 14:58:04 +13:00
Shiny
01d6232bcf Merge branch 'dev' into charts 2018-01-11 13:11:32 +13:00
Daniel O'Connor
8afff39c09 Merge pull request #1523 from Growstuff/awesomecode-style/rescuestandarderror-7269 
Auto corrected by following Style/RescueStandardError
 2018-01-11 10:00:50 +10:30
Brenda Wallace
7dab57f9ba Removed d3 graph tests 2018-01-11 09:31:59 +13:00
Awesome Code
1a4e0bd48a Auto corrected by following Style/RescueStandardError 2018-01-10 20:18:17 +00:00
Shiny
a931f26b00 Merge branch 'dev' into awesomecode-factorybot/dynamicattributedefinedstatically-7220 2018-01-11 09:15:00 +13:00
Brenda Wallace
390282f9f2 Added Harvested for chart 2018-01-11 09:03:13 +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
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
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
f3ec7e0c4e Add a green border around predictions boxes 2018-01-08 18:12:57 +13:00
Brenda Wallace
d8cce280e2 Remove highcharts.js, we're not using it 2018-01-08 18:03:20 +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
pozorvlak
ace0d7ab77 Merge pull request #1505 from Br3nda/js/cleanup 
Js clean up
 2018-01-05 11:35:17 +00: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
pozorvlak
965fb28ab3 Merge branch 'dev' into js/cleanup 2018-01-03 11:07:35 +00:00
pozorvlak
196707e6e8 Merge pull request #1508 from Br3nda/fix/1502 
Fix/1502  Missing ordering, crops form
 2018-01-03 11:07:11 +00:00
Brenda Wallace
00130b3c0a Merge remote-tracking branch 'origin/fix/1502' into fix/1502 2018-01-03 15:12:31 +13:00
Brenda Wallace
d86de897c7 Wrap long line 2018-01-03 15:12:09 +13:00
Shiny
0db3b3d532 Merge branch 'dev' into fix/1502 2018-01-03 15:10:00 +13:00
Brenda Wallace
a39c304fac Fix ordering of crops' parent on form 2018-01-03 15:06:55 +13:00
Brenda Wallace
ee1617c7c3 Added new line at end of file 2018-01-03 14:43:29 +13:00
Brenda Wallace
0a71bfe99f Tabulation and jsdoc fixes 2018-01-03 14:40:22 +13:00
Brenda Wallace
56b0562785 Removed unused variables in js 2018-01-03 14:24:08 +13:00
Brenda Wallace
2d98a7e793 Wrapped a long line 2018-01-03 14:21:29 +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
Brenda Wallace
591c95dca2 added JSDoc 2018-01-03 12:56:52 +13:00
Brenda Wallace
e910bfd50f added JSDoc 2018-01-03 12:54:33 +13:00
Brenda Wallace
7c25161574 contributors/commits update 2018-01-03 12:48:13 +13:00
Brenda Wallace
0db2d6b346 converted variable to camel case 2018-01-03 12:42:20 +13:00