Robot
/
morris.js
mirror of https://github.com/morrisjs/morris.js.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
421 Commits 4 Branches 20 Tags 3.3 MiB
Commit Graph

421 Commits

Author SHA1 Message Date
Jelte Fennema a9076b2cc4 Merge pull request #452 from JelteF/feature-noshow 2014-07-15 15:45:22 +02:00
sudodoki 089109093f Merge pull request #457 from JelteF/horizontal-bar-fixes 
Horizontal bar: Fix stacked and vertical grid
 2014-07-15 09:30:56 -04:00
Jelte Fennema 6aa57ca30e Horizontal bar: Fix stacked and vertical grid 2014-07-15 14:57:37 +02:00
Olly Smith cab4b6d859 Merge pull request #450 from JelteF/feature-trendline 
Add trend line calculation
 2014-07-14 21:19:54 +01:00
Olly Smith ed1bc7584a Merge pull request #449 from JelteF/pointsize-zero 
Don't grow a point if its size is 0
 2014-07-14 21:15:23 +01:00
Olly Smith 8c100cde86 Merge pull request #448 from JelteF/feature-nolabel 
Add feature to pass false as a label so it isn't displayed
 2014-07-14 21:13:06 +01:00
Olly Smith 72ad7823ad Merge pull request #453 from ebeigarts/bower-jquery 
Fix dependencies in bower.json
 2014-07-14 21:00:45 +01:00
Olly Smith 18c1842850 Merge pull request #454 from ebeigarts/fix-version 
Bump version in all the files
 2014-07-14 20:59:51 +01:00
Olly Smith 62b4290315 Merge pull request #455 from JelteF/feature-horizontal-bar 
Add horizontal barchart option
 2014-07-14 20:51:41 +01:00
Edgars Beigarts 18db33cf9d Bump version in all the files 2014-07-14 10:26:44 +03:00
Edgars Beigarts bdaf4553bd Test against jQuery 1.7 since it is mentioned in README 2014-07-14 10:26:16 +03:00
Edgars Beigarts 1311793733 Fix dependencies in bower.json 
1. README clearly states jQuery >= 1.7.0
2. mocha is not runtime dependeny
 2014-07-14 10:25:35 +03:00
Jelte Fennema 715771431c Add horizontal barchart option 2014-07-14 00:15:21 +02:00
sudodoki 72596faa6f Update package.json 2014-07-14 00:06:58 +03:00
Jelte Fennema 877e341ac4 Add feature to not show certain plots, but still show values in the legend 2014-07-12 17:35:21 +02:00
Jelte Fennema 3c7398d0b6 Add trendline calculation 2014-07-10 22:53:43 +02:00
Jelte Fennema 46022aabe0 Don't grow a point if its size is 0 2014-07-10 18:59:24 +02:00
Jelte Fennema f92f5bf6fb Add feature to pass false as a label so it isn't displayed 2014-07-10 18:54:29 +02:00
Olly Smith d5cf1410ed Update README for v0.5.1 release. 2014-06-15 21:14:08 +01:00
Olly Smith 2df090ee48 Fix touch events. 2014-06-15 21:01:21 +01:00
Olly Smith bce2c80fde Support different jQuery package paths for travis builds. 2014-06-14 10:13:31 +01:00
Olly Smith 4a67502b05 Rebuild. 2014-06-14 09:58:59 +01:00
Olly Smith 1f0abcd631 Merge branch 'master' of github.com:oesmith/morris.js 2014-06-14 09:58:31 +01:00
Olly Smith 587ecaa784 Fix stacked=false in bar chart (fixes #275). 2014-06-14 09:58:16 +01:00
Olly Smith aca2438c00 Merge pull request #297 from sudodoki/feature/vertical_grid 
feature: configurable vertical segments
 2014-06-14 08:07:32 +01:00
Olly Smith 4346d98fdd Merge branch 'master' of https://github.com/mikach/morris.js 
Conflicts:
	morris.min.js
 2014-06-14 08:01:24 +01:00
Olly Smith ed05eb817c Add a reminder in the README to only change coffee source. 2014-06-14 07:55:27 +01:00
Olly Smith 8f8aa35e3b (Finally) deprecate continuousLine option. 2014-05-05 21:38:39 +01:00
Olly Smith 64e5adf0b4 Update URLs in package.json. 2014-05-05 20:56:38 +01:00
Olly Smith fe8577c751 v0.5.0 release date. 2014-05-05 20:45:10 +01:00
mikach 9532354320 Hide hover tooltip if empty 2014-04-03 19:37:57 +03:00
Olly Smith d31c072942 Update links in README. 2014-03-19 20:59:42 +00:00
Olly Smith 3063cf5688 Fix specs. 2014-03-19 20:55:54 +00:00
Olly Smith 41c3775156 Merge pull request #380 from kara/patch-1 
Update copyright year in license to 2014
 2014-03-19 20:31:16 +00:00
Kara 725d50400d Update copyright year in license to include 2014 2014-03-09 16:29:27 -07:00
Kara a758c20484 Update copyright year in license to 2014 2014-03-09 16:10:14 -07:00
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
sudodoki e8d84dca09 feature: configurable vertical segments 2013-11-16 01:53:37 +02:00
Olly Smith 88a14d952a Update docs and metadata. 2013-11-11 21:44:52 +00:00