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
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
Patrick O'Carroll
a69c260173
redesigning links editor
2017-12-12 13:06:32 +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
Patrick O'Carroll
515faa9ec5
new dashboard and folder in search ( #10152 )
...
* new dashboard and folder in search
* code formatting fixes
2017-12-12 11:26:15 +01:00
Patrick O'Carroll
6ae94dda87
redesign dashlinks
2017-12-12 11:21:32 +01:00
Torkel Ödegaard
79d9b64f82
fix: fixed issue with optimized build grid directive missing ngInject comment, fixes #10161
2017-12-12 11:00:16 +01:00
Johannes Schill
097596a336
ux: Adjust margins when external auth providers are enabled ( #9879 )
2017-12-11 17:22:40 +01:00
Torkel Ödegaard
cc046f03aa
ux: dashboard settings progress
2017-12-11 17:19:17 +01:00
Torkel Ödegaard
97bd00c520
ux: dashboard settings work progress
2017-12-11 16:46:10 +01:00
Daniel Lee
a37f1b77f1
dashfolders: new dashboard with folder selected
...
Fixes #10133
2017-12-11 16:37:40 +01:00
Johannes Schill
f77d34f7c9
ux: wip - Push pixels for new login, remove inline styling, change so we use media queries using min-width instead of max-width and make sure it looks ok across all screen sizes ( #9879 )
2017-12-11 16:31:50 +01:00
Torkel Ödegaard
008b9bb3e9
ux: dashboard settings work progress
2017-12-11 16:28:57 +01:00
Torkel Ödegaard
c4b759fe6d
ux: dashboard settings progress
2017-12-11 15:04:48 +01:00
Torkel Ödegaard
7f597283e8
ux: dashboard settings progress
2017-12-11 13:47:04 +01:00
Torkel Ödegaard
61dbcfd35b
ux: dashboard settings progress
2017-12-11 13:29:23 +01:00
Torkel Ödegaard
a682475152
fix: fixed failing test
2017-12-11 13:09:25 +01:00
Torkel Ödegaard
05ec7541c8
ux: dashboard settings progress
2017-12-11 13:04:06 +01:00
Torkel Ödegaard
8354c64ff5
Merge branch 'develop' into develop-settings
2017-12-11 12:15:59 +01:00
Torkel Ödegaard
09cc60ffe4
ux: dashboard settings progress
2017-12-11 12:13:45 +01:00
Torkel Ödegaard
795d9c0362
ux: fixed navbar and sidemenu z-index issue and improved responsive rules
2017-12-11 11:42:13 +01:00
Torkel Ödegaard
2ce4a8e4c5
fix: fixed build failure
2017-12-11 10:52:38 +01:00
Torkel Ödegaard
84aa1e89c0
Merge branch 'develop' into develop-login
2017-12-11 10:29:37 +01:00
Mikael Olenfalk
8e7166b5c4
Explicitly specify default region in CloudWatch datasource ( #9440 )
...
The datasource uses the default region in the query if the region
is "" in the settings. However setting the region to an empty string
is almost impossible and rendered incorrectly.
This commit introduces a special value "default" for region which
is shown in the drop down and is translated to the default region
of the data source when performing queries.
2017-12-11 09:37:27 +01:00
Torkel Ödegaard
502171fff1
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-11 09:18:03 +01:00
Dan Cech
588ce6606c
fix function re-ordering broken in #9436
2017-12-10 21:20:38 -05:00
Dan Cech
525ae4fdf5
support metric trees of varying depth, never send '.select metric' to graphite
2017-12-10 10:48:12 -05:00
Dan Cech
8dcfa18761
simplify function parameter addition
2017-12-10 10:45:41 -05:00
Torkel Ödegaard
511fa7dec1
ux: dashboard settings progress
2017-12-10 12:41:11 +01:00
Torkel Ödegaard
00c723f04a
ux: minor changes
2017-12-10 12:21:04 +01:00
Torkel Ödegaard
e1440dcc44
ux: navbar progress
2017-12-09 22:45:33 +01:00
Dan Cech
3a1700cbee
improve handling of query references
2017-12-09 16:27:05 -05:00
Torkel Ödegaard
1e5983b46c
Merge branch 'develop' into develop-settings
2017-12-09 21:50:26 +01:00
Torkel Ödegaard
47ecbbab8d
build: fix for tslint
2017-12-09 21:47:59 +01:00
Torkel Ödegaard
7f73fae6ae
ux: form styles polish, improvement but can be better
2017-12-09 21:46:30 +01:00
Dan Cech
4fcf79a3a6
demonstrate parseTarget issue
2017-12-09 11:17:34 -05:00
Torkel Ödegaard
55609382f1
fix: fixed panel size rerendering issues
2017-12-09 13:53:03 +01:00
Torkel Ödegaard
fbe9f759ad
ux: work on dashboard settings views
2017-12-08 18:15:24 +01:00
Marcus Efraimsson
47014ddb65
dashfolders: Do not allow loading a folder as a dashboard
2017-12-08 17:50:37 +01:00
Marcus Efraimsson
70b0165835
fix: Remove console.log
2017-12-08 17:49:33 +01:00
Marcus Efraimsson
1985027549
dashfolders: Folder picker should set correct default values. Fixes #10135
2017-12-08 17:46:52 +01:00
Alexander Zobnin
e4675ca5c1
refactor: user groups to teams, replace rest mentions
2017-12-08 19:01:10 +03:00
Alexander Zobnin
9e62a777c7
refactor: user groups to teams, rename frontend files
2017-12-08 18:47:55 +03:00
Alexander Zobnin
d8612380e9
refactor: rename User Groups to Teams
2017-12-08 18:25:45 +03:00
Torkel Ödegaard
7a2e886e70
Merge branch 'develop' into develop-settings
2017-12-08 16:02:42 +01:00
Torkel Ödegaard
10a77b0353
ux: forms style font size change
2017-12-08 15:59:51 +01:00
Torkel Ödegaard
1b6be031e5
ux: dashboard settings progress
2017-12-08 15:53:26 +01:00
Sven Klemm
ce809de1ed
postgres: change $__timeGroup macro to include "AS time" column alias ( #10119 )
...
* change $__timeGroup macro to include column alias
* update docs and help text for $__timeGroup macro
2017-12-08 15:14:10 +01:00
Torkel Ödegaard
db663c380b
new timepicker is working
2017-12-08 14:38:33 +01:00
Torkel Ödegaard
9369a87e93
Merge branch 'develop' into develop-settings
2017-12-08 14:32:15 +01:00
