IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 00:08:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,282 Commits 1,123 Branches 715 Tags
ed546c97208be444469947de41ce03e8ab0fc1e4
Commit Graph
13282 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard ed546c9720 updated package.json version v5.0.0-beta2 2018-02-15 13:30:40 +01:00
Torkel Ödegaard 168ac314fc fix: more phantomjs fixes 2018-02-15 13:20:50 +01:00
Torkel Ödegaard 57103ec98a fix: refactoring #10922 2018-02-15 12:42:17 +01:00
Torkel Ödegaard 4b4e38531b Merge branch 'fix-10526' of https://github.com/alexanderzobnin/grafana 2018-02-15 11:46:33 +01:00
Alexander Zobnin b4c51f8822 Fix phantomjs legend rendering issue, #10526 2018-02-15 12:59:14 +03:00
bergquist 0ab0343995 mark redirect_to cookie as http only 
closes #10829
 2018-02-15 10:56:29 +01:00
Carl Bergquist aa902ef826 Merge pull request #10921 from bergquist/invalid_uid 
dashboard: whitelist allowed chars for uid
 2018-02-15 10:19:42 +01:00
bergquist 8954559cbd dashboard: whitelist allowed chars for uid 2018-02-15 09:56:13 +01:00
Carl Bergquist fcca578f41 updates readmes for mysql and postgres (#10913) 
ref #10813
 2018-02-15 09:38:39 +01:00
Carl Bergquist 243b987758 Merge pull request #10910 from bergquist/provisioning_disable_deleting_dashboards 
provisioning: adds setting to disable dashboard deletes
 2018-02-15 08:28:10 +01:00
bergquist ad42883fc7 provisioning: adds setting to disable dashboard deletes 2018-02-14 17:30:08 +01:00
bergquist 842f4c1d32 tech: dont print error message on 500 page 
closes #10828
 2018-02-14 16:39:20 +01:00
bergquist 47e363ea15 removes dependencies install for plugins 
this features was never intended for production.
 2018-02-14 15:40:42 +01:00
bergquist 56907eef69 tests: makes sure we all migrations are working 2018-02-14 15:30:29 +01:00
Leonard Gram fa1b92a12b provisioning: uses unix epoch timestamps. (#10907) 
* provisioning: uses unix epoch timestamps.
 2018-02-14 15:28:30 +01:00
Sven Klemm ebbc079853 improve error message for invalid/unknown datatypes (#10834) 2018-02-14 15:21:00 +01:00
Mitsuhiro Tanda 60b30d3e9a add AWS/States Rekognition (#10890) 
* added AWS/States

* added Rekognition
 2018-02-14 15:14:38 +01:00
Torkel Ödegaard fcaa8227a6 Dashboard acl query fixes (#10909) 
* initial fixes for dashboard permission acl list query, fixes #10864

* permissions: refactoring of acl api and query
 2018-02-14 15:04:26 +01:00
bergquist 1a041a2250 bug: return correct err message 
if the sql query failed has is false and the method will return
m.ErrDataSourceNotFound which is incorrect. We now return the
correct error message from the query

ref #10843
 2018-02-14 13:32:52 +01:00
bergquist dba087463a provisioing: always skip sample.yaml files 2018-02-14 11:33:58 +01:00
bergquist 165304a342 provisioning: handle nil configs 2018-02-14 11:22:24 +01:00
Carl Bergquist 3091697a2c Merge pull request #10896 from bergquist/provisioning_cfg_camelCase 
Change naming format to camelCase for provisioning configs
 2018-02-14 11:00:01 +01:00
Torkel Ödegaard 8dd4d505ee Merge branch 'dashboard-search-permissions-filter' 2018-02-14 10:48:55 +01:00
Leonard Gram b60b6690ba sql: removes locale from test to mirror prod. 2018-02-14 10:31:36 +01:00
bergquist fc371af47f adds tests that validate that updated is correct 2018-02-14 10:31:36 +01:00
bergquist 84de76ff0a provisioning: code formating 2018-02-14 10:30:08 +01:00
bergquist 44baaeed8f provisioning: adds logs about deprecated config format 2018-02-14 10:30:08 +01:00
bergquist b010e4df93 provisioning: support camelcase for dashboards configs 2018-02-14 10:30:08 +01:00
bergquist 4a35244cb9 provisioning: support camcelCase provisioning files 2018-02-14 10:30:08 +01:00
Torkel Ödegaard ead1c300d7 API Integration Tests via jest (#10899) 
* tests: experiment with api tests

* api tests are getting nice

* api: api testing ready for feedback
 2018-02-14 10:26:20 +01:00
Torkel Ödegaard bb681cd498 Merge branch '10819_empty_dashboard_list' 2018-02-14 09:38:19 +01:00
Torkel Ödegaard b0fae0129c ux: refactoring #10884 2018-02-14 09:37:39 +01:00
Marcus Efraimsson 57e55954d9 Merge pull request #10902 from stukselbax/patch-1 
Duplicate typo in docs fixed
 2018-02-14 09:30:30 +01:00
stukselbax 3d91a1cbdd Duplicate typo fixed 2018-02-14 10:53:14 +03:00
Mitsuhiro Tanda 6a85369c50 add 13-24 for min width (#10891) 2018-02-13 17:22:55 +01:00
Jan Fajerski e9380bbdff sass/base: import from current dir in _fonts.scss (#10894) 
The import statement relative to base seems to confuse sass if there is
a colon (:) in the path name.

Fixes: #10866

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
 2018-02-13 17:20:51 +01:00
Torkel Ödegaard 162439a8d6 fix: removed logging 2018-02-13 17:03:20 +01:00
Torkel Ödegaard e3c3f3ce4c fix: sql search permissions filter fix 2018-02-13 16:49:00 +01:00
Leonard Gram ba0285a3ec provisioning: Warns the user when uid or title is re-used. (#10892) 
* provisioning: Warns the user when uid or title is re-used.

Closes #10880
 2018-02-13 15:47:02 +01:00
Carl Bergquist d31e333e7e Merge pull request #10888 from ScottBrenner/patch-1 
Minor typo fix
 2018-02-13 15:11:29 +01:00
Scott Brenner e57c8d0357 Minor typo fix 
Minor typo fix
 2018-02-12 13:59:19 -08:00
Patrick O'Carroll aaf4e760c6 new dashboard is now hidden from viewer, fixes #10815 (#10854) 
* new dashboard is now hidden from viewer, fixes #10815

* changed orgRole to isEditor

* removed unused import

* added contextSrv mock to search.jest
 2018-02-12 17:11:41 +01:00
Patrick O'Carroll 42af87b7c9 fixed bg gradient, fixes #10869 (#10875) 2018-02-12 17:10:27 +01:00
Marcus Efraimsson ac3bf54fb4 login: fix broken reset password form (#10881) 2018-02-12 17:09:39 +01:00
Patrick O'Carroll f2d8222af5 moved div in code 2018-02-12 16:13:39 +01:00
Patrick O'Carroll 5fced6e92b added buttons and text to empty dashboard list 2018-02-12 16:10:23 +01:00
Leonard Gram acd085605c docs: spelling. 2018-02-12 15:17:56 +01:00
Leonard Gram 5af2d09fb3 Merge pull request #10865 from grafana/provisioning 
Support deleting provisioned dashboards when file is removed
 2018-02-12 14:53:52 +01:00
Leonard Gram 9a7eb5c327 Merge branch 'master' into provisioning 2018-02-12 14:19:20 +01:00
Marcus Efraimsson 12a6de7461 dashboard: always make sure dashboard exist in dashboard acl http api (#10856) 2018-02-12 09:26:09 +01:00