Commit Graph

14239 Commits

Author SHA1 Message Date
Patrick O'Carroll cb8d436ea3 changed test name and dashboardMock code
(cherry picked from commit 38a4a2dc60)
2018-04-26 14:59:09 +02:00
Patrick O'Carroll 8e7147a7da fixed test
(cherry picked from commit 1446f54447)
2018-04-26 14:58:59 +02:00
Patrick O'Carroll f72c4bc0e0 removed import config
(cherry picked from commit 45e6d9fcc4)
2018-04-26 14:58:46 +02:00
Patrick O'Carroll 06d52adf4e fixed so user who can edit dashboard can edit row, fixes #11466
(cherry picked from commit 3eaaa5d32d)
2018-04-26 14:58:34 +02:00
Leonard Gram 790fd99676 Fixes signing of packages.
Signing was failing as the builds
were expected to run as ubuntu but
is run as root.

Closes #11686

(cherry picked from commit 3a48ea8dde)
2018-04-26 14:57:57 +02:00
Marcus Efraimsson 3908571baf db: fix failing user auth tests for postgres
(cherry picked from commit d14ac54af6)
2018-04-26 14:52:52 +02:00
Patrick O'Carroll 0e8f05e6d5 added pointer to show more, reset values on new query
(cherry picked from commit a40314022b)
2018-04-26 14:52:20 +02:00
Patrick O'Carroll 111839bdcc added button to show more preview values for variables, button runs a function that increases options limit, fixes #11508
(cherry picked from commit c2cc77fa08)
2018-04-26 14:51:49 +02:00
Marcus Efraimsson a46d0204d9 use inherited property from api when rendering permissions
(cherry picked from commit 079346917f)
2018-04-26 14:51:27 +02:00
Marcus Efraimsson 3e93fd1372 return inherited property for permissions
(cherry picked from commit d86ed679b1)
2018-04-26 14:51:13 +02:00
bergquist a07f525686 build: fixes build script for releases v5.1.0-beta1 2018-04-20 12:47:56 +02:00
Daniel Lee 6a2d9e21dc Merge pull request #11640 from grafana/11637-dropdown-styling
removed padding and moved carrot
(cherry picked from commit c2064781a0)
2018-04-20 11:22:54 +02:00
bergquist 9dfc53d5a4 release 5.1.0-beta1 2018-04-20 11:01:55 +02:00
bergquist 98bbb01898 build: removes gometalinter
for some reason the linter lints files in /vendor
which it should not. So we have to remove it until
it works as expected

