IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-29 15:59:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
15,627 Commits 1,119 Branches 715 Tags
7b06800295189343bb61e6ef56cebe70056cc23b
Commit Graph
1410 Commits
Author SHA1 Message Date
flopp999 185aa6d47b Added concentration units and "Normal cubic metre" 
ppm, ppb, ng/m3, ng/Nm3, μg/m3, μg/Nm3, mg/m3, mg/Nm3, g/m3, g/Nm3, Nm3
ppm was moved from "Dimensionless" and "submenu" to "Concentration"
 2018-03-12 20:59:43 +01:00
Alexander Zobnin 94cf560304 Merge remote-tracking branch 'upstream/master' into prometheus-heatmap 2018-03-12 17:16:02 +03:00
Jiri Tyr 6bfed903c4 Adding Timeticks unit 2018-03-09 17:20:24 +00:00
bergquist 0ee6a5216b Merge branch 'master' of https://github.com/mayli/grafana into mayli-master 
* 'master' of https://github.com/mayli/grafana:
  Use B/s instead Bps for Bytes per second
 2018-03-08 18:50:02 +01:00
Alexander Zobnin 18a90667ba heatmap: refactor 2018-03-07 16:33:33 +03:00
Daniel Lee c657fe8875 Merge pull request #11092 from grafana/11091_anonymous_sign_in 
made drop-menu into link
 2018-03-07 10:54:48 +01:00
Daniel Lee 8e81dc1e79 scrolling: faster wheelspeed 
ref #11053
 2018-03-06 20:08:00 +01:00
Carl Bergquist 1fe8b33f65 Merge pull request #11000 from victorclaessen/master 
Added radiation units
 2018-03-06 09:38:12 +01:00
Patrick O'Carroll 42cd462cbf made drop-menu into link 2018-03-05 14:09:04 +01:00
Marcus Efraimsson 71a0a298bf permissions: remove client validation and handle server validation 2018-02-27 16:04:45 +01:00
Patrick O'Carroll e037ef21f7 added admin icon and permission member definitions(role,team,user) 2018-02-26 10:21:24 +01:00
victorclaessen 91e8468fb4 Added radiation units 
Add common units in radiation and health physics monitoring, Bq, Ci, Gy, rad, Sv, rem. C/kg, R, Sv/h.
 2018-02-22 19:21:08 +01:00
Marcus Efraimsson cacfdc6421 dashboards: remove non-supported keyboard shortcuts for delete/collapse row 2018-02-22 18:08:51 +01:00
Marcus Efraimsson 34f1611d18 dashboards: fix keyboard shortcut for expand/collapse rows 2018-02-22 18:03:29 +01:00
Marcus Efraimsson 609f3c1c9d dashboards: fix keyboard shortcut for remove panel 2018-02-22 18:02:29 +01:00
Marcus Efraimsson 20ebb614f6 dashboards: cleanup 
Move api calls to backend_srv
 2018-02-21 16:56:34 +01:00
Marcus Efraimsson b7cf6f9781 folders: use folder api for retrieving folder 2018-02-21 16:55:35 +01:00
Marcus Efraimsson 9d288c3a86 Merge branch 'master' into 10630_folder_api 2018-02-21 16:38:36 +01:00
Marcus Efraimsson 3f3175972e dashboards: fix batch dashboard/folder delete response 
Use message returned from backend and use that as alert success response to user
 2018-02-21 16:38:09 +01:00
Leonard Gram 13209f5671 Merge pull request #10639 from overcookedpanda/hash-rate-units 
added hash rate units for monitoring mining processes
 2018-02-21 13:39:09 +01:00
