 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 |
|
 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
|
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 |
|
|
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
|
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 |
|
|
Alexander Zobnin
|
8aaaee5e16
|
fix colorpicker colors order (width issue) (#10170)
|
2017-12-12 17:00:56 +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
|
89db9cc976
|
fix: fixed dashboard api tests
|
2017-12-12 16:15:24 +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 |
|
|
Torkel Ödegaard
|
d379b501aa
|
ux: search look update
|
2017-12-12 13:55:32 +01:00 |
|
|
Torkel Ödegaard
|
df25c9f0fa
|
tech: updated version for react-grid item
|
2017-12-12 13:27:56 +01:00 |
|
|
Torkel Ödegaard
|
8a61e0967e
|
Merge branch 'master' into develop
|
2017-12-12 13:22:13 +01:00 |
|
|
Torkel Ödegaard
|
a00af85f36
|
build: fixed unit test failure
|
2017-12-12 13:21:50 +01:00 |
|
|
Torkel Ödegaard
|
cafed8ce8f
|
Merge branch 'master' into develop
|
2017-12-12 13:19:07 +01:00 |
|
|
bergquist
|
ff1b71bc20
|
allow overriding dashboards from api
|
2017-12-12 13:18:00 +01:00 |
|
|
Torkel Ödegaard
|
871b98c06b
|
graphite: minor fix for PR #10142 the query was being sent for every segmen t you selected before you completed the metric path
|
2017-12-12 12:56:40 +01:00 |
|
|
Torkel Ödegaard
|
bb52f3670e
|
Merge branch 'parseTarget' of https://github.com/DanCech/grafana into DanCech-parseTarget
|
2017-12-12 12:38:58 +01:00 |
|
|
Torkel Ödegaard
|
e98f573732
|
build: fixed broken test
|
2017-12-12 12:31:41 +01:00 |
|
|
Torkel Ödegaard
|
35c8cdf3a5
|
refactor: minor change to panel json fix PR #10156
|
2017-12-12 12:10:19 +01:00 |
|
|
Alexander Zobnin
|
86204abbfe
|
Move panel JSON editor to modal dialog (#10156)
* panel: fix JSON edit, #10149
* panel: show JSON editor in modal, #10149
|
2017-12-12 12:04:08 +01:00 |
|
|
Torkel Ödegaard
|
bbd0b98be9
|
Merge branch 'develop-settings' into develop
|
2017-12-12 12:03:10 +01:00 |
|
|
Torkel Ödegaard
|
7b0bbefb96
|
ux: minor updates to dashboard settings
|
2017-12-12 12:02:44 +01:00 |
|
|
Torkel Ödegaard
|
0a8bd5d289
|
ux: dashboard settings updated
|
2017-12-12 11:49:01 +01:00 |
|