 Torkel Ödegaard
|
fad07f0d15
|
refactor(http): refactoring http server
|
2016-12-21 14:36:32 +01:00 |
|
|
Torkel Ödegaard
|
8bccbdafd2
|
feat(live): minor progress on stream manager
|
2016-12-21 09:16:29 +01:00 |
|
|
Torkel Ödegaard
|
b7827962dc
|
feat(live): just wanted to checkout how far I got on the websocket data source
|
2016-12-20 16:09:04 +01:00 |
|
|
Torkel Ödegaard
|
e81e4ad06f
|
updated websocket lib
|
2016-12-20 11:36:11 +01:00 |
|
|
Torkel Ödegaard
|
164de5e3ce
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-12-19 16:36:26 +01:00 |
|
|
Torkel Ödegaard
|
a2baec8592
|
fix(panel): fixed panel help tooltip issue, #4079
|
2016-12-19 16:36:09 +01:00 |
|
|
Torkel Ödegaard
|
090db9401c
|
fix(graph): fix for when data min/max delta is zero and negative and grid y min/max is auto, fixes #6980
|
2016-12-19 09:30:52 +01:00 |
|
|
Torkel Ödegaard
|
3be77ad293
|
fix(docs): fixed spelling in docs article
|
2016-12-19 08:42:37 +01:00 |
|
|
Torkel Ödegaard
|
0a0b4f5533
|
Merge branch 'info-corner-refinements'
|
2016-12-16 21:17:47 +01:00 |
|
|
Torkel Ödegaard
|
2fc2cc721e
|
change(panel): changed hover delay for #6998
|
2016-12-16 21:16:35 +01:00 |
|
|
Torkel Ödegaard
|
3a9680939e
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-12-16 16:09:59 +01:00 |
|
|
Torkel Ödegaard
|
a361d1f488
|
feat(panel): refinements for panel help text, made the inspector the home for the model version
|
2016-12-16 16:09:02 +01:00 |
|
|
Torkel Ödegaard
|
2c05237d90
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-12-16 13:47:22 +01:00 |
|
|
Torkel Ödegaard
|
c04590784b
|
Merge branch 'utkarshcmu-help-text'
|
2016-12-16 13:43:51 +01:00 |
|
|
Torkel Ödegaard
|
af363ab478
|
fix(panel): build fixes
|
2016-12-16 13:43:43 +01:00 |
|
|
Torkel Ödegaard
|
62f3b16671
|
feat(panel): working on panel help text and unifying panel links, panel errors, and panel help into a single panel feature, #4079 , #6847
|
2016-12-16 13:06:04 +01:00 |
|
|
Torkel Ödegaard
|
ac9ae52cea
|
feat(panel): working on panel help text and unifying panel links, panel errors, and panel help into a single panel feature, #4079 , #6847
|
2016-12-16 12:46:29 +01:00 |
|
|
Torkel Ödegaard
|
b9043c915e
|
feat(panel): working on panel help text, #4079 , #6847
|
2016-12-16 11:48:32 +01:00 |
|
|
Torkel Ödegaard
|
ca7bc25c83
|
feat(panel): working on panel help text, #4079 , #6847
|
2016-12-16 10:34:00 +01:00 |
|
|
Torkel Ödegaard
|
597ebb1161
|
fix(config): fixed issue setting generic oauth name via ENV variable, fixes #6974
|
2016-12-15 14:08:39 +01:00 |
|
|
Torkel Ödegaard
|
0c94194a5b
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-12-15 13:57:05 +01:00 |
|
|
Torkel Ödegaard
|
b50490f080
|
docs(): changelog updated
|
2016-12-15 13:56:49 +01:00 |
|
|
Torkel Ödegaard
|
35b970347a
|
Merge branch 'v4.0.x'
|
2016-12-15 13:55:26 +01:00 |
|
|
Torkel Ödegaard
|
497a1fcefc
|
Merge branch 'v4.0.x' of github.com:grafana/grafana into v4.0.x
|
2016-12-15 13:54:58 +01:00 |
|
|
Torkel Ödegaard
|
94962b4193
|
fix(logging): fixed default log level filter option not taking effect, fixex #6978
|
2016-12-15 13:54:47 +01:00 |
|
|
Torkel Ödegaard
|
19552450fa
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-12-14 22:31:11 +01:00 |
|
|
Torkel Ödegaard
|
435f474e8a
|
docs(): minor fix for docker docs
|
2016-12-14 22:30:20 +01:00 |
|
|
Torkel Ödegaard
|
8fc6e4cfb0
|
fix(auth proxy, ldap): fixed so users cannot change password when ldap or auth proxy is enabled, fixes #2495, do not allow user to change email or username depending on what property auth proxy is using, fixes #6903
|
2016-12-14 22:19:25 +01:00 |
|
|
Torkel Ödegaard
|
df562e23cf
|
feat(ldap): better ldap logging, closes #6918
|
2016-12-14 22:01:02 +01:00 |
|
|
Torkel Ödegaard
|
6e27db148c
|
Merge branch 'authproxy_ldap' of https://github.com/seuf/grafana into seuf-authproxy_ldap
|
2016-12-14 21:45:15 +01:00 |
|
|
Torkel Ödegaard
|
9f69a4d34d
|
clean(): removed old docs file
|
2016-12-14 21:22:01 +01:00 |
|
|
Torkel Ödegaard
|
c59fd2e8f6
|
fix(docs): fixed support for old docs url, fixes #6960
|
2016-12-14 21:21:21 +01:00 |
|
|
Torkel Ödegaard
|
330c1b945e
|
refactor(datasource): refactoring datasource secure json fields handling, #6697, #6692
|
2016-12-14 21:06:10 +01:00 |
|
|
Torkel Ödegaard
|
b38e9b0cac
|
fix(cloudwatch): removed debugger statement
|
2016-12-14 20:40:02 +01:00 |
|
|
Torkel Ödegaard
|
c3920bfba1
|
fix(cloudwatch): fixed broken cloudwatch edit page, #6697
|
2016-12-14 20:38:35 +01:00 |
|
|
Torkel Ödegaard
|
467ddc19c3
|
feat(panel): worked on panel description tooltip, #6847
|
2016-12-14 17:22:19 +01:00 |
|
|
Torkel Ödegaard
|
5f7ad9ddb6
|
Merge branch 'help-text' of https://github.com/utkarshcmu/grafana into utkarshcmu-help-text
|
2016-12-14 16:20:36 +01:00 |
|
|
Torkel Ödegaard
|
7425c63528
|
fix(dashboard): fixed unit test
|
2016-12-14 14:42:25 +01:00 |
|
|
Torkel Ödegaard
|
e72a60bbf5
|
feat(graph): shared graph tooltip is not a select option with 3 options, normal, shared crosshair & shared tooltip, CTRL+O or CMD+O cycles option, closes #6894
|
2016-12-14 14:33:33 +01:00 |
|
|
Torkel Ödegaard
|
baec2bbe8a
|
fix(firefox): fixed table options tab UX issues, fixes #6900
|
2016-12-14 13:16:54 +01:00 |
|
|
Torkel Ödegaard
|
488fe62f15
|
fix(singletat): fixed/polished layout in singlestat ui options tab
|
2016-12-14 12:58:20 +01:00 |
|
|
Torkel Ödegaard
|
faf6a5fd36
|
fixed issue in metric segment and option lookup, #6912
|
2016-12-14 10:50:48 +01:00 |
|
|
Torkel Ödegaard
|
62d18cd493
|
docs(): updated changelog with PR #6940
|
2016-12-13 09:18:10 +01:00 |
|
|
Torkel Ödegaard
|
0841e841f5
|
cleanup(): removed docker/production folder as it was old and unused (ie grafana-docker repo is the place for the offical production docker container
|
2016-12-12 22:12:27 +01:00 |
|
|
Torkel Ödegaard
|
46c161b104
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-12-12 16:35:59 +01:00 |
|
|
Torkel Ödegaard
|
80d88d302c
|
fix(config): changed default for oauth and allow_sign_up setting, #6928
|
2016-12-12 16:35:42 +01:00 |
|
|
Torkel Ödegaard
|
9da44141f1
|
fix(git): removed external submodule, accedentially included in PR, fixes #6929
|
2016-12-12 15:43:04 +01:00 |
|
|
Torkel Ödegaard
|
5ec7dea81a
|
Merge branch 'v4.0.x'
|
2016-12-12 14:39:53 +01:00 |
|
|
Torkel Ödegaard
|
8feaef20e0
|
fix(graph): fixed graph issue with axes mode set to series and picking Max value, fixes #6926
|
2016-12-12 14:37:40 +01:00 |
|
|
Torkel Ödegaard
|
40b359334b
|
fix(typescript): fixed sourcemap issue, #6904
|
2016-12-12 14:24:36 +01:00 |
|
|
Torkel Ödegaard
|
ee6cd727ea
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-12-12 11:38:31 +01:00 |
|
|
Torkel Ödegaard
|
3bb9d47a45
|
minor change to #6904
|
2016-12-12 11:38:10 +01:00 |
|
|
Torkel Ödegaard
|
815722c3cc
|
Merge branch 'upgrade_typescript' of https://github.com/Nepomuceno/grafana into Nepomuceno-upgrade_typescript
|
2016-12-12 10:53:19 +01:00 |
|
|
Torkel Ödegaard
|
22bf6420f1
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-12-08 10:25:26 +01:00 |
|
|
Torkel Ödegaard
|
05772b30d7
|
feat(ux): completed work on getting started panel, #6466
|
2016-12-08 10:25:05 +01:00 |
|
|
Torkel Ödegaard
|
dee6b7d150
|
Merge branch 'master' into getting-started-panel
|
2016-12-08 08:51:40 +01:00 |
|
|
Torkel Ödegaard
|
924535c6d0
|
change(graph): changed null value graph option to default to null, closes #6868
|
2016-12-07 15:27:20 +01:00 |
|
|
Torkel Ödegaard
|
e082d78697
|
fix(elasticsearch): removed unused code
|
2016-12-07 12:07:56 +01:00 |
|
|
Torkel Ödegaard
|
7b68e6ea3b
|
feat(elasticsearch): Added support for Missing option (bucket) for terms aggregation, refactoring PR #4244, thx @shanielh
|
2016-12-07 12:06:47 +01:00 |
|
|
Torkel Ödegaard
|
83afbd4262
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-12-06 11:58:51 +01:00 |
|
|
Torkel Ödegaard
|
e1b25b3999
|
changelog(): updated changelog with info on shared tooltip feature merged via PR #6274, closes #1578
|
2016-12-06 11:58:39 +01:00 |
|
|
Torkel Ödegaard
|
fa393c282a
|
feat(graph): refactoring shared tooltip PR #6274
|
2016-12-06 11:55:20 +01:00 |
|
|
Torkel Ödegaard
|
51165e76ba
|
Merge branch 'shared_tooltip' of https://github.com/connection-reset/grafana into connection-reset-shared_tooltip
|
2016-12-06 09:32:22 +01:00 |
|
|
Torkel Ödegaard
|
9bb440bc82
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-12-06 09:02:51 +01:00 |
|
|
Torkel Ödegaard
|
62269bb894
|
change(influxdb): always specify absolute time range in milliseconds, refactoring #6571
|
2016-12-06 08:56:01 +01:00 |
|
|
Torkel Ödegaard
|
c6bb86d833
|
Merge branch 'master' of https://github.com/ryantxu/grafana into ryantxu-master
|
2016-12-06 08:38:29 +01:00 |
|
|
Torkel Ödegaard
|
d56b9a720a
|
feat(alerting): added confirm text when removing panel with alert rule
|
2016-12-06 08:11:21 +01:00 |
|
|
Torkel Ödegaard
|
167936f9b9
|
updated changelog
|
2016-12-06 07:43:39 +01:00 |
|
|
Torkel Ödegaard
|
ee36234196
|
Merge branch 'v4.0.x'
|
2016-12-06 07:42:35 +01:00 |
|
|
Torkel Ödegaard
|
f9fba0e935
|
fix(timerange): fixed time range zoom out shortcut, fixes #6837
|
2016-12-06 07:42:22 +01:00 |
|
|
Torkel Ödegaard
|
88e1d56bc2
|
fix(logging): added extra logging when default config file is not found (ie homepath is not correct), fixes #6829
|
2016-12-06 07:36:10 +01:00 |
|
|
Torkel Ödegaard
|
4c406dec2f
|
cleanup(): removed unused (old) migrate stuff
|
2016-12-05 12:52:34 +01:00 |
|
|
Torkel Ödegaard
|
aea3093d85
|
change(Timepicker): removed last 90 days to make room for Last 2 days, #6758
|
2016-12-05 11:52:00 +01:00 |
|
|
Torkel Ödegaard
|
37c1a49dc9
|
updated changelog
|
2016-12-05 11:44:50 +01:00 |
|
|
Torkel Ödegaard
|
50022253bd
|
Merge branch 'v4.0.x'
|
2016-12-05 11:44:02 +01:00 |
|
|
Torkel Ödegaard
|
890e5ce8ca
|
feat(playlist): added support for kiosk mode & minor polish/fix, closes #6727
|
2016-12-05 11:43:51 +01:00 |
|
|
Torkel Ödegaard
|
80f7a6a896
|
updated changelog
|
2016-12-05 11:20:54 +01:00 |
|
|
Torkel Ödegaard
|
1f50c6d76f
|
Merge branch 'v4.0.x'
|
2016-12-05 11:20:14 +01:00 |
|
|
Torkel Ödegaard
|
cc46b81961
|
fix(rendering): fixed server side rendering issue when sertting enforce_domain to true, fixes #6769
|
2016-12-05 11:20:01 +01:00 |
|
|
Torkel Ödegaard
|
c5ff1e4584
|
Merge branch 'v4.0.x'
|
2016-12-05 11:04:24 +01:00 |
|
|
Torkel Ödegaard
|
a9c0f66cda
|
fix(influxdb): Fix for Ad-Hoc Filters variable & changing dashboards, fixes #6821
|
2016-12-05 11:04:05 +01:00 |
|
|
Torkel Ödegaard
|
e1d52902c1
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-12-05 10:54:40 +01:00 |
|
|
Torkel Ödegaard
|
d1feaaf4f3
|
Merge branch 'v4.0.x'
|
2016-12-05 10:54:01 +01:00 |
|
|
Torkel Ödegaard
|
ab07667b69
|
fix(rendering): minor fix for server side rendering when using non default http addr setting and non default domain setting, #6813
|
2016-12-05 10:51:46 +01:00 |
|
|
Torkel Ödegaard
|
a5f7edbe40
|
Update CHANGELOG.md
|
2016-12-02 11:29:12 -05:00 |
|
|
Torkel Ödegaard
|
bc0fdc1f8e
|
Update CHANGELOG.md
|
2016-12-02 11:28:06 -05:00 |
|
|
Torkel Ödegaard
|
25a5fc465c
|
fix(row): fixed dropping new panels onto panels, should split target panel
|
2016-11-29 11:38:02 -05:00 |
|
|
Torkel Ödegaard
|
7276b00fc7
|
fix(row): fixed dropping new panels onto panels, should split target panel
|
2016-11-29 11:37:06 -05:00 |
|
|
Torkel Ödegaard
|
7e831e10a2
|
updated version in grafana-server main.go
|
2016-11-29 10:41:31 -05:00 |
|
|
Torkel Ödegaard
|
a2d1cc1a46
|
fix(css): minor style fix
|
2016-11-28 09:39:07 -05:00 |
|
|
Torkel Ödegaard
|
2f354ed926
|
fix(getting started panel): some more work on this, #6466
|
2016-11-24 13:58:51 +01:00 |
|
|
Torkel Ödegaard
|
2233938ba7
|
Merge branch 'master' into getting-started-panel
|
2016-11-24 13:17:22 +01:00 |
|
|
Torkel Ödegaard
|
ad7ae1b912
|
fix(graph): Fixed tooltip date header visible when x-mode was set to series, fixes #6364
|
2016-11-24 13:16:46 +01:00 |
|
|
Torkel Ödegaard
|
d9cf6a958b
|
fix(unsaved changes): You now navigate to the intended page after saving in the unsaved changes dialog fixes #6675
|
2016-11-24 11:06:09 +01:00 |
|
|
Torkel Ödegaard
|
223f2320eb
|
fix(streaming): clear data stream on subject completion
|
2016-11-23 17:12:30 +01:00 |
|
|
Torkel Ödegaard
|
cf751c256b
|
fix(graph): fixed order of graph tooltip when sort order was none, fixes #6648
|
2016-11-23 17:08:14 +01:00 |
|
|
Torkel Ödegaard
|
ea5cb0d076
|
fix(server side rendering): Fixed address used when rendering panel via phantomjs and using non default http_addr config, fixes #6660
|
2016-11-23 15:35:43 +01:00 |
|
|
Torkel Ödegaard
|
773fb5d1ae
|
fix(alerting): check if dashboard is saved before testing alert rule, fixes #6549
|
2016-11-23 14:55:10 +01:00 |
|
|
Torkel Ödegaard
|
2a33594c02
|
fix(templating): fixed duplicate button bug, fixes #6652
|
2016-11-22 14:20:24 +01:00 |
|
|
Torkel Ödegaard
|
34790e1fab
|
fix(dashboard): minor fix to schema upgrade when schemaVersion is not correct, fixes #6650
|
2016-11-22 14:20:24 +01:00 |
|