Robot/morris.js
1
0
Fork 0
mirror of https://github.com/morrisjs/morris.js.git synced 2024-11-14 07:41:11 +01:00
Code Issues Projects Releases Packages Wiki Activity
334 commits 4 branches 20 tags 3.3 MiB
Commit graph

334 commits

This branch
This branch
All branches
Author SHA1 Message Date
Olly Smith
2d25af9098 Re-build. 2014-02-23 19:54:38 +00:00
Alexander Simonov
4b2f0a7aad Merge pull request #365 from morrisjs/multiple-deps 
Tests refactoring
 2014-02-05 15:01:42 +02:00
sudodoki
4fe3a644e4 Update grunt-mocha package for 1.6.0 compatibility 2014-02-05 14:38:30 +02:00
sudodoki
ad0615467e Change prettify to be from cdn too 2014-02-05 14:28:43 +02:00
Alexander Simonov
c7a90c7ed2 Fix opening examples locally 2014-02-05 07:52:37 +02:00
Alexander Simonov
c36593d7a3 Use only one version of node.js. Fix Raphael.js version strings. 2014-02-02 19:20:21 +02:00
Alexander Simonov
0f602d116b Removing third_party folder. Using cdn links in examples. Using bower.js for deps. Build matrix for Travic-CI. 2014-02-02 19:15:26 +02:00
Olly Smith
ecd6fd7155 Merge pull request #359 from sudodoki/feature/#352 
Add license header for coffee & js files
 2014-01-30 12:57:30 -08:00
sudodoki
8e38ecc593 Add license header for coffee & js files 2014-01-30 14:57:34 +02:00
Olly Smith
07c740414b Merge pull request #358 from sudodoki/feature/#311 
Feature - bar max width
 2014-01-29 23:07:41 -08:00
sudodoki
e3e50aac93 Implement #311: feature - bar max width 2014-01-30 01:57:57 +02:00
Olly Smith
7bce55890f Update README.md 2013-12-16 21:33:49 +00:00
Olly Smith
88a14d952a Update docs and metadata. 2013-11-11 21:44:52 +00:00
Olly Smith
c1e40c13f4 Add note on pdiffs. 2013-11-11 21:00:12 +00:00
Olly Smith
85730ec938 Remove perceptualdiff from travis config. 2013-11-11 20:58:08 +00:00
Olly Smith
863d4289a9 Revert "Add pdiffs to npm test." 
This reverts commit a3566f0ccf.
 2013-11-11 20:57:21 +00:00
Olly Smith
d2df6ef233 More perceptualdiff testing tweaks. 2013-11-11 07:02:58 +00:00
Olly Smith
a3566f0ccf Add pdiffs to npm test. 2013-11-10 22:12:30 +00:00
Olly Smith
063957657c Add perceptual diffs. 
Uses perceptualdiff to catch regressions / changes in charts as they are
displayed by a browser (in this case, phantomjs).

Currently has exemplaries for basic line, area, bar and stacked bar
charts.
 2013-11-10 22:09:01 +00:00
Olly Smith
68aa4c36f2 Add original data to custom hover callback. 
Chart data points are sorted when using parseTime, so indices will not
always match the original data ordering.

Also fixes a couple of event triggers.

Ref: #264.
 2013-11-09 20:36:47 +00:00
Olly Smith
c07222445c setData() method for Morris.Donut. 
Fixes #211
 2013-11-09 19:53:50 +00:00
Olly Smith
88e3fe6211 Automatic resizing. 
Fixes #111. It's a costly operation, but it's working.
 2013-11-09 19:33:36 +00:00
Olly Smith
6e5d68fc99 Merge pull request #298 from sudodoki/fix_travis_builds 
update npm test task
 2013-11-09 10:19:15 -08:00
Olly Smith
6422b543be Merge branch 'feature/coffee_idioms' of https://github.com/sudodoki/morris.js into sudodoki-feature/coffee_idioms 
Conflicts:
	lib/morris.grid.coffee
 2013-11-09 17:50:53 +00:00
Olly Smith
221c83781d Tidy up. 
- The options namespace should stay flat - no nested config values.
- Used single array literal instead of chained Array.concats.
- Added default values to config defaults, instead of using default
  method arguments.
