186 Commits

Author SHA1 Message Date
38a10f8be4 progress 2016-04-01 17:34:30 -07:00
6ed9164c9d Merge branch 'master' of github.com:grafana/grafana into preferences 2016-03-30 13:35:17 -07:00
14326b626e ux(): checkbox now works in dark and white theme 2016-03-28 13:10:42 +02:00
c711fb67c8 Merge branch 'master' into websocket 2016-03-22 10:31:57 +01:00
5e431149cd feat(preferences): removed unused api prefernce methods, these need to be abstracted more from an http api perpsective, they are too low level for the http api, #4399 2016-03-20 11:54:24 +01:00
9e98c86ae1 Merge branch 'master' into preferences 2016-03-20 11:27:49 +01:00
9d4fa87914 Viewer not able to delete snapshot 2016-03-18 01:13:34 -07:00
cb42cfc6af Removed unwanted api, moved logic into backend 2016-03-17 02:29:34 -07:00
4fbe954a79 Home dashboard per user per org works 2016-03-17 01:38:18 -07:00
66621d762e Added getDashboardSlugById api 2016-03-17 01:01:58 -07:00
9dd6aefcec Minor corrections 2016-03-16 23:35:06 -07:00
749fd618a9 Saving home dashboard id in table 2016-03-16 23:22:27 -07:00
e06756bcab Merge branch 'preferences' of github.com:grafana/grafana into preferences 2016-03-15 22:15:27 +01:00
9c222a445f Merge branch 'master' into preferences 2016-03-15 22:14:35 +01:00
3d5251d9a5 feat(websocket): more work websocket ds, # 4355 2016-03-14 17:32:48 +01:00
195be2742c feat(live): wip work 2016-03-14 16:18:07 +01:00
fbd94fc6ce feat(websockets): inital work on websockets, #4355 2016-03-14 11:59:51 +01:00
e371e03696 Able to save preference version, created, updated fields 2016-03-14 03:12:52 -07:00
5b6754ce6c Merge branch 'master' into websocket 2016-03-14 10:33:11 +01:00
581ffb862c feat(plugins): polish to plugin page, better handling for reading readme file contents 2016-03-13 19:21:44 +01:00
c5a817194a more work on dashboard importing and templating 2016-03-11 17:31:57 +01:00
43b474143c Preferences model updated 2016-03-11 06:30:05 -08:00
ece8a925a6 Merge branch 'master' of github.com:grafana/grafana
Conflicts:
	examples/nginx-app/package.json
	examples/nginx-app/plugin.json
2016-03-11 12:39:10 +01:00
2de439bd1e feat(plugins): progress on dashboard installs , #4298 2016-03-11 09:57:20 +01:00
4fbff99186 Implemented GetDataSourceIdByName API 2016-03-10 01:31:10 -08:00
8afd56575c Moved api in correct group 2016-03-10 00:48:38 -08:00
dfaa6d8eb9 feat(plugins): a lot of work on #4298 2016-03-08 18:17:47 +01:00
1a39d93b4e Implemented GetDataSourceByName API 2016-03-08 01:54:10 -08:00
8f42bec270 Implemented GetUserPreferences API 2016-03-06 11:42:15 -08:00
660d3fa1e9 Implemented savePreferences API 2016-03-06 03:47:39 -08:00
cf926134ef Added savePreferencesAPI 2016-03-05 13:15:49 -08:00
fc877ae0f4 poc(websockets): websocket poc 2016-03-03 23:05:08 +01:00
35f7a71f9a fix app->plugin renamin in more places 2016-02-29 19:54:36 +08:00
8db7cf49a6 feat(plugins): began refactoring AppSettings -> PluginSettings, and have the plugins list view and plugin edit view be common for all plugins 2016-02-25 14:55:31 +01:00
08f7ccff38 feat(avatar): added server side proxy and cache of gravatar requests 2016-02-21 00:06:28 +01:00
fcc960e9a2 Merge pull request #3792 from utkarshcmu/snapshot-view
UI Review: Snapshot view
2016-02-05 08:49:23 +01:00
251bf7a2b4 Merge pull request #3840 from utkarshcmu/stats
Grafana stats view as mentioned in #3812
2016-01-27 19:41:10 +01:00
da67afa51e Fixed api bugs, stats endpoint working 2016-01-24 21:18:17 -08:00
c7fae5386d Added backend API for stats 2016-01-24 11:01:33 -08:00
f94599cd29 merge apiPlugins with appPlugins 2016-01-22 01:15:04 +08:00
ca55d1f315 Minor bug fixes 2016-01-19 05:05:24 -08:00
bcb44b7b31 UI and backend connectivity implemented 2016-01-19 05:02:22 -08:00
1ab1154010 Optimized backend queries 2016-01-19 04:09:57 -08:00
8f067a5ed2 Added backend functionality for searching snapshots 2016-01-19 01:37:36 -08:00
66eebd1ac3 refactor(playlist): refactor of playlist feature, and PR #3776 2016-01-18 16:01:14 +01:00
6da3af5e89 Merge branch 'new_macaron' 2016-01-13 15:48:49 +01:00
bdb67d4909 fix(build): fixed dependency and build issue 2016-01-13 15:38:54 +01:00
4fe72ebf69 feat(macaron): upgrades macaron version 2016-01-13 15:11:23 +01:00
dc427d5a2c add get org by name api 2016-01-12 13:50:56 -08:00
e5b3f27a30 Merge branch 'apps' 2016-01-12 15:41:15 +01:00