Commit Graph

5078 Commits

Author SHA1 Message Date
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
Torkel Ödegaard
79d9b64f82 fix: fixed issue with optimized build grid directive missing ngInject comment, fixes #10161 2017-12-12 11:00:16 +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
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
502171fff1 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-11 09:18:03 +01: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
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
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
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
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
Marcus Efraimsson
b03b360414 dashfolders: Create nav model for folder page client side #10083 2017-12-08 14:08:16 +01:00
Torkel Ödegaard
63b717f607 ux: minor change to new folder page 2017-12-08 13:54:11 +01:00
Patrick O'Carroll
9cae579c75 fix for search dropdown on small screen + icon overlapping fix (#10091)
* fix for search dropdown on small screen + icon overlapping fix

* fixing search filter for small screen

* hid tags and filter box

* iphone input zoom fix

* moved input styling to old-responsive
2017-12-08 13:37:37 +01:00
Torkel Ödegaard
77b537f45f ux: added react scrollbar component and added it to add panel panel 2017-12-08 13:30:16 +01:00
Torkel Ödegaard
2bc23d2063 tech: updated ngreact and with custom PR applied 2017-12-08 12:26:19 +01:00
Torkel Ödegaard
e03abde778 refactoring: #10130 2017-12-08 12:17:09 +01:00
Torkel Ödegaard
974d4d9739 Revert "Don't animate panels on initial render (#10130)"
This reverts commit e0c173c5af.
2017-12-08 11:53:51 +01:00
Torkel Ödegaard
b59d06cab6 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-08 11:49:28 +01:00
Alexander Zobnin
e0c173c5af Don't animate panels on initial render (#10130)
* grid: dont animate panels on initial render

* grid: dont animate panels on initial render
2017-12-08 11:49:14 +01:00
Torkel Ödegaard
9f87d8d344 Merge branch 'develop-graph-legend' into develop 2017-12-08 11:47:50 +01:00
Torkel Ödegaard
35a7109a6a refactoring: fixing bug when all values are null 2017-12-08 11:45:44 +01:00
Marcus Efraimsson
f78f86d0ab dashfolders: Hide search input area when showing CTA. #10083 2017-12-08 11:23:57 +01:00