Torkel Ödegaard
|
eaaf9246b7
|
feat(plugins): more work on refining datasource editors
|
2016-02-02 09:12:58 +01: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
|
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
|
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 |
|
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
|
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 |
|
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 |
|
Torkel Ödegaard
|
32989f4cca
|
Merge branch 'master' into pinned
|
2016-01-29 15:13:35 -05:00 |
|
Torkel Ödegaard
|
b5ef793ae4
|
feat(sidemenu): pinned work started
|
2016-01-29 15:12:56 -05:00 |
|
Trent White
|
339e73ee3d
|
change file names to remove the rt reference in the icon files
|
2016-01-29 13:57:48 -05:00 |
|
Trent White
|
6da3f87736
|
use svg icon instead of png file
|
2016-01-29 12:52:29 -05:00 |
|
Trent White
|
6ae464f33a
|
add rt-fonts file and point refs to snapshot icon to it
|
2016-01-29 12:46:57 -05:00 |
|
Anthony Woods
|
2e9272c778
|
Merge remote-tracking branch 'upstream/master' into apiPlugin
|
2016-01-30 01:38:01 +08:00 |
|
Matt Toback
|
6fe850e2c1
|
New dropdown menu to surface the snapshot feature, basic styling in place. Want to extend menu to include summary text of each feature
|
2016-01-29 11:48:57 -05:00 |
|
Vitor Boschi
|
bb3360e92a
|
add default value for fill policy
|
2016-01-29 07:50:30 -02:00 |
|
bergquist
|
5a4e48fa99
|
style(playlist_spec): rename to underscore standard
|
2016-01-29 02:42:23 +01:00 |
|
bergquist
|
35071649e0
|
tests(playlist): refactor playlist edit ctrl
|
2016-01-29 02:37:07 +01:00 |
|
Torkel Ödegaard
|
05e8c576a2
|
feat(panels): updated influxdb editor to use panelCtrl
|
2016-01-28 19:07:53 -05:00 |
|
bergquist
|
ea7c2e73ad
|
style(playlist): remove console logging
|
2016-01-29 00:38:50 +01:00 |
|
bergquist
|
b6f276265d
|
style(playlist): remove semi colons for functions in TS
|
2016-01-29 00:13:29 +01:00 |
|
Torkel Ödegaard
|
3c3d3c9ec6
|
feat(): fixed share modal
|
2016-01-28 18:05:49 -05:00 |
|
Torkel Ödegaard
|
34141363ae
|
feat(panels): fixed panel time
|
2016-01-28 17:17:56 -05:00 |
|
bergquist
|
3ccf7c8006
|
feat(playlist): improve the look of tag playlist items
|
2016-01-28 23:04:22 +01:00 |
|
Torkel Ödegaard
|
56c76f380b
|
feat(panels): fixes
|
2016-01-28 16:48:37 -05:00 |
|
bergquist
|
f36ade2959
|
chore(playlist): cleanup some code
|
2016-01-28 22:43:54 +01:00 |
|
bergquist
|
85ad5f1d37
|
Merge branch 'master' into playlist_tags
|
2016-01-28 22:32:59 +01:00 |
|