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
bergquist
dfde6e75ed
changelog: adds note about closing #10151
2017-12-13 14:41:28 +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
bergquist
ee5f030ded
changelog: adds note about closing #9318
2017-12-13 13:53:38 +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
bergquist
bf999a4f82
fixes broken alert eval when first condition is using OR
...
closes #9318
2017-12-13 13:37:10 +01:00
Torkel Ödegaard
ccbd18006e
ux: org user management changes
2017-12-13 13:16:44 +01:00
bergquist
dd3dd407ad
removes unused property
2017-12-13 13:12:50 +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
02d3a9f365
docs: SSL Mode config settings for Postgres
2017-12-13 10:55:58 +01:00
Daniel Lee
c98e15903e
dashfolder: settings page for folder
...
with rename and delete. Fixes #10120
2017-12-13 10:54:08 +01:00
bergquist
355a12d7cb
Merge branch 'Thib17-master'
...
* Thib17-master:
removes verbose logging
Add a per-notifier ShouldNotify()
2017-12-13 10:26:35 +01:00
bergquist
0b6169b3f5
removes verbose logging
2017-12-13 10:21:11 +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
Thibault Chataigner
fd633a1d5d
Add a per-notifier ShouldNotify()
...
This way we are able to edit notification behavior per notifier.
This would be usefull to let some notifiers send notifications,
even when the state doesn't change, or with custom condition.
Signed-off-by: Thibault Chataigner <t.chataigner@criteo.com>
2017-12-12 17:35:54 +01:00
Torkel Ödegaard
67f1435dc7
minor fix for #10136
2017-12-12 17:18:25 +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
