public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,591 Commits 655 Branches 650 Tags
0f6579801d8d5a61ba92096a8b43a49941b4990e
Commit Graph
6591 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard 0f6579801d Merge branch 'master' into websocket 
Conflicts:
	public/app/core/core.ts
 2016-03-16 15:19:32 +01:00
Torkel Ödegaard fcaf2bfdba fix(datasource): when addding data source withCredentials did not get set, fixes #4389 2016-03-16 15:16:28 +01:00
Torkel Ödegaard 4144f71e23 Merge branch 'datasource-lists-cards' 2016-03-16 15:05:46 +01:00
Torkel Ödegaard 852ecd71f7 ux(): update data source list to card view, #4364 2016-03-16 15:05:07 +01:00
bergquist aadc6e0bbd fix(fonts): move icon fonts back to main css 2016-03-16 14:45:39 +01:00
Torkel Ödegaard a738945a88 feat(data source observerable): started work on handling data source observerable 2016-03-16 14:19:30 +01:00
bergquist 9d3cbfe896 Merge branch 'cli_colors' 2016-03-16 14:18:19 +01:00
bergquist 1a11f1e8c6 Merge branch 'master' into cli_colors 2016-03-16 14:17:35 +01:00
bergquist a12f5376b5 feat(cli): adds some colors to ls command 2016-03-16 14:09:30 +01:00
Carl Bergquist fd531e84fc Merge pull request #4384 from vitorboschi/fixTypo 
fix typo
 2016-03-16 13:40:39 +01:00
Torkel Ödegaard d26d7162a5 fix(opentsdb): fixed templating issue for single value variables, fixes #4312 2016-03-16 13:11:07 +01:00
Vitor Boschi a9cdf580a7 fix typo 2016-03-16 09:06:44 -03:00
Carl Bergquist 990acb3fd3 Merge pull request #4383 from bbinet/patch-1 
[docs] typos in plugins/installation.md
 2016-03-16 11:59:51 +01:00
Bruno Binet 3486bf92eb [docs] typos 2016-03-16 11:56:19 +01:00
bergquist ed1864e076 feat(dashlist): stores recently visited dashboards per orgid 2016-03-16 11:52:25 +01:00
bergquist 0998ce81f3 Merge branch 'local_fonts' 2016-03-16 11:08:53 +01:00
bergquist 99e068643b feat(fonts): download fonts from grafana instead of CDN 
Makes its possible to run grafana without internet access.
The performance hit by not using a cdn is very small since
most grafana instances are setup on locally.

closes #4223
 2016-03-16 10:51:59 +01:00
Torkel Ödegaard 0d7eb18d7b Merge branch 'master' of github.com:grafana/grafana 2016-03-16 10:32:24 +01:00
Torkel Ödegaard 81c11ebb53 fix(dashlist): fixed issue with viewing last viewed dashboards, when you had more than dashboards in last viewed than panel limit they did not show up in list 2016-03-16 10:32:11 +01:00
Carl Bergquist 2e73c58338 Merge pull request #4379 from mtanda/cloudwatch_tag_search_fix 
(cloudwatch) remove duplicative attribute
 2016-03-16 08:33:59 +01:00
Mitsuhiro Tanda 381a48f21d (cloudwatch) remove duplicative attribute 2016-03-16 15:41:52 +09:00
Torkel Ödegaard e4c0c39fbf ux(): began work on updating data source list to cards view 2016-03-15 20:29:35 +01:00
Torkel Ödegaard 1abdd170d3 ux(): fixes to cards and sorting plugin list, #4364 2016-03-15 15:52:29 +01:00
Torkel Ödegaard dddd155afa Merge branch 'master' of github.com:grafana/grafana 2016-03-15 15:28:55 +01:00
Torkel Ödegaard c411714546 ux(): added card layout selector and list view mode, #4364 2016-03-15 15:28:37 +01:00
Trent White cba7c1726f add graphite logo to datasource card 2016-03-15 10:08:23 -04:00
Carl Bergquist 0b3ccaff27 Merge pull request #4361 from bergquist/remove_staticRoot 
plugin.json: remove staticRoot field
 2016-03-15 10:07:08 +01:00
Torkel Ödegaard b273cd1339 Merge branch 'master' into websocket 2016-03-15 09:52:36 +01:00
Torkel Ödegaard 82eb32a71e ux(): initial pass at new card / list design, #4364 2016-03-15 09:15:24 +01:00
bergquist e905c2c6b5 feat(plugin.json): remove staticRoot field 2016-03-15 09:00:55 +01:00
Torkel Ödegaard 13376d89cc Merge pull request #4363 from cookiefission/fix/trim-edges-typo 
Fix minor typo in tooltip
 2016-03-14 22:29:14 +01:00
Torkel Ödegaard 2e1f26096f feat(grafana_live): more work pushing data to websocket, #4355 2016-03-14 22:26:43 +01:00
Sean Kenny 8f97e8d5ed Fix minor typo in tooltip 2016-03-14 19:40:23 +00:00
Torkel Ödegaard 92f20b9b7d feat(websocket): reconnection and resubscription handling, #4355 2016-03-14 19:21:32 +01:00
Torkel Ödegaard 3d5251d9a5 feat(websocket): more work websocket ds, # 4355 2016-03-14 17:32:48 +01:00
Torkel Ödegaard 195be2742c feat(live): wip work 2016-03-14 16:18:07 +01:00
Torkel Ödegaard 2adc4d12be feat(live): work on websocket data source, #3455 2016-03-14 13:20:55 +01:00
Torkel Ödegaard 8d7b7009c3 Merge branch 'master' into websocket 2016-03-14 12:01:43 +01:00
Torkel Ödegaard ca5a34ad1e fix(datasource): filter out built in data sources from data source type dropdown 2016-03-14 12:00:56 +01:00
Torkel Ödegaard fbd94fc6ce feat(websockets): inital work on websockets, #4355 2016-03-14 11:59:51 +01:00
bergquist 953a07252a Revert "fix(datasource): fixes testdatasource bug" 
This reverts commit f77bd59e1d.
 2016-03-14 11:43:35 +01:00
bergquist f77bd59e1d fix(datasource): fixes testdatasource bug 2016-03-14 11:33:38 +01:00
Torkel Ödegaard 5b6754ce6c Merge branch 'master' into websocket 2016-03-14 10:33:11 +01:00
Torkel Ödegaard 4aba3bc62b fix(opentsdb): fixed templating issue for OpenTSDB, fixes #4312, fixes #4311 2016-03-14 10:18:43 +01:00
Torkel Ödegaard fc6ad2059a docs(): updated doc version 2016-03-14 10:03:18 +01:00
Torkel Ödegaard 69c8bb1eb3 feat(plugins): added filter (type) tabs po plugin list view 2016-03-14 09:10:32 +01:00
Torkel Ödegaard c504abb84d feat(plugins): added dashboards tab to plugin edit page, #4275 2016-03-13 20:18:45 +01:00
Torkel Ödegaard 2527289e3e Merge branch 'master' of github.com:grafana/grafana 2016-03-13 19:21:56 +01:00
Torkel Ödegaard 581ffb862c feat(plugins): polish to plugin page, better handling for reading readme file contents 2016-03-13 19:21:44 +01:00
bergquist 8e70e9c1c3 feat(cli): improve error message for missing permission 2016-03-13 11:29:43 +01:00