Marcus Efraimsson 71c9741764 permissions: use updated api endpoint for dashboard permissions 2018-02-21 11:53:02 +01:00
Marcus Efraimsson 3c6bc263dc Merge branch 'master' into 10630_folder_api 2018-02-21 11:25:56 +01:00
Torkel Ödegaard 3964d6b797 fix: added new known data source plugins, and minor migration fix for v1 dashboards 2018-02-20 16:08:43 +01:00
Torkel Ödegaard dceac3aa71 fix: fixes to signup flow, fixes #9816 2018-02-20 13:39:16 +01:00
Patrick O'Carroll 9f4b7ac26f added scroll to org list modal (#10960) 
* added scroll to org list modal, fixes #10774

* removed console.log
 2018-02-20 11:08:53 +01:00
Marcus Efraimsson fce1e3f7f1 Merge branch 'master' into 10630_folder_api 2018-02-19 13:32:45 +01:00
Patrick O'Carroll 9c36ee22a8 changed m3 and dm3 to fixedUnit, fixes #10920 (#10944) 2018-02-19 09:23:02 +01:00
Torkel Ödegaard 497132c441 fix: esc key now closes panel edit/view mode as usual, fixes #10945 2018-02-16 16:09:54 +01:00
Patrick O'Carroll 244ae555d9 Close modal with esc (#10929) 
* added var to check if modal is open and an if for escape fullview

* moved showconfirmmodal to utils, showconfirmmodal now uses showmodal, esc works in textinput

* made esc global
 2018-02-16 09:14:32 +01:00
Torkel Ödegaard 57103ec98a fix: refactoring #10922 2018-02-15 12:42:17 +01:00
Torkel Ödegaard 73eaba076e wip: dashboard acl ux2, #10747 2018-02-14 15:03:22 +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
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
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
Marcus Efraimsson cb8c82f7f6 Merge branch 'master' into 10630_folder_api 2018-02-12 15:14:41 +01:00
Alexander Zobnin 111b32290a Fixes for graphite tags editor (#10861) 
* graphite: don't fetch tags on editor init

* add debounce option to query editor directives

* graphite: debounce tag queries
 2018-02-09 16:20:30 +01:00
Marcus Efraimsson a86f2fa34b user picker should only include users from current org (#10845) 2018-02-09 10:42:37 +01:00
Torkel Ödegaard 17cbd9d6b4 fix: removed old shortcut that does not exist, fixes #10802 2018-02-07 10:43:42 +01:00
Alexander Zobnin 81dc051ae9 graph panel: fix csv export (series as col) (#10769) 2018-02-06 10:11:17 +01:00
Daniel Lee 5ca03972a8 org-switcher: should redirect to home page (#10782) 
Fixes #10776
 2018-02-06 10:02:28 +01:00
Daniel Lee 4ce862c5b4 scroll: use wheelpropagation. Ref #10772 
Once the vertical scrollbar comes to its end position, it should
allow the page scroll bar to start scrolling.
 2018-02-05 18:12:04 +01:00
Daniel Lee 2d1bd270fb Stale permissions (#10768) 
* dashfolders: hide permissions in settings if folder has changed

and the dashboard has not been saved yet. Otherwise the use will
see stale permissions from the original folder.

* dashfolders: return folder url for inherited permissions
 2018-02-05 14:28:24 +01:00
Marcus Efraimsson a879dd8c0c dashboards: render correct link for folder when searching for dashboards (#10763) 
Fixes #10761
 2018-02-05 13:23:24 +01:00
Marcus Efraimsson 7d3b990e91 permissions: fix link to folder from permissions list 
Also, closing Add Permissions CTA when DashboardPermissions and
FolderPermissions unmounts.
Fixes #10749"
 2018-02-05 11:10:37 +01:00
Torkel Ödegaard 40c9d5f2a3 ux: hide sidemenu in kiosk mode, and while playlist is playing, fixes #107402 2018-02-04 17:32:27 +01:00
Marcus Efraimsson 3a906ea335 Merge branch 'master' into 10630_folder_api 2018-02-02 14:34:10 +01:00
Daniel Lee 512f6992f1 dashfolders: rename Root folder to General. Closes #10692 2018-02-02 10:39:26 +01:00