Commit Graph
18633 Commits
Author SHA1 Message Date
Erik Sundell 0c596a0274 align input widths 2018-12-18 13:03:29 +01:00
Erik Sundell 738fd997ce remove console log 2018-12-18 11:46:07 +01:00
Erik Sundell d23d4c2ca0 rename directive 2018-12-18 11:31:11 +01:00
Erik Sundell b46be0b638 remove linebreak 2018-12-18 11:28:35 +01:00
Erik Sundell ea1ce578ff remove old group heading 2018-12-18 11:26:42 +01:00
Erik Sundell 8430c5a491 use new generic picker 2018-12-18 11:25:13 +01:00
Erik Sundell 47b3901e7d remove on metric type change 2018-12-18 10:37:47 +01:00
Erik Sundell a5f64a5668 fix remove filter bug 2018-12-18 10:37:47 +01:00
Erik Sundell a7bdd757ef use same color for label as in explore dropdown 2018-12-18 10:37:47 +01:00
Erik Sundell 15ba05d7ee cleanup query filter 2018-12-18 10:37:47 +01:00
Erik Sundell 5affc55756 update failing tests 2018-12-18 10:37:46 +01:00
Erik Sundell 8afe48bb3e remove redundant default value 2018-12-18 10:37:46 +01:00
Erik Sundell dcbe12989f use new option group in aggregation directive 2018-12-18 10:37:46 +01:00
Erik Sundell 2ac1fe2a17 remove redundant default value 2018-12-18 10:37:46 +01:00
Erik Sundell fe4c77a8a4 wip: add option group component 2018-12-18 10:37:46 +01:00
Erik Sundell 5370f78ee7 wip: add basic option header 2018-12-18 10:37:46 +01:00
Erik Sundell 73b5bc680f Wrap react select component in angular directive 2018-12-18 10:36:59 +01:00
bergquist 3c6bcde8b2 changelog: adds note about closing #14548 2018-12-18 08:22:02 +01:00
Carl Bergquist ac458a4e4b Merge pull request #14511 from grafana/go-ldap-v3
ldap: upgrades go-ldap to v3
2018-12-18 08:18:40 +01:00
Torkel Ödegaard 1b1f8ebadc Merge pull request #14541 from grafana/minor-cleanup
Minor cleanup now that angular panel edit is no longer
2018-12-18 07:36:31 +01:00
Torkel Ödegaard 705cbb4095 Minor cleanup now that angular panel edit is no longer 2018-12-17 21:29:25 +01:00
Carl Bergquist 7653d8a197 Merge pull request #14468 from bergquist/db_lock
Infra package for creating distributed lock to make sure functions are executed once even in HA mode.
2018-12-17 16:51:11 +01:00
bergquist 7aa84aeb61 moves migrations to /sqlstore/migrations 2018-12-17 16:36:57 +01:00
bergquist dbcc2e868d adds integration tests to ci build 2018-12-17 16:36:57 +01:00
bergquist 11cde7ed71 renames main lock function 2018-12-17 16:36:57 +01:00
bergquist c565b018c5 clean up integration tests 2018-12-17 16:36:57 +01:00
bergquist 823bba8d98 change from db_text to nvarchar 2018-12-17 16:36:57 +01:00
bergquist dc49bebb00 adds server lock package 2018-12-17 16:36:57 +01:00
bergquist ff136b6ba8 initial verison of server lock 2018-12-17 16:36:57 +01:00
Torkel Ödegaard c0fc236fcb Merge pull request #14535 from grafana/react-graph-changes
React graph changes
2018-12-17 16:29:00 +01:00
Torkel Ödegaard 0fe452ec26 Minor react graph panel refactorings and fixes 2018-12-17 15:38:51 +01:00
Torkel Ödegaard cfae98fae2 Merge pull request #14532 from grafana/fixes-to-user-and-team-picker
Fixes issues with user and team picker
2018-12-17 14:56:05 +01:00
Torkel Ödegaard e80a287f7a Merge pull request #14510 from grafana/14484-table-format-string-epochs
In Table Panel, renders epoch string as date if date column style
2018-12-17 14:37:00 +01:00
Torkel Ödegaard e38a04ba9a Fixes issues with user and team picker 2018-12-17 14:31:43 +01:00
Torkel Ödegaard 0fd92ef6fb Refactoring react graph 2018-12-17 13:55:25 +01:00
Torkel Ödegaard 3efaf52049 Merge pull request #14274 from grafana/develop
Develop (New Panel Edit UX & Explore All Datasources suppport) -> Master
2018-12-17 13:35:59 +01:00
Torkel Ödegaard 1ac81c3ad0 updated dropdown typeahead to place down instead of up, works better when inside scrollable area 2018-12-17 13:08:09 +01:00
Torkel Ödegaard 7455dfcc84 minor style tweak 2018-12-17 12:57:40 +01:00
Erik Sundell f673d60dae Merge branch 'develop' of https://github.com/grafana/grafana into develop 2018-12-17 11:17:58 +01:00
Erik Sundell e84e6740e6 propagate initial state back to explore query runner 2018-12-17 11:17:16 +01:00
Torkel Ödegaard d912677d80 Merge pull request #14520 from Soitora/patch-1
OAuth Title Fix
2018-12-17 07:22:48 +01:00
Simon Mattila c4126f9910 Update gitlab.md
Change title from Google to GitLab
2018-12-17 00:26:23 +01:00
Simon Mattila 5d190769e6 Update github.md
Change title from Google to GitHub
2018-12-17 00:24:52 +01:00
Torkel Ödegaard d7e5582c76 minor style fixes 2018-12-16 10:31:37 -08:00
Torkel Ödegaard e6b8bfe7e6 Updated snapshot 2018-12-16 10:10:25 +01:00
Torkel Ödegaard 72b9cb9b9f Switched to react-select fork 2018-12-16 09:58:37 +01:00
Torkel Ödegaard 660c9fd467 Merge branch 'develop' of github.com:grafana/grafana into develop 2018-12-16 09:21:15 +01:00
Daniel Lee 167e8815d3 ldap: upgrades go-ldap to v3 2018-12-16 01:05:14 +01:00
Daniel Lee 0ebd5e0c80 table: fixes #14484. Renders epoch string if date column style 2018-12-16 00:03:03 +01:00
Daniel Lee 217596b4a1 changelog: adds note for #14483 2018-12-16 00:01:56 +01:00