ref #10381
2018-04-20 10:35:29 +02:00
bergquist 03a9650c57 cli: adds os and arch headers
this makes it possible for the plugin repo
to provide the correct package if arch and os matters
2018-04-20 09:52:25 +02:00
bergquist 7a62231816 build: only lint the pkg folder 2018-04-19 11:29:02 +02:00
bergquist f50bcb6aae changelog: adds note about closing #11476 2018-04-19 11:20:29 +02:00
Carl Bergquist 2dfa576c76 Merge pull request #11504 from hahnjo/11476-influxdb-show-cardinality
influxdb: Check before assuming first column to be 'time'
2018-04-19 11:18:01 +02:00
Marcus Efraimsson e6f38591b5 dev: only build server with bra run 2018-04-19 10:43:31 +02:00
Carl Bergquist 4f0d7586ae Merge pull request #11648 from mjtrangoni/add-gometalinter-circleci
Add gometalinter to CircleCI
2018-04-19 09:35:21 +02:00
Mario Trangoni 3543f1c3d4 add gometalinter to circleci 2018-04-18 22:52:21 +02:00
Mario Trangoni 33ae8d35ea comment unused struct fields 2018-04-18 22:23:49 +02:00
Carl Bergquist 89acafd567 Merge pull request #11646 from mjtrangoni/fix-varcheck-issues
remove unused variables detected by varcheck
2018-04-18 21:45:11 +02:00
Mario Trangoni c1742df9ac remove unused variables detected by varcheck 2018-04-18 19:04:37 +02:00
Marcus Efraimsson 4ddd15d921 changelog: notes about closing #10427
[skip ci]
2018-04-18 14:18:21 +02:00
Marcus Efraimsson fd409f119d Merge pull request #10986 from grafana/10427_addpanel_filter
add tabs and search filter to new panel control
2018-04-18 14:13:21 +02:00
Carl Bergquist 0ad6336634 Merge pull request #11354 from grafana/external-auth
External auth refactor
2018-04-18 14:03:50 +02:00
Marcus Efraimsson 606257a1da move jest test file to specs 2018-04-18 14:00:15 +02:00
Marcus Efraimsson ce97f89de6 make add panel panel scrollbar adjust when panel/dashboard grid are resized 2018-04-18 13:59:26 +02:00
bergquist dbf61355b3 style: code simplifications 2018-04-18 12:16:25 +02:00
Marcus Efraimsson 82054e1a3e Merge branch 'master' into 10427_addpanel_filter 2018-04-18 11:36:13 +02:00
Marcus Efraimsson b7b0ca2b90 build: introduce -dev flag optimal for building in development mode
Fix performance issue with running bra run for go run build.go build
2018-04-18 11:25:34 +02:00
Patrick O'Carroll 23f644c2f5 changed copied message and added forced render for width change 2018-04-18 10:34:43 +02:00
Carl Bergquist 54b7846eb6 Merge pull request #11635 from ohadbenita/patch-1
Specify expected encoding for access/secret key
2018-04-18 10:06:12 +02:00
bergquist c22495b6f8 Merge branch 'master' into external-auth
* master:
  changelog: adds note about closing #11613 and #11602
  fix: sign in link should have target self to trigger full page reload, fixes #11626
  codespell: exclude by words instead of files
  Use sort.Strings() (gosimple)
  Remove unused return value assignment (gosimple)
  Remove unnecessary fmt.Sprintf() calls (gosimple)
  Merge variable declaration with assignment (gosimple)
  Use fmt.Errorf() (gosimple)
  Simplify make() (gosimple)
  Use raw strings to avoid double escapes (gosimple)
  Simplify if expression (gosimple)
  Simplify comparison to bool constant (gosimple)
  Simplify error returns (gosimple)
  Remove redundant break statements (gosimple)
2018-04-18 09:34:45 +02:00
bergquist d9b3ff1952 changelog: adds note about closing #11613 and #11602 2018-04-18 09:21:51 +02:00
Dan Cech 3fedcb1e4b cleanup, make sure users are always synced with ldap 2018-04-17 17:48:56 -04:00
ohadbenita 4664549411 Specify expected encoding for access/secret key 2018-04-17 23:55:07 +03:00
Dan Cech 33760b5c3b make sure user's default org is kept up to date 2018-04-17 16:51:05 -04:00
Carl Bergquist 8367199a2d Merge pull request #11613 from knweiss/gosimple
Code simplification (gosimple)
2018-04-17 22:40:40 +02:00
Carl Bergquist 6ba830c73b Merge pull request #11632 from mjtrangoni/fix-codespell-circleci
codespell: exclude by words instead of files
2018-04-17 21:10:46 +02:00
Torkel Ödegaard e81330abf0 fix: sign in link should have target self to trigger full page reload, fixes #11626 2018-04-17 21:01:52 +02:00
Mario Trangoni b0217f5dd3 codespell: exclude by words instead of files 2018-04-17 20:45:46 +02:00
Dan Cech 00e74990ed remove old comment 2018-04-17 14:06:25 -04:00
Dan Cech 857830d981 org role sync tests 2018-04-17 14:06:25 -04:00
Dan Cech 52503d9cb5 refactor authproxy & ldap integration, address comments 2018-04-17 14:06:25 -04:00
Dan Cech c8a0c1e6b8 pass DN in ldap test 2018-04-17 14:06:25 -04:00
Dan Cech daeba40b3b tests for user auth module 2018-04-17 14:06:25 -04:00
Dan Cech 59f83ca5d8 fix ldap test 2018-04-17 14:06:25 -04:00
Dan Cech e53e039b1b restructure GetUserByAuthInfo 2018-04-17 14:06:25 -04:00