- Tweaked spec.
 2013-11-09 17:23:07 +00:00
Olly Smith
415476f7ca Merge branch 'feature/rounded_corners' of https://github.com/sudodoki/morris.js into sudodoki-feature/rounded_corners 2013-11-09 16:56:32 +00:00
Olly Smith
4580852416 Merge pull request #306 from sudodoki/feature/xLabelPadding 
feature: option to set padding for x axis label
 2013-11-09 08:52:46 -08:00
Olly Smith
c1264caa61 Use local third-party javascript for examples. 
Move scripts from spec/lib into third_party, update references.
 2013-11-09 16:50:32 +00:00
Olly Smith
3cba9e5769 Merge pull request #314 from abrinkman/master 
Adds the ability to mark events on a non-time-based line and area charts.
 2013-11-09 08:28:28 -08:00
Alex Brinkman
b162e18cce Adds the ability to mark events on a non-time-based line graph 2013-11-03 20:58:17 -07:00
sudodoki
c9820c2d44 it is actually only top padding 2013-10-26 00:49:14 +03:00
sudodoki
b79e0be820 feature: optional xAxisLabelPadding 2013-10-26 00:18:16 +03:00
sudodoki
ca371d112a feature: round-corners for bars in barchart 2013-10-25 23:54:18 +03:00
sudodoki
9162df9f62 some coffee idioms, common constructor change 2013-10-25 00:34:05 +03:00
sudodoki
98db726906 update npm test task 2013-10-20 18:24:59 +03:00
Olly Smith
a738317adb Recompile. 2013-10-12 14:07:18 +01:00
Olly Smith
e19d676bc4 Merge branch 'grunt_update' of https://github.com/sudodoki/morris.js into sudodoki-grunt_update 2013-10-12 14:05:06 +01:00
Olly Smith
7123d419a6 Merge branch 'master' of https://github.com/stlk/morris.js into stlk-master 
Conflicts:
	morris.min.js
 2013-10-12 14:02:06 +01:00
Olly Smith
0e8c0f49b6 Merge branch, and merge with previous changes. 
Previous point-width work by other contributors conflicted, so have tied
the two changes and sets of tests together. Have also slightly changed
some variable / config names to read easier.

Merge branch 'master' of https://github.com/dgilperez/morris.js into dgilperez-master

Conflicts:
	lib/morris.line.coffee
	morris.js
	morris.min.js
 2013-10-12 13:58:10 +01:00
Olly Smith
005edd9770 Rebuild JS. 2013-10-12 13:37:29 +01:00
Olly Smith
d889eb6268 Merge pull request #257 from mathieubigorne/master 
pointSize attribute should accept an array of values
 2013-10-12 05:35:34 -07:00
Olly Smith
96e918a297 Merge branch 'disable-individual-axes' of https://github.com/arachnys/morris.js into arachnys-disable-individual-axes 
Conflicts:
	morris.min.js
 2013-10-12 13:32:25 +01:00
Olly Smith
e868701016 Merge branch 'range-selection' of https://github.com/arachnys/morris.js into arachnys-range-selection 
Conflicts:
	morris.min.js
 2013-10-12 13:27:35 +01:00
Olly Smith
019a04ed08 Merge branch 'label_specs_week' of https://github.com/dhoko/morris.js into dhoko-label_specs_week 
Conflicts:
	morris.min.js
 2013-10-12 13:24:09 +01:00
Olly Smith
85330798d9 Merge pull request #243 from dissolved/master 
Update Developer Quickstart instructions
 2013-10-12 05:21:09 -07:00
Olly Smith
4345fa3723 Merge pull request #266 from movabletype/options-smooth-boolean 
Use the @options.smooth directly if the value's type is "boolean".
 2013-10-12 05:20:24 -07:00
sudodoki
99836064a0 adding engines and reordering move task 2013-09-25 22:26:31 +03:00
sudodoki
5c17052bb5 updating gruntfile & travis install & npm test command 2013-09-25 09:27:24 +03:00
Josef Rousek
e31c466528 You can now specify segment color in data parameter 2013-09-11 14:37:32 +02:00
David Gil
8817e221b5 fix hilight WIP 2013-08-20 04:10:18 +02:00