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
233 Commits 4 Branches 20 Tags 3.3 MiB
ad5b1c8056
Commit Graph

233 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Olly Smith
cf9d10b9dc Merge branch 'master' into html-hover 
Conflicts:
	morris.min.js
 2012-12-03 21:39:03 +00:00
Olly Smith
0bce4d3076 Merge branch 'broken-lines' 
Conflicts:
	morris.min.js
 2012-12-03 17:46:52 +00:00
Olly Smith
d41bea2e23 Refactor. 
- Test paths as rendered in SVG.
- More exact unit tests for createPath.
- Catch some more edge case bugs in createPath.
- Refactor createPath to handle null values better.
 2012-12-03 08:39:13 +00:00
Olly Smith
a8ca88e583 Merge branch 'morris-hover' of https://github.com/tiraeth/morris.js into html-hover 
Conflicts:
	lib/morris.bar.coffee
	morris.js
	morris.min.js
 2012-12-02 22:23:59 +00:00
Olly Smith
691bd8d017 Merge pull request #120 from dynaum/master 
Adding support to stacked bars
 2012-12-02 13:06:53 -08:00
Christopher Erin
b0e99f7ca9 default continuousLine to true for backwards compat 2012-11-29 16:34:04 -06:00
Christopher Erin
6d14aa831d filled out tests for createPath and generatePaths. refactored code to allow for jagged/broken lines and to pass tests. 2012-11-29 16:28:27 -06:00
Christopher Erin
ee6cbd8eac replace array.filter with list comprehension 2012-11-29 12:27:21 -06:00
Olly Smith
370edd2e2e Unit test stubs. 2012-11-29 08:18:14 +00:00
Elber Ribeiro
5c5e882c6b Adding new example file to staked bars 2012-11-26 14:47:36 -02:00
Elber Ribeiro
71bb498c05 generating min js 2012-11-20 10:51:26 -02:00
Elber Ribeiro
4773f909a8 Adding support to stacked bars 2012-11-19 23:23:11 -02:00
Marcin Chwedziak
9bdabf1d0d first version of hover refactored to be 100% html 2012-11-18 20:02:46 +01:00
Christopher Erin
10826cbfc0 discontinuous line in cases where null data values should be represented by no line rather than a line connecting only the coords with data. 2012-11-13 17:42:01 -06:00
Olly Smith
25698d6664 Decade intervals for time-axis labels. 2012-11-08 17:18:23 +00:00
Olly Smith
2a2a849ebd Tests for bar colours. 2012-11-08 15:21:33 +00:00
Olly Smith
25906c1635 Add sinon.js 2012-11-08 12:54:57 +00:00
Olly Smith
236afa4003 Define bar colors with a function. 2012-11-06 08:18:19 +00:00
Olly Smith
d6b955af02 Tidy up use of "is/isnt null" using ? operator. 2012-11-06 07:48:29 +00:00
Olly Smith
b233059e8d Replace $.map with coffeescript for-loops. 2012-11-06 07:36:36 +00:00
Olly Smith
93fa8df7b8 Merge pull request #108 from tiraeth/fix-107 
Fixes #107, passes data row to formatter function as second param
 2012-11-05 12:44:48 -08:00
Marcin Chwedziak
c279b9b0b1 fixes #107, passes data row to formatter function to allow user make usage of it 2012-11-05 19:55:08 +01:00
Olly Smith
8faced7668 Couple of quick fixes. 2012-11-03 14:08:57 +00:00
Olly Smith
0dc74db428 Merge branch 'grid-parallel-lines' of https://github.com/tiraeth/morris.js into tiraeth-grid-parallel-lines 2012-11-03 13:51:47 +00:00
Olly Smith
41e52815c3 Bower! 2012-11-02 19:12:51 +00:00
tiraeth
38a1cdd9ec Added value goals and time events. 2012-11-01 20:17:04 +01:00
Olly Smith
df9eb94464 v0.3.3 Changelog. 2012-11-01 00:53:38 -07:00
Olly Smith
e4f4594fab Back-to-basics bar chart. 2012-10-31 21:58:26 +00:00
Olly Smith
5ee5ffe824 Revert paddings. 2012-10-31 20:14:39 +00:00
tiraeth
69f932d9e6 Morris.Bar + additional updates to Morris.Grid for bars handling 2012-10-31 20:38:09 +01:00
Olly Smith
54c7e3f4c1 Update README for v0.3.2. 2012-10-28 21:27:36 +00:00
Olly Smith
5192f678dc *really* fix hover placing. 2012-10-28 21:22:10 +00:00
Olly Smith
a8d60d03fe Fix hover placing when nil values present. 2012-10-28 20:39:56 +00:00
Olly Smith
a03926897b Label x-axis from right to left. 2012-10-28 20:30:48 +00:00
Olly Smith
df63f19358 Reverse hover order for area charts. 2012-10-28 19:50:38 +00:00
Olly Smith
f72b14f619 Initial area charts. 2012-10-28 18:55:37 +00:00
Olly Smith
16b88ba1de Make hover a *teensy* bit clearer. 2012-10-27 18:31:21 +01:00
Olly Smith
e76f6c8e0a Loads more specs. 2012-10-25 18:51:30 +01:00
Olly Smith
5776c44d60 Improved support for empty charts. 2012-10-25 09:19:37 +01:00
Olly Smith
5ae2dfc478 Start building up the spec coverage. Fix hover label bug (yay, specs!) 2012-10-25 08:23:20 +01:00
Olly Smith
69f949b132 Refactor spec runner, update to newer mocha. 2012-10-25 07:51:13 +01:00
Olly Smith
1aca098694 MUCH simpler internal code. 2012-10-23 09:15:21 +01:00
Olly Smith
f6b1cfe7a0 Line chart working again. 2012-10-22 07:56:40 +01:00
Olly Smith
3b5ff1a47e Update spec for new exception. 2012-10-22 07:12:44 +01:00
Olly Smith
d5b8071dbb WIP Refactor grid drawing into a base class. 2012-10-21 22:33:49 +01:00
Olly Smith
67fbc481aa Simplify! 2012-10-21 00:29:40 +01:00
Olly Smith
66461001b7 Merge branch 'smooth-per-series' of https://github.com/tiraeth/morris.js into tiraeth-smooth-per-series 
Conflicts:
	morris.min.js
 2012-10-20 23:55:23 +01:00
Olly Smith
1d4c7f0d65 Custom dateFormat for string x-values. #90 2012-10-19 10:20:22 +01:00
Olly Smith
42099ea26b Add watch task back to grunt.js. 2012-10-19 09:07:30 +01:00
tiraeth
b8674f3869 fixed the code to use ykeys for smooth instead of seriesLabels 2012-10-15 23:16:00 +02:00