Commit Graph
100 Commits
Author SHA1 Message Date
Torkel Ödegaard 10fcf2f5be Merge branch 'master' into develop 2017-11-02 15:56:09 +01:00
Torkel Ödegaard 97cc454ded ux: minor changes 2017-11-01 14:23:46 +01:00
Torkel Ödegaard 894951c7d4 fix: panel view now wraps, no scrolling required, fixes #9746 2017-11-01 11:24:26 +01:00
Torkel Ödegaard f46b7560e8 Update CHANGELOG.md 2017-11-01 10:50:24 +01:00
Torkel Ödegaard e19b4a9291 plugins: fix for loading external plugins behind auth proxy, fixes #9509 2017-11-01 10:45:20 +01:00
Torkel Ödegaard c3bd07f9b4 testdata: added manual entry mode to test data 2017-11-01 09:59:24 +01:00
Torkel Ödegaard fec37f22b8 fix: fixed compiler error from #9676 2017-11-01 08:08:16 +01:00
Torkel Ödegaard 84b10df887 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-10-31 16:14:40 +01:00
Torkel Ödegaard ae367db377 Update ROADMAP.md 2017-10-31 16:07:45 +01:00
Torkel Ödegaard 9d020ea1e2 Merge branch 'master' of github.com:grafana/grafana 2017-10-31 14:30:26 +01:00
Torkel Ödegaard 7f83460f42 tests: migrated tests for link_srv to jest, #9666 2017-10-31 14:30:06 +01:00
Torkel Ödegaard 9aa6a6b4c4 Merge branch 'linkSrv-js-to-ts' 2017-10-31 14:29:42 +01:00
Torkel Ödegaard ec94dfa890 tests: migrated tests for link_srv to jest, #9666 2017-10-31 14:29:25 +01:00
Torkel Ödegaard afd4f37f39 Update codecov.yml 2017-10-31 13:58:01 +01:00
Torkel Ödegaard 7336a98bb1 Update CHANGELOG.md 2017-10-31 13:56:00 +01:00
Torkel Ödegaard 497993e2b2 Update ROADMAP.md 2017-10-31 13:04:10 +01:00
Torkel Ödegaard ae11bf7c14 fix: dashboard links dropdown toggle did not update view, fixes #9732 2017-10-31 09:22:45 +01:00
Torkel Ödegaard 3ff2dc2850 Merge branch 'master' of github.com:grafana/grafana 2017-10-31 09:17:44 +01:00
Torkel Ödegaard 8838e43088 Merge branch 'master' of github.com:grafana/grafana 2017-10-31 09:01:10 +01:00
Torkel Ödegaard d03b0d664b Merge branch 'master' of github.com:grafana/grafana 2017-10-28 13:28:30 +02:00
Torkel Ödegaard 3e3cef28ec fix: undefined is not an object evaluating this., #9538 2017-10-28 13:28:06 +02:00
Torkel Ödegaard 43d45f9fae fix: graphite annotation tooltip included undefined, fixes #9707 2017-10-28 12:59:32 +02:00
Torkel Ödegaard cae852a1a2 updated icons 2017-10-27 08:33:04 +02:00
Torkel Ödegaard 9b4e1aa0e7 ux: testing 3px panel border radius 2017-10-26 16:06:28 +02:00
Torkel Ödegaard 9605ab4475 Merge branch 'master' into develop 2017-10-26 15:59:50 +02:00
Torkel Ödegaard 9d5e4bee56 Merge branch 'master' of github.com:grafana/grafana 2017-10-26 15:27:46 +02:00
Torkel Ödegaard c78a9368f0 docs: updated download links 2017-10-26 13:17:51 +02:00
Torkel Ödegaard 01f16ece3e plugins: added backward compatible path for rxjs 2017-10-26 12:07:23 +02:00
Torkel Ödegaard bf680acae5 ux: updated singlestat default colors 2017-10-26 11:57:48 +02:00
Torkel Ödegaard 74fcb2494a prometheus: fixed unsaved changes warning when changing time range due to step option on query model was changed in datasource.query code, fixes #9675 2017-10-26 11:46:33 +02:00
Torkel Ödegaard 77331e92b6 docs: updated changelog 2017-10-26 10:57:41 +02:00
Torkel Ödegaard 0c2aa91e61 fix: firefox can now create region annotations, fixes #9638 2017-10-26 10:56:10 +02:00
Torkel Ödegaard 9718fa7c03 grid: work in progress on row repeats 2017-10-26 09:53:48 +02:00
Torkel Ödegaard 7559982b05 grid: minor changes 2017-10-25 12:38:08 +02:00
Torkel Ödegaard 17d95dc848 Create codecov.yml 2017-10-25 11:23:47 +02:00
Torkel Ödegaard a299118c92 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-10-24 20:29:53 +02:00
Torkel Ödegaard 38f97d5cc9 grid: worked on row options modal and row removal 2017-10-24 20:13:34 +02:00
Torkel Ödegaard df12cbc4a7 tests: added test for DashboardRow 2017-10-24 15:46:03 +02:00
Torkel Ödegaard 15024e96e4 ux: row collapse / expand starting to work 2017-10-24 12:33:14 +02:00
Torkel Ödegaard 68562a2077 Merge branch 'master' into develop 2017-10-24 11:02:48 +02:00
Torkel Ödegaard 7861c27557 fix: another fix for playlist view state, #9639 2017-10-24 10:58:14 +02:00
Torkel Ödegaard 3e89ec4ff2 ux: updated icons 2017-10-24 10:47:24 +02:00
Torkel Ödegaard b44daaabf2 Merge branch 'master' into develop 2017-10-24 09:06:09 +02:00
Torkel Ödegaard 4d72323623 shore: removed unused old system conf file 2017-10-23 20:31:23 +02:00
Torkel Ödegaard 4fdb351c32 build: tryingt of fix windows build issue 2017-10-23 12:33:30 +02:00
Torkel Ödegaard b986f744e4 fix: escape series name in graph legend, added aliasEscaped to time series model to reuse escape, fixes #9615 2017-10-23 10:15:58 +02:00
Torkel Ödegaard 9cce5217d0 build: fixed gofmt issue and addd mock response feature 2017-10-23 09:57:28 +02:00
Torkel Ödegaard 1fd2270a93 build: split circle test shell scripts 2017-10-23 09:06:50 +02:00
Torkel Ödegaard 48f384dcf1 build: reduced webpack log output and remove race flag from go tests 2017-10-22 20:16:32 +02:00
Torkel Ödegaard b6184a71bd build: set max workers to 2 for jest 2017-10-22 19:22:06 +02:00
Torkel Ödegaard 76b9b792b4 build: log heap usage 2017-10-22 19:19:29 +02:00
Torkel Ödegaard 4632b8daa5 build: another build fix 2017-10-22 18:10:22 +02:00
Torkel Ödegaard 7a277c69ac tests: migrated two more tests to jest 2017-10-22 17:36:50 +02:00
Torkel Ödegaard c6feb903b1 build: fixed build failure 2017-10-22 17:31:10 +02:00
Torkel Ödegaard 2de439c5a1 build: reworking pre commit hook 2017-10-22 15:19:06 +02:00
Torkel Ödegaard cde87d9adc build: added precommit 2017-10-22 15:11:37 +02:00
Torkel Ödegaard 34edea4ac7 fix: fixed tslint validation error 2017-10-22 14:56:20 +02:00
Torkel Ödegaard adb9d92082 test: added first react snapshot test 2017-10-22 12:48:20 +02:00
Torkel Ödegaard a06ccaa428 docs: another docs fix 2017-10-22 12:00:35 +02:00
Torkel Ödegaard 974d38583d docs: fix docs redirect for older datasources index page, fixes #9609 2017-10-22 11:53:30 +02:00
Torkel Ödegaard fff0fa2aee Merge branch 'master' into develop 2017-10-22 11:51:14 +02:00
Torkel Ödegaard 4aa227dd84 [Tech]: Start migrating to Jest for tests (#9610)
* tech: investigating karma + jest mix

* tech: migrating tests to jest

* tech: moved anoter test file to jest

* test: migrated two more test files to jest

* test: updated readme and made test fail to verify that it causes CI build failure

* tech: added code coverage for jest tests

* tech: testing codecov coverage

* tech: migrated more tests

* tech: migrated template srv to typescript and the tests to jest

* tech: minor build fix

* tech: build fixes

* build: another attempt at fixing go test with coverage
2017-10-22 07:03:26 +02:00
Torkel Ödegaard a56287c2dc ux: minor ux tweaks 2017-10-19 13:42:49 +02:00
Torkel Ödegaard d58a560fda Update CHANGELOG.md 2017-10-19 12:55:52 +02:00
Torkel Ödegaard 1e61eae9f4 fix: fixed save to file button in export modal, fixes #9586 2017-10-19 12:52:26 +02:00
Torkel Ödegaard 6c01125416 Update CHANGELOG.md 2017-10-18 15:22:34 +02:00
Torkel Ödegaard 8d68bd6bb9 fix: fixed prometheus step issue that caused browser crash, fixes #9575 2017-10-18 13:28:18 +02:00
Torkel Ödegaard 039fc2964a fix: getting started panel and mark adding data source as done, fixes #9568 2017-10-18 12:02:57 +02:00
Torkel Ödegaard 6f71af449b ux: new fixes 2017-10-18 09:48:37 +02:00
Torkel Ödegaard bc8c2409c0 ux: work on rows 2017-10-17 14:53:52 +02:00
Torkel Ödegaard eda3cffe22 build: added imports of rxjs utility functions 2017-10-17 12:14:54 +02:00
Torkel Ödegaard e375159eec grid: row work 2017-10-17 12:04:18 +02:00
Torkel Ödegaard d8230f8fa7 Merge branch 'master' into develop 2017-10-17 11:17:28 +02:00
Torkel Ödegaard 233062229a Update CHANGELOG.md 2017-10-17 11:08:43 +02:00
Torkel Ödegaard 574afe8568 fix: fixed color pickers that were broken in minified builds, fixes #9549 2017-10-17 10:51:42 +02:00
Torkel Ödegaard b86ae3f0e8 ux: align alert and btn colors 2017-10-17 09:35:14 +02:00
Torkel Ödegaard 8ff7e1d05d docs: doc updates 2017-10-17 09:35:14 +02:00
Torkel Ödegaard 00c2153edd Merge branch 'develop' of github.com:grafana/grafana into develop 2017-10-17 09:21:45 +02:00
Torkel Ödegaard cd10be0f52 newgrid: row progress 2017-10-16 16:09:23 +02:00
Torkel Ödegaard a979767439 grid: minor progress on new row concept 2017-10-16 10:58:08 +02:00
Torkel Ödegaard 2ff4b86781 ux: add panel progress 2017-10-16 10:39:50 +02:00
Torkel Ödegaard 772ab7812f ux: worked on add panel function 2017-10-16 09:55:55 +02:00
Torkel Ödegaard 48b6692491 ux: minor button changes 2017-10-15 12:25:31 +02:00
Torkel Ödegaard 9b7d346d3f ux: color tweaks 2017-10-14 21:51:36 +02:00
Torkel Ödegaard a3bd761b0c ux: testing out new icons 2017-10-14 21:17:16 +02:00
Torkel Ödegaard 7e16254b1a Merge branch 'develop' of github.com:grafana/grafana into develop 2017-10-14 08:21:55 +02:00
Torkel Ödegaard 825cac38b4 ux: minor fixes 2017-10-13 17:01:38 +02:00
Torkel Ödegaard 0c31d23086 grid: fixed grid width issues 2017-10-13 15:11:05 +02:00
Torkel Ödegaard 70005d3e37 grid: repeat refactoring and unit tests 2017-10-13 14:50:16 +02:00
Torkel Ödegaard e5a6cb6241 newgrid: added constants, changed grid to 24 cols, added tests for panel repeats 2017-10-13 13:51:05 +02:00
Torkel Ödegaard 9fb4f61975 Merge branch 'master' into develop 2017-10-13 10:49:55 +02:00
Torkel Ödegaard 7bfd8e2a56 docs: doc updates 2017-10-13 10:31:34 +02:00
Torkel Ödegaard 8bb9d92a73 grid: minor progress on panel repeats 2017-10-12 21:37:27 +02:00
Torkel Ödegaard 215d59865e changed name back to use underscore instead of camelcase, need to think more about this 2017-10-12 20:02:07 +02:00
Torkel Ödegaard 83e496606e fixed dashboard sorting 2017-10-12 19:55:52 +02:00
Torkel Ödegaard 770a21b368 newgrid: worked panel duplicate 2017-10-12 19:01:02 +02:00
Torkel Ödegaard 48c8e4d627 fix: various fixes for new grid 2017-10-12 17:38:49 +02:00
Torkel Ödegaard 88ceb19d96 Merge branch 'master' into develop 2017-10-12 16:32:44 +02:00
Torkel Ödegaard 2992fb4b0e fix: can now remove annotation tags without popover closing 2017-10-12 16:24:32 +02:00
Torkel Ödegaard e7b718ed7a fix: fixed links on new 404 page, fixes #9493 2017-10-12 15:31:41 +02:00