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
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
Marcus Efraimsson
d217688d5e
folders: use new folder api in frontend
2018-02-01 22:32:26 +01:00
Marcus Efraimsson
cd61d2b237
Merge branch 'master' into 7883_new_url_structure
2018-02-01 17:32:43 +01:00
Marcus Efraimsson
3db328f516
fix for dashboard/folder url's when having a sub path in root_url config
2018-02-01 16:30:48 +01:00
Daniel Lee
22a349051c
Merge pull request #10719 from grafana/add_permissions_10676
...
Grafana 5.0: Add permissions modal for the permissions pages
2018-02-01 14:20:04 +00:00
Daniel Lee
cc55ab6bc8
dashfolders: adds permission modal to dashboard settings
2018-02-01 14:32:19 +01:00
Daniel Lee
9cdc1428d7
Merge remote-tracking branch 'upstream/master' into add_permissions_10676
2018-02-01 14:02:14 +01:00
Marcus Efraimsson
cdf2fd64b7
route params from angular to view store should be updated on routeChangeSuccess
2018-02-01 13:28:04 +01:00
Marcus Efraimsson
ee9c408188
folders: changes needed due to merge
2018-02-01 13:21:24 +01:00
Marcus Efraimsson
ef90b3e49c
Merge branch '7883_new_url_structure' into 7883_frontend_step2
2018-02-01 11:08:39 +01:00
Marcus Efraimsson
b135df9a6c
Merge remote-tracking branch 'upstream/master' into 7883_new_url_structure
2018-02-01 10:48:06 +01:00
Torkel Ödegaard
e985a9cd7c
ux: fixed issue with zoom on graph caused scroll, fixes #10696
2018-02-01 10:36:55 +01:00
Marcus Efraimsson
8fc648ac43
dashboards: fix updating folder so that correct url is returned
2018-01-31 18:40:54 +01:00
Marcus Efraimsson
035b724725
dashboards: remove slug property in dashboard search responses
...
Removes slug property in dashboard search responses since this property isn't needed
anymore and it haven't been released to any stable release.
2018-01-31 18:40:54 +01:00
Marcus Efraimsson
92a0171a9b
folders: change the front end route for browsing folders
...
Change the front end route for folders to /dashboards/f/<uid>/<slug of folder title>.
Use new route for deleting dashboard/folder by uid.
Retrieve dashboard/folder by uid when moving or deleting dashboards/folders.
2018-01-31 18:40:54 +01:00
Johannes Schill
2e0cc2e347
ux: Change input width of UserPicker and TeamPicker in AddPermissions component #10676
2018-01-31 17:01:04 +01:00
Johannes Schill
780c7f8775
tests: Add TeamPicker test and update TeamPicker/UserPicker snapshots so they match the latest classNames update #10676
2018-01-31 16:48:45 +01:00
Daniel Lee
a9e2273064
Merge remote-tracking branch 'upstream/master' into dashboard_permissions
2018-01-31 16:45:32 +01:00
Johannes Schill
a73af39056
ux: Add an optional className to the UserPicker and TeamPicker #10676
2018-01-31 16:44:14 +01:00
Johannes Schill
20052150ba
tests: Move tests from Permissions to AddPermissions #10676
2018-01-31 16:15:05 +01:00
Johannes Schill
1b9e02e4cc
tests: Update tests in PermissionsStore and rem out the Permissions-tests for now #10676
2018-01-31 16:12:51 +01:00
Daniel Lee
2409d129c2
dashfolders: text change
2018-01-31 15:41:52 +01:00
Daniel Lee
9ef64d3056
dashfolders: special case for folders in root
...
Allow users to change permissions inherited from root.
2018-01-31 15:34:05 +01:00
Daniel Lee
a7e57bc2f8
spelling
2018-01-31 15:07:17 +01:00
Johannes Schill
2ad4c30bc6
ux: POC - Update "Add permissions" design and add a fancy animation #10676
2018-01-31 14:19:07 +01:00
Johannes Schill
666d29fafa
dashfolders: POC - Use separate component for "Add permission" #10676
2018-01-31 10:39:38 +01:00
Daniel Lee
816c4d2340
url: fix for boolean querystring parameters
...
Without this fix then the querystring looks like ?abool=true which causes
a mismatch with the angular routing. This results in a redirect and messes
up the browser history and back button.
2018-01-31 09:58:21 +01:00
