Torkel Ödegaard
|
ec0b09450c
|
Merge branch 'export-dashboard'
Conflicts:
conf/defaults.ini
pkg/setting/setting.go
public/app/core/components/grafana_app.ts
public/app/core/core.ts
public/app/features/dashboard/dashboardCtrl.js
|
2016-06-16 08:06:43 +02:00 |
|
Mitsuhiro Tanda
|
25899b72d2
|
use applyAsync for compile (#5287)
|
2016-06-06 17:18:18 +02:00 |
|
Torkel Ödegaard
|
53bb264375
|
Merge branch 'master' into export-dashboard
|
2016-05-28 17:17:51 +02:00 |
|
Carl Bergquist
|
a6afd85526
|
Merge pull request #5197 from minkikim89/fixtypo
Fixed type
|
2016-05-27 16:57:07 +02:00 |
|
Torkel Ödegaard
|
ba6573af61
|
Merge branch 'master' into export-dashboard
Conflicts:
public/app/features/dashboard/submenu/submenu.ts
|
2016-05-25 12:32:56 +02:00 |
|
Torkel Ödegaard
|
dfe3806d01
|
fix(elasticsearch): fixed query editor issue with elasticsearch
|
2016-05-23 10:14:40 +02:00 |
|
minki
|
70d6b32e14
|
Fixed type
|
2016-05-22 05:38:57 +09:00 |
|
Torkel Ödegaard
|
7cd663bbe8
|
feat(import): more import work
|
2016-05-14 10:00:43 +02:00 |
|
Torkel Ödegaard
|
d9d46096dd
|
feat(import): lots of work on dashboard import
|
2016-05-13 17:39:22 +02:00 |
|
Torkel Ödegaard
|
2c7447eaca
|
feat(): started work on new import system
|
2016-05-11 16:18:52 +02:00 |
|
Torkel Ödegaard
|
65b4945548
|
Merge branch 'master' into query-editor-style
|
2016-04-27 08:43:34 +02:00 |
|
Torkel Ödegaard
|
aa98ada141
|
fix(snapshots): fixed snapshot issue introdiuced yesterday
|
2016-04-26 14:51:06 +02:00 |
|
Torkel Ödegaard
|
bbf4d00319
|
fix(query editors): added select style to segment, used by data source selector
|
2016-04-25 15:49:33 +02:00 |
|
Torkel Ödegaard
|
1a433de0b4
|
Merge branch 'master' into query-editor-style
|
2016-04-25 14:22:36 +02:00 |
|
Torkel Ödegaard
|
00827ce921
|
fix(): let binding cycle complete before adding panel to dom
|
2016-04-24 12:50:33 +02:00 |
|
Torkel Ödegaard
|
68bd82f1b6
|
Merge branch 'master' into query-editor-style
|
2016-04-16 13:46:05 -04:00 |
|
Torkel Ödegaard
|
dc7f8014a2
|
fix(app config): fixed issue with app config tab, fixes #4575
|
2016-04-06 08:43:06 -04:00 |
|
Torkel Ödegaard
|
a4f9621473
|
Merge branch 'master' into query-editor-style
|
2016-03-29 17:45:24 +02:00 |
|
Torkel Ödegaard
|
32c8f495ab
|
ux(): redesign of axis & grid forms
|
2016-03-29 12:32:40 +02:00 |
|
Torkel Ödegaard
|
8dee54bf5d
|
feat(live): progress on panel <-> data source communication patterns
|
2016-03-22 18:21:21 +01:00 |
|
Torkel Ödegaard
|
55189200a4
|
ux(): updated query editor test
|
2016-03-20 16:18:31 +01:00 |
|
Torkel Ödegaard
|
2adc4d12be
|
feat(live): work on websocket data source, #3455
|
2016-03-14 13:20:55 +01:00 |
|
Torkel Ödegaard
|
1951f3856f
|
feat(plugins): refactored datasourceEditCtrl to typescript, #4298
|
2016-03-10 09:47:29 +01:00 |
|
Torkel Ödegaard
|
cb8b038795
|
feat(templating): progress on templating rethink
|
2016-02-29 17:31:31 +01:00 |
|
Torkel Ödegaard
|
078e69d06d
|
feat(templating): simplified templating forms removed all formats
|
2016-02-29 17:07:53 +01:00 |
|
Mitsuhiro Tanda
|
09dfaf9875
|
timeFrom and timeShift templating
|
2016-02-29 17:53:41 +09:00 |
|
Torkel Ödegaard
|
d55dc92502
|
feat(plugins): restored config view functionality to plugin page
|
2016-02-26 18:55:17 +01:00 |
|
bergquist
|
f6457a2023
|
ux(templating): tight-form -> gf-form
|
2016-02-24 11:56:45 +01:00 |
|
Torkel Ödegaard
|
26c5029256
|
ux(): new dashboard tabs view
|
2016-02-23 13:20:59 +01:00 |
|
Torkel Ödegaard
|
a6a5f393cc
|
feat(annotations): updated flot events lib and refactored it to use tether-drop lib
|
2016-02-23 08:09:56 +01:00 |
|
bergquist
|
f225bb0032
|
ux(annotations): migrate annotations editors to new form
|
2016-02-22 10:07:02 +01:00 |
|
Torkel Ödegaard
|
422decde3b
|
ux(): trying out flexbox for new form styles
|
2016-02-15 22:24:28 +01:00 |
|
Torkel Ödegaard
|
b369b7e495
|
ux(): added page-dashboard body class
|
2016-02-12 18:55:45 +01:00 |
|
Torkel Ödegaard
|
8784be9a14
|
feat(plugins): made it possible to have relative plugin template urls
|
2016-02-09 18:17:32 +01:00 |
|
Torkel Ödegaard
|
18eb9d6076
|
feat(apps): began work on app pages
|
2016-02-09 11:17:49 +01:00 |
|
Torkel Ödegaard
|
99a053bbdd
|
feat(): removed unused routes and minor fixes
|
2016-02-08 16:57:29 +01:00 |
|
Torkel Ödegaard
|
ff4dbea19d
|
ux(navbar): worked on responsive breakpoints for navbar
|
2016-02-07 12:28:06 +01:00 |
|
Torkel Ödegaard
|
0fab210ad2
|
feat(apps): changed edit apps view to use plugin-component for apps config view
|
2016-02-05 12:13:59 +01:00 |
|
Torkel Ödegaard
|
660ce3a61d
|
fix(row editor): row editor fix and cleanup of unused code
|
2016-02-04 22:19:46 +01:00 |
|
Torkel Ödegaard
|
14cc771cbe
|
feat(plugins): made panels loaded via plugin-componet directive
|
2016-02-04 15:04:07 +01:00 |
|
Torkel Ödegaard
|
2a8b96b680
|
feat(plugins): last refactoring of how panels are implemented, now the same way as plugin editors
|
2016-02-04 14:36:19 +01:00 |
|
Torkel Ödegaard
|
0bea6aba63
|
feat(plugins): migrated elasticsearch to new plugin editor model, also minor fixes
|
2016-02-03 16:31:07 +01:00 |
|
Torkel Ödegaard
|
eecf844ca2
|
feat(plugins): migrated influxdb query editor to new plugin model
|
2016-02-02 22:58:37 +01:00 |
|
Torkel Ödegaard
|
05dfccbb74
|
feat(plugins): moved annotation editor to new plugin component loader
|
2016-02-02 18:16:30 +01:00 |
|
Torkel Ödegaard
|
f2700822e9
|
feat(plugins): extracted first plugin row to its own component
|
2016-02-02 16:32:36 +01:00 |
|
Torkel Ödegaard
|
21f6c07686
|
feat(plugins): more progress on plugin editors
|
2016-02-02 15:15:20 +01:00 |
|
Torkel Ödegaard
|
356f7b9db6
|
feat(plugins): good progress on converting query editors, graphite's query ctrl is now working as is unit tests
|
2016-02-02 13:07:54 +01:00 |
|
Torkel Ödegaard
|
822c8f1575
|
feat(plugins): migrating graphite query editor to new model
|
2016-02-02 12:52:43 +01:00 |
|
Torkel Ödegaard
|
efdd4a6682
|
feat(plugins): more work on plugin editors,prometheus query editor is working
|
2016-02-02 10:19:15 +01:00 |
|
Torkel Ödegaard
|
eaaf9246b7
|
feat(plugins): more work on refining datasource editors
|
2016-02-02 09:12:58 +01:00 |
|