AQNOUCH Mohammed
cc1ed98fc4
Updated copyright to 2016
2016-01-01 01:30:43 +00:00
Mitsuhiro Tanda
ebf0bd5fc9
fix end time of Prometheus link
2015-12-31 16:05:04 +09:00
Mitsuhiro Tanda
be48caf59f
fix Prometheus link, expand template variable in expression
2015-12-31 16:05:04 +09:00
Qtax
c0cf0cb802
Added an option to set a min-width for the graphs side table/area.
2015-12-29 14:42:52 +01:00
Carl Bergquist
3d60d0dfa5
Merge pull request #3613 from utkarshcmu/recorded
...
Made Playlist UI user friendly
2015-12-29 11:33:19 +01:00
utkarshcmu
b68df56b03
Made Playlist UI user friendly
2015-12-28 04:24:38 -08:00
Carl Bergquist
6fbba13ab3
Merge pull request #3611 from utkarshcmu/recorded
...
Playlist enhancements
2015-12-28 10:40:52 +01:00
Carl Bergquist
311624beaa
Merge pull request #3598 from eddawley/ISSUE-2818
...
Fixes #2818 . Adds support for mysql backends via unix sockets
2015-12-28 10:33:49 +01:00
utkarshcmu
ca5099f53b
Fixed gofmt tests
2015-12-24 02:25:49 -08:00
utkarshcmu
5877e5e11a
Merged with master, resolved conflicts
2015-12-24 02:24:59 -08:00
Torkel Ödegaard
69eb62c09f
Merge pull request #3597 from eddawley/ISSUE-3461
...
Issue 3461: Session table is now created automatically
2015-12-24 09:59:34 +01:00
Ed Dawley
ec36e28368
Small typo in comment
2015-12-23 15:15:59 -06:00
Ed Dawley
4da56b65ab
Fixes #2818 . Adds support for mysql backends via unix sockets
2015-12-23 15:06:28 -06:00
utkarshcmu
71febeb71f
Playlist can be run without saving too
2015-12-23 02:38:27 -08:00
utkarshcmu
a292aedd9c
Made playlist URL clickable
2015-12-23 02:15:28 -08:00
utkarshcmu
b58e605b99
Added play button
2015-12-23 02:02:48 -08:00
utkarshcmu
7776803890
Removed unused components
2015-12-23 01:46:23 -08:00
Ed Dawley
cd23ab9955
Issue 3461: Session table is now created automatically
2015-12-23 01:33:46 -06:00
Torkel Ödegaard
aa32459bc2
feat(apps): mini update to apps config view
2015-12-22 17:00:21 +01:00
Torkel Ödegaard
41a0995db7
feat(apps): minor progress on app meta data
2015-12-22 16:32:17 +01:00
Daniel Low
3f9f0679ec
gofmt
2015-12-22 13:10:34 +00:00
Torkel Ödegaard
d1145ed3fb
Merge branch 'master' into apps
2015-12-22 13:59:25 +01:00
Torkel Ödegaard
f074c1eaff
refactor(lodash): changed how lodash is referenced from typescript
2015-12-22 13:59:11 +01:00
Daniel Low
ea566fff24
Add TLS for mysql
...
Use ssl_mode for mysql and add docs
add docs for the new parameters in config
Tolerate ssl_mode without client authentication
Client cert is not necessary for a SSL connection. So we tolerate
failure if client cert is not provided.
Improve error message if missing server_cert_name and mode is not
skip-verify.
2015-12-22 12:42:52 +00:00
Torkel Ödegaard
b8cb5e0367
feat(apps): WIP progress app views
2015-12-22 13:42:48 +01:00
Torkel Ödegaard
7a87c900ee
Merge branch 'master' into apps
2015-12-22 12:41:52 +01:00
Torkel Ödegaard
e95170e9fd
tech(angularjs): upgrade to angularjs 1.5
2015-12-22 12:24:36 +01:00
Torkel Ödegaard
d0dead0a08
feat(apps): rewrote appsCtrl to app_list_ctrl and to typescript
2015-12-22 12:13:55 +01:00
Torkel Ödegaard
71d718a6e2
fix(systemjs): systemjs config fix for plugins
2015-12-22 11:46:41 +01:00
Torkel Ödegaard
ad94f99d57
refactor(apps): more WIP work on apps
2015-12-22 11:37:44 +01:00
utkarshcmu
bcaaedf2ff
Resurrected nikita-graf's work and added playlistType for future use
2015-12-22 02:07:15 -08:00
Carl Bergquist
3dc3d363fd
Merge pull request #3581 from bergquist/zoomout_on_doubleclick
...
Zoom out on double click in graphs
2015-12-22 10:04:28 +01:00
bergquist
690a6e1a59
feat(graphs): zoom out on double click
2015-12-22 09:56:24 +01:00
Torkel Ödegaard
eacc46da6d
feat(plugins): WIP on new apps concept
2015-12-21 23:09:27 +01:00
woodsaj
0903d5541b
Merge branch 'master' of github.com:grafana/grafana into externalPlugin
...
Conflicts:
pkg/api/api.go
pkg/api/api_plugin.go
pkg/api/datasources.go
pkg/api/frontendsettings.go
pkg/api/index.go
pkg/plugins/models.go
pkg/plugins/plugins.go
2015-12-22 00:23:24 +08:00
Torkel Ödegaard
c19a2e5b45
fix(influxdb): systemjs fix
2015-12-21 16:48:12 +01:00
Torkel Ödegaard
10a764c4f2
fix(less): minor less fix
2015-12-21 16:42:28 +01:00
Torkel Ödegaard
0a9f705308
tech(systemjs): more fixes for optmized build
2015-12-21 16:34:18 +01:00
Torkel Ödegaard
dabd680d6b
tech(systemjs): merged sync with master, all tests are passing
2015-12-21 16:13:24 +01:00
Torkel Ödegaard
4522b02925
tech(systemjs): almost all tests are passing
2015-12-21 16:00:58 +01:00
Carl Bergquist
fabaf5cc04
Merge pull request #3575 from piotr1212/no_username_in_render_logging
...
Fix empty username in http log for /render calls
2015-12-21 13:31:10 +01:00
Torkel Ödegaard
f7888886e9
tech(systemjs): working on getting tests to work
2015-12-21 11:10:16 +01:00
Torkel Ödegaard
dfd5413b10
tech(systemjs): worked on making optimized builds work with systemjs builder
2015-12-21 10:02:39 +01:00
carl bergquist
1b341f8000
fix(dashboard_settings): update css for last row
2015-12-20 21:13:44 +01:00
Carl Bergquist
af9b864b83
Merge pull request #3446 from utkarshcmu/new-columns
...
Displaying Last UpdatedBy as Metadata
2015-12-20 15:11:20 -05:00
Torkel Ödegaard
93e424de4c
tech(systemjs): work on systemjs builder
2015-12-18 15:59:27 +01:00
woodsaj
e7a0ab76c3
change plugin to app in breadcrumb
2015-12-18 22:09:33 +08:00
utkarshcmu
d8b90721b3
Able to display login Id of the user in Last Updated By
2015-12-18 03:38:49 -08:00
utkarshcmu
cb5c1bd24d
Removed created_by and fixed gofmt
2015-12-18 02:30:20 -08:00
utkarshcmu
af371249f9
Successfully displayed userdId in UI
2015-12-18 01:52:05 -08:00
