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
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
David Kaltschmidt
dfc0c5052d
Fix loglevel tests for Explore loggging
2018-11-06 15:40:29 +01:00
Johannes Schill
ca4612af26
wip: panel-header: Merge conflicts
2018-11-06 15:35:15 +01:00
Johannes Schill
f471482569
wip: panel-header: Fragment not needed anymore
2018-11-06 15:27:15 +01:00
Johannes Schill
443d381dd9
wip: panel-header: Add possibility to add custom actions to the menu by passing them in as props
2018-11-06 15:26:56 +01:00
Johannes Schill
f124b9de6a
wip: panel-header: Separate all panel actions to its own file so we decouple them from react
2018-11-06 15:26:43 +01:00
Johannes Schill
6151310216
wip: panel-header: Start implementing the Toggle legend, but its not taken all the way
2018-11-06 15:26:34 +01:00
Johannes Schill
79da3dc9f6
wip: panel-header: Change DashboardPanel to a PureComponent to avoid unwanted rerenders
2018-11-06 15:25:59 +01:00
Johannes Schill
5375ce5ffd
wip: panel-header: Refactor so "Share" use the same code in angular+react
2018-11-06 15:25:46 +01:00
Johannes Schill
f9dd516578
wip: panel-header: Add "Edit JSON" functionality + make sure everyone using the json editor pass in the model property instead of the scope property when triggering the json modal
2018-11-06 15:25:36 +01:00
Johannes Schill
edceb204e7
wip: panel-header: Add "Copy" functionality
2018-11-06 15:25:13 +01:00
Johannes Schill
b296d724e5
wip: panel-header: Add "Duplicate"
2018-11-06 15:25:07 +01:00
Johannes Schill
839057dc7a
wip: Add "Share" to the react panels
2018-11-06 15:25:02 +01:00
Johannes Schill
bf8703edb8
wip: panel-header: Move code existing in both angular+react to utility functions
2018-11-06 15:24:25 +01:00
Johannes Schill
820e47b4c0
wip: panel-header: Remove panel
2018-11-06 15:24:06 +01:00
Johannes Schill
212c086162
Mobx is now Redux
2018-11-06 15:24:00 +01:00
