Torkel Ödegaard
b2acac3a41
feat(apps): more polish on app dashboard save warning, #5529
2016-07-12 08:41:56 +02:00
Torkel Ödegaard
d9096110f8
Merge branch 'master' into alerting
...
Conflicts:
pkg/api/dashboard.go
pkg/models/dashboards.go
pkg/services/sqlstore/dashboard.go
2016-07-11 18:28:07 +02:00
Torkel Ödegaard
d44325affd
feat(apps): progress on app dashboard imports
2016-07-08 09:35:06 +02:00
Torkel Ödegaard
ae8fabdad3
fix(modal): fixed duplicate confirm modal issue
2016-06-29 14:26:21 -07:00
Torkel Ödegaard
b275fa8109
fix(alerts): fixed login and other alert popups not showing, fixes #5435
2016-06-25 17:42:08 +02:00
bergquist
8ec311ade4
Merge branch 'master' into alerting
2016-06-16 16:29:41 +02:00
Torkel Ödegaard
81e9aa4de4
feat(datasource): cancel in flight data source requests, refeatoring #5321
2016-06-16 10:48:26 +02:00
Torkel Ödegaard
6d3521c240
Merge branch 'cancel-in-flight-repeats' of https://github.com/stuartnelson3/grafana into stuartnelson3-cancel-in-flight-repeats
2016-06-16 08:57:31 +02:00
stuart nelson
8797be9f89
Add existence check for canceler.
2016-06-09 15:16:53 +02:00
stuart nelson
cc64d65c2f
Rename cacheKey to exprID/requestID
...
Depending on context in the code, rename cacheKey
to exprID when it identifies a unique expression,
and rename cacheKey to requestID when it is
identifying a request.
2016-06-09 12:57:55 +02:00
stuart nelson
efdb990e56
Return an error for a canceled request.
...
Allow the datasource to decide how to handle a
canceled request.
2016-06-09 12:13:17 +02:00
stuart nelson
6da7ed9706
Add support for canceling in-flight requests
...
Repeat requests, if they already exist in the
in-flight request map, will cause the previous
request to cancel.
The implementation of the unique key is the
responsibility of individual datasources.
2016-06-08 18:04:31 +02:00
bergquist
1686d86c3b
Merge branch 'master' into alerting_definitions
2016-05-30 08:26:08 +02:00
Torkel Ödegaard
e83d13848e
Merge branch 'master' into export-dashboard
...
Conflicts:
public/app/features/dashboard/submenu/submenu.ts
2016-05-26 14:22:22 +02:00
Jared Wiltshire
c9d6321f38
Allow for proxying Authorization header and automatically convert ( #4832 )
...
Authorization header to X-DS-Authorization in backend_srv.js
2016-05-26 07:13:29 +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
1da149d9e1
feat(annotations): annotations can now use a template variable as data source, closes #5054
2016-05-23 09:28:14 +02:00
bergquist
fa19e0d9c6
style(modal): use standard valid styles
2016-05-16 17:03:01 +02:00
bergquist
6435fa6b99
fix(modal): add undefined check
2016-05-16 16:48:28 +02:00
bergquist
2ce9d4571c
fix(alerting): fix spacing
2016-05-16 14:29:54 +02:00
bergquist
80f7fe8646
feat(alerting): add confirm text dialog when deleting dashboards with alerts
2016-05-16 11:54:28 +02: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
ca8df67947
feat(import): things are starting to work
2016-05-13 11:26:02 +02:00
Torkel Ödegaard
bf890719ff
Merge remote-tracking branch 'origin/wizard' into export-dashboard2
2016-05-12 10:52:24 +02:00
Torkel Ödegaard
0d85254a19
fix(annotations): Fixed issue with entering annotation edit view, fixes #4857
2016-04-29 23:14:39 +02:00
Torkel Ödegaard
8b4c7c94b8
feat(templating): completed work on templating as data source, closes #816
2016-04-28 19:31:43 +02:00
Torkel Ödegaard
7349427189
feat(data source variable): progress on data source as variable
2016-04-28 19:08:35 +02:00
Torkel Ödegaard
6b813b4e2a
feat(query editors): remember collapsed state
2016-04-25 15:11:40 +02:00
Torkel Ödegaard
13471ae2c4
feat(templating): templated ds progress
2016-04-16 13:43:16 -04:00
Torkel Ödegaard
75649c49d5
Merge branch 'master' into wizard
2016-04-11 18:18:09 -04:00
Torkel Ödegaard
52e2091f2c
fix(): fixed issue with series override color selector when using the mouse to select color option, fixes #4620
2016-04-08 18:12:08 -04:00
Torkel Ödegaard
431a610f00
fix(): fixed failing unit test
2016-04-03 10:12:43 -04:00
Torkel Ödegaard
55d95f9009
feat(prefs): moved context srv to typescript
2016-04-03 05:27:35 -07:00
Torkel Ödegaard
437b880b3e
feat(plugins): work on setup wizard started
2016-03-25 22:14:29 +01:00
Torkel Ödegaard
32a1d1445c
refactor(): trying to move app events away from rootScope
2016-03-23 17:39:10 +01:00
bergquist
90c6b04361
fix(backendsrv): remove invalid check
2016-03-21 12:43:30 +01:00
bergquist
86a274a7ee
feat(backendsrv): improves error response handling
...
datasourceRequests that could not reach the destination threw
invalid errors due to missing property. This fixes gives the user
a better error message.
closes #4428
2016-03-21 12:30:13 +01:00
Torkel Ödegaard
fcd75422d5
ux(): update all confirm modals to new design
2016-03-04 20:57:10 +01:00
Torkel Ödegaard
c94659f552
ux(color popover): refactored color popover to use drop lib
2016-02-22 18:46:58 +01:00
Torkel Ödegaard
3231d767d5
in progress work
2016-02-22 15:15:01 +01:00
Torkel Ödegaard
9eabd956b7
ux(): tweak to help popover annimation and fixed pull-right state
2016-02-22 14:20:43 +01:00
Torkel Ödegaard
78598df96e
fixes(): fixes for changed app -> public/app paths and fixes for optimized build
2016-02-01 19:00:40 +01:00
Torkel Ödegaard
b5ef793ae4
feat(sidemenu): pinned work started
2016-01-29 15:12:56 -05:00
Torkel Ödegaard
c201f4c63e
feat(sidemenu): added handling of click outside to hide sidemenu, also refactored grafana_ctrl to a more general grafana component
2016-01-16 18:55:13 +01:00
Torkel Ödegaard
2bfded3c5f
ux(): general ux polish
2016-01-15 14:42:59 +01:00
Torkel Ödegaard
f6a3b53fb5
fix(firefox): fixed js issue that made master build break in firefox
2016-01-15 11:23:08 +01:00
Torkel Ödegaard
8699d49f93
feat(plugins): updated cloudwatch to new plugin style
2016-01-14 15:15:45 +01:00
Torkel Ödegaard
c4ce3293a2
feat(plugins): now solved all cases of loading plugin directives, now just have to upgrade all panels and data sources
2016-01-14 14:37:04 +01:00
Torkel Ödegaard
6c6c3a5081
feat(plugins): more work on how plugins expose directives
2016-01-14 12:35:31 +01:00
Torkel Ödegaard
d420cb38d1
feat(plugins): work on plugin directives loading
2016-01-14 11:21:56 +01:00
Torkel Ödegaard
b55f8215ec
feat(apps): work on plugin directives loading
2016-01-13 22:31:29 +01:00
Torkel Ödegaard
59c928acc2
feat(tslint): added more tslint rules
2016-01-13 21:07:57 +01:00
Torkel Ödegaard
534bc83173
temp work on dynamic directives
2016-01-13 14:03:50 +01:00
Torkel Ödegaard
15546dd84e
feat(plugins): added better error message when trying to load data source plugin module that is missing datasource constructor
2016-01-09 19:14:59 +01:00
Torkel Ödegaard
cf98a16db0
feat(plugins): made data source custom edit view into a directive instead of html path config in plugin.json
2016-01-09 18:07:42 +01:00
Torkel Ödegaard
c5635f9c89
feat(plugins): changed what datasources should return, they should now return the datasource constructor
2016-01-09 13:21:16 +01:00
Torkel Ödegaard
c24935b519
minor progress
2015-12-16 17:01:34 +01:00
Torkel Ödegaard
ca84ef38f8
angular2 test
2015-12-16 12:21:13 +01:00
Torkel Ödegaard
7ee290cc57
tech(systemjs): systemjs and jspm work
2015-12-15 17:56:16 +01:00
Torkel Ödegaard
ee0e4d2b69
Merge branch 'master' into external-plugins
...
Conflicts:
public/app/plugins/panels/table/editor.ts
public/views/index.html
2015-12-02 18:30:48 +01:00
Torkel Ödegaard
a1afd2328d
fix(elasticsearch): made interval template variable appear in group by time interval dropdown, fixes #3241
2015-11-23 14:19:10 +01:00
Torkel Ödegaard
df0bc7bbc4
feat(external_plugin): lots of refactoring for side menu link extensions and view data, #3185
2015-11-20 09:43:10 +01:00
Torkel Ödegaard
5bc194e1f0
Merge branch 'master' of github.com:grafana/grafana
2015-11-12 13:47:25 +01:00
Torkel Ödegaard
d8f68eb118
refactoring: moving and renaming things
2015-10-30 16:06:29 +01:00
Torkel Ödegaard
97697b93ed
refactoring: moving and renaming things
2015-10-30 15:58:20 +01:00
