Torkel Ödegaard
8905c8e5fb
Merge branch 'team_member_count' of https://github.com/bergquist/grafana into develop
2017-12-15 11:53:47 +01:00
Torkel Ödegaard
75bfe313d7
Merge remote-tracking branch 'origin/develop-filter-table' into develop
2017-12-15 11:44:51 +01:00
Torkel Ödegaard
ff0c2b496f
ux:s sidemenu icon rules
2017-12-15 11:18:22 +01:00
bergquist
256f7176a2
teams: add team count when searching for team
...
closes #10207
2017-12-15 11:08:06 +01:00
Torkel Ödegaard
68ab11d7bf
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-15 11:01:30 +01:00
Patrick O'Carroll
c78f1834bd
changed background color for infobox and new blues in light theme, light theme now uses blue-dark in panel query ( #10211 )
2017-12-15 11:01:18 +01:00
Torkel Ödegaard
313d20292e
ux: fixed navbar issue when sidemenu closes
2017-12-15 10:28:45 +01:00
Torkel Ödegaard
9a711a4fc3
ux: minor position change for layout selector, fixes #10217
2017-12-15 09:58:39 +01:00
Torkel Ödegaard
3300af909a
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-15 09:50:18 +01:00
Torkel Ödegaard
ba3dbac50d
fix: view json from share modal now works, #10217
2017-12-15 09:49:57 +01:00
Torkel Ödegaard
69305c20a0
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-15 09:29:41 +01:00
Torkel Ödegaard
25d8f21b64
ux: used new add data sources icon
2017-12-15 09:19:29 +01:00
Marcus Efraimsson
a84e03ddc4
dashfolders: styling of selected filters
...
#10081
2017-12-15 09:14:10 +01:00
Marcus Efraimsson
bd7837e8d7
dashfolders: styling of selected filters
...
#10081
2017-12-14 20:20:36 +01:00
Torkel Ödegaard
581257416e
Merge remote-tracking branch 'origin/develop-icons' into develop
2017-12-14 19:56:19 +01:00
Marcus Efraimsson
62e6fed5ce
dashfolders: fix moving plugin dashboard to folder
...
If moving a dashboard and the server responds with a plugin-dashboard
error we add the overwrite flag and moving the dashboard again.
Fixes #10183
2017-12-14 16:51:23 +01:00
Marcus Efraimsson
b1bb012343
dashfolders: fix folder selection dropdown in dashboard settings
...
Use folder id from meta instead of dashboard object
2017-12-14 15:58:24 +01:00
Carl Bergquist
f5d26bfcc9
Merge pull request #10050 from davkal/davkal/multi-query-table
...
Add support to render values of multiple queries in the same table
2017-12-14 15:57:07 +01:00
Patrick O'Carroll
780d3e2c8f
fix for merge conflict
2017-12-14 15:50:47 +01:00
Trent White
764992df2a
add links for large cta
2017-12-14 09:31:59 -05:00
Patrick O'Carroll
0f62b3e04d
resolve merge conflict
2017-12-14 15:15:54 +01:00
Marcus Efraimsson
854d22fa8e
dashfolders: bulk move/delete improvements
...
bulk delete dashboards synchronously
moved bulk delete and move dashboards to backend_srv
better error handling/messages when moving and deleting folders/dashboards
fixes #10181
2017-12-14 15:09:17 +01:00
Torkel Ödegaard
4f56d4ac07
snapshots: fixed snapshot issues, fixes #10214
2017-12-14 14:58:45 +01:00
Patrick O'Carroll
33f2e31393
replaced old table with filter-table, removed edit button, made whole rows to links
2017-12-14 14:30:13 +01:00
Torkel Ödegaard
4e38526404
playlist: fixed playlist buttons in dashboard header, fixes #10213
2017-12-14 14:27:47 +01:00
Torkel Ödegaard
0085114d4e
ux: minor changes to search input
2017-12-14 13:08:32 +01:00
Johannes Schill
b012131050
Magnifying glass on search fields #10188 ( #10206 )
...
* ux: Add magnifying glass icon to search input and remove the text label (#10188 )
* ux: Add new look on search field to manage dashboards, users, teams, data sources, plugins. Change to use our own icon class instead of .fa (#10188 )
* ux: Add new search look on org/users (#10188 )
2017-12-14 12:46:00 +01:00
Torkel Ödegaard
776c39fd79
templating: made templateSrv globally accessable as ES6 module, DashboardRow can not interpolate row title
2017-12-14 12:31:57 +01:00
Torkel Ödegaard
9007e26106
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-14 12:10:59 +01:00
Torkel Ödegaard
ff89531849
fix: ignore row clones in schema migration
2017-12-14 12:10:32 +01:00
Daniel Lee
bcc85862fe
dshttpsettings: Move whitelisted cookies to end of config page
2017-12-14 11:46:44 +01:00
Daniel Lee
592cb386e2
dshttpsettings: add field for cookies that should be kept
...
The ds proxy strips out cookies. Cookie names specified in
this field will not be stripped out. This is the frontend
change only.
2017-12-14 11:46:44 +01:00
Marcus Efraimsson
196a05d487
dashfolders: bulk move/delete improvements
...
Use slug and url instead of uri
Check/uncheck a folder will check/uncheck all its children dashboards
Allow to move dashboards when there are both folders and dashboards selected
Hide the header of section when only managing one folder
#10081 #10181
2017-12-14 11:26:16 +01:00
Daniel Lee
fcca36a256
fix: after removed file
2017-12-14 09:46:55 +01:00
Daniel Lee
34cffc6b92
dashfolder: fix after backendSrv change
...
also removes unused create folder modal
2017-12-14 09:35:14 +01:00
Daniel Lee
c5c403b6ef
orgswitcher: update test
2017-12-14 09:02:23 +01:00
Trent White
2c4de364f8
annotation icon fix
2017-12-13 18:18:51 -05:00
Trent White
d23131bbd2
udpate dark json icon
2017-12-13 18:18:15 -05:00
Trent White
1cbd88fc14
dashboard settings icons
2017-12-13 18:17:56 -05:00
Trent White
2a32d01bd5
replace icon on dashboard list (fa-th-large - looked squished) with a smaller version of dashbord icon. This may not be the best way to do the css, so it's a separate commit
2017-12-13 17:51:01 -05:00
Trent White
e2bbb85daa
new icons created and added to nav
2017-12-13 17:48:44 -05:00
Torkel Ödegaard
00e2413013
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-13 19:18:47 +01:00
Torkel Ödegaard
a7645b710d
Merge remote-tracking branch 'origin/master' into develop
2017-12-13 19:18:10 +01:00
Carl Bergquist
35106537f2
Replace Read Only Editor role with ViewersCanEdit setting ( #10166 )
...
* removes readonly editor role
* adds viewersCanEdit setting
This enable you to allow viewers to edit/inspect
dashboards in grafana in their own browser without
allowing them to save dashboards
* remove read only editor option from all dropdowns
* migrates all read only viewers to viewers
* docs: replace readOnlyEditor with viewersCanEdit
2017-12-13 18:53:42 +01:00
Marcus Efraimsson
a583f92d16
dashfolders: bulk move dashboards synchronously
...
#10181
Also added better error handling when moving dashboards to other folders
2017-12-13 18:21:49 +01:00
Marcus Efraimsson
d736795fe6
dashfolders: remove error message when moving to the same folder. #10135
2017-12-13 18:21:49 +01:00
Torkel Ödegaard
26b8483fb0
teams: Fixes to edit team page
2017-12-13 18:20:49 +01:00
Torkel Ödegaard
529fcc46c0
Merge remote-tracking branch 'origin/10172_team_edit' into develop
2017-12-13 18:13:16 +01:00
Torkel Ödegaard
6254304667
Merge remote-tracking branch 'origin/select-wrapper' into develop
2017-12-13 18:12:35 +01:00
Torkel Ödegaard
9fb5367eea
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-13 18:08:29 +01:00
Torkel Ödegaard
2765c2ecc7
Merge branch 'develop-settings-links' into develop
2017-12-13 18:08:12 +01:00
Torkel Ödegaard
e99f846a6f
ux: minor text change to #10177
2017-12-13 18:07:56 +01:00
Patrick O'Carroll
c63569b6ce
made template link look like input ( #10198 )
2017-12-13 18:01:06 +01:00
Torkel Ödegaard
7f0440fded
minor tweaks
2017-12-13 18:00:16 +01:00
Alexander Zobnin
a48ba7b19e
Dashboard grid fixes ( #10194 )
...
* grid: fix layout saving after panel move, #10185
* don't allow to drag fullscreen panels, #10171
2017-12-13 17:53:57 +01:00
Torkel Ödegaard
90c5a8435f
refactor: minor change to #10199
2017-12-13 17:52:42 +01:00
Torkel Ödegaard
04bb2b8ce8
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-13 17:49:08 +01:00
Alexander Zobnin
3cdf0af398
fix broken 'd r' shortcut (refresh dashboard) ( #10199 )
2017-12-13 17:48:58 +01:00
Torkel Ödegaard
59ea19e03b
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-13 17:46:51 +01:00
Torkel Ödegaard
1eeb421ddb
ux: updated login page
2017-12-13 17:46:14 +01:00
Daniel Lee
fa29ff0d79
fixes switching org when url contains orgId querystring param
2017-12-13 17:29:17 +01:00
Torkel Ödegaard
8ea94817f5
build: fixed build issue
2017-12-13 16:56:24 +01:00
Torkel Ödegaard
db95a01feb
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-13 16:31:11 +01:00
Torkel Ödegaard
3c65015671
ux: refactoring login page change
2017-12-13 16:30:31 +01:00
Daniel Lee
7d0ca63b72
navmodel: fix for signout link on pref page
...
without a target property on the link, the signout tab on
the preferences page returned a 404.
2017-12-13 16:28:36 +01:00
bergquist
f18eeaa920
change protip to go to manage dashboards
2017-12-13 16:08:32 +01:00
Torkel Ödegaard
aa4f1fa971
Merge remote-tracking branch 'origin/9879-login' into develop-login2
2017-12-13 16:06:17 +01:00
Torkel Ödegaard
d417a625d5
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-13 15:55:16 +01:00
Torkel Ödegaard
313735bd75
search: worked on search results
2017-12-13 15:51:59 +01:00
Patrick O'Carroll
3b783216fa
added select-wrapper to where it was missing for unified look
2017-12-13 15:05:43 +01:00
Johannes Schill
c433597f99
Merge branch 'develop' into 9879-login
2017-12-13 14:21:39 +01:00
Johannes Schill
b8bfe51b03
ux: wip - Login animation POC ( #9879 )
2017-12-13 14:20:07 +01:00
Johannes Schill
0be9789364
ux: Move "Sign up" and "Reset password" to its own pages - and remove all inline styling ( #9879 )
2017-12-13 13:51:52 +01:00
Torkel Ödegaard
ccbd18006e
ux: org user management changes
2017-12-13 13:16:44 +01:00
Patrick O'Carroll
29d1ec561f
fixed edit team header, fixes #10172
2017-12-13 12:48:49 +01:00
Patrick O'Carroll
daf32c579d
changed width to input fields ( #10184 )
2017-12-13 12:42:50 +01:00
Torkel Ödegaard
cacbcb9c99
ux: added search box to ds list page, closes #10106
2017-12-13 11:29:29 +01:00
Torkel Ödegaard
22aa1f7e42
ux: change members to users
2017-12-13 11:21:33 +01:00
Torkel Ödegaard
60e2ba111f
plugins: fixed plugin edit page and plugin page
2017-12-13 11:12:35 +01:00
Marcus Efraimsson
c6a02bec81
dashfolders: Minor css fixes for bulk edit
2017-12-13 11:08:28 +01:00
Marcus Efraimsson
a9ba7b912f
dashfolders: Minor css fixes for bulk edit
2017-12-13 10:59:29 +01:00
Daniel Lee
c98e15903e
dashfolder: settings page for folder
...
with rename and delete. Fixes #10120
2017-12-13 10:54:08 +01:00
Torkel Ödegaard
2465fcbd6b
fix: FolderId and IsFolder when saving dashboard
2017-12-13 10:00:54 +01:00
Torkel Ödegaard
d3858d8847
ux: fixed inactive view mode and removed animation
2017-12-13 09:49:24 +01:00
Patrick O'Carroll
afc8948905
removed unused declaration
2017-12-13 09:46:55 +01:00
Patrick O'Carroll
f28a434566
updated dashlink editor, now has list
2017-12-13 09:44:51 +01:00
Johannes Schill
6a2b1e52b2
Merge branch 'develop' into 9879-login
2017-12-13 09:22:48 +01:00
Johannes Schill
1f8c1a5cc3
fix: Handle state when no password is entered on registration page ( #9879 )
2017-12-13 09:09:58 +01:00
Alexander Zobnin
d85405d5b5
ux: move add member into its own page ( #10167 )
2017-12-12 20:15:26 +01:00
Torkel Ödegaard
05cc1f85c3
Merge branch 'refactor-user-group-to-team' of https://github.com/alexanderzobnin/grafana into user-group-to-team
2017-12-12 17:07:00 +01:00
Alexander Zobnin
10fbfcb1d3
Fix graph legend scroll ( #10169 )
...
* graph panel: fix legend scroll
* graph panel: enable scroll for table legend
* graph panel: fix legend right side toggle
2017-12-12 17:02:19 +01:00
Alexander Zobnin
8aaaee5e16
fix colorpicker colors order (width issue) ( #10170 )
2017-12-12 17:00:56 +01:00
Torkel Ödegaard
a02086814e
graphite: remove check so that query is sent even for possible non leaf nodes
2017-12-12 17:00:00 +01:00
Torkel Ödegaard
e88bd67d5b
fix: fixed build failure
2017-12-12 16:31:24 +01:00
Johannes Schill
8624414657
ux: Use the previously renamed classes ( #9879 )
2017-12-12 16:29:45 +01:00
Torkel Ödegaard
de91d68402
fix: don't detect graphite version before it's saved
2017-12-12 15:28:41 +01:00
Torkel Ödegaard
cfd755eb93
updated new dashboard folder
2017-12-12 15:19:59 +01:00
Torkel Ödegaard
271c597c9b
ux: style tweaks
2017-12-12 15:13:47 +01:00
Johannes Schill
01e9053625
ux: Update ui of login buttons via third parties and add link to sign up page ( #9879 )
2017-12-12 15:00:04 +01:00
Patrick O'Carroll
9b9ac45295
redesigning links editor
2017-12-12 14:05:24 +01:00
