Robot/morris.js
1
0
Fork 0
mirror of https://github.com/morrisjs/morris.js.git synced 2024-11-10 21:36:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
22 Commits 4 Branches 20 Tags 3.3 MiB
8da7935d8e
Commit Graph

22 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Olly Smith
8da7935d8e Merge branch 'master' of https://github.com/scockram/morris.js into scockram-master 2012-02-28 21:15:31 +00:00
Olly Smith
7a72eb3ed3 Simplify $.extend call. 2012-02-28 21:06:55 +00:00
Steve Cockram
3371209ab8 Added option to draw straight lines 2012-02-28 13:30:52 +00:00
Mickele Moriconi
d059c3acaf Clone @default options object before merging it 2012-02-28 13:12:46 +01:00
Olly Smith
8d6cb3ee8e Add ymax 'auto $min' support. 2012-02-28 08:20:41 +00:00
Olly Smith
846c4677c9 Proper dependencies in Makefile. 2012-02-28 07:53:53 +00:00
Olly Smith
7d9d0b811a Merge pull request #7 from thedjinn/ymax-option 
Added option to set maximum y-value
 2012-02-27 23:00:58 -08:00
Olly Smith
92666d6a6c Merge pull request #6 from thedjinn/makefile 
Added Makefile
 2012-02-27 23:00:27 -08:00
Emil Loer
3b4934003e add option to set maximum y value 2012-02-28 00:25:53 +01:00
Emil Loer
336482cd62 add makefile 2012-02-28 00:16:22 +01:00
Olly Smith
738f53ec72 Pulled some examples from #5 (closes #5). 2012-02-26 01:25:10 +00:00
Olly Smith
91dd0fcb42 Update readme. 2012-02-26 01:13:19 +00:00
Olly Smith
99aafd3ed8 Add minified build output. Make 'new' optional on Morris.Line. 2012-02-26 00:28:58 +00:00
Olly Smith
40f336e8bc Fix date-parsing bug. 2012-02-26 00:11:29 +00:00
Olly Smith
9b4791534b Merge branch 'coffee-rewrite' 
Conflicts:
	morris.js
 2012-02-25 18:04:26 +00:00
Olly Smith
9350b63d18 Add YYYY-MM-DD support. 2012-02-23 22:27:26 +00:00
Olly Smith
1e61298d7c YYYY-MM-DD date support (closes #2) 2012-02-23 22:15:07 +00:00
Olly Smith
b8302f24b9 Roughly complete coffeescript port. Still ugly though. 2012-02-23 21:59:45 +00:00
Olly Smith
0514145522 Add a vim modeline so I don't go crazy if I edit something at work. 2012-02-23 08:16:42 +00:00
Olly Smith
f729b1530a CoffeeScript re-write. Has a working plot, but so far no hover labels. 2012-02-23 08:11:31 +00:00
Olly Smith
f740d80c14 Improved date handling: now recognises YYYY-MM dates. 
(also fix a silly math error)
 2012-02-22 16:51:51 +00:00
Olly Smith
eba644feca First post 2012-02-21 22:50:41 +00:00