Torkel Ödegaard
|
dac3cb15c4
|
Merge branch 'v1.8.x'
|
2014-10-02 12:17:37 +02:00 |
|
Torkel Ödegaard
|
ca654ccaf7
|
fixed stupid unit test mistake
|
2014-10-02 12:17:10 +02:00 |
|
Torkel Ödegaard
|
30512b7032
|
Merge fix from 'v1.8.x' branch
Conflicts:
CHANGELOG.md
|
2014-10-02 12:15:21 +02:00 |
|
Torkel Ödegaard
|
bc8fd62cff
|
Dashboard: fix for dashboard schema upgrade during load, ensure that annotation and templating object as a list array, Closes #890
|
2014-10-02 12:13:18 +02:00 |
|
Torkel Ödegaard
|
a9a51ee3c6
|
Fix to new checkboxes in features toggles tab
|
2014-10-02 11:54:06 +02:00 |
|
Torkel Ödegaard
|
2d2da7c881
|
Small tweak to shared tooltip edit option in Display styles tab
|
2014-10-02 10:55:08 +02:00 |
|
Torkel Ödegaard
|
d22d8c4905
|
Added grafana logo to repo instead of fetching it from grafana.org, Fixes #881
|
2014-10-02 10:24:18 +02:00 |
|
Torkel Ödegaard
|
bcdc8eafa6
|
Updated gitter badge
|
2014-10-02 10:13:23 +02:00 |
|
Torkel Ödegaard
|
9cf6ace979
|
Updated gitter badge
|
2014-10-02 10:09:16 +02:00 |
|
Torkel Ödegaard
|
eef063cec2
|
Merge pull request #889 from gitter-badger/gitter-badge
Add a Gitter chat badge to README.md
|
2014-10-02 10:05:01 +02:00 |
|
The Gitter Badger
|
8b9bdf9054
|
Added Gitter badge
|
2014-10-02 07:59:43 +00:00 |
|
Torkel Ödegaard
|
1c7b898b01
|
Dashboard: show error when importing dashboard json file with broken/incorrect json syntax, Closes #878
|
2014-10-01 13:56:57 +02:00 |
|
Torkel Ödegaard
|
7ad18da08e
|
update to test helper
|
2014-10-01 13:49:36 +02:00 |
|
Torkel Ödegaard
|
5530915b49
|
Updated AngularJS from 1.3-beta-17 to 1.3-RC3
|
2014-10-01 13:44:45 +02:00 |
|
Torkel Ödegaard
|
77f380c94b
|
Graph: shared tooltip improvements, info tooltip when point counts are not the same, #850
|
2014-10-01 10:30:24 +02:00 |
|
Torkel Ödegaard
|
c79ab84fdf
|
More fixes related to shared crosshair #880
|
2014-10-01 09:42:42 +02:00 |
|
Torkel Ödegaard
|
d77448d84e
|
Fixed unit tests for grafanaGraph component
|
2014-10-01 09:10:49 +02:00 |
|
Torkel Ödegaard
|
8fc5a2785f
|
Refactoring and fixes for PR #880
|
2014-10-01 09:08:11 +02:00 |
|
Torkel Ödegaard
|
27da2b026f
|
Merge branch 'add_shared_croshair_to_dashboards' of github.com:toni-moreno/grafana into toni-moreno-add_shared_croshair_to_dashboards
|
2014-10-01 08:00:20 +02:00 |
|
Torkel Ödegaard
|
2e9cc2a74e
|
Fix for SharePanelCtrl-specs and travis-ci timezone issue
|
2014-10-01 07:58:31 +02:00 |
|
toni-moreno
|
ffd370176d
|
fix tooltip test expecting for stacked data
|
2014-10-01 07:15:20 +02:00 |
|
toni-moreno
|
44f2a375f6
|
Added shared crosshair to dashboards to track better all graphs, and little Fix for #884
|
2014-10-01 07:03:59 +02:00 |
|
Torkel Ödegaard
|
05cb97819c
|
Updated changelog
|
2014-09-30 18:21:19 +02:00 |
|
Torkel Ödegaard
|
282c834d9f
|
updated package.json
|
2014-09-30 17:58:02 +02:00 |
|
Torkel Ödegaard
|
4a6ff9e2aa
|
Merge branch 'v1.8.x'
|
2014-09-30 17:57:30 +02:00 |
|
Torkel Ödegaard
|
ce972d4f19
|
Graph: css & scroll fix for dropdown menus in graph edit mode, Closes #855
|
2014-09-30 17:56:43 +02:00 |
|
Torkel Ödegaard
|
b250d10320
|
Trying to fox unit tests for sharePanelCtrl
|
2014-09-30 17:55:07 +02:00 |
|
Torkel Ödegaard
|
f63706d118
|
Small update to share panel
|
2014-09-30 15:31:18 +02:00 |
|
Torkel Ödegaard
|
c41aa64719
|
ShareModal: Added template variables to share url, and an option for it, #864
|
2014-09-30 15:19:48 +02:00 |
|
Torkel Ödegaard
|
285d246c65
|
PanelMenu: fixed interpolate template vars for new panel title/menu
|
2014-09-30 14:48:36 +02:00 |
|
Torkel Ödegaard
|
2c85205259
|
SharePanelModal: working on share feature, #864
|
2014-09-30 14:42:59 +02:00 |
|
Torkel Ödegaard
|
2d866b9298
|
Updated changelog with the new panel menu, Closes #770
|
2014-09-30 10:49:59 +02:00 |
|
Torkel Ödegaard
|
7a7629acf7
|
Panel-menu: small tweeks to css for cursor types
|
2014-09-30 10:43:13 +02:00 |
|
Torkel Ödegaard
|
debf820037
|
New checkbox change is complete
|
2014-09-30 10:27:56 +02:00 |
|
Torkel Ödegaard
|
f908ae8c40
|
added checkbox image for white theme
|
2014-09-30 09:50:01 +02:00 |
|
Torkel Ödegaard
|
022cbdda31
|
Merge branch 'master' into panel_edit_menu_poc
|
2014-09-30 09:25:19 +02:00 |
|
Torkel Ödegaard
|
ae2523aa59
|
Merge branch 'v1.8.x'
|
2014-09-30 09:23:07 +02:00 |
|
Torkel Ödegaard
|
bf361d2b02
|
Updated package.json version and latest.json, preparation for 1.8.1 release
|
2014-09-30 09:03:14 +02:00 |
|
Torkel Ödegaard
|
64f3303711
|
InfluxDB: save dashboard issue, another fix for #859
|
2014-09-30 09:02:25 +02:00 |
|
Torkel Ödegaard
|
06f382c454
|
Merge branch 'master' of github.com:grafana/grafana
|
2014-09-29 16:59:54 +02:00 |
|
Torkel Ödegaard
|
5f164d99ac
|
Updated changelog with merged PR #850, shared multi series graph tooltip & crosshair
|
2014-09-29 16:59:17 +02:00 |
|
Torkel Ödegaard
|
2473ae3b47
|
Graph: shared multi series tooltip, refactoring PR #850
|
2014-09-29 16:57:05 +02:00 |
|
Torkel Ödegaard
|
3fb457ccd1
|
Merge branch 'master' into toni-moreno-add_shared_tooltips_to_graphs
|
2014-09-29 14:25:25 +02:00 |
|
toni-moreno
|
51333c9eda
|
improved tooltip styles, add multiple highlight points, and changed highligth size when graph plotted without points.
|
2014-09-29 12:48:08 +02:00 |
|
Torkel Ödegaard
|
1aaf3961ff
|
Merge pull request #867 from tobym/patch-1
Fix typo
|
2014-09-29 12:43:48 +02:00 |
|
Torkel Ödegaard
|
af4f3f62e9
|
Merged yaxis_precision branch, #877, updated changelog
|
2014-09-29 12:38:52 +02:00 |
|
Torkel Ödegaard
|
cc31a12b8c
|
Smart decimal precision when using scaled unit format, Closes #877
|
2014-09-29 12:29:53 +02:00 |
|
Torkel Ödegaard
|
bc9989f9be
|
replaced checkbox options with the new editor-opt-bool directive
|
2014-09-27 10:47:48 +02:00 |
|
toni-moreno
|
7f33bec71c
|
fixing the previous fix, now working fine
|
2014-09-25 15:45:18 +02:00 |
|
toni-moreno
|
3ea94c3484
|
little fix when searching x index time
|
2014-09-25 06:35:49 +02:00 |
|