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
|
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 |
|
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 |
|
Torkel Ödegaard
|
0dd7fb7361
|
tech(systemjs): most things work
|
2015-12-18 10:28:00 +01:00 |
|
utkarshcmu
|
22fd2aed02
|
Removed columns from snapshot table
|
2015-12-18 00:30:44 -08:00 |
|
utkarshcmu
|
c433167950
|
Merged with master, resolved conflicts
|
2015-12-18 00:23:08 -08:00 |
|
utkarshcmu
|
e0ffcda32e
|
Added UI , DB settings
|
2015-12-18 00:20:23 -08:00 |
|
Torkel Ödegaard
|
d34ba416a6
|
tech(systemjs): more stuff is starting to work
|
2015-12-18 08:22:05 +01:00 |
|
Torkel Ödegaard
|
406ee43ae5
|
Merge pull request #3556 from xiaoping378/master
fixes #3555, path of table panel option error
|
2015-12-18 06:28:37 +01:00 |
|
xiaoping378
|
488165ec73
|
fixes #3555, path of table panel option error
|
2015-12-18 12:35:02 +08:00 |
|
Torkel Ödegaard
|
545c39356a
|
tech(systemjs): starting work on systemjs bundling
|
2015-12-17 19:18:30 +01:00 |
|
Torkel Ödegaard
|
df1e52e394
|
tech(systemjs): more stuff is starting to work
|
2015-12-17 16:30:53 +01:00 |
|
carl bergquist
|
246b04f904
|
docs(sessions): add memcache support to changelog
|
2015-12-17 15:59:25 +01:00 |
|
Carl Bergquist
|
333f9101a0
|
Merge pull request #3458 from improbable-io/use-memcache-for-session
Add memcache as session provider
|
2015-12-17 15:56:15 +01:00 |
|
carl bergquist
|
24acea7261
|
refactoring(top_nav): move menu condition to controller
|
2015-12-17 14:41:10 +01:00 |
|
Carl Bergquist
|
08ca72399b
|
Merge pull request #3051 from utkarshcmu/viewer
Removed export/view permission from a dashboard viewer
|
2015-12-17 14:40:42 +01:00 |
|
Piotr Popieluch
|
e29e3416db
|
router logger did not show username in /render calls because cookies are
cleared in these call. Not just get username before the call is
executed. see #3405 for more info.
|
2015-12-17 14:28:11 +01:00 |
|
Torkel Ödegaard
|
83ce40191c
|
tech(systemjs): ok, moving forward
|
2015-12-17 14:27:34 +01:00 |
|
Torkel Ödegaard
|
7c06b5cc22
|
tech(systemjs): minor change
|
2015-12-17 13:18:32 +01:00 |
|
Torkel Ödegaard
|
3b8e478a6a
|
tech(systemjs): finally starting to get systemjs and typescript and runtime loading to work together in a manner that I want it to.. took forever
|
2015-12-17 11:46:10 +01:00 |
|
utkarshcmu
|
9498c78576
|
Merged with master, resolved conflicts
|
2015-12-17 01:46:34 -08:00 |
|
utkarshcmu
|
746e203f7b
|
Admin can toggle editable checkbox
|
2015-12-17 01:44:05 -08:00 |
|
Torkel Ödegaard
|
a7d7f31e76
|
Merge branch 'master' of github.com:grafana/grafana
|
2015-12-17 10:13:40 +01:00 |
|
Torkel Ödegaard
|
16847fdb41
|
feat(elasticsearch): trim edges, minor refactoring of #3541
|
2015-12-17 10:13:23 +01:00 |
|
carl bergquist
|
28e7f0f74f
|
Merge branch 'felixbarny-global_interval'
|
2015-12-17 10:01:40 +01:00 |
|
carl bergquist
|
80d757b371
|
feat(elasticsearch): move default query parameters to new table
|
2015-12-17 10:00:53 +01:00 |
|
carl bergquist
|
5bdf0cd136
|
Merge branch 'global_interval' of https://github.com/felixbarny/grafana into felixbarny-global_interval
Conflicts:
public/app/plugins/datasource/elasticsearch/partials/config.html
|
2015-12-17 09:53:02 +01:00 |
|
carl bergquist
|
e498503428
|
fix(elastic): fixed typo
|
2015-12-17 09:05:01 +01:00 |
|
carl bergquist
|
26f70a5fd7
|
fix(settings): make headline more informative
|
2015-12-17 09:04:05 +01:00 |
|
Carl Bergquist
|
ef46b23250
|
Merge pull request #3133 from tdyas/add_pencil_to_graphite_ds
add pencil icon back to graphite data source
|
2015-12-17 08:48:03 +01:00 |
|
carl bergquist
|
39ccf1526f
|
Merge branch 'addshore-graphiteSortByNameNatural'
|
2015-12-17 07:21:43 +01:00 |
|
carl bergquist
|
12889a9509
|
feat(graphite): make sortByName optional
fixes #3360
closes #3361
|
2015-12-17 07:17:39 +01:00 |
|
Torkel Ödegaard
|
c24935b519
|
minor progress
|
2015-12-16 17:01:34 +01:00 |
|
carl bergquist
|
3693473f40
|
Merge branch 'utkarshcmu-relative'
|
2015-12-16 16:34:56 +01:00 |
|
carl bergquist
|
2cb83cf19d
|
style(graph.tooltip): moves checkdate logic inside each method.
I find it easier to follow and checkdate didnt do much.
|
2015-12-16 16:32:55 +01:00 |
|
carl bergquist
|
8c02a7bd6b
|
Merge branch 'relative' of https://github.com/utkarshcmu/grafana into utkarshcmu-relative
|
2015-12-16 16:09:44 +01:00 |
|