Commit Graph

20269 Commits

Author SHA1 Message Date
Dominik Prokop
83bb3fb8d4 Remove old overwritten sass vars 2019-02-19 17:05:50 +01:00
ijin08
2372474ca8 updated theme variables to master 2019-02-19 13:57:56 +01:00
ijin08
547696af19 updated theme template files variables to master 2019-02-19 13:40:43 +01:00
Dominik Prokop
4721250d19 Variables regenerated 2019-02-18 11:05:02 +01:00
Dominik Prokop
6da57d4c08 Make clear that variable scss files are generated from templates 2019-02-18 11:03:52 +01:00
Dominik Prokop
28f42bab5b Replace require with import in start task 2019-02-18 09:26:14 +01:00
Johannes Schill
3ca4adf51e Add missing nodemon dependency 2019-02-14 11:24:34 +01:00
Dominik Prokop
d3b90d5b78 Fixed sass vars template files 2019-02-13 14:58:27 +01:00
Dominik Prokop
4366b1588e Added deprecation warning to npm watch script - use start script instead 2019-02-13 14:58:01 +01:00
Dominik Prokop
a09250a309 Simple CLI for running grafana in dev env 2019-02-13 14:47:59 +01:00
Dominik Prokop
06bae9aa46 Added common theme variabless generation, created GrafanaThemeCommons interface 2019-02-13 14:45:11 +01:00
Dominik Prokop
4903b03d24 Remove precommit from npm scrips 2019-02-13 12:32:42 +01:00
Dominik Prokop
2542a43ec0 Regenerating variabless sas on theme edit v1 2019-02-12 21:54:20 +01:00
Dominik Prokop
0a66d8afc7 Merge branch 'master' into cli/watch-sass-var 2019-02-12 17:20:14 +01:00
Torkel Ödegaard
ef7236439a
Merge pull request #15391 from grafana/fixed-double-datasource-edit-page
Fixed issues with double page body and husky pre-commit hook
2019-02-12 16:28:07 +01:00
Torkel Ödegaard
bde9e9d5a5
Merge pull request #15394 from grafana/13066-save-as-dashboard
fix: No need to have edit permissions to be able to "Save as"
2019-02-12 15:57:41 +01:00
Carl Bergquist
dcec61e1b4
Merge pull request #15378 from grafana/auth_token_quotas
use authTokenService for session quotas restrictions
2019-02-12 15:38:57 +01:00
bergquist
e163aadfe4 use authtoken for session quota restrictions
closes #15360
2019-02-12 15:10:55 +01:00
Torkel Ödegaard
8bd7e5a5f4
Merge pull request #15374 from grafana/explore/dedup-selector
Move deduplication calculation from Logs component to reselect selector
2019-02-12 14:57:06 +01:00
Torkel Ödegaard
9772497354
Merge pull request #15389 from grafana/tooltip-error-theme-text-color
fix: Tooltip error text color
2019-02-12 14:43:51 +01:00
Torkel Ödegaard
2c4cb03cd3 Fixed issues with double page body and husky pre-commit hook 2019-02-12 14:41:12 +01:00
Johannes Schill
335042b2d0 fix: No need to have edit permissions to be able to "Save as" a dashboard 2019-02-12 14:29:27 +01:00
Johannes Schill
2a655cb38a Revert "chore: wip: Replace brace with ace-builds to get latest version of ace"
This reverts commit c98b86fd6b58ac5f77c197d7551751e62d53bedd.
2019-02-12 12:41:19 +01:00
Johannes Schill
2d4e1a80bc chore: wip: Replace brace with ace-builds to get latest version of ace 2019-02-12 12:41:18 +01:00
Johannes Schill
49e0572611 fix: Error tooltip should have white text on red background. Not red text on red background 2019-02-12 12:41:18 +01:00
Dominik Prokop
dd19ec3b22 Move explore selectors to a separate file 2019-02-12 12:36:46 +01:00
bergquist
1310d356fc removes unused session code 2019-02-12 12:33:54 +01:00
Torkel Ödegaard
e5759fa0ed
Merge pull request #15387 from grafana/hugoh/can-not-set-decimal-threshold-in-gauge
Fixes #15372 with number input and parseFloat
2019-02-12 12:22:09 +01:00
Hugo Häggmark
da80286f97 Fixes #15372 with number input and parseFloat 2019-02-12 11:10:31 +01:00
Torkel Ödegaard
bc8418adac Merge branch 'master' of github.com:grafana/grafana 2019-02-12 09:49:01 +01:00
Torkel Ödegaard
38a74c6444
Merge pull request #15383 from bergquist/test_provisoned_ds
enable testing provsioned datasources
2019-02-12 09:48:36 +01:00
bergquist
3b9105e1be enable testing provsioned datasources
closes #12164
2019-02-12 08:45:21 +01:00
Torkel Ödegaard
342aa0ad01 Merge branch 'master' of github.com:grafana/grafana 2019-02-12 08:22:28 +01:00
Torkel Ödegaard
edd9576f15 Fixed elastic5 docker compose block 2019-02-12 08:04:30 +01:00
Torkel Ödegaard
1407691de2
Merge pull request #15377 from grafana/fix/named-colors-palette-default-colors
Fix error caused by named colors that are not part of named colors palette
2019-02-12 06:57:19 +01:00
Dominik Prokop
a5d158c014 Added one more test case for color resolving helper 2019-02-11 21:22:53 +01:00
Dominik Prokop
ed208f2b5f Fix error caused by named colors that are not part of named colors palette 2019-02-11 21:11:19 +01:00
Torkel Ödegaard
b590c4da40
Merge pull request #15371 from grafana/react-panels-request-id-fix
Fixed issue with gauge requests being cancelled
2019-02-11 20:47:27 +01:00
Torkel Ödegaard
fc91e1cf57 Fixed issue with gauge requests being cancelled 2019-02-11 17:47:47 +01:00
Torkel Ödegaard
e38cfc1a71
Update package.json 2019-02-11 17:43:02 +01:00
Torkel Ödegaard
0493d905f1
Update CHANGELOG.md 2019-02-11 17:42:31 +01:00
Torkel Ödegaard
a79bd42414
Merge pull request #15306 from grafana/explore/dedup-strategu-url
Persist deduplication strategy in url
2019-02-11 17:12:41 +01:00
Daniel Lee
951e5932d4 changelog: adds note for #15363 2019-02-11 17:00:16 +01:00
Dominik Prokop
1693f083cc Move deduplication calculation from Logs component to redux selector 2019-02-11 16:57:49 +01:00
Torkel Ödegaard
e50b7b3279 Merge branch 'ui-new-red-green-blue' 2019-02-11 16:51:30 +01:00
Torkel Ödegaard
99df7b87c0 Merge branch 'master' of github.com:grafana/grafana 2019-02-11 16:51:24 +01:00
Torkel Ödegaard
6d11999e20
Merge pull request #15367 from grafana/gauge-max-value
Fix issue with Max value in Gauge
2019-02-11 16:50:42 +01:00
Torkel Ödegaard
5195954681 style tweak to alert 2019-02-11 16:50:12 +01:00
Daniel Lee
18615a3357
Merge pull request #15363 from bergquist/edition_to_build_info
adds edition to build_info metric
2019-02-11 16:46:53 +01:00
Torkel Ödegaard
afc2efa56d Removed plus icons 2019-02-11 16:45:47 +01:00