Commit Graph

12187 Commits

Author SHA1 Message Date
Torkel Ödegaard
93d21bec75 Merge branch 'master' into develop 2017-11-24 09:25:14 +01:00
Torkel Ödegaard
02e2d5da2b ux breadcrumb work 2017-11-23 21:50:20 +01:00
Torkel Ödegaard
b3ddcc8077 ux: sass fixes and polish 2017-11-23 20:41:16 +01:00
Marcus Efraimsson
d9ecb59dae dashlist: Support for check/uncheck all 2017-11-23 18:32:44 +01:00
Patrick O'Carroll
4ce1ee4120 Migrate gfunc to ts (#9973)
* migrated gfunc from js to ts

* deleted gfunc.js, small fixes in gfunc.ts
2017-11-23 17:05:27 +01:00
Patrick O'Carroll
3acf106303 migrated admin files to ts (#9975) 2017-11-23 17:05:08 +01:00
Patrick O'Carroll
b94839574c migration of org files from js to ts (#9974)
* migration of org files from js to ts

* more migration of org files to ts

* minor fix to change_password

* renamed files
2017-11-23 17:04:50 +01:00
Torkel Ödegaard
99e52143df sass tweaks 2017-11-23 16:50:22 +01:00
Marcus Efraimsson
7ee57b774a dashlist: When searching should reset checked state to false 2017-11-23 14:59:52 +01:00
Patrick O'Carroll
b7956ef499 More js to ts (#9966)
* four files js to ts, fixed ng_model_on_blur

* added /** @ngInject */
2017-11-23 14:53:23 +01:00
Carl Bergquist
c3699d8259
Merge pull request #9952 from seuf/log_file_count_lines
Optimized number of lines fetching in log file initialisation
2017-11-23 14:22:50 +01:00
Daniel Lee
9ba9043d64 dashlist: change scrollbar to new perfect scroll directive 2017-11-23 13:31:35 +01:00
Marcus Efraimsson
5b05941dec docs: Improve delete snapshot documentation 2017-11-23 13:08:44 +01:00
Torkel Ödegaard
84c46f0cd3 ux: fixed sass issue 2017-11-23 13:01:19 +01:00
Torkel Ödegaard
2b1371c4b8 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-11-23 12:54:35 +01:00
Torkel Ödegaard
458f6fc4b2 sass refactoring and updating styles for list item elements 2017-11-23 12:54:12 +01:00
Daniel Lee
245cebedde dashlist: style list to be same as dash search 2017-11-23 11:53:55 +01:00
Torkel Ödegaard
a1d47d36f6 css tweaks and cleanup 2017-11-23 11:37:59 +01:00
Torkel Ödegaard
d9a913afe1 Merge branch 'develop-scrollable-panels' into develop 2017-11-23 11:13:21 +01:00
Torkel Ödegaard
f18f1a1093 removing gemini scrollbar and replacing with perfect scrollbar, muuuch better 2017-11-23 11:12:32 +01:00
Torkel Ödegaard
856a0393ab Merge branch 'develop' into develop-scrollable-panels 2017-11-23 10:27:16 +01:00
Daniel Lee
41a3431c4e dashlist: starred filter search 2017-11-22 18:44:57 +01:00
Torkel Ödegaard
2d2015d3dd ux: tweaked panel color and dashboard background is same as page background 2017-11-22 17:18:04 +01:00
Torkel Ödegaard
c94331cd20 Merge branch 'develop' into develop-color-tweaks 2017-11-22 14:54:57 +01:00
Torkel Ödegaard
b7a8db4937 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-11-22 14:51:53 +01:00
Torkel Ödegaard
905553052a removed call to unused function in panel_ctrl 2017-11-22 14:47:26 +01:00
Torkel Ödegaard
85e81959f2 scrollable panels works better with perfect-scrollbar 2017-11-22 14:46:17 +01:00
Torkel Ödegaard
5ab72f48fc
Update latest.json 2017-11-22 14:44:18 +01:00
THIERRY SALLE
658109e0d6 Optimized number of lines fetching in log file initialisation
Added unit tests for file logging line counting

Remove file after unit test
2017-11-22 14:25:39 +01:00
Torkel Ödegaard
68bd17bd0e work on scrollable panels 2017-11-22 13:32:54 +01:00
Carl Bergquist
d8d44224f5
Merge pull request #9950 from seuf/es_56_max_concurrent_shards_request
Elasticsearch max_concurrent_shard_requests parameter for es 5.6+
2017-11-22 10:49:46 +01:00
Patrick O'Carroll
27e486d678 converted 3 .js files to .ts (#9958)
* converted files from .js to .ts
2017-11-22 10:11:50 +01:00
bergquist
ca940c2ae5 docs: adds docs for pausing all alerts 2017-11-22 09:31:23 +01:00
Daniel Lee
400bd205a8
Removing file that got committed by accident 2017-11-22 09:30:49 +01:00
Alexander Zobnin
18ca7a53aa scrollable panels: fix initial content size (#9960) 2017-11-22 07:05:33 +01:00
Matt Toback
3f2a510568
Delete LICENSE.txt 2017-11-21 17:16:35 -05:00
Carl Bergquist
79e788e46f
Merge pull request #9937 from saady/gcs-path
[GCS] Support for gcs path
2017-11-21 19:46:53 +01:00
Daniel Lee
ba511f3e24 dashlist: adds tag filter select (GitHub style) 2017-11-21 18:53:49 +01:00
saady
767b460ff1 [GCS] Support for gcs path 2017-11-21 17:22:40 +00:00
Daniel Lee
121d48ec26 dashlist: toggle folders 2017-11-21 17:06:30 +01:00
Daniel Lee
3dc2e06a33 dashboard: fix test for folderIds 2017-11-21 16:41:08 +01:00
Torkel Ödegaard
9fc22e5a66 Merge branch 'master' of github.com:grafana/grafana into develop 2017-11-21 16:05:18 +01:00
bergquist
3a772c7f7f allows head requests for /api/health endpoint
closes #9955
2017-11-21 15:03:04 +01:00
Daniel Lee
bd2b26e9f5 dashlist: fix tag filtering and some css 2017-11-21 14:47:19 +01:00
Torkel Ödegaard
43a6a65f8b fix: fixed issue with metric segment introduced in graphite tags query editor PR 2017-11-21 14:39:09 +01:00
Torkel Ödegaard
830c307bba progress on scrollable panels work 2017-11-21 14:30:33 +01:00
Daniel Lee
5dd9582520 mysql: add data source support for Azure MySql
Fixes #9649
2017-11-21 13:21:19 +01:00
Torkel Ödegaard
741e5a38bd Merge branch 'feat-9887' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-feat-9887 2017-11-21 11:55:07 +01:00
Torkel Ödegaard
ccbdb29f07 fixed unit tests 2017-11-21 11:53:56 +01:00
Torkel Ödegaard
0d12b37dfd fix: alert list panel now works correctly after adding manual annotation on dashboard, fixes #9951 2017-11-21 11:28:17 +01:00