IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
14,250 Commits 5,416 Branches 554 Tags
7e8bd8d0042d0a2ffa73738ebbd780da7eef5ea1
Commit Graph

548 Commits

Author SHA1 Message Date
Johannes Schill
5a9fe9aff9 dashfolders: Add a Team Picker component and use it on the dashboard permissions page #10275 2018-01-25 15:33:11 +01:00
Johannes Schill
6b9858c1d3 dashfolders: Working user picker on the dashboard permissions page #10275 2018-01-25 15:30:43 +01:00
Johannes Schill
b79a15b057 dashfolders: Re-use the API of the angular user picker instead, which is reusable #10275 2018-01-25 15:29:21 +01:00
Johannes Schill
1d8ce3673e dashfolders: Remove the PermissionsInner-strategy since we have a container for this route now #10275 2018-01-25 15:20:56 +01:00
Johannes Schill
a5d441e78e dashfolders: Permissions are injected via MST so it needs to be defined as optional #10275 2018-01-25 15:20:37 +01:00
Johannes Schill
f23fb740a9 dashfolders: Add FolderPermissions container and make sure isFolder is passed to PermissionsStore #10275 2018-01-25 15:20:00 +01:00
Johannes Schill
7e13d0f773 dashfolders: Always get dashboardid and backendsrv from props #10275 2018-01-25 15:19:41 +01:00
Johannes Schill
3490c44636 dashfolders: Rem code to avoid tests to fail #10275 2018-01-25 15:19:30 +01:00
Johannes Schill
44ea8e58e2 wip: More on the permissions. Left are team picker and user picker, tests and error messages #10275 2018-01-25 15:19:17 +01:00
Johannes Schill
c8193e10b9 dashfolder: wip: More wip on acl.html2permissions.tsx #10275 2018-01-25 15:18:16 +01:00
Johannes Schill
7616cfb5f0 dashfolders: wip - Move Permissions into React #10275 2018-01-25 15:14:59 +01:00
Daniel Lee
bc5fae5367 dashfolders: merge conflict 2018-01-25 14:54:50 +01:00
Torkel Ödegaard
889bc29330 ux: minor change, added import dashboard link to dashboard search side view 2018-01-24 15:29:16 +01:00
Torkel Ödegaard
12b08b61d7 Merge remote-tracking branch 'origin/graphite-query-editor-enhancements' 2018-01-23 16:02:46 +01:00
Marcus Efraimsson
b5a6a9ab3b dashboards: Fix issue with first click when expanding folder in search 
Fixes #10580
 2018-01-22 16:12:52 +01:00
