utkarshcmu
|
c6ab63ec47
|
Calculated total stats in frontend
|
2016-02-02 11:50:01 -08:00 |
|
Torkel Ödegaard
|
05dfccbb74
|
feat(plugins): moved annotation editor to new plugin component loader
|
2016-02-02 18:16:30 +01:00 |
|
Torkel Ödegaard
|
fc829b32d9
|
feat(plugins): minor fixes to breaking out query editor row into reusable component
|
2016-02-02 16:57:05 +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 |
|
Carl Bergquist
|
4bafb88720
|
Merge pull request #3915 from pra85/patch-1
Fix typo in docs
|
2016-02-02 15:02:29 +01:00 |
|
Prayag Verma
|
7c61ed99ae
|
Fix typo in docs
Remove extra `of`
|
2016-02-02 17:47:06 +05:30 |
|
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 |
|
utkarshcmu
|
00a6efa15e
|
Excluded total calculations from backend
|
2016-02-01 23:26:11 -08:00 |
|
utkarshcmu
|
c5377fb429
|
Merge branch 'master' of https://github.com/utkarshcmu/grafana into metadata
|
2016-02-01 23:12:36 -08:00 |
|
Torkel Ödegaard
|
0583ec0f93
|
feat(plugins): more work on plugin directives and isolation
|
2016-02-01 23:32:12 +01:00 |
|
Torkel Ödegaard
|
12f487e223
|
feat(plugin-editors): more work on plugin editor loading
|
2016-02-01 23:24:08 +01:00 |
|
Torkel Ödegaard
|
30a8a434a1
|
Merge branch 'master' into plugin-editors
Conflicts:
public/app/features/panel/panel.ts
public/app/features/panel/panel_directive.js
public/app/plugins/datasource/grafana/module.ts
|
2016-02-01 21:37:36 +01:00 |
|
Torkel Ödegaard
|
79db997e8c
|
login(): testing new login look on login page
|
2016-02-01 21:31:54 +01:00 |
|
Torkel Ödegaard
|
137ef1f781
|
ux(home dashboard): minor polish to home dashboard header
|
2016-02-01 21:17:18 +01:00 |
|
utkarshcmu
|
338afc80d5
|
Merge branch 'master' of https://github.com/grafana/grafana into metadata
|
2016-02-01 10:32:36 -08: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
|
e737dab5ca
|
removed /app route, confusing when some assets use public/app/.. route and some use just app/... all public static assets should no use public route, app route is no more
|
2016-02-01 18:19:02 +01:00 |
|
Torkel Ödegaard
|
84609a4a3b
|
fix(panel links): changed icon back
|
2016-02-01 17:18:39 +01:00 |
|
Torkel Ödegaard
|
0b25a29a9c
|
Merge branch 'panelbase'
|
2016-02-01 17:11:08 +01:00 |
|
Torkel Ödegaard
|
b1bfd35968
|
feat(datasources): last fixes for data sources
|
2016-02-01 17:06:44 +01:00 |
|
Torkel Ödegaard
|
a053552fee
|
fixes to data source query editors
|
2016-02-01 13:51:47 +01:00 |
|
Torkel Ödegaard
|
6886faa944
|
feat(plugins): fixed cloudwatch query editor
|
2016-02-01 13:30:20 +01:00 |
|
Torkel Ödegaard
|
c843637a6a
|
more progress on some experimental stuff
|
2016-02-01 13:02:11 +01:00 |
|
Torkel Ödegaard
|
2f78584cdb
|
poc(plugin editors): experimential test for plugin editors
|
2016-02-01 12:42:10 +01:00 |
|
Torkel Ödegaard
|
6b7491e111
|
Merge pull request #3903 from grafana/log-fixes
Log fixes
|
2016-02-01 11:02:14 +01:00 |
|
Torkel Ödegaard
|
2e20c680cb
|
Merge pull request #3892 from pfischermx/master
Allow the use of auth and credentials in opentsdb
|
2016-02-01 11:01:15 +01:00 |
|
Pablo Fischer
|
f33de8e911
|
Fix lint/syntax (grunt test)
|
2016-02-01 09:29:57 +00:00 |
|
Dieter Plaetinck
|
fbc90e038c
|
prevent needless cpu burning in unused levels. fix #3898
|
2016-02-01 17:49:37 +13:00 |
|
Dieter Plaetinck
|
bf943ddba3
|
actually make use of the LogLevel type
why else would it be defined?
and this is sane anyway.
|
2016-02-01 17:48:42 +13:00 |
|
Torkel Ödegaard
|
3f945e886b
|
merge sync with master
|
2016-01-31 19:51:23 +01:00 |
|
Torkel Ödegaard
|
931d7cd039
|
Merge branch 'master' into panelbase
|
2016-01-31 16:57:04 +01:00 |
|
Torkel Ödegaard
|
3f5b33b060
|
css(): minor tweaks to navbar and timepicker margins/paddings
|
2016-01-31 11:38:38 +01:00 |
|
Torkel Ödegaard
|
fa63d26485
|
feat(timepicker): added validation to timepicker, and validation state to apply button, fixes #3870
|
2016-01-31 11:30:18 +01:00 |
|
Torkel Ödegaard
|
d617d029d2
|
fix(css): fixed issues introduced in recent sidemenu enhancements, fixes #3893, fixes #3894
|
2016-01-30 12:55:47 -05:00 |
|
Pablo Fischer
|
98082a940c
|
Allow the use of auth and credentials in opentsdb
|
2016-01-30 01:09:55 +00:00 |
|
Torkel Ödegaard
|
12460af0ec
|
Merge pull request #3830 from raintank/apiPlugin
Add secureJsonData field to appSettings model
|
2016-01-29 17:17:37 -05:00 |
|
bergquist
|
34eb5acee7
|
feat(dataproxy): remove 'SetCookie' from reponse
set cookie could potentialll leak information about the
datasource if in proxy mode.
closes #3845
|
2016-01-29 23:17:11 +01:00 |
|
Torkel Ödegaard
|
9ec3216ab0
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-01-29 16:52:44 -05:00 |
|
Torkel Ödegaard
|
92c2f8d556
|
feat(pinned sidemenu): completed side menu pinned stuff
|
2016-01-29 16:52:30 -05:00 |
|
bergquist
|
eef506d8c4
|
tests(playlist): add more test for playlist ui
|
2016-01-29 22:31:53 +01:00 |
|
Daniel Lee
|
7f15e2c167
|
Merge pull request #3889 from grafana/dashboard-share-menu
New dropdown menu to surface the snapshot feature, basic styling in p…
|
2016-01-29 21:58:05 +01:00 |
|
Torkel Ödegaard
|
03aea09ce9
|
feat(pinned): updated
|
2016-01-29 15:49:13 -05:00 |
|
Daniel Lee
|
2897f618a6
|
Merge pull request #3880 from vitorboschi/fix3877
add default value for fill policy
|
2016-01-29 21:44:08 +01:00 |
|
Torkel Ödegaard
|
5f2aba6c5b
|
feat(sidemenu): pinned state
|
2016-01-29 15:36:41 -05:00 |
|
Daniel Lee
|
21632d22ab
|
Merge pull request #3882 from bergquist/playlist_tags
Add support for playlist based on tags
|
2016-01-29 21:32:58 +01:00 |
|
Matt Toback
|
f59f6a5486
|
Standardized on fa-link icon for Link instead of external-link, which generally means Open In New Window or Go Offsite
|
2016-01-29 15:27:42 -05:00 |
|