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

394 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jelte Fennema
ac48c048a0 Merge pull request #510 from JelteF/monthlines 
Add vertical grid lines to line graphs
 2015-01-08 12:51:48 +01:00
Jelte Fennema
d008d9317f Merge pull request #518 from JelteF/in-bar-value 
Add an option to display the value of a bar in the bar itself
 2015-01-08 12:51:36 +01:00
Jelte Fennema
763c91e795 Add an option to display the value of a bar in the bar itself (only for horizontal bars) 2014-10-26 13:29:10 +01:00
Jelte Fennema
f17d78fd2e Rebuild to fix a serious bug. 2014-10-25 17:44:21 +02:00
Jelte Fennema
77011bbae4 Merge pull request #517 from JelteF/off-by-one-bar 
Fix off by one error when shown was not given
 2014-10-25 17:42:14 +02:00
Jelte Fennema
5f1ea081a5 Fix off by one error when shown was not given 2014-10-25 17:40:54 +02:00
Jelte Fennema
c8e14ae163 Add vertical grid lines to line graphs 2014-10-15 16:53:15 +02:00
Jelte Fennema
75cdb5bd97 Merge pull request #498 from fran6co/events 
Adds events range
 2014-10-15 14:01:41 +02:00
Jelte Fennema
1c66cfc4ac Merge pull request #464 from JelteF/escape-hover 
Escape labels in hover
 2014-10-15 13:58:05 +02:00
Jelte Fennema
a158fb7677 Merge pull request #484 from JelteF/master 
Rebuild files
 2014-10-08 16:33:41 +02:00
Francisco Facioni
a5705894fa Adds events range 2014-09-23 08:06:55 -03:00
Jelte Fennema
93c7441bbc Merge pull request #497 from fran6co/patch-1 
Fixes copy&paste error in event
 2014-09-23 12:28:55 +02:00
Francisco Facioni
ab0bad541d Fixes copy&paste error in event 
This was referenced in 715771431c
 2014-09-22 16:17:58 -03:00
Jelte Fennema
2356f4977e Rebuild. 2014-08-14 15:38:30 +02:00
Jelte Fennema
ef8b3f3276 Merge pull request #458 from JelteF/non-blurry-lines 
Fix blurry lines
 2014-08-14 14:48:15 +02:00
Jelte Fennema
025fb4887a Merge pull request #474 from JelteF/horizontal-bar-click-fix 
A small fix that makes the click handler work for horizontal bar charts
 2014-08-14 14:41:43 +02:00
Jelte Fennema
d54a039837 Merge pull request #460 from JelteF/horizontal-bar-fixes 
Fix transX
 2014-08-14 14:32:51 +02:00
Jelte Fennema
bb86c78613 Merge pull request #459 from JelteF/better-ylabel-callback 
Pass series index to yLabelFormat
 2014-08-14 14:32:08 +02:00
Jelte Fennema
127b2bf271 A small fix that makes the click handler work for horizontal bar charts 2014-07-29 16:37:15 +02:00
Jelte Fennema
77c24f6b70 Escape labels in hover 2014-07-16 23:24:16 +02:00
Jelte Fennema
2901f63fba Fix transX 2014-07-15 18:24:20 +02:00
Jelte Fennema
0192dd0eee Pass series index to yLabelFormat 2014-07-15 17:55:56 +02:00
Jelte Fennema
bc76a22ec3 Fix blurry lines 2014-07-15 16:02:34 +02:00
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