Torkel Ödegaard
6a5ce09b08
Merge branch 'feature/save_json' of https://github.com/jereksel/grafana into jereksel-feature/save_json
2018-05-08 10:54:26 +02:00
Marcus Efraimsson
f17100e98e
Merge pull request #11786 from marefr/11625_save_as
...
dashboard: show save as button if user has edit permission
This will show the "Save As..." button in dashboard settings page if the user
has edit permissions (org role admin/editor or viewers_can_edit enabled)
and has at least edit permission in any folder.
2018-05-02 11:15:22 +02:00
Marcus Efraimsson
1f21b3e23b
remove jest it.only to not skip important tests
2018-05-02 10:54:00 +02:00
Marcus Efraimsson
5c57c7cff5
dashboard: show save as button if can edit and has edit permission to folders
2018-04-30 15:38:46 +02:00
Patrick O'Carroll
38a4a2dc60
changed test name and dashboardMock code
2018-04-24 11:22:58 +02:00
Patrick O'Carroll
1446f54447
fixed test
2018-04-24 09:45:53 +02:00
Patrick O'Carroll
45e6d9fcc4
removed import config
2018-04-23 17:45:51 +02:00
Patrick O'Carroll
3eaaa5d32d
fixed so user who can edit dashboard can edit row, fixes #11466
2018-04-23 17:44:29 +02:00
Andrzej Ressel
9d5ccaef54
Merge branch 'master' into feature/save_json
2018-04-22 21:24:52 +02:00
Marcus Efraimsson
606257a1da
move jest test file to specs
2018-04-18 14:00:15 +02:00
Marcus Efraimsson
ce97f89de6
make add panel panel scrollbar adjust when panel/dashboard grid are resized
2018-04-18 13:59:26 +02:00
Marcus Efraimsson
82054e1a3e
Merge branch 'master' into 10427_addpanel_filter
2018-04-18 11:36:13 +02:00
Patrick O'Carroll
23f644c2f5
changed copied message and added forced render for width change
2018-04-18 10:34:43 +02:00
Marcus Efraimsson
d7688241c6
Merge branch 'master' into readonly_dashboards
2018-04-17 16:27:51 +02:00
Daniel Lee
26bb22bffa
Merge pull request #11554 from grafana/11553_viewer_general_access
...
User with org viewer role permission fixes
2018-04-17 13:50:45 +02:00
Patrick O'Carroll
0120023aba
added forceupdate to grid item so addpanel items rezie instantly, renamed function to copyPanel, fixed panel items height issue
2018-04-17 13:10:08 +02:00
Marcus Efraimsson
2fc1558daf
revert changes of add panel button to require save permission
...
This resolves an issue where the add panel button was shown on the default home dashboard
2018-04-17 11:03:46 +02:00
Marcus Efraimsson
8a5cb088d3
Merge branch 'master' into readonly_dashboards
2018-04-17 10:50:04 +02:00
Torkel Ödegaard
85121e55c9
fix: Row state is now ignored when looking for dashboard changes ( #11608 )
...
* fix: Row state is now ignored when looking for dashboawrd changes, had to fix bug in expand logic to make fix work. Also moved the ChangeTracker to it's own file and moved tests to jest, fixes #11208
* removed commented out log calls
2018-04-17 09:41:07 +02:00
Marcus Efraimsson
0e0976b0a2
Merge branch 'master' into 10427_addpanel_filter
2018-04-16 23:30:34 +02:00
Mario Trangoni
e5e6bc56c8
public: fix codespell issues
2018-04-13 20:31:29 +02:00
Marcus Efraimsson
4a26797cdd
Merge branch 'master' into readonly_dashboards
2018-04-13 17:03:00 +02:00
Andrzej Ressel
bff174dba9
PR comments
2018-04-11 22:59:29 +02:00
Marcus Efraimsson
e73479ef33
folders: fix permissions in folder picker component
...
Only enable creating new folders from folder picker if user has org roles
admin or editor.
Only render General option in folder picker if user has org roles admin
or editor.
2018-04-11 00:26:16 +02:00
Andrzej Ressel
dc11f1da81
Make dashboard JSON editable
2018-04-08 20:00:18 +02:00
Alexander Zobnin
41e5d66e39
scrollbar: fix add panel height bug
2018-04-06 20:31:44 +03:00
Marcus Efraimsson
f619dd579e
provisioning: fix tests for save provisioned dashboard modal
2018-04-05 20:51:47 +02:00
Marcus Efraimsson
6bbeb723ca
Merge branch 'master' into readonly_dashboards
2018-04-05 20:30:27 +02:00
Marcus Efraimsson
bcdb3ec84d
provisioning: ux fixes when saving provisioned dashboards
...
Wider modal.
Tried to improve provisioning description text.
Code editor for json.
Button that allows to save the json to a file.
2018-04-05 20:28:04 +02:00
Alexander Zobnin
d6233714d2
Merge remote-tracking branch 'upstream/master' into fix-11053
2018-04-05 16:30:46 +03:00
Marcus Efraimsson
94d1a9fd83
Merge pull request #11430 from grafana/11332_esc_timepicker
...
Enable closing timepicker using escape key
2018-04-05 15:11:34 +02:00
Patrick O'Carroll
0273365df3
created closeDropdown function, renamed appevent, added second appevent for open timepicker
2018-04-04 16:20:01 +02:00
Alexander Zobnin
a265c77cf9
scrollbar: fix Firefox scroll position restore
2018-04-04 14:51:46 +03:00
Patrick O'Carroll
98e1404fed
added if to onAppevent, renamed appevent, add appevent to applyCustom and setRelativeFilter
2018-04-03 09:39:46 +02:00
Patrick O'Carroll
8195c085fa
bounnd the esc key to exit timepicker
2018-03-29 09:15:15 +02:00
bergquist
7f5c2ebdd1
provisioning: better description for provisioned save modal
2018-03-27 15:19:20 +02:00
Patrick O'Carroll
d4be953d23
fixed alignment in search + fixed issue ie popup
2018-03-27 12:36:13 +02:00
bergquist
d6faa3d06f
provisioning: improve UX when saving provisioned dashboards
2018-03-26 15:08:46 +02:00
Patrick O'Carroll
99626b8e07
added save icon to save buttons
2018-03-22 17:04:00 +01:00
Patrick O'Carroll
823f903048
removed trash can icon from save buttons
2018-03-22 16:59:06 +01:00
Alexander Zobnin
05ac7d8fca
dashboard: fix phantomjs panel rendering in collapsed row
2018-03-20 14:13:31 +03:00
Alexander Zobnin
205714759e
fix failed tests for dashboard view state
2018-03-16 21:45:31 +03:00
Alexander Zobnin
0e5b790b54
dashboard: fix rendering link to panel in collapsed row
2018-03-16 21:03:49 +03:00
Patrick O'Carroll
1d190de918
added test for sorting and filtering
2018-03-12 11:58:47 +01:00
Patrick O'Carroll
834c421943
replaced if with classNames
2018-03-07 15:01:50 +01:00
Patrick O'Carroll
8d4c439eeb
add panel to list now copy, started on jest
2018-03-07 12:46:27 +01:00
bergquist
d3b23b01d8
hide row actions for viewers
...
closes #11112
2018-03-06 12:32:50 +01:00
bergquist
a7d62f44d3
ignore iteration property when checking for unsaved changes
...
closes #11063
2018-03-05 22:03:26 +01:00
Torkel Ödegaard
dff2c14aed
fix: changed react-grid-layout to use grafana fork to a commit before https://github.com/STRML/react-grid-layout/commit/15503084fb7b0af826427c8c0706901e5745a39f , this fixes all the panel movement bugs, fixes #10831
2018-02-27 11:34:29 +01:00
Marcus Efraimsson
34f1611d18
dashboards: fix keyboard shortcut for expand/collapse rows
2018-02-22 18:03:29 +01:00
Torkel Ödegaard
Marcus Efraimsson
Patrick O'Carroll
Andrzej Ressel
Daniel Lee
Mario Trangoni
Alexander Zobnin
bergquist