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
74 Commits 4 Branches 20 Tags 3.3 MiB
870e0a649a
Commit Graph

74 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Olly Smith
870e0a649a Merge branch 'master' of https://github.com/littlebtc/morris.js into timezones 
Conflicts:
	morris.coffee
	morris.js
	morris.min.js
 2012-04-04 21:02:56 +01:00
Olly Smith
564126fbfa Merge xLabelFormat contributions by @jonthornton. 
Rename `xLabelsFormat` -> `xLabelFormat` (grammatically better :))

Add note to example to recommend use of `xLabels` option when using
`xLabelFormat`.

Use $.extends rather than setting spec.fmt directly (avoids modifying
the globals).

Add a test.
 2012-04-04 20:32:24 +01:00
Jon Thornton
57211d6db2 Added option to customize x-labels. 2012-04-03 11:31:59 -04:00
Olly Smith
4b6be4104c README.md 2012-04-02 21:30:02 +01:00
Olly Smith
e11c28187c Add years example. 2012-04-02 21:28:57 +01:00
Olly Smith
e670a6dbee Add xLabels option to specify x-label intervals. 
Clean up whitespace (hooray for Whitespace.tmbundle!).
 2012-04-02 21:27:45 +01:00
Oliver Smith
2d901e04fa Add build status icon. 2012-04-02 14:57:15 +01:00
Oliver Smith
40e2c60b2b try an absolute path 2012-04-02 14:52:01 +01:00
Oliver Smith
0e1b9f6f18 revert to 1.4.1 qunit runner. 2012-04-02 14:47:05 +01:00
Oliver Smith
02ef26ec6b Language key 2012-04-02 14:42:15 +01:00
Oliver Smith
1a84e1aadc Let's try travis. 2012-04-02 14:31:24 +01:00
Olly Smith
f761a8e483 Update README. 2012-04-01 22:29:48 +01:00
Olly Smith
fc4ff279a5 Refactor x-axis labelling. 2012-04-01 22:29:37 +01:00
Hsiao-Ting Yu
970a813a5a Support ISO 8601 with time zone offsets 2012-04-01 01:19:40 +08:00
Olly Smith
18b4191093 Better ISO date support 2012-03-23 19:09:15 +00:00
Olly Smith
b3ab944aa8 Fix bug with single value in non time-series graphs. 2012-03-23 18:54:13 +00:00
Olly Smith
ab0178da02 Bump README for v0.2.6. 2012-03-18 20:43:58 +00:00
Olly Smith
bde431ac34 Merge prettifylabels() into commas(). 
Stop parsing times for labels when @options.parseTime is false.

Tweak examples to show partial data series support.
 2012-03-18 19:50:40 +00:00
Olly Smith
ad8d0b6a8c Refactor redraw() 2012-03-18 19:10:20 +00:00
Olly Smith
64cfa4a0ff Merge branch 'partialseries' of https://github.com/tangerilli/morris.js into tangerilli-partialseries 2012-03-18 18:24:06 +00:00
Olly Smith
3fa0ba6dff Bump README for 0.2.5. 2012-03-15 21:48:03 +00:00
Olly Smith
ca5675954f Timestamp support. 2012-03-15 21:44:55 +00:00
Olly Smith
8261dd1e9a YYYY-MM-DD HH:MM[:SS[.SSS]] support. 2012-03-15 21:18:39 +00:00
Olly Smith
144092128c Timestamp refactor, 2/2. 2012-03-15 21:06:21 +00:00
Olly Smith
d8564ab251 Timestamp refactor, 1/2. 2012-03-15 20:47:15 +00:00
Olly Smith
634179d9e8 Better decimal number support. 2012-03-15 20:18:33 +00:00
Tony Angerilli
82a508f341 Various changes to allow for x-series data that is not complete (i.e. a series with fewer data points than another series) 2012-03-10 23:42:04 -08:00
Olly Smith
5ee41e16e2 0.2.4 changelog 2012-03-08 21:04:12 +00:00
Olly Smith
bcc034e152 Units labels. Fix commas for negative hundreds. 2012-03-08 20:50:43 +00:00
Olly Smith
4fb43d5d37 Support for negative numbers. 2012-03-08 20:03:45 +00:00
Olly Smith
c4e48a275c Refactor examples. 2012-03-07 21:35:25 +00:00
Olly Smith
56f2e8a48d Update README 2012-03-06 22:21:36 +00:00
Olly Smith
d4b4a77e9f 0.2.3 changelog. 2012-03-06 22:13:18 +00:00
Olly Smith
13f41027eb Rebuild. 2012-03-06 22:06:40 +00:00
Olly Smith
28cb48bb36 Coffeescript non-date X values. 2012-03-06 22:05:25 +00:00
Olly Smith
35b46d15aa hideHover in coffeescript 2012-03-06 22:05:25 +00:00
Kefan Xie
e526784f39 Added hideHover option to hide hover when mousing out 2012-03-06 21:22:51 +00:00
Kefan Xie
939baf5e9e Added parseTime option to allow non-date parsing line charts 2012-03-06 21:22:51 +00:00
Olly Smith
64c5ac10f2 Add clean target to Makefile. 2012-03-04 21:43:54 +00:00
Olly Smith
f484b7574d Merge pull request #27 from msabbott/master 
Support ISO-8601 Week Numbers on X-Axis
 2012-03-04 13:41:54 -08:00
Mark Abbott
b67c1b2358 Fixed bug where number of weeks was miscalculated 2012-03-04 17:03:11 +00:00
Mark Abbott
6fb708acea Added extra comments to the Coffeescript to describe the calculations that are going on 2012-03-04 17:01:09 +00:00
Mark Abbott
6be7b1904c Converted draft code to Coffeescript, and added calculation for number of weeks in the year 2012-03-04 16:11:48 +00:00
Mark Abbott
ceab688216 Add functionality to support Week Numbers 2012-03-04 13:36:44 +00:00
Olly Smith
8446be205e Move jQuery wrapper into coffeescript. 2012-03-01 08:06:38 +00:00
Adrian Rollett
a174ae924b Wrapped morris.js to allow compatibility with noConflict mode. 2012-02-29 21:20:37 -07:00
Olly Smith
a280a1717e v0.2.2 changelog 2012-02-29 21:10:48 +00:00
Olly Smith
eca4b3aba1 Sort input data (closes #10, #20). 2012-02-29 20:53:53 +00:00
Olly Smith
b3b8377c53 Fix bug when options.data.length == 2. 
Closes #19
 2012-02-29 08:11:01 +00:00
Olly Smith
819f40b3d4 0.2.1 changelog. 2012-02-28 22:29:33 +00:00