IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,740 Commits 5,416 Branches 554 Tags
efdd4a66823f4d334e3a5eeae2f23a9291eb09f5
Commit Graph

543 Commits

Author SHA1 Message Date
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
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
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
a053552fee fixes to data source query editors 2016-02-01 13:51:47 +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
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
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
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
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
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
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
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
Torkel Ödegaard
600ffa727e feat(panels): fixes 2016-01-28 14:19:24 -05:00
bergquist
a7de2ceae4 feat(playlist): basic UI support for tags 2016-01-28 20:06:50 +01:00
Torkel Ödegaard
9bd3b417c4 feat(panels): upgraded table panel to latest plugin model 2016-01-28 12:48:43 -05:00
Torkel Ödegaard
97ac81aa9c feat(panels): upgradede singlestat panel 2016-01-27 19:07:39 -05:00
Torkel Ödegaard
57d22fb93f Merge remote-tracking branch 'origin/master' into panelbase 2016-01-27 17:33:33 -05:00
Torkel Ödegaard
f0f7da9ff0 feat(panels): fixing broken stuff 2016-01-27 17:16:00 -05:00
Carl Bergquist
251bf7a2b4 Merge pull request #3840 from utkarshcmu/stats 
Grafana stats view as mentioned in #3812
 2016-01-27 19:41:10 +01:00
Torkel Ödegaard
f1efce56aa feat(panels): fixed duplicate and remove panel 2016-01-27 13:22:37 -05:00
Torkel Ödegaard
34b82caaa8 feat(panels): fixed unit tests 2016-01-27 12:51:01 -05:00
bergquist
12dfee544f Merge branch 'master' into playlist_tags 2016-01-27 15:22:16 +01:00
Torkel Ödegaard
51a32a2bfa feat(panels): fixes 2016-01-26 18:08:08 -05:00
Torkel Ödegaard
ebba7a0327 feat(graph): updating graph panel to new format progress 2016-01-26 17:28:07 -05:00
bergquist
f384538959 fix(search): fixes broken esc button in search 2016-01-26 23:18:10 +01:00