Commit Graph

1831 Commits

Author SHA1 Message Date
Torkel Ödegaard
63424f9866 ux: more work on sidemenu 2017-08-15 14:49:12 +02:00
Torkel Ödegaard
7bf6904119 ux: scrollbar stuff 2017-08-15 11:51:47 +02:00
Torkel Ödegaard
e81cb9c929 ux: testing fixed sidemenu and breadcrumbs 2017-08-14 22:44:01 +02:00
Torkel Ödegaard
097fa74390 ux: minor navbar update 2017-08-14 21:43:24 +02:00
Torkel Ödegaard
8aa73401a9 ux: new breadcrumb progress 2017-08-14 19:47:40 +02:00
Torkel Ödegaard
8d6a1cdbb4 ux: wip 2017-08-14 18:11:35 +02:00
Torkel Ödegaard
78ea1dc87d ux: new page header look wip 2017-08-14 16:06:20 +02:00
Torkel Ödegaard
f02be0251b ux: use flexbox for sidenav, put logo in sidenav 2017-08-14 12:26:24 +02:00
Torkel Ödegaard
1dab313ca3 Merge branch 'master' into develop 2017-08-14 10:30:36 +02:00
Torkel Ödegaard
d4dd0222fa fix: prometheus does not have two editor modes, fixes #9025 2017-08-11 12:33:56 +02:00
Torkel Ödegaard
d2437d3cf1 fix: ad-hoc filters now works with data source variables, fixes #8052 2017-08-10 12:04:46 +02:00
Daniel Lee
1105bb371f mysqlds: adds support for template variables
Fixes #8855
2017-08-09 19:32:53 +02:00
Daniel Lee
59513ff963 tempvar: bug fix for duplicate template var
and a fix for when selecting the same value twice in
a template variable if it is not multi select. It threw an
exception on the second selection
2017-08-09 14:28:23 +02:00
Torkel Ödegaard
668cb3c1ef Merge branch 'v4.4.x' 2017-08-09 10:37:06 +02:00
Torkel Ödegaard
e8a20643d6 feat: store last seen date for users and present in stats and user lists, closes #9007 2017-08-09 10:36:41 +02:00
Torkel Ödegaard
68c4ce34d5 fix: templating issue with data source variables, can now be used right away in other query variables and panels (without page reload), fixes #7510 2017-08-08 17:08:35 +02:00
Torkel Ödegaard
d3680d290c fix: graphite issue with metricFind and sending from/until in normal format, fixes #8997 2017-08-08 13:51:54 +02:00
Torkel Ödegaard
83beff300b Merge branch 'v4.4.x' 2017-08-08 11:26:45 +02:00
Torkel Ödegaard
64b5153e7d fix: change view json to use the grafana built json viewer, fixes #9002 2017-08-08 11:26:16 +02:00
Torkel Ödegaard
eb18bfea07 ux: minor panel menu fix 2017-08-03 15:19:06 +02:00
Torkel Ödegaard
d862b64b1b ux: minor panel menu tweaks 2017-08-03 13:26:30 +02:00
Torkel Ödegaard
148c24aa18 ux: tweaks to new panel menu 2017-08-03 10:35:27 +02:00
Torkel Ödegaard
a5d5f3d82f feat: add ad hoc filters directly from table panel cells, kibana 3 style, #8052 2017-08-02 16:15:22 +02:00
Torkel Ödegaard
9fb60c2fc8 Merge branch 'develop' into panel-title-menu-ux 2017-08-02 09:56:08 +02:00
Torkel Ödegaard
e312408855 updated 2017-08-02 09:22:22 +02:00
Torkel Ödegaard
21a3f443f2 Merge branch 'master' into panel-title-menu-ux 2017-08-01 11:43:00 +02:00
squain
ede6d71e72 Fix typo in alert_howto.html (#8964) 2017-07-31 21:16:39 +02:00
Torkel Ödegaard
44fbd3ec9f feat: calls to Graphite api /metrics/find now include panel or dashboard time ranges in some scenarios, closes #8055 2017-07-31 17:21:25 +02:00
Torkel Ödegaard
61d8eb1fac Merge branch 'v4.4.x' 2017-07-31 15:07:22 +02:00
Torkel Ödegaard
73563d087c feat: more work on #8768 2017-07-31 14:39:33 +02:00
Cedric Cellier
417c5163dd Fix typos (#8954)
Some being user visible.
2017-07-31 12:12:28 +02:00
Torkel Ödegaard
6956110497 Merge branch 'master' of github.com:grafana/grafana 2017-07-24 12:23:33 +02:00
Torkel Ödegaard
cd0e1a8978 Merge branch 'v4.4.x' 2017-07-24 12:21:43 +02:00
Torkel Ödegaard
2d2800e710 fix: url did not update correctly when closing settings view by using ESC key, fixes #8869 2017-07-24 12:21:30 +02:00
Alexander Zobnin
af56cc4c28 Panel Alertlist: use dashboard timezone (#8880)
* panel-alertlist: use dashboard timezone, fixes #8874

* alert state history: use dashboard timezone, issue #8874

* alert state history: minor refactor
2017-07-19 20:45:57 +02:00
Matt Toback
a045f175b6 Fixed typo 2017-07-14 12:20:04 -04:00
Denis Doria
89822acf38 More precise detection for self reference variable on templates (#8814)
This should close the bug #8773
2017-07-12 06:54:32 +02:00
Alexander Zobnin
1499c2bf74 Fix User/Org default timezone bug (#8748)
* dashboard: don't override timezone if default selected, issue #8503

* dashboard: hide UTC icon immediately after timezone changing
2017-07-03 09:20:55 +02:00
Daniel Lee
7ea5930a90 alerting: minor fix 2017-06-29 12:18:10 +02:00
Daniel Lee
3ac306a72e playlist: fixes #6727. Remember Kiosk mode 2017-06-28 16:29:46 +02:00
Daniel Lee
ebcbcdc27a dashfolders: inherited permissions for dashboards
Allow duplicate permissions if the original is an
inherited permission from a parent folder.

If a dashboard has permissions but the parent folder
does not, return the default permissions for the
editor and view role combined with the permissions
for the child dashboard.
2017-06-24 03:50:22 +02:00
Torkel Ödegaard
1833c65559 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-06-23 16:07:16 -04:00
Torkel Ödegaard
fc69d59cae dashboard folder search fix 2017-06-23 16:00:26 -04:00
Daniel Lee
01ac3a49bd dashfolders: fix user group picker + cleanup 2017-06-23 20:56:02 +02:00
Torkel Ödegaard
456225365f Merge branch 'develop' of github.com:grafana/grafana into develop 2017-06-23 12:59:14 -04:00
Torkel Ödegaard
e854fadb67 Merge branch 'master' into develop 2017-06-23 12:56:59 -04:00
Daniel Lee
c6965ce6f4 dashfolders: rename refactor 2017-06-23 18:00:49 +02:00
Torkel Ödegaard
73fcc919cd change: made dashboard save message optional 2017-06-23 11:49:32 -04:00
Daniel Lee
97ff245ad0 dashfolders: validation for duplicates in acl modal 2017-06-23 17:45:55 +02:00
Torkel Ödegaard
86a73c359b fix: data source selector did not show, fixes #8692 2017-06-23 11:32:17 -04:00