Commit Graph

5333 Commits

Author SHA1 Message Date
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
Daniel Lee
a8e9a4995c dashfolders: fix mergeconflict error 2018-01-09 14:44:36 +01:00
Daniel Lee
6f98117641 dashfolders: prettify 2018-01-09 14:44:36 +01:00
Daniel Lee
3ae1bf0c16 dashfolders: permissions for saving annotations
ref #10275 Use folder permissions instead of hard coded
permissions on the annotations routes.
2018-01-09 14:44:36 +01:00
Daniel Lee
eef37c4071 dashfolders: disable save button after save of acl 2018-01-09 14:44:36 +01:00
Daniel Lee
e77878bba8 dashfolders: on folder page, hide tabs if not has admin permission 2018-01-09 14:44:36 +01:00
Daniel Lee
f7bbfeba28 dashfolders: must have admin permission to save/see dash acl 2018-01-09 14:44:36 +01:00
Daniel Lee
5b6ee6f37b dashfolders: prettify on tests file 2018-01-09 14:44:36 +01:00
Daniel Lee
1e496ec76c dashfolders: permissions tab in dashboard settings 2018-01-09 14:44:36 +01:00
Daniel Lee
5400692cd4 dashfolders: permissions tab for dashboard folders 2018-01-09 14:44:36 +01:00
Daniel Lee
3ea63a1064 fix for unsaved changes popup on tab close/refresh
Incorrect return values in onbeforeunload event handler mean that the
unsaved changes popup is shown despite there being no changes.
2018-01-09 14:42:58 +01:00
Alexander Zobnin
04b9752932 dashboard: fix opening links in new tab (#10465) 2018-01-09 13:59:11 +01:00
Alexander Zobnin
51cd3a0d0c alert list: fix rendering timeout when share panel (#10467) 2018-01-09 13:58:24 +01:00
Marcus Efraimsson
3ecec8e0d2 More fixes for relative urls when running Grafana under a different sub path (#10470)
* Add nginx proxy docker container

Ease test/verification of running Grafana thru a reverse proxy

* Add apache proxy docker container

Ease test/verification of running Grafana thru a reverse proxy

* Fix relative urls for reset password page

* Fix relative urls for signup page

* Fix relative urls for login page

* Fix relative urls edit plugin page
2018-01-09 13:56:41 +01:00
Torkel Ödegaard
776d17458b
Delete CopyQuery.png 2018-01-09 12:50:59 +01:00
Torkel Ödegaard
69936057a9
Delete tgr288gear_line6.pdf 2018-01-09 12:50:18 +01:00
Marcus Efraimsson
4af1aca97c
Merge pull request #10463 from AnonyV/master
Fixed the subUrl bugs for folder/settings/teams etc. with root_url modified
2018-01-09 12:42:22 +01:00
Torkel Ödegaard
62165f91bf fix: added back colors to rootScope, fixes #10462 2018-01-09 11:13:37 +01:00
AnonyV
6c9554499b fixed the subUrl bugs from https://community.grafana.com/t/suburl-not-work-at-some-links-and-buttons/4701 with folder/settings/teams etc. 2018-01-09 18:03:43 +08:00
Mariano Benítez Mulet
ec9db318e3 Fix typo in error message 2018-01-09 08:24:14 +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
Trent White
ee05ea8d60 new add alert notification channel icon 2018-01-03 14:23:14 -05:00
Johannes Schill
8abef88b94 mobx: poc in using each store as individual prop on the react containers (#10414)
* mobx: poc in using each store as individual prop on the react containers

* prettier test

* fix: end the war between prettier vs tslint.

* mobx: Move stores into their own folders

* mobx: Refactor the AlertRule into its own file and add a helper-file

* mobx: Move NavItem out of NavStore and remove lodash dependancy

* mobx: Move ResultItem and SearchResultSection models out of the SearchStore

* mobx: ServerStatsStore rename .tsx => .ts. And move ServerStat-model to its own file.

* mobx: Remove lodash and jquery dependancy from ViewStore

* mobx: Remove issue with double question mark
2018-01-03 20:11:07 +01:00
Johannes Schill
d2cdacce40 fix: Change max size of panel JSON editor so button is shown on smaller screens, #10346 (#10415) 2018-01-03 20:04:45 +01:00
Patrick O'Carroll
58e0bdd71f added empty list cta to notification channels, fixes 10393 (#10400) 2018-01-02 12:16:38 +01:00
Torkel Ödegaard
f049fc4816 mobx: fixed issue with view store, and added missing snapshot 2018-01-02 11:02:43 +01:00
Torkel Ödegaard
5981f67226 tech: enzyme container test working 2018-01-01 18:54:23 +01:00
Torkel Ödegaard
644adef465 tech: enzyme container test working 2018-01-01 16:04:32 +01:00
Torkel Ödegaard
3301f8f194 react: trying to get enzyme and mobx tests working 2018-01-01 15:39:26 +01: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
Torkel Ödegaard
029317ed18 tech: alert list react migration progress 2017-12-31 14:16:19 +01:00
Alexander Zobnin
62df406d7b fix info popover, #10302 (#10377) 2017-12-31 12:26:02 +01:00
Alexander Zobnin
e84b6d189a fix move dashboard variables, #10347 (#10375) 2017-12-31 12:24:42 +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
Alexander Zobnin
d210e766e7 fix mixed datasource add query button, #10316 (#10361) 2017-12-31 12:21:49 +01:00
Torkel Ödegaard
5a571f4784 tech: react mobx progress 2017-12-29 17:13:58 +01:00
Torkel Ödegaard
4c1a67c34e tech: began reworking alerting list to mobx 2017-12-28 18:49:33 +01:00
Torkel Ödegaard
8fd8853770 tech: progress on react pages 2017-12-28 17:03:40 +01:00
bergquist
1f9e2ef6ec prom: fixes broken test 2017-12-28 16:43:48 +01:00
bergquist
71272d9076 prom: make $__$interval the first suggested range vector 2017-12-28 16:01:02 +01:00
Carl Bergquist
7a8a52a145
Merge pull request #10362 from grafana/cloudwatch-file-to-ts
migrated datasource to ts
2017-12-28 13:44:18 +01:00
Patrick O'Carroll
54c502ae4d fixed error 2017-12-28 09:44:37 +01:00
Patrick O'Carroll
0c5314cec7 migrated datasource to ts 2017-12-27 13:25:40 +01:00
Torkel Ödegaard
5b91bb9163 tech: minor progress on mobx state tree & react containers, working on unit testing 2017-12-27 13:15:27 +01:00
Torkel Ödegaard
8aff969f70 Merge branch 'master' into react-mobx 2017-12-27 11:00:37 +01:00
Alexander Zobnin
1108101087 Fix tooltip unit when legend isn't shown (#10348)
* graph: fix tooltip unit when legend isn't shown, #10311

* fix broken tests (updateLegendValues() function)
2017-12-27 09:50:51 +01:00
Torkel Ödegaard
c8f87a3d09 refactor: minor refactoring of PR #10236 2017-12-27 09:49:12 +01:00
Alexander Zobnin
77843623b2 don't save dashboard on make editable, #10236 2017-12-27 09:49:12 +01:00
Alexander Zobnin
d4ff603eb0 fix scripted dashboard loader, #10350 (#10351) 2017-12-27 09:36:25 +01:00