Torkel Ödegaard
9fc22e5a66
Merge branch 'master' of github.com:grafana/grafana into develop
2017-11-21 16:05:18 +01:00
Ryan McKinley
b1de1e6f26
Move the loading flag to PanelCtrl ( #9929 )
2017-11-20 11:27:18 +01:00
Torkel Ödegaard
10fcf2f5be
Merge branch 'master' into develop
2017-11-02 15:56:09 +01:00
Torkel Ödegaard
fec37f22b8
fix: fixed compiler error from #9676
2017-11-01 08:08:16 +01:00
Torkel Ödegaard
7559982b05
grid: minor changes
2017-10-25 12:38:08 +02:00
Torkel Ödegaard
b44daaabf2
Merge branch 'master' into develop
2017-10-24 09:06:09 +02:00
Torkel Ödegaard
b986f744e4
fix: escape series name in graph legend, added aliasEscaped to time series model to reuse escape, fixes #9615
2017-10-23 10:15:58 +02:00
Torkel Ödegaard
9cce5217d0
build: fixed gofmt issue and addd mock response feature
2017-10-23 09:57:28 +02:00
Torkel Ödegaard
a3bd761b0c
ux: testing out new icons
2017-10-14 21:17:16 +02:00
Torkel Ödegaard
7e16254b1a
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-10-14 08:21:55 +02:00
Torkel Ödegaard
e5a6cb6241
newgrid: added constants, changed grid to 24 cols, added tests for panel repeats
2017-10-13 13:51:05 +02:00
Torkel Ödegaard
8bb9d92a73
grid: minor progress on panel repeats
2017-10-12 21:37:27 +02:00
Torkel Ödegaard
215d59865e
changed name back to use underscore instead of camelcase, need to think more about this
2017-10-12 20:02:07 +02:00
Torkel Ödegaard
48c8e4d627
fix: various fixes for new grid
2017-10-12 17:38:49 +02:00
Torkel Ödegaard
98b582bead
ux: style tweaks
2017-10-11 22:10:33 +02:00
Torkel Ödegaard
331b50dcaa
grid: edit/view now works
2017-10-11 16:32:05 +02:00
Torkel Ödegaard
087b55aece
newgrid: progress on fullscreen/edit view modes
2017-10-11 11:42:49 +02:00
Torkel Ödegaard
2e77bd0cb1
grid: progress on react grid
2017-10-10 17:57:53 +02:00
Torkel Ödegaard
10a3504309
grid: progress on new grid, resize & saving layouts works
2017-10-10 14:20:53 +02:00
Torkel Ödegaard
647a3cc5ae
Merge branch 'master' into develop
2017-10-09 16:01:54 +02:00
Torkel Ödegaard
3dac77468b
fix: ensure panel.datasource is null as default
2017-10-03 12:18:22 +02:00
Torkel Ödegaard
a02cac2126
refactoring: minor refactoring of PR #8916
2017-10-02 16:45:25 +02:00
Torkel Ödegaard
42a0e9ebdf
Merge branch 'day_rounding' of https://github.com/ctide/grafana into ctide-day_rounding2
2017-10-02 16:20:23 +02:00
Torkel Ödegaard
d38c891fac
merge with master
2017-10-02 14:14:45 +02:00
Torkel Ödegaard
0c86241c5b
Webpack ( #9391 )
...
* webpack poc, this is not going to work for plugins, dam
* tech: webpack and systemjs for plugins starting to work
* tech: webpack and systemjs combo starting to work
* tech: webpack + karma tests progress
* tech: webpack + karma progress
* tech: working on tests
* tech: webpack
* tech: webpack + karma, all tests pass
* tech: webpack + karma, all tests pass
* tech: webpack all tests pass
* webpack: getting closer
* tech: webpack progress
* webpack: further build refinements
* webpack: ng annotate fixes
* webpack: optimized build fix
* tech: minor fix for elasticsearch
* tech: webpack + ace editor
* tech: restored lodash move mixin compatability
* tech: added enzyme react test and upgraded to react v16
* tech: package version fix
* tech: added testdata to built in bundle
* webpack: sass progress
* tech: prod & dev build is working for the sass
* tech: clean up unused grunt stuff and moved to scripts folder
* tech: added vendor and manifest chunks, updated readme and docs
* tech: webpack finishing touches
2017-10-01 20:02:25 +02:00
Torkel Ödegaard
5849fbf04e
Merge branch 'master' of github.com:grafana/grafana into develop
2017-09-28 10:37:57 +02:00
Torkel Ödegaard
7b42e13c79
typescript: stricter typescript option
2017-09-26 11:24:58 +02:00
Torkel Ödegaard
18337f610d
Merge branch 'master' into develop
2017-09-22 08:42:07 +02:00
Torkel Ödegaard
b8d9722b4f
tech: removing unused variables from typescript files, and making tslint rules more strict
2017-09-21 16:40:18 +02:00
Torkel Ödegaard
a9e3130ef6
Merge branch 'master' into develop
2017-09-13 16:06:34 +02:00
Torkel Ödegaard
73248d6687
fixes for metrics tab when data source was not found
2017-09-13 09:48:50 +02:00
Torkel Ödegaard
2953d64429
prometheus: minor update to focus editor PR, #9201
2017-09-08 11:43:29 +02:00
Torkel Ödegaard
a38ded9e7e
Merge branch 'master' into develop-newgrid-row-design2
2017-09-07 15:05:41 +02:00
Torkel Ödegaard
6e4090abf2
feat: finished work on the interval changes #9161
2017-09-04 13:27:28 +02:00
Torkel Ödegaard
07e192ff47
change: more work on changing default group by time interval to min interval setting
2017-09-01 15:57:02 +02:00
Torkel Ödegaard
eb0f5cc900
ux: progress on metrics tab changes
2017-08-31 16:38:49 +02:00
Torkel Ödegaard
84d4958a3c
plugin change: make interval, cache timeout & max data points options in plugin.json, remove query.options component feature, add help markdown feature and toggle for data sources
2017-08-31 14:05:52 +02:00
Torkel Ödegaard
9b60a63778
ux: metrics tab v3
2017-08-30 16:39:00 +02:00
Torkel Ödegaard
1aa5ed0cde
ux: minor fixes
2017-08-25 10:41:24 +02:00
Torkel Ödegaard
d87653b079
ux: new grid progress
2017-08-25 10:19:08 +02:00
Torkel Ödegaard
a3eaa7f178
Merge branch 'develop' into develop-newgrid-row-panels
2017-08-21 10:16:50 +02:00
Torkel Ödegaard
3e3501b57d
minor fix
2017-08-19 21:45:15 +02:00
Torkel Ödegaard
afe0137c66
grid work
2017-08-18 17:39:07 +02:00
Torkel Ödegaard
6609dbff90
ux: sidenav fixes and dashboard search changes
2017-08-17 12:06:51 +02:00
Torkel Ödegaard
61459b287c
grid: new grid fixes
2017-08-10 15:29:40 +02:00
Torkel Ödegaard
23666c0f78
grid: remove panel works
2017-08-10 14:54:56 +02:00
Torkel Ödegaard
77b42220f4
feat: new grid fixes
2017-08-09 15:33:19 +02:00
Chris Burkhart
3e0b92d6fe
Enable datasources to be able to round off to a UTC day properly
2017-08-08 09:34:41 -07:00
Torkel Ödegaard
957e1c188a
Merge branch 'develop' into develop-newgrid
2017-08-04 13:26:05 +02:00
Torkel Ödegaard
a0a2eda5c6
Merge branch 'master' into gridstack
2017-08-04 13:09:26 +02:00
