|
6ac3bd4c7c
|
feat(): update checks starting to work
|
2016-04-11 12:47:04 -04:00 |
|
|
b4a8c227cc
|
feat(update checks): started work on update checks
|
2016-04-11 12:21:48 -04:00 |
|
|
370589d6c0
|
fix(org switch): fixed issue with switching orgs, fixes #4614
|
2016-04-09 13:27:06 -04:00 |
|
|
9b30634217
|
fix(postgres): fixed issue with postgres caused by wrong prefrences table types, dropped table and created it with correct column types, fixes #4558
|
2016-04-05 11:24:21 -04:00 |
|
|
43ebc172cb
|
fix(profile): fixed change password link and page, fixes #4542
|
2016-04-04 13:52:41 -04:00 |
|
|
cab859a0e4
|
Merge branch 'master' into preferences
|
2016-04-03 05:33:11 -07:00 |
|
|
a2c6469d41
|
fix(): A Datasource with null jsonData would make Grafana fail to load page, fixes #4536
|
2016-04-03 05:32:15 -07:00 |
|
|
ab1048b7ee
|
feat(preferences): theme and home dashbord settings now work work on profile and org settings page
|
2016-04-02 13:54:06 -07:00 |
|
|
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 |
|
|
b7d198793f
|
refactor(): minor refactoring of #4455
|
2016-03-23 15:09:48 +01:00 |
|
|
c711fb67c8
|
Merge branch 'master' into websocket
|
2016-03-22 10:31:57 +01:00 |
|
|
10df9dc8c3
|
feat(plugins): finished app navigation enhancements, closes #4434
|
2016-03-22 10:15:47 +01:00 |
|
|
65c0937741
|
ux(): app navigation improvements, changes to plugin.json for apps, merged pages with includes section, #4434
|
2016-03-21 19:07:08 +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 |
|
|
7023dedc05
|
feat(preferences): refactoring PR #4399
|
2016-03-20 11:52:19 +01:00 |
|
|
9e98c86ae1
|
Merge branch 'master' into preferences
|
2016-03-20 11:27:49 +01:00 |
|
|
e63ff1c762
|
feat(dataproxy): set flush interval, need a setting for this
|
2016-03-19 11:09:26 +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 |
|
|
9ddf22ea93
|
Merge branch 'master' into websocket
|
2016-03-17 10:16:05 +01:00 |
|
|
b2fe7e518f
|
ux(): added specific fallback logos for plugin depending on type, polished layout selector style
|
2016-03-17 10:15:16 +01: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 |
|
|
0f6579801d
|
Merge branch 'master' into websocket
Conflicts:
public/app/core/core.ts
|
2016-03-16 15:19:32 +01:00 |
|
|
a88176e060
|
feat(preferences): lots of refactoring and changes to #3214
|
2016-03-15 22:49:52 +01: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 |
|
|
e4c0c39fbf
|
ux(): began work on updating data source list to cards view
|
2016-03-15 20:29:35 +01:00 |
|
|
1abdd170d3
|
ux(): fixes to cards and sorting plugin list, #4364
|
2016-03-15 15:52:29 +01:00 |
|
|
2e1f26096f
|
feat(grafana_live): more work pushing data to websocket, #4355
|
2016-03-14 22:26:43 +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 |
|
|
2adc4d12be
|
feat(live): work on websocket data source, #3455
|
2016-03-14 13:20:55 +01:00 |
|
|
8d7b7009c3
|
Merge branch 'master' into websocket
|
2016-03-14 12:01:43 +01:00 |
|
|
ca5a34ad1e
|
fix(datasource): filter out built in data sources from data source type dropdown
|
2016-03-14 12:00:56 +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 |
|
|
0398face05
|
feat(plugins): dashboard import for data sources is working! #4298
|
2016-03-12 10:13:49 +01:00 |
|
|
1f9f439acb
|
lib(): added simplejson lib
|
2016-03-11 23:28:33 +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 |
|
|
fc54c01f01
|
feat(plugins): more work on plugin dashboard install, #4298
|
2016-03-11 12:31:56 +01:00 |
|
|
2de439bd1e
|
feat(plugins): progress on dashboard installs , #4298
|
2016-03-11 09:57:20 +01:00 |
|