mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-17 21:19:38 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,940 Commits 58 Branches 82 Tags
2a2bef71da42a4e595e7df59748ecc00fdb126d9
Commit Graph

2552 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Shiny
9d47b2b029 Merge branch 'dev' into feature/admin-nicer 2017-12-18 15:10:36 +13: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
Brenda Wallace
2394f4d237 One view for showing photos on an item 2017-12-17 11:40:55 +13:00
Brenda Wallace
6f2b4b13cd Only show photo pagination if there are photos 2017-12-17 09:55:52 +13:00
Brenda Wallace
970da53873 Merge remote-tracking branch 'origin/feature/photos-1457' into feature/photos-1457 2017-12-17 09:15:24 +13:00
Brenda Wallace
3aa2f0bd3b Paginate photos on seeds#show (inc feature specs) 2017-12-17 08:55:08 +13:00
Shiny
8c1514bc04 Merge branch 'dev' into feature/photos-1457 2017-12-15 17:13:12 +13:00
Brenda Wallace
3d3a3b669e Order posts by most recent 2017-12-15 13:28:41 +13:00