Torkel Ödegaard
38f4d5d06d fix: restored previous behavior of form_dropdown, this fixes all my observerd bugs with the dropdown behavior 2018-01-16 17:02:03 -05:00
Dan Cech
ebad19b232 work on tag dropdown behavior 2018-01-16 17:02:03 -05:00
Torkel Ödegaard
11ba8070b8 Tag filters in search (#10521) 
* tag filter: initial react component

* dashboard: move tag filter to filterbox

* tag filter: customize value rendering

* tag filter: get color from name

* tag filter:  custom option renderer

* tag filter: mode with tags in different container

* tag filter: refactor

* refactoring PR #10519

* tag filter: refactor of PR #10521
 2018-01-16 12:52:13 +01:00
Daniel Lee
a5830c6dbc Merge remote-tracking branch 'upstream/master' into dashboard_permissions 2018-01-16 12:02:13 +01:00
Daniel Lee
58293ce5cc dashfolders: bugfix after rename 2018-01-15 10:15:52 +01:00
Daniel Lee
4948d4fd75 dashfolders: bugfix after rename 2018-01-15 10:14:10 +01:00
Daniel Lee
21b5ded75b dashfolder: refactor breadcrumbs in PageHeader 
Combines title and breadcrumbs in PageHeader instead of having to
set title to empty and add it as a breadcrumb.
 2018-01-11 17:53:06 +01:00
Daniel Lee
545d7b9477 dashfolders: convert folder settings to React 2018-01-11 15:42:45 +01:00
Torkel Ödegaard
b76958f07b ux: minor change to alert list page 2018-01-10 14:18:58 +01:00
Torkel Ödegaard
686548a6ed fix: updated snapshot test 2018-01-10 13:16:16 +01:00
Torkel Ödegaard
7854f80f5a Merge remote-tracking branch 'origin/10289_user_picker' 2018-01-10 13:14:43 +01:00
Johannes Schill
e4a2bda4f2 10389 react tooltip components (#10473) 
* poc: Use react-popper for tooltips #10389

* poc: Add popover component and use a hoc() for Tooltip + Popover to avoid code duplication #10389

* jest: Add snapshot tests to Popover and Tooltip #10389

* poc: Move target from hoc into Popover/Tooltip-component #10389

* poc: Clean up unused styles and use the existing Grafana style/colors on popper tooltip #10389

* poc: Remove test code before PR

* poc: Remove imports used in poc but shouldn't be included anymore #10389
 2018-01-10 10:27:33 +01:00
Johannes Schill
ffda5eef95 test: Updated snapshot for UserPicker jest test #10289 2018-01-09 15:48:02 +01:00
Johannes Schill
aac1b250af ux: When adding a new panel we should scroll to top until we figure o… (#10417) 
* ux: When adding a new panel we should scroll to top until we figure out a better solution #10299

* ux: Use jquery to add smooth scrolling when scrolling up to add a panel, and make sure to pass the scope to the event emitter, #10299

* ux: Add a close button to the "New panel"-box and make sure you scroll to top every time you click "Add panel" #10299
 2018-01-09 15:27:53 +01:00
Daniel Lee
e1aff1d5ff dashfolders: show/hide create folder or dashboard buttons 
depending on the user role and the permissions the user has for a
folder.
 2018-01-09 14:44:36 +01:00
Johannes Schill
c62a6aa7df fix: Clean up logging and remove unused css #10289 2018-01-09 14:42:23 +01:00
Johannes Schill
76ba7d1f8c test: Add snapshot tests for UserPicker and UserPickerOption (#10289) 2018-01-09 14:39:10 +01:00
Johannes Schill
68d43b865f fix: Add interface for props to UserPickerOption (#10289) 2018-01-09 14:39:10 +01:00
Johannes Schill
5931d6c87d ux: POC on new select box for the user picker (#10289) 2018-01-09 14:39:10 +01:00
Torkel Ödegaard
62165f91bf fix: added back colors to rootScope, fixes #10462 2018-01-09 11:13:37 +01:00
Torkel Ödegaard
27835f373e cleanup: removed unused typescript typings import 2018-01-04 10:12:02 +01:00
Torkel Ödegaard
c42a232644 Merge branch 'react-mobx' 2018-01-04 09:12:57 +01:00
Ali
de22e793d8 Merge branch 'master' into master 2018-01-03 10:33:54 +03:00
Torkel Ödegaard
8f50795a94 tech: url and query mobx store so now react components and containers can read and modify url path and query via mobx store 2017-12-31 22:31:11 +01:00
Alexander Zobnin
62df406d7b fix info popover, #10302 (#10377) 2017-12-31 12:26:02 +01:00
Marcus Efraimsson
11ae7d5964 dashfolders: relative links should work when root_path is specified (#10363) 
Fixes #10336
 2017-12-31 12:24:21 +01:00
Torkel Ödegaard
8fd8853770 tech: progress on react pages 2017-12-28 17:03:40 +01:00
Torkel Ödegaard
02ad2e5f0f tech: cleaned up unused stuff 2017-12-21 12:31:04 +01:00
Torkel Ödegaard
4181602b78 react: progress on react containers and mobx-state-tree store 2017-12-21 11:56:45 +01:00
Torkel Ödegaard
3a1f52d8a2 prettier: ran on all files again, sorry. now settings are defined in package.json 2017-12-21 08:39:31 +01:00
Torkel Ödegaard
444240dffc tech: mobx tests 2017-12-21 08:27:47 +01:00
Marcus Efraimsson
d41ce4f9ca Various dashboard folders improvements (#10309) 
* dashfolders: fix url for create dashboard from manage dashboards

Don't include folderId querystring if you don't manage a folder and
creating a new dashboard from there.

* dashfolders: don't store folderId in dashboard model

Use folderId from meta instead
#10307

* dashfolders: minor ux fix

* dashfolders: minor fix for edit folder title
 2017-12-20 21:17:55 +01:00
Torkel Ödegaard
354913a704 mobx: progress on poc 2017-12-20 17:24:04 +01:00
Torkel Ödegaard
85879a7014 prettier: change to single quoting 2017-12-20 12:33:33 +01:00
Torkel Ödegaard
4acf6b0eee Merge remote-tracking branch 'origin/10190_fix_select_icon_and_firefox' 2017-12-20 11:22:29 +01:00