public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,146 Commits 655 Branches 650 Tags
dc3a81200b1cd366bdf237ada152ae3d79bdaf59
Commit Graph
15146 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard dc3a81200b wip: you can now change panel type in edit mode 2018-07-09 13:24:15 -07:00
Torkel Ödegaard 761283231c react panels: working on changing type 2018-07-09 18:17:51 +02:00
Torkel Ödegaard e052e165e9 Merge branch 'react-panels' of github.com:grafana/grafana into react-panels 2018-07-09 15:35:31 +02:00
Torkel Ödegaard 4fd2107071 Merge branch 'master' of github.com:grafana/grafana into react-panels 2018-07-09 15:35:16 +02:00
David 25bcdbcab1 Merge pull request #12284 from grafana/davkal/queryfield-refactor 
Query field refactorings to support external plugins
 2018-07-09 11:29:59 +02:00
Torkel Ödegaard 5a925461f1 Update CHANGELOG.md 2018-07-09 07:00:11 +02:00
Jesse Tane 677117fb03 fix diff and percent_diff (#12515) 
* make diff and percent_diff tests more realistic

* fix diff and percent_diff

* include @marefr's additional tests
 2018-07-08 21:58:34 -07:00
Ryan McKinley f53e166114 Update lodash/moment version (#12532) 
* tabs to spaces

testing commit permisions :)

* revert

* Update lodash and moment
 2018-07-08 13:06:08 -07:00
Torkel Ödegaard 51f8d3ca42 fix: minor css change 2018-07-08 13:03:22 -07:00
Torkel Ödegaard 8036c49ffe wip: minopr progress on react panel edit infra 2018-07-08 12:29:23 -07:00
Ryan McKinley dca22fd151 Tabs to spaces in tslint (#12529) 
* tabs to spaces

testing commit permisions :)

* revert

* tabs to spaces
 2018-07-08 07:48:05 -07:00
Torkel Ödegaard 50f24c98f7 wip: minor progres on react panels edit mode 2018-07-08 07:39:25 -07:00
Torkel Ödegaard b464a28cca devenv: updated devenv provision scripts 2018-07-07 14:40:17 +02:00
Torkel Ödegaard dbe191fd55 wip: viz editor started 2018-07-07 05:10:42 -07:00
Torkel Ödegaard 645974ec8d ux: minor fix/tweak to inactive view mode, think logo should be visible & fixes dashboard title alignment 2018-07-07 10:25:41 +02:00
Marcus Efraimsson 922371ba76 changelog: add notes about closing #12379 
[skip ci]
 2018-07-06 17:48:39 +02:00
Marcus Efraimsson 319488676f Merge pull request #12521 from grafana/davkal/fix-datasource-sort 
Fix datasource sorting with template variables
 2018-07-06 16:18:02 +02:00
David Kaltschmidt 7ddcaf22d5 Fix datasource sorting with template variables 
- fixes sorting when template variables are present
- simplified existing test cases
- added test to cover variable usage in datasource service
 2018-07-06 15:32:08 +02:00
Torkel Ödegaard dec62d7340 another baby step 2018-07-06 04:42:59 -07:00
Marcus Efraimsson f2980bb978 changelog: add notes about closing #12484 
[skip ci]
 2018-07-06 12:55:12 +02:00
Marcus Efraimsson cbdf6ef355 changelog: add notes about closing #12506 
[skip ci]
 2018-07-06 12:53:10 +02:00
Marcus Efraimsson 1db067f2ad Merge pull request #12511 from alexanderzobnin/fix-12484 
Prometheus heatmap: fix unhandled error when some points are missing
 2018-07-06 12:50:04 +02:00
Marcus Efraimsson af434df5a3 changelog: add notes about closing #12506 
[skip ci]
 2018-07-06 12:35:19 +02:00
Marcus Efraimsson 926892749f Merge pull request #12518 from grafana/12506_dash_links 
Fix links not updating after changing variables
 2018-07-06 12:33:19 +02:00
Marcus Efraimsson 5e4d6958d6 fix links not updating after changing variables 2018-07-06 11:54:37 +02:00
Torkel Ödegaard c86fc6fb47 react-panels: minor progress on data flow 2018-07-05 13:10:39 -07:00
Torkel Ödegaard 447bc3a6e0 Merge branch 'react-panels' of github.com:grafana/grafana into react-panels 2018-07-05 09:37:42 -07:00
Torkel Ödegaard 09ad8360ea Merge branch 'master' into react-panels 2018-07-05 09:36:03 -07:00
Alexander Zobnin 36f08994cc prometheus heatmap: fix unhandled error when some points are missing 2018-07-05 16:33:52 +03:00
Marcus Efraimsson 50a522d418 fix caret for help button is ds http settings 2018-07-05 13:01:10 +02:00
Marcus Efraimsson 240cf63ba6 changelog: add notes about closing #11618 #11619 2018-07-04 20:07:43 +02:00
Marcus Efraimsson d90d4ce55d Merge pull request #12402 from AustinWinstanley/macros/sql 
mysql,mssql: improve $__timeFilter, $__timeFrom, $__timeTo macros

The $__timeFilter macro now uses a BETWEEN with timestamps instead of 
comparing epochs
The $__timeFrom and $__timeTo macros now return strings of format 
YYYY-MM-DDThh:mm:ssZ instead of epoch
 2018-07-04 20:01:43 +02:00
Marcus Efraimsson ea9964cfa1 Merge pull request #12493 from dehrax/12224-datasource-elastic 
Karma to Jest: elasticsearch datasource
 2018-07-04 14:03:25 +02:00
Marcus Efraimsson e8ee1be5e4 Merge pull request #12502 from Nexucis/feature/api-doc-improve 
Fix HTTP-API admin doc
 2018-07-04 13:52:13 +02:00
Tobias Skarhed d3c213973c Basic cleanup 2018-07-04 13:13:06 +02:00
Tobias Skarhed 12d158f391 Add mocks in test file 2018-07-04 13:13:06 +02:00
Tobias Skarhed 8f1bcd9117 Remove q and stub 2018-07-04 13:13:06 +02:00
Tobias Skarhed 80b2f5c756 Add Jest stubs 2018-07-04 13:13:06 +02:00
Tobias Skarhed 69c85e0d7e Remove async 2018-07-04 13:13:06 +02:00
Tobias Skarhed 12e76ad197 Remove logs and comments 2018-07-04 13:13:06 +02:00
Tobias Skarhed bd417bedb2 Start elastic ds test conversion 2018-07-04 13:13:06 +02:00
Marcus Efraimsson a8970a4de9 run enterprise build only on master for now 2018-07-04 13:09:42 +02:00
Augustin Husson 86a574cc50 refix the settings indentation 2018-07-04 12:30:23 +02:00
Augustin Husson 991a4b1663 update stats admin doc 2018-07-04 12:26:30 +02:00
Augustin Husson 01fc6c5d95 fix json indentation 2018-07-04 12:23:10 +02:00
Marcus Efraimsson d2f31a716f remove unnecessary conversions 2018-07-04 12:16:39 +02:00
Marcus Efraimsson 723a894fc5 changelog: update 
[skip ci]
 2018-07-03 19:59:34 +02:00
Marcus Efraimsson 634c77469d changelog: add notes about closing #11818 
[skip ci]
 2018-07-03 19:58:19 +02:00
Marcus Efraimsson faf2ab4249 changelog: add notes about closing #12460 
[skip ci]
 2018-07-03 19:54:09 +02:00
Marcus Efraimsson 512e7f8567 changelog: add notes about closing #8186 
[skip ci]
 2018-07-03 19:50:21 +02:00