Marcus Efraimsson
20dbc40411
Merge branch '10630_folder_api' of github.com:grafana/grafana into 10630_folder_api
2018-02-01 22:34:58 +01:00
Marcus Efraimsson
d217688d5e
folders: use new folder api in frontend
2018-02-01 22:32:26 +01:00
Marcus Efraimsson
04a9a650e7
folders: changes and updated tests after merging permissions and new url structure
2018-02-01 22:07:27 +01:00
Marcus Efraimsson
773fff9f1a
folders: changes and updated tests after merging permissions and new url structure
2018-02-01 21:00:37 +01:00
Marcus Efraimsson
5912cf4dc2
folders: rename api files
2018-02-01 18:41:50 +01:00
Marcus Efraimsson
4e0542d740
dashboards: revert logic of returning 404 in dashboard api if it's a folder for now
2018-02-01 18:41:04 +01:00
Marcus Efraimsson
b07ac3c054
Merge branch '7883_new_url_structure' into 10630_folder_api
2018-02-01 18:29:00 +01:00
Marcus Efraimsson
cd61d2b237
Merge branch 'master' into 7883_new_url_structure
2018-02-01 17:32:43 +01:00
Marcus Efraimsson
744f402a96
db: fix failing integration tests for mysql and postgresql
2018-02-01 17:27:29 +01:00
Marcus Efraimsson
cef910dd78
Merge branch '7883_new_url_structure' of github.com:grafana/grafana into 7883_new_url_structure
2018-02-01 16:32:33 +01:00
Marcus Efraimsson
3db328f516
fix for dashboard/folder url's when having a sub path in root_url config
2018-02-01 16:30:48 +01:00
Torkel Ödegaard
5171d7e285
Merge branch 'master' of github.com:grafana/grafana
2018-02-01 15:45:59 +01:00
Torkel Ödegaard
c3181552f8
ux: added max width to dashboard settings views
2018-02-01 15:45:15 +01:00
bergquist
734a2e59aa
add gofmt as precommit hook
2018-02-01 15:23:52 +01:00
Daniel Lee
22a349051c
Merge pull request #10719 from grafana/add_permissions_10676
...
Grafana 5.0: Add permissions modal for the permissions pages
2018-02-01 14:20:04 +00:00
Daniel Lee
a77c656033
dashfolders: adds test for permission store
2018-02-01 14:48:11 +01:00
Carl Bergquist
3b4e487662
Merge pull request #10715 from grafana/7883_alerting
...
Implement new url format in alerting
2018-02-01 14:38:28 +01:00
Daniel Lee
cc55ab6bc8
dashfolders: adds permission modal to dashboard settings
2018-02-01 14:32:19 +01:00
bergquist
90207bcb7d
register handler for get dashboards by slug
2018-02-01 14:17:14 +01:00
bergquist
fcd86fb24f
make it easier for dashboards to generate ur;
2018-02-01 14:08:51 +01:00
bergquist
74ca6f6dbf
changes dashboard url in alertlist
2018-02-01 14:08:51 +01:00
bergquist
992fd37010
alert: use new url format
2018-02-01 14:08:51 +01:00
Mikael Olenfalk
c0f100f1b5
Improve logging in the phantomjs renderer ( #10697 )
...
* Add add adapter between io.Writer and log.Logger
* Add phantomjs output to grafana log
* Unexport LogWriterImpl
* Add test for LogWriter
* Make it possible to get phantomjs debug output
* Make it possible to get the configured log level
2018-02-01 14:04:52 +01:00
Daniel Lee
9cdc1428d7
Merge remote-tracking branch 'upstream/master' into add_permissions_10676
2018-02-01 14:02:14 +01:00
Marcus Efraimsson
d8d82c1769
Merge pull request #10706 from grafana/7883_frontend_step2
...
WIP: Dashboard & Persistent urls - Frontend Step 2
2018-02-01 13:55:03 +01:00
Marcus Efraimsson
cdf2fd64b7
route params from angular to view store should be updated on routeChangeSuccess
2018-02-01 13:28:04 +01:00
Alexander Zobnin
16e1640ba4
repeat panel: process repeats when row is expanding ( #10712 )
2018-02-01 13:23:45 +01:00
Marcus Efraimsson
ee9c408188
folders: changes needed due to merge
2018-02-01 13:21:24 +01:00
Torkel Ödegaard
50bd9eee55
docs: removed section with session table sql, that is not needed anymore
2018-02-01 13:16:39 +01:00
Torkel Ödegaard
d08a829b69
ux: fix for responsive breakpoints and solo mode showing sidemenu
2018-02-01 11:29:04 +01:00
Marcus Efraimsson
ef90b3e49c
Merge branch '7883_new_url_structure' into 7883_frontend_step2
2018-02-01 11:08:39 +01:00
Torkel Ödegaard
b55ce1dd72
docs: moved whats new article to master
2018-02-01 10:55:29 +01:00
Marcus Efraimsson
b135df9a6c
Merge remote-tracking branch 'upstream/master' into 7883_new_url_structure
2018-02-01 10:48:06 +01:00
Torkel Ödegaard
e985a9cd7c
ux: fixed issue with zoom on graph caused scroll, fixes #10696
2018-02-01 10:36:55 +01:00
Carl Bergquist
eff687bece
Merge pull request #10694 from grafana/7883_backend
...
backend for new url structure.
2018-02-01 09:35:00 +01:00
Carl Bergquist
1303dc7ac0
Merge pull request #10704 from alexanderzobnin/fix-backend-plugin-table-rows
...
plugins: return table with empty rows array insteaf of nil
2018-02-01 09:17:29 +01:00
Marcus Efraimsson
90933b0621
dashboard: refactor logic for retrieving url for folder/dashboard
2018-01-31 23:14:48 +01:00
Marcus Efraimsson
40c83e3e22
dashboards: update dashboard/folder url if browser url is not the same as from backend
2018-01-31 18:40:54 +01:00
Marcus Efraimsson
c0c3f17d84
dashboards: when restoring a dashboard to an older version, set current uid
2018-01-31 18:40:54 +01:00
Marcus Efraimsson
8fc648ac43
dashboards: fix updating folder so that correct url is returned
2018-01-31 18:40:54 +01:00
Marcus Efraimsson
035b724725
dashboards: remove slug property in dashboard search responses
...
Removes slug property in dashboard search responses since this property isn't needed
anymore and it haven't been released to any stable release.
2018-01-31 18:40:54 +01:00
Marcus Efraimsson
92a0171a9b
folders: change the front end route for browsing folders
...
Change the front end route for folders to /dashboards/f/<uid>/<slug of folder title>.
Use new route for deleting dashboard/folder by uid.
Retrieve dashboard/folder by uid when moving or deleting dashboards/folders.
2018-01-31 18:40:54 +01:00
Marcus Efraimsson
b23560ed5a
dashboards: add validation to delete dashboard by slug
...
Validates that there are only one folder/dashboard having that slug,
otherwise returns 412 Precondition Failed
2018-01-31 18:40:54 +01:00
Marcus Efraimsson
95d063621e
dashboards: new route for deleting dashboards by uid
2018-01-31 18:40:54 +01:00
Marcus Efraimsson
c19f4a866f
Merge pull request #10695 from grafana/7883_frontend_step
...
WIP: Dashboard & Persistent urls - Frontend Step
2018-01-31 18:37:05 +01:00
Alexander Zobnin
db7890ec1e
plugins: return table with empty rows array insteaf of nil
2018-01-31 19:59:15 +03:00
bergquist
58cfb23625
retry uid generation
2018-01-31 17:29:17 +01:00
Torkel Ödegaard
75cf9ae27d
fix: use replace when redirecting to new url
2018-01-31 17:26:35 +01:00
Johannes Schill
2e0cc2e347
ux: Change input width of UserPicker and TeamPicker in AddPermissions component #10676
2018-01-31 17:01:04 +01:00
Daniel Lee
3a0459e425
Merge branch 'dashboard_permissions'
2018-01-31 16:53:07 +01:00
