Commit Graph

12766 Commits

Author SHA1 Message Date
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
bergquist
0506cfdc1d changelog: adds ntoe about closing #10111 2017-12-08 16:09:32 +01:00
Carl Bergquist
2408d8f09a
Merge pull request #10112 from adiletmaratov/master
Solves problem with Github authentication restriction by organization
2017-12-08 16:05:27 +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
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
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
bergquist
0c5ef1453d fixes broken test 2017-12-08 11:33:15 +01:00
Marcus Efraimsson
f78f86d0ab dashfolders: Hide search input area when showing CTA. #10083 2017-12-08 11:23:57 +01:00
Torkel Ödegaard
4aad4a069c ux: graph legend refactoring 2017-12-08 10:54:53 +01:00
bergquist
5f5cdad97a improve error handling for datasources as cfg 2017-12-08 10:50:11 +01:00
bergquist
c766802325 improve sample datasource.yaml 2017-12-08 10:28:38 +01:00
bergquist
80a852b00a make gitignore more generic 2017-12-08 09:35:46 +01:00
Alexander Zobnin
cd3cf5d19b grid css transforms: minor refactor (#10128) 2017-12-08 08:43:47 +01:00
Alexander Zobnin
3de17ecda7 dashboard grid: enable CSS transforms (#10125) 2017-12-08 08:21:00 +01:00
bergquist
79d7213e11 fixes issue with datasource/dash as cfg and gitignore 2017-12-08 06:52:47 +01:00
Torkel Ödegaard
8415ea6c71 refactoring: changing how graph height and legend height is calculated, using flex box seems to actually work, #10079 2017-12-07 19:53:32 +01:00
Marcus Efraimsson
017b337f00 dashfolders: create folder page
Fixes #10085
2017-12-07 19:32:38 +01:00
Torkel Ödegaard
c629a58b6d refactor: removed graph height from legend decimal calc 2017-12-07 18:13:56 +01:00
Marcus Efraimsson
ff535a5e9a dashfolders: css fix 2017-12-07 18:05:47 +01:00
Marcus Efraimsson
2ea663df78 dashfolders: New Dashboard Folder page
Fixes #10083. Permissions page is just a placeholder
for now.
2017-12-07 17:30:54 +01:00
Marcus Efraimsson
10b0fc79f3 fix: move components tests to specs folder 2017-12-07 17:30:54 +01:00
Ben Whaley
51854ff4fa Fix go fmt 2017-12-07 16:10:13 +00:00
Torkel Ödegaard
a7897b945b Merge branch 'graph-legend-v5' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-graph-legend-v5 2017-12-07 17:09:46 +01:00
Torkel Ödegaard
87ceeb0898 fix: v5 sidemenu & link to shortcuts now works, fixes #10087 2017-12-07 16:58:57 +01:00
bergquist
7b81ebc991 changelog: breaking regardless what your running 2017-12-07 16:29:56 +01:00
bergquist
f39b40c2dd changelog: better styling 2017-12-07 16:29:00 +01:00
bergquist
5aab6b5c20 removes last pieces of dashboard.json 2017-12-07 16:26:07 +01:00
Torkel Ödegaard
68dab71275 refactor: sidemenu toggle & hiding logic 2017-12-07 16:25:21 +01:00
bergquist
5fb8b37241 changelog: note about closing #5269 and #9654 2017-12-07 16:13:08 +01:00
Carl Bergquist
fb386f3c8d
Merge pull request #10052 from bergquist/dashboards_from_disk
Load dashboards from disk into the database at regular interval
2017-12-07 16:12:02 +01:00
bergquist
5006f9e4c5 dashboards as cfg: update docs to use /provisioning 2017-12-07 15:55:00 +01:00
bergquist
2e610cb256 dashboards as cfg: move dash/ds config files to /provisioning/* 2017-12-07 15:27:01 +01:00
bergquist
50bc801f1c dashboards as cfg: copy dash/ds files if missing 2017-12-07 15:27:01 +01:00
bergquist
361acd3fa1 dashboards as cfg: include cfg files in dist packages 2017-12-07 15:27:01 +01:00
bergquist
1dfa529941 dashboards as cfg: avoid walking fs in parallel 2017-12-07 15:27:01 +01:00