bergquist
4a35244cb9
provisioning: support camcelCase provisioning files
2018-02-14 10:30:08 +01:00
Torkel Ödegaard
ead1c300d7
API Integration Tests via jest ( #10899 )
...
* tests: experiment with api tests
* api tests are getting nice
* api: api testing ready for feedback
2018-02-14 10:26:20 +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
Marcus Efraimsson
57e55954d9
Merge pull request #10902 from stukselbax/patch-1
...
Duplicate typo in docs fixed
2018-02-14 09:30:30 +01:00
stukselbax
3d91a1cbdd
Duplicate typo fixed
2018-02-14 10:53:14 +03:00
Mitsuhiro Tanda
6a85369c50
add 13-24 for min width ( #10891 )
2018-02-13 17:22:55 +01:00
Jan Fajerski
e9380bbdff
sass/base: import from current dir in _fonts.scss ( #10894 )
...
The import statement relative to base seems to confuse sass if there is
a colon (:) in the path name.
Fixes : #10866
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
2018-02-13 17:20:51 +01:00
Leonard Gram
ba0285a3ec
provisioning: Warns the user when uid or title is re-used. ( #10892 )
...
* provisioning: Warns the user when uid or title is re-used.
Closes #10880
2018-02-13 15:47:02 +01:00
Carl Bergquist
d31e333e7e
Merge pull request #10888 from ScottBrenner/patch-1
...
Minor typo fix
2018-02-13 15:11:29 +01:00
Scott Brenner
e57c8d0357
Minor typo fix
...
Minor typo fix
2018-02-12 13:59:19 -08: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
Patrick O'Carroll
42af87b7c9
fixed bg gradient, fixes #10869 ( #10875 )
2018-02-12 17:10:27 +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
Leonard Gram
acd085605c
docs: spelling.
2018-02-12 15:17:56 +01:00
Leonard Gram
5af2d09fb3
Merge pull request #10865 from grafana/provisioning
...
Support deleting provisioned dashboards when file is removed
2018-02-12 14:53:52 +01:00
Leonard Gram
9a7eb5c327
Merge branch 'master' into provisioning
2018-02-12 14:19:20 +01:00
Marcus Efraimsson
12a6de7461
dashboard: always make sure dashboard exist in dashboard acl http api ( #10856 )
2018-02-12 09:26:09 +01:00
Andrey Inishev
1b795c0ced
Fix #10823 ( #10851 )
...
* Fix of #10823
* Typo fix
* Revert Gopkg.lock
2018-02-12 09:24:01 +01:00
bergquist
f01890c3ff
provisioning: better variable naming
2018-02-12 08:22:34 +01:00
Torkel Ödegaard
6bbd87dd9c
ux: minor tweak to grid resize handle color
2018-02-10 20:11:11 +01:00
Marcus Efraimsson
e1e0b5f951
teams: use orgId in all team and team member operations ( #10862 )
...
Also fixes issue in org users tests for postgres
2018-02-09 17:26:15 +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
Torkel Ödegaard
c01b80522e
fix: clear items list before fetching permissions list
2018-02-09 16:13:20 +01:00
bergquist
84fea7c148
provisioning: dont return error unless you want to cancel all operations
2018-02-09 15:43:58 +01:00
bergquist
5a76624003
provisioning: createWalkFn doesnt have to be attached to the filereader anymore
2018-02-09 15:33:54 +01:00
bergquist
e93fe9db25
provisioning: update sample config to use path
2018-02-09 15:25:31 +01:00
bergquist
59cd2d5102
provisioning: avoid caching and use updated field from db
2018-02-09 15:23:38 +01:00
Marcus Efraimsson
e429cd8333
update README.md regarding running tests
...
[skip ci]
2018-02-09 13:34:10 +01:00
Marcus Efraimsson
fae9eb546e
update README.md regarding running tests
...
[skip ci]
2018-02-09 13:31:37 +01:00
Torkel Ödegaard
e672604835
docs: minor docs update
2018-02-09 12:53:07 +01:00
Torkel Ödegaard
41a6e7c2c8
docs: updated docs landing page
2018-02-09 12:39:17 +01:00
bergquist
31f3fdcba3
provisioning: delete dashboards before insert/update
2018-02-09 12:17:58 +01:00
Marcus Efraimsson
a86f2fa34b
user picker should only include users from current org ( #10845 )
2018-02-09 10:42:37 +01:00
Carl Bergquist
864e2647db
Merge pull request #10844 from marefr/env_db_test
...
Allow use of environment variable to decide what database engine to run tests on
2018-02-09 09:35:48 +01:00
Marcus Efraimsson
8921b0b517
db test: allow use of env variable for database engine to run tests for
2018-02-08 19:16:45 +01:00
Leonard Gram
e0abd862e0
provisioning: fixed bug in saving dashboards.
2018-02-08 16:36:53 +01:00
Marcus Efraimsson
a91bd53a34
dashboard: fix delete of folder from folder settings tab.
...
Fixes #10821
2018-02-08 14:25:23 +01:00
Leonard Gram
5a85fb6d32
Merge branch 'master' into provisioning
2018-02-08 13:43:19 +01:00
Marcus Efraimsson
0e8377a9f4
Update logic for create/update dashboard, validation and plugin dashboard links ( #10809 )
...
* enables overwrite if dashboard allready exist in folder
* dashboard: Don't allow creating a folder named General
* dashboards: update logic for save/update dashboard
No id and uid creates a new dashboard/folder.
No id and uid, with an existing title in folder allows overwrite
of dashboard.
Id without uid, allows update of existing dashboard/folder without
overwrite.
Uid without id allows update of existing dashboard/folder without
overwrite.
Id without uid, with an existing title in folder allows overwrite
of dashboard/folder and updated will have the uid of overwritten.
Uid without id, with an existing title in folder allows overwrite
of dashboard/folder and new will have the same uid as provided.
Trying to change an existing folder to a dashboard yields error.
Trying to change an existing dashboard to a folder yields error.
* dashboards: include folder id when confirmed to save with overwrite
* dashboards: fixes due to new url structure
Return importedUrl property in response to importing dashboards and
getting plugin dashboards and use this for redirects/links in the
frontend.
2018-02-08 12:48:38 +01:00
Leonard Gram
b549d29319
Merge branch 'master' into provisioning
2018-02-08 11:01:09 +01:00
Patrick O'Carroll
fc05fc42c9
added width class to add member choose ( #10835 )
2018-02-08 10:52:13 +01:00
Torkel Ödegaard
39238c192d
fix: folder redirect after creation
2018-02-07 15:33:08 +01:00
Daniel Lee
db1423eebc
dashfolders: fixes #10820
2018-02-07 15:13:34 +01:00
Torkel Ödegaard
541b0a0ca1
fix: fixed bug with redirect after new dashboard saved, related to buggy angularjs location path/url and base href, fixes #10817
2018-02-07 14:10:23 +01:00
Torkel Ödegaard
17cbd9d6b4
fix: removed old shortcut that does not exist, fixes #10802
2018-02-07 10:43:42 +01:00
Torkel Ödegaard
76c2a6e5ee
build: fixed recovery test
2018-02-06 13:16:21 +01:00
Torkel Ödegaard
f54ba20783
fix: css fix, found a better way to fix #10772
2018-02-06 13:01:23 +01:00
