Torkel Ödegaard
|
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 |
|
Torkel Ödegaard
|
38a10f8be4
|
progress
|
2016-04-01 17:34:30 -07:00 |
|
Torkel Ödegaard
|
6ed9164c9d
|
Merge branch 'master' of github.com:grafana/grafana into preferences
|
2016-03-30 13:35:17 -07:00 |
|
Anthony Woods
|
036f407d6a
|
gofmt
|
2016-03-29 16:04:24 +08:00 |
|
Anthony Woods
|
2c60dbd4fb
|
handle errors when requesting plugin list. fixes #4494
|
2016-03-29 15:35:08 +08:00 |
|
Torkel Ödegaard
|
1e44ee9e9b
|
feat(grafana-cli): minor changes
|
2016-03-28 21:42:26 +02:00 |
|
Torkel Ödegaard
|
b3bda2aa64
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-03-28 20:44:54 +02:00 |
|
Anthony Woods
|
776af45c09
|
update default repo url in grafana-cli
|
2016-03-28 23:36:27 +08:00 |
|
Torkel Ödegaard
|
14326b626e
|
ux(): checkbox now works in dark and white theme
|
2016-03-28 13:10:42 +02:00 |
|
Torkel Ödegaard
|
f27ce7e1e4
|
Merge pull request #4461 from dfwarden/ldap_nested_groups
LDAP Nested Groups
|
2016-03-28 11:19:28 +02:00 |
|
Torkel Ödegaard
|
b7d198793f
|
refactor(): minor refactoring of #4455
|
2016-03-23 15:09:48 +01:00 |
|
David Warden
|
87aca5bf1b
|
new config option for source of %s in group_search_filter, useful for nested LDAP groups
|
2016-03-23 08:21:25 -04:00 |
|
Torkel Ödegaard
|
c711fb67c8
|
Merge branch 'master' into websocket
|
2016-03-22 10:31:57 +01:00 |
|
Torkel Ödegaard
|
10df9dc8c3
|
feat(plugins): finished app navigation enhancements, closes #4434
|
2016-03-22 10:15:47 +01:00 |
|
Torkel Ödegaard
|
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 |
|
bergquist
|
14df3c6249
|
feat(cli): use built in envvar support
|
2016-03-21 10:11:08 +01:00 |
|
bergquist
|
7f8643efde
|
feat(cli): make all plugin commands subcommands
|
2016-03-21 10:01:07 +01:00 |
|
Torkel Ödegaard
|
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 |
|
Torkel Ödegaard
|
7023dedc05
|
feat(preferences): refactoring PR #4399
|
2016-03-20 11:52:19 +01:00 |
|
Torkel Ödegaard
|
9e98c86ae1
|
Merge branch 'master' into preferences
|
2016-03-20 11:27:49 +01:00 |
|
Torkel Ödegaard
|
e63ff1c762
|
feat(dataproxy): set flush interval, need a setting for this
|
2016-03-19 11:09:26 +01:00 |
|
utkarshcmu
|
9d4fa87914
|
Viewer not able to delete snapshot
|
2016-03-18 01:13:34 -07:00 |
|
utkarshcmu
|
cb42cfc6af
|
Removed unwanted api, moved logic into backend
|
2016-03-17 02:29:34 -07:00 |
|
Torkel Ödegaard
|
9ddf22ea93
|
Merge branch 'master' into websocket
|
2016-03-17 10:16:05 +01:00 |
|
Torkel Ödegaard
|
b2fe7e518f
|
ux(): added specific fallback logos for plugin depending on type, polished layout selector style
|
2016-03-17 10:15:16 +01:00 |
|
utkarshcmu
|
4fbe954a79
|
Home dashboard per user per org works
|
2016-03-17 01:38:18 -07:00 |
|
utkarshcmu
|
66621d762e
|
Added getDashboardSlugById api
|
2016-03-17 01:01:58 -07:00 |
|
utkarshcmu
|
9dd6aefcec
|
Minor corrections
|
2016-03-16 23:35:06 -07:00 |
|
utkarshcmu
|
749fd618a9
|
Saving home dashboard id in table
|
2016-03-16 23:22:27 -07:00 |
|
Torkel Ödegaard
|
0f6579801d
|
Merge branch 'master' into websocket
Conflicts:
public/app/core/core.ts
|
2016-03-16 15:19:32 +01:00 |
|
Torkel Ödegaard
|
fcaf2bfdba
|
fix(datasource): when addding data source withCredentials did not get set, fixes #4389
|
2016-03-16 15:16:28 +01:00 |
|
Torkel Ödegaard
|
4144f71e23
|
Merge branch 'datasource-lists-cards'
|
2016-03-16 15:05:46 +01:00 |
|
bergquist
|
1a11f1e8c6
|
Merge branch 'master' into cli_colors
|
2016-03-16 14:17:35 +01:00 |
|
bergquist
|
a12f5376b5
|
feat(cli): adds some colors to ls command
|
2016-03-16 14:09:30 +01:00 |
|
Torkel Ödegaard
|
a88176e060
|
feat(preferences): lots of refactoring and changes to #3214
|
2016-03-15 22:49:52 +01:00 |
|
Torkel Ödegaard
|
e06756bcab
|
Merge branch 'preferences' of github.com:grafana/grafana into preferences
|
2016-03-15 22:15:27 +01:00 |
|
Torkel Ödegaard
|
9c222a445f
|
Merge branch 'master' into preferences
|
2016-03-15 22:14:35 +01:00 |
|
Torkel Ödegaard
|
e4c0c39fbf
|
ux(): began work on updating data source list to cards view
|
2016-03-15 20:29:35 +01:00 |
|
Torkel Ödegaard
|
1abdd170d3
|
ux(): fixes to cards and sorting plugin list, #4364
|
2016-03-15 15:52:29 +01:00 |
|
Carl Bergquist
|
0b3ccaff27
|
Merge pull request #4361 from bergquist/remove_staticRoot
plugin.json: remove staticRoot field
|
2016-03-15 10:07:08 +01:00 |
|
Torkel Ödegaard
|
b273cd1339
|
Merge branch 'master' into websocket
|
2016-03-15 09:52:36 +01:00 |
|
Torkel Ödegaard
|
82eb32a71e
|
ux(): initial pass at new card / list design, #4364
|
2016-03-15 09:15:24 +01:00 |
|
bergquist
|
e905c2c6b5
|
feat(plugin.json): remove staticRoot field
|
2016-03-15 09:00:55 +01:00 |
|
Torkel Ödegaard
|
2e1f26096f
|
feat(grafana_live): more work pushing data to websocket, #4355
|
2016-03-14 22:26:43 +01:00 |
|
Torkel Ödegaard
|
3d5251d9a5
|
feat(websocket): more work websocket ds, # 4355
|
2016-03-14 17:32:48 +01:00 |
|
Torkel Ödegaard
|
195be2742c
|
feat(live): wip work
|
2016-03-14 16:18:07 +01:00 |
|
Torkel Ödegaard
|
2adc4d12be
|
feat(live): work on websocket data source, #3455
|
2016-03-14 13:20:55 +01:00 |
|
Torkel Ödegaard
|
8d7b7009c3
|
Merge branch 'master' into websocket
|
2016-03-14 12:01:43 +01:00 |
|
Torkel Ödegaard
|
ca5a34ad1e
|
fix(datasource): filter out built in data sources from data source type dropdown
|
2016-03-14 12:00:56 +01:00 |
|
Torkel Ödegaard
|
fbd94fc6ce
|
feat(websockets): inital work on websockets, #4355
|
2016-03-14 11:59:51 +01:00 |
|