146 Commits

Author SHA1 Message Date
04d25dc58a Dashboard: When saving a dashboard and another user has made changes inbetween, the user is promted with a warning if he really wants to overwrite the other's changes, Closes #718 2015-03-02 22:24:01 +01:00
9710771f16 Added basic auth to data source edit/create, add support for basic auth in data source proxy code, Closes #1510 2015-03-02 09:58:35 +01:00
d0d995da09 Inital work on SQL metric/annotation data source, #1542 2015-02-28 17:27:30 +01:00
04ca85fe89 Moved dashboard theme option from the dashboard to a persisted user setting, #1458 2015-02-28 14:30:08 +01:00
ae3b9617b6 Fixed dataproxy test 2015-02-28 12:34:51 +01:00
232f980c72 More work on restoring features after moving to plugin model for datasources, no annotations work again #1276 #1472 2015-02-28 10:52:25 +01:00
9e892bddf0 More work on restoring features after moving to plugin model for datasources, #1276 #1472 2015-02-28 09:46:37 +01:00
109dd3240a Work on new datasource plugin model, #1276 #1472 2015-02-28 08:25:13 +01:00
c198242292 A lot of work on backend plugin model for frontend components, right now for data sources, will enable dropin plugins for data sources and panels, #1472 2015-02-27 22:29:00 +01:00
5bd5713a52 Began work on plugin system 2015-02-27 13:45:00 +01:00
c75aa23092 New implementation for API Keys that only stores hashed api keys, and the client key is base64 decoded json web token with the unhashed key, Closes #1440 2015-02-26 17:23:28 +01:00
6a2a6afc1d Merge branch 'develop' into apikey_hashed
Conflicts:
	pkg/api/apikey.go
	pkg/services/sqlstore/migrations.go
2015-02-26 15:48:54 +01:00
7c241fd617 Added permissions section to admin > edit user view, an admin can now make another user admin, Closes #1517 2015-02-26 15:43:48 +01:00
ae7f18f981 Made a copy of influxdb datasource named influxdb_08 so the main influxdb data source can be modified to support InfluxDB 0.9, made some initial experiments to get queries to work, but a lot more work is needed, #1525 2015-02-25 18:43:44 +01:00
9e789e6d82 More work on organization / admin nav, views, #1506 2015-02-25 14:27:34 +01:00
da41d99aa7 Fixed sql integration test 2015-02-23 20:48:43 +01:00
26e4809e2e Big Backend Refatoring: Renamed Account -> Org 2015-02-23 20:07:49 +01:00
e9e2fa2927 Started Account -> Organization rename 2015-02-23 18:29:01 +01:00
5b2715515f Began work on Account -> Organization rethink, #1506 2015-02-23 16:40:04 +01:00
138e720695 Increased max user list to 1000 for user admin page, need to paging, but will have to wait a few days 2015-02-23 11:30:58 +01:00
1a106e5c38 Added change password ability to admin > edit user view, #1446 2015-02-23 11:24:22 +01:00
47c6c6e1b7 Added change password feature, Closes #1455 2015-02-19 16:09:49 +01:00
60ae4afe87 Refresh frontend datasourceSrv after datasource update, no longer need to reload the page to use a newly added or updated datasource, #1493 2015-02-18 14:06:44 +01:00
26eb6e559e Removed use of absolute urls in dashboard search and dashlist, root_url option is now not required, it is required if you use oauth or proxy grafana under suburl, #1483 2015-02-17 18:43:37 +01:00
f6c07fdabd Rewrote and redesign how the data source edit views look and work so they conform better to how account views look, removed tabs and put top nav items to add data source etc, made list, edit and new seperate url routes, #1483 2015-02-14 10:04:34 +01:00
8722ee8ad6 Worked on playlist update for Grafana 2.0, added dashboard search to playliststart view, #1460 2015-02-13 08:47:44 +01:00
1a44036148 Fixed req.Host in datasource proxy, Fixes #1478 2015-02-13 07:26:33 +01:00
e65a6cc063 added an inital admin settings view, very basic right now only displays all config options in grafana.ini 2015-02-12 15:46:14 +01:00
71f09ddd94 Added delete user action to user admin api, and made it work in UI, Closes #1466, #1446 2015-02-11 16:47:22 +01:00
add4adeec9 Fixed links to user admin views, and backend html routes for user admin edit/create urls, Closes #1451 2015-02-10 16:26:23 +01:00
e165e2af95 Worked on user admin features, can now create and edit users as a grafana admin user, #1446 2015-02-10 15:36:51 +01:00
c5afcd8e09 Fixed issue with datasource proxying, it required account admin role when it should not 2015-02-10 10:19:43 +01:00
5269422f7c Began work on hashing api keys 2015-02-09 13:30:04 +01:00
727fc9d3a6 Updated search result view, removed delete link, added delete action from dashboard cogs dropdown 2015-02-07 20:25:53 +01:00
9818f81c5f Completed search makover 2015-02-07 16:12:29 +01:00
397dfc54cd Fixed bug in png rendering when having changed public url 2015-02-06 14:17:40 +01:00
e5fbbe96fd fixed error handling, and error logging for panel rendering 2015-02-05 12:23:24 +01:00
8e1b753664 Added limit to dashboard list panel and search 2015-02-05 11:10:56 +01:00
10820f31c2 Changed go package path 2015-02-05 10:37:13 +01:00
076905d14e Added isStarred to search result hit, very inefficient loading right now but can be cached later on 2015-02-05 09:49:00 +01:00
60541a455f Worked on search filter flag IsStarred, and updated frontend with new dashboard list panel 2015-02-04 11:35:59 +01:00
1ac3355b03 updated frontend with style changes 2015-02-03 22:06:07 +01:00
42a5aefb23 Worked on home dashboard 2015-02-03 15:04:35 +01:00
bd470abcf0 fontend styles updated 2015-02-03 10:46:52 +01:00
97758380e0 Worked on stars in search results 2015-02-02 17:17:57 +01:00
ad3d15e28d Worked on dashboard starring and unstarring, renamed favorite model to star 2015-02-02 11:32:32 +01:00
04d03f73b3 Added disable user sign up feature 2015-01-29 15:46:54 +01:00
1d6413bfae More work on backend for user favorites 2015-01-29 12:10:34 +01:00
1cff564483 Fontend handling of account role to hide user actions and links that the user does not have access to 2015-01-28 11:33:50 +01:00
aa261bbe23 Login: only enabled oauth options are shown on login page 2015-01-28 10:26:13 +01:00