Commit Graph

19465 Commits

Author SHA1 Message Date
Torkel Ödegaard
909d89077d
Merge pull request #14998 from roidelapluie/patch-1
Fix a typo in changelog
2019-01-22 21:14:11 +01:00
Julien Pivotto
2bdc92f7dd
Fix a typo in changelog 2019-01-22 20:42:56 +01:00
Torkel Ödegaard
2264c27504
Merge pull request #14989 from grafana/hugoh/bug-folder-name-appears-misleadingly-when-using-viewers-can-edit
fixes:#14282 - Do not change folder for persisted dashboards
2019-01-22 17:47:12 +01:00
Torkel Ödegaard
3a390a994b
Update ROADMAP.md 2019-01-22 17:46:38 +01:00
Torkel Ödegaard
2a50777001 use resetfolder instead so it shows current folder 2019-01-22 17:41:36 +01:00
Torkel Ödegaard
0151846e1e Updated home dashboard, removed home dashboard header 2019-01-22 17:23:24 +01:00
Torkel Ödegaard
5d3ef4e500
Merge pull request #14992 from grafana/hugoh/bug-explore-toggle-table-does-not-work
fix: Dispatch the correct action (#14985)
2019-01-22 16:43:36 +01:00
bergquist
c3ff3d644c fixes nil ref in tests 2019-01-22 16:16:32 +01:00
Torkel Ödegaard
db99b86591
Merge pull request #12765 from cxcv/master
added percentencode formatting option
2019-01-22 15:55:36 +01:00
bergquist
31b5db06f1 Merge branch 'master' into poc_token_auth
* master: (156 commits)
  Fixed issues with the sanitizie input in text panels, added docs, renamed config option
  build: removes arm32v6 docker image.
  Updated version in package.json to 6.0.0-pre1
  Update CHANGELOG.md
  build: armv6 docker image.
  build: skips building rpm for armv6.
  build: builds for armv6.
  Explore: mini styling fix for angular query editors
  Removed unused props & state in PromQueryField
  chore: Remove logging and use the updated config param
  chore: Reverse sanitize variable so it defaults to false
  feat: wip: Sanitize user input on text panel
  fix: Text panel should re-render when panel mode is changed #14922
  Minor rename of LogsProps and LogsState
  Splitted up LogLabels into LogLabelStats and LogLabel
  Refactored out LogRow to a separate file
  Removed strange edit
  Added link to side menu header and fixed styling
  Moved ValueMapping logic and tests to separate files
  Fixed data source selection in explore
  ...
2019-01-22 15:39:54 +01:00
bergquist
64124b5042 add setting for how to long we should keep expired tokens 2019-01-22 15:31:43 +01:00
bergquist
12f8338977 stores hashed state code in cookie 2019-01-22 15:22:24 +01:00
bergquist
d3ec8e1ccb creates new config section for login settings 2019-01-22 15:22:11 +01:00
Benjamin Schweizer
bde4b76c16 based on encodeURIComponent() using strict RFC 3986 sub-delims 2019-01-22 15:09:58 +01:00
Hugo Häggmark
85838a40d6 fix: Dispatch the correct action (#14985) 2019-01-22 13:59:58 +01:00
Marcus Efraimsson
59d0c19ba8
passing middleware tests 2019-01-22 13:51:55 +01:00
Hugo Häggmark
151b838f0b fixes:#14282 - Do not change folder for persisted dashboards 2019-01-22 13:07:03 +01:00
Torkel Ödegaard
75e3d90089
Merge pull request #14988 from grafana/sanitize-input-fixes
Fixed issues with the sanitizie input in text panels
2019-01-22 12:26:51 +01:00
Marcus Efraimsson
4096449aec
extract auth token interface and remove auth token from context 2019-01-22 12:00:33 +01:00
Torkel Ödegaard
f0e61af8e0 Fixed issues with the sanitizie input in text panels, added docs, renamed config option 2019-01-22 11:56:35 +01:00
Leonard Gram
caa9a90bfd build: removes arm32v6 docker image. 2019-01-22 11:44:02 +01:00
Torkel Ödegaard
39fa0aec5d
Updated version in package.json to 6.0.0-pre1 2019-01-22 11:37:14 +01:00
Torkel Ödegaard
cd3157fa68
Update CHANGELOG.md 2019-01-22 11:36:38 +01:00
Torkel Ödegaard
cfdef66f8c
Merge pull request #14984 from grafana/4117-xss-sanitize-text-panels
XSS sanitize text panels
2019-01-22 11:29:50 +01:00
Torkel Ödegaard
bc7842e324
Merge pull request #14972 from grafana/hugoh/rendering-null-as-valuemapping
Added check for null value in ValueMappings and added tests
2019-01-22 11:28:44 +01:00
Benjamin Schweizer
8a09d84707 Merge branch 'master' of https://github.com/grafana/grafana 2019-01-22 11:20:56 +01:00
Leonard Gram
ec11d5a90a build: armv6 docker image. 2019-01-22 11:09:27 +01:00
Leonard Gram
2bdc147e55 build: skips building rpm for armv6. 2019-01-22 11:09:27 +01:00
Leonard Gram
5f188058e3 build: builds for armv6. 2019-01-22 11:09:27 +01:00
Torkel Ödegaard
e43fafd96e Explore: mini styling fix for angular query editors 2019-01-22 10:46:21 +01:00
Torkel Ödegaard
a03faba9a3
Merge pull request #14983 from grafana/hugoh/logs-refactoring
Logs refactoring
2019-01-22 10:32:05 +01:00
Torkel Ödegaard
40b73a1fcd Removed unused props & state in PromQueryField 2019-01-22 09:57:27 +01:00
Torkel Ödegaard
e8e1d35340
Merge pull request #14981 from grafana/hugoh/sidemenu-should-be-clickable
Added link to side menu header and fixed styling
2019-01-22 09:36:58 +01:00
Johannes Schill
08dc5a4f97 chore: Remove logging and use the updated config param 2019-01-22 09:36:07 +01:00
Johannes Schill
1ed35f3dc1 chore: Reverse sanitize variable so it defaults to false 2019-01-22 09:36:07 +01:00
Johannes Schill
15d560a1c0 feat: wip: Sanitize user input on text panel 2019-01-22 09:36:07 +01:00
Johannes Schill
a3e13b333e fix: Text panel should re-render when panel mode is changed #14922 2019-01-22 09:36:07 +01:00
Torkel Ödegaard
5446f49f19
Merge pull request #14977 from grafana/explore-fix-datasource-selector
Fixed data source selection in explore
2019-01-22 09:36:02 +01:00
Hugo Häggmark
bcb3824e6a Minor rename of LogsProps and LogsState 2019-01-22 09:25:40 +01:00
Hugo Häggmark
c369279401 Splitted up LogLabels into LogLabelStats and LogLabel 2019-01-22 09:22:38 +01:00
Hugo Häggmark
23202ab130 Refactored out LogRow to a separate file 2019-01-22 08:59:22 +01:00
Hugo Häggmark
bf0333e329 Removed strange edit 2019-01-22 08:18:03 +01:00
Hugo Häggmark
a6428fef0c Added link to side menu header and fixed styling 2019-01-22 08:12:48 +01:00
Hugo Häggmark
a9c33ab658 Moved ValueMapping logic and tests to separate files 2019-01-22 06:40:04 +01:00
Marcus Efraimsson
366e356e08
more auth token tests 2019-01-21 21:48:18 +01:00
Torkel Ödegaard
9c8dea062a
Merge pull request #14975 from grafana/default-datasource-query-editor
Fix for default datasource query editor
2019-01-21 21:43:01 +01:00
Torkel Ödegaard
79bd7f4077 Fixed data source selection in explore 2019-01-21 21:36:30 +01:00
Torkel Ödegaard
018fef0400 Added refId to missing queries on panel model init 2019-01-21 20:35:24 +01:00
bergquist
777bd9ea18 adds cleanup job for old session tokens 2019-01-21 19:03:32 +01:00
Torkel Ödegaard
db2a15daf0 Fixed loading of default query editor 2019-01-21 18:54:57 +01:00