 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 |
|
|
Carl Bergquist
|
8ee0e5d11f
|
Merge pull request #3307 from dennisdegreef/addCubicMeters
Add cubic meters to units
|
2015-12-16 16:04:20 +01:00 |
|
|
Carl Bergquist
|
c87b425639
|
Merge pull request #3542 from grafana/revert-3445-cloudwatch_sum_period
Revert "(cloudwatch) add "Divide Sum By Period" option"
|
2015-12-16 14:36:43 +01:00 |
|
|
Carl Bergquist
|
e320bd025f
|
Revert "(cloudwatch) add "Divide Sum By Period" option"
|
2015-12-16 14:35:04 +01:00 |
|
|
Carl Bergquist
|
d465c445fc
|
Merge pull request #3445 from mtanda/cloudwatch_sum_period
(cloudwatch) add "Divide Sum By Period" option
|
2015-12-16 14:07:52 +01:00 |
|
|
carl bergquist
|
dc30b9d37b
|
feat(elastic): change concept to trim edges instead.
|
2015-12-16 13:50:56 +01:00 |
|
|
carl bergquist
|
37cfe2a3cb
|
feat(elastic): shorten expression to target input
|
2015-12-16 13:29:54 +01:00 |
|
|
carl bergquist
|
26abce647d
|
feat(elastic): isolate drop first and last logic
|
2015-12-16 13:27:35 +01:00 |
|
|
Torkel Ödegaard
|
ca84ef38f8
|
angular2 test
|
2015-12-16 12:21:13 +01:00 |
|
|
utkarshcmu
|
78fe588330
|
Removed NewAddColumnMigration via 3473
|
2015-12-16 02:46:20 -08:00 |
|
|
Torkel Ödegaard
|
ddf72fa53f
|
Merge pull request #3535 from utkarshcmu/typos
Fixed typos
|
2015-12-16 11:41:29 +01:00 |
|
|
utkarshcmu
|
3a6e8a535c
|
Fixed typos
|
2015-12-16 02:30:53 -08:00 |
|
|
carl bergquist
|
d882af9f94
|
Merge branch 'es_drop_first_last' of https://github.com/Qtax/grafana into Qtax-es_drop_first_last
|
2015-12-16 09:48:14 +01:00 |
|
|
carl bergquist
|
48539c851e
|
feat(graphite): adds support for grep function
closes #1163
|
2015-12-16 09:45:28 +01:00 |
|
|
carl bergquist
|
a701bba839
|
Merge branch 'jmaitrehenry-feature/symlinks'
|
2015-12-16 09:24:37 +01:00 |
|
 Mitsuhiro Tanda
|
c7ba60162b
|
(cloudwatch) add Divide By Sum option
|
2015-12-16 17:23:13 +09:00 |
|
|
carl bergquist
|
d4e98cd9bc
|
Merge branch 'feature/symlinks' of https://github.com/jmaitrehenry/grafana into jmaitrehenry-feature/symlinks
Conflicts:
pkg/plugins/plugins.go
closes #2899
closes #2834
|
2015-12-16 09:21:52 +01:00 |
|
|
Torkel Ödegaard
|
05ec24e7b8
|
Merge pull request #3531 from mtanda/cloudwatch_fix_annotation
(cloudwatch) fix query editor
|
2015-12-16 09:08:30 +01:00 |
|
|
Mitsuhiro Tanda
|
e44ef7f823
|
fix cloudwatch query editor
|
2015-12-16 17:01:58 +09:00 |
|
|
Torkel Ödegaard
|
04ff97cd72
|
tech(systemjs): tricky mixing systemjs and requirejs, might need to migrate
|
2015-12-15 20:23:55 +01:00 |
|
|
Torkel Ödegaard
|
8e6fdf62fb
|
tech(systemjs): things are starting to work
|
2015-12-15 19:27:04 +01:00 |
|
|
Torkel Ödegaard
|
74d7a946a7
|
tech(systemjs): work on moving to systemjs
|
2015-12-15 19:10:08 +01:00 |
|
|
Carl Bergquist
|
2b58b6b5d7
|
Merge pull request #3304 from utkarshcmu/info
Added metadata info panel
|
2015-12-15 18:02:29 +01:00 |
|
|
Torkel Ödegaard
|
7ee290cc57
|
tech(systemjs): systemjs and jspm work
|
2015-12-15 17:56:16 +01:00 |
|
|
carl bergquist
|
3868a796a4
|
Merge branch 'stesie-fix-formatter-stack-percentage'
|
2015-12-15 17:35:05 +01:00 |
|
|
carl bergquist
|
b99ea80b58
|
test(graph): validates that percentage is shown when using stack and percentage
fixes #2379
|
2015-12-15 17:34:37 +01:00 |
|