Torkel Ödegaard
c4ad069083
refactoring & cleaning up css
2018-11-10 17:28:28 +01:00
Torkel Ödegaard
f74f7b017f
Minor progress on edit mode
2018-11-10 07:34:09 -08:00
Torkel Ödegaard
c54ae5d124
improve dropdown pane connetion to tab toolbar
2018-11-09 11:33:33 -08:00
Torkel Ödegaard
1bad8db94c
data source picker demo state
2018-11-09 15:50:09 +01:00
Torkel Ödegaard
a7daf58bb9
wip: progress on edit mode ux with tabs
2018-11-09 13:17:41 +01:00
Torkel Ödegaard
8a9d721c00
panel-edit-ux-tabs on top alternative
2018-11-08 12:25:22 +01:00
Torkel Ödegaard
964a21b091
Merge branch 'master' into panel-edit-ux
2018-11-08 11:46:04 +01:00
Marcus Efraimsson
662808f092
Merge pull request #13930 from grafana/enterprise-docs
...
docs: restructure and enhancement
2018-11-08 01:50:35 -08:00
Torkel Ödegaard
7de07eb096
Merge pull request #13992 from grafana/auth_proxy_headers_default
...
add auth.proxy headers to default.ini
2018-11-08 08:57:33 +01:00
Dan Cech
8a74fe2b76
add auth.proxy headers to sample.ini
2018-11-07 18:21:25 -05:00
Torkel Ödegaard
3b4d8c9b9b
Merge pull request #13984 from grafana/12759-panel-header-standard-menu-only
...
12759 panel header menu in React (standard options only)
2018-11-07 23:42:42 +01:00
Dan Cech
502290817a
add auth.proxy headers to default.ini
2018-11-07 17:36:44 -05:00
Torkel Ödegaard
dcb5015022
Merge pull request #13951 from marefr/11977_6x_terms
...
Fix terms agg order deprecation warning on es 6+
2018-11-07 20:47:41 +01:00
Torkel Ödegaard
d7655e0b54
fixed issue with reducer sharing url query instance with angular router
2018-11-07 11:44:50 -08:00
Torkel Ödegaard
4e49c453b9
Merge pull request #13990 from grafana/exporter-fix-13891
...
Exporter bug fix
2018-11-07 20:33:22 +01:00
Torkel Ödegaard
bcd0b2fcf7
Merge branch 'master' into 12759-panel-header-standard-menu-only
2018-11-07 11:22:30 -08:00
Torkel Ödegaard
99610e040f
fixed exporter bug missing adding requires for datasources only used via data source variable, fixes #13891
2018-11-07 11:14:39 -08:00
Torkel Ödegaard
0712c52cbc
Merge branch 'bergquist-export_dashboard_guidence'
2018-11-07 11:13:22 -08:00
Torkel Ödegaard
c52e91ee6c
minor text change in export modal
2018-11-07 10:46:09 -08:00
Torkel Ödegaard
e73e18913c
Merge branch 'export_dashboard_guidence' of https://github.com/bergquist/grafana into bergquist-export_dashboard_guidence
2018-11-07 10:34:15 -08:00
Torkel Ödegaard
0353c9ea9f
Merge pull request #13988 from xlson/removes_old_ci
...
build: removes unused.
2018-11-07 19:32:34 +01:00
Leonard Gram
d88693fd6d
build: removes unused.
2018-11-07 17:03:24 +01:00
Torkel Ödegaard
93b4cb562d
Fixed issues introduced by changing to PureComponent
2018-11-07 16:03:33 +01:00
Torkel Ödegaard
37eb7ca62b
further refactoring of #13984
2018-11-07 13:55:02 +01:00
Marcus Efraimsson
d7edc59882
minor fix
2018-11-07 13:52:11 +01:00
Torkel Ödegaard
a24f6998f2
refactorings and some clean-up / removal of things not used
2018-11-07 13:36:35 +01:00
Marcus Efraimsson
454d74a176
Merge pull request #13982 from grafana/adeverteuil-patch-1
...
Fix typo in docs/sources/reference/scripting.md
2018-11-07 03:49:43 -08:00
Alexandre de Verteuil
d0794dbce1
Update docs/sources/permissions/dashboard_folder_permissions.md
...
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-07 09:17:36 +01:00
Alexandre de Verteuil
1d3b8e25ce
Fix typo in docs/sources/reference/scripting.md
...
Change:
> In the folder grafana install folder under `public/dashboards/` there is a file named `scripted.js`.
…to:
> In the grafana install folder under `public/dashboards/` there is a file named `scripted.js`.
2018-11-06 15:41:37 -05:00
Torkel Ödegaard
7d87f57367
experimental option boxes
2018-11-06 18:55:35 +01:00
Torkel Ödegaard
5975c4a737
ux: changed panel selection ux
2018-11-06 18:34:37 +01:00
Marcus Efraimsson
f294dbdb86
move enterprise down in menu
2018-11-06 17:39:35 +01:00
Johannes Schill
08251425ca
wip: panel-header: Fix shareModal compatibility with react and angular
2018-11-06 16:55:44 +01:00
Johannes Schill
9c28ff8f84
wip: panel-header: Remove custom menu items from panels completely
2018-11-06 16:44:13 +01:00
Johannes Schill
dd7437e9e9
wip: panel-header: Reverted a lot of code to pause the "custom menu options" for now
2018-11-06 16:37:51 +01:00
Johannes Schill
49550ccedf
wip: panel-header: More merge conflicts during cherry pick
2018-11-06 16:12:04 +01:00
Johannes Schill
dbf7f3fb61
wip: panel-header: More merge conflicts during cherry pick
2018-11-06 16:05:34 +01:00
Dan Cech
1347ce5f75
Update docs/sources/permissions/datasource_permissions.md
...
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:57:14 +01:00
Dan Cech
850c0e7111
Update docs/sources/permissions/datasource_permissions.md
...
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:56:53 +01:00
Dan Cech
4ef770fe98
Update docs/sources/permissions/dashboard_folder_permissions.md
...
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:56:32 +01:00
Dan Cech
1bc3f0af07
Update docs/sources/http_api/datasource_permissions.md
...
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:56:12 +01:00
Dan Cech
8a52cb7714
Update docs/sources/enterprise/index.md
...
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:55:53 +01:00
Dan Cech
d44b8968d2
Update docs/sources/enterprise/index.md
...
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:55:42 +01:00
Dan Cech
803b36a059
Update docs/sources/enterprise/index.md
...
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:55:28 +01:00
Dan Cech
5cdd53c5e7
Update docs/sources/enterprise/index.md
...
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:55:05 +01:00
Dan Cech
32e001dba4
Update docs/sources/enterprise/index.md
...
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:54:53 +01:00
Dan Cech
881c73fb93
Update docs/sources/enterprise/index.md
...
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:54:25 +01:00
Dan Cech
044505a213
minor change
...
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:53:49 +01:00
Johannes Schill
6c0c1254fe
wip: panel-header: More merge conflicts
2018-11-06 15:44:04 +01:00
Johannes Schill
ca4612af26
wip: panel-header: Merge conflicts
2018-11-06 15:35:15 +01:00
