mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-31 05:02:02 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,898 Commits 55 Branches 76 Tags
2c3fe3c2046bc386efb0bddd378eebedf8aba4f2
Commit Graph

4898 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
2c3fe3c204 updated prediction spec 2018-01-09 13:18:58 +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
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
Brenda Wallace
5584da02c3 Some js cleanups 2018-01-03 12:35:30 +13:00
Brenda Wallace
7464668021 Add bootstrap js to codeclimate excludes 2018-01-03 12:02:21 +13:00
Brenda Wallace
29dcc01cde Merge remote-tracking branch 'upstream/dev' into js/cleanup 2018-01-03 11:54:09 +13:00
Brenda Wallace
a836d6432f Updating javascript style 2018-01-03 11:52:47 +13:00
Brenda Wallace
4e0f7e9086 Use the old "var" syntax, and max line 120 2018-01-03 11:49:06 +13:00
Brenda Wallace
93eba14af9 Adding package lock, and eslint 2018-01-03 11:28:12 +13:00
Shiny
7d51ba98ec Merge pull request #1500 from Growstuff/bundle-update-2017-12-24-080947 
Bundle Update on 2017-12-24
 2017-12-24 16:43:34 +13:00
deppbot
4ba210cf81 Bundle Update on 2017-12-24 2017-12-24 08:09:48 +08:00
Cesy
c08beb5291 Merge pull request #1495 from Growstuff/dev 
Release 37
release37 		2017-12-22 09:54:32 +00:00
pozorvlak
269f3164b7 Merge pull request #1497 from Br3nda/feature/admin-nicer 
Nicer admin interface
 2017-12-18 11:33:02 +00:00
Shiny
9d47b2b029 Merge branch 'dev' into feature/admin-nicer 2017-12-18 15:10:36 +13:00
Daniel O'Connor
81e26aaf02 Merge pull request #1496 from Br3nda/feature/ordering 
Feature/ordering
 2017-12-18 09:30:51 +10:30
Shiny
d62322b498 Merge branch 'dev' into feature/admin-nicer 2017-12-18 06:59:33 +13:00
Shiny
ebb2f90294 Merge branch 'dev' into feature/ordering 2017-12-18 06:59:17 +13:00
Shiny
72922a160d Merge pull request #1498 from Growstuff/bundle-update-2017-12-18-000857 
Bundle Update on 2017-12-18
 2017-12-18 06:58:50 +13:00
deppbot
0699716c19 Bundle Update on 2017-12-18 2017-12-18 00:08:58 +08:00
Brenda Wallace
4c35987cb7 Ignore long method in ability.rb 2017-12-17 17:57:19 +13:00
Brenda Wallace
54e0806f38 don't check role is there's no member 2017-12-17 17:55:14 +13:00
Brenda Wallace
99828c7c01 Updated spec for new admin#index 2017-12-17 17:54:13 +13:00
Brenda Wallace
25d2773464 Use nested module/class definitions instead of compact style. 2017-12-17 17:50:30 +13:00
Brenda Wallace
233a30a045 Haml code style fix up 2017-12-17 17:49:05 +13:00
Brenda Wallace
01a7463ae8 Split up ability.rb into methods 2017-12-17 12:47:41 +13:00
Brenda Wallace
8a446ecbfc Member admin 2017-12-17 12:45:19 +13:00
Brenda Wallace
efc60e6313 Nicer layout on editing roles 2017-12-17 12:11:55 +13:00
Brenda Wallace
406b2dbf04 Make admin index a bit nicer 2017-12-17 12:06:03 +13:00