Commit Graph

5638 Commits

Author SHA1 Message Date
Torkel Ödegaard
f30df8bb57 Merge pull request #3795 from raintank/apiPlugin
get apiPlugins working again.
2016-01-20 07:42:36 +01:00
utkarshcmu
1c5be92259 Removed unused component from playlist code 2016-01-19 17:15:24 -08:00
Anthony Woods
92a085550e fix up imports 2016-01-20 06:17:48 +08:00
Anthony Woods
c4a0ec844c get apiPlugins working again. 2016-01-20 06:13:45 +08:00
bergquist
36e99ac531 feat(tech): force create symlinks 2016-01-19 21:46:43 +01:00
Torkel Ödegaard
7a26d309b1 feat(apps): more work on apps and how apps can include panels 2016-01-19 18:18:53 +01:00
Torkel Ödegaard
6b85a6fd78 feat(apps): minor design update for apps view 2016-01-19 11:54:35 +01:00
Torkel Ödegaard
db1ba30df7 Merge pull request #3789 from utkarshcmu/snap-bug
Snapshot name is saved in DB now Fixes #3768
2016-01-19 10:34:04 +01:00
utkarshcmu
1952ebf7c4 Fixed failing gofmt tests 2016-01-19 00:33:30 -08:00
utkarshcmu
70481953fd Snapshot name is saved in DB now 2016-01-19 00:26:20 -08:00
Carl Bergquist
870775e863 Merge pull request #3788 from utkarshcmu/grunt-test
Fix failing circleci
2016-01-19 09:13:20 +01:00
utkarshcmu
54383a9a0c Fix failing circleci 2016-01-19 00:08:55 -08:00
Torkel Ödegaard
510a21195a feat(influxdb): support for policy selection in query editor, closes #2018 2016-01-18 18:38:36 +01:00
Torkel Ödegaard
3b5a583903 Merge branch 'master' into influxdb-policy-selector 2016-01-18 18:10:01 +01:00
Torkel Ödegaard
a9e05c77d1 Merge pull request #3780 from msambol/graphite_doc
Fix grammatical error in graphite datasource doc
2016-01-18 18:09:33 +01:00
Michael Sambol
3418db1dcd Fix grammatical error in graphite datasource doc
Replace "you" with "your".
2016-01-18 10:41:14 -06:00
bergquist
d94896cf10 feat(build): make symlink script executible 2016-01-18 17:31:53 +01:00
bergquist
eb8871a4bd fix(playlist): add nginject for prod build 2016-01-18 17:31:33 +01:00
Carl Bergquist
389dd12ab4 Merge pull request #3779 from bergquist/playlist_stop_playing
feat(playlist): clicks outside control stops playlist
2016-01-18 17:23:20 +01:00
bergquist
4a54edd8bb feat(playlist): clicks outside control stops playlist
fixes #3711
2016-01-18 17:17:13 +01:00
Torkel Ödegaard
1d4803cff0 fix(singlestat): fixed issue with singlestat and drilldown link introduced in recent commit, fixes #3777 2016-01-18 16:18:04 +01:00
Torkel Ödegaard
6fc972ab1e feat(playlists): merge sync with RP 2016-01-18 16:05:38 +01:00
Torkel Ödegaard
66eebd1ac3 refactor(playlist): refactor of playlist feature, and PR #3776 2016-01-18 16:01:14 +01:00
bergquist
568832c5af style(playlist): improves variable name 2016-01-18 14:58:46 +01:00
Torkel Ödegaard
4ff7b0f49b Merge branch 'playlist_reload' of https://github.com/bergquist/grafana into bergquist-playlist_reload 2016-01-18 14:51:54 +01:00
bergquist
c12aa0e8ce feat(hooks): add scripts for symlinking git hooks 2016-01-18 14:41:17 +01:00
bergquist
61a655f199 feat(hooks): add grunt test to pre commit 2016-01-18 14:37:53 +01:00
bergquist
88e9161e57 style(playlist): fixes some TS hint errors 2016-01-18 14:13:11 +01:00
bergquist
10adc57b3f style(playlist): fixes some TS hint errors 2016-01-18 14:05:48 +01:00
bergquist
62ae02bdd1 feat(playlist): reload all dashboards every cycle
closes #3706
2016-01-18 13:54:32 +01:00
bergquist
dca503bcbd feat(playlist): playlistsrv is now started by id 2016-01-18 13:40:51 +01:00
bergquist
bc21862661 tech(playlist): refactor playlistSrv to typescript 2016-01-18 13:21:48 +01:00
Torkel Ödegaard
1e06f3f5f4 Merge branch 'master' of github.com:grafana/grafana 2016-01-18 12:19:54 +01:00
Torkel Ödegaard
00802d035a refactor(): refactoring submenu to directive 2016-01-18 12:19:46 +01:00
Torkel Ödegaard
edcef7d078 fix(graph): fixed for graph series color selector popover, broken in recent 3.0-pre1 build, fixes #3774 2016-01-18 12:12:05 +01:00
bergquist
899a44a735 feat(units): add more data rate options 2016-01-18 10:02:46 +01:00
bergquist
6a95963c89 Revert "feat(units): add more data rate units"
This reverts commit a35bf497be.
2016-01-18 09:47:01 +01:00
bergquist
a35bf497be feat(units): add more data rate units
closes #3759
2016-01-18 09:26:24 +01:00
Carl Bergquist
9b42b33648 Merge pull request #3771 from bergquist/contant_time_comparison
fix(login): fix vulnerbility for timing attacks
2016-01-18 08:44:11 +01:00
bergquist
053868f593 fix(login): fix vulnerbility for timing attacks
closes #3760
2016-01-18 08:38:32 +01:00
Torkel Ödegaard
1adb7b286c updated 2016-01-18 07:28:01 +01:00
Torkel Ödegaard
30c19d525e ux(): minor page rename 2016-01-17 20:32:37 +01:00
Torkel Ödegaard
8161a0943d ux(password): minor fix for change password page 2016-01-17 20:16:39 +01:00
Torkel Ödegaard
a8e3f731b7 feat(influxdb): began work on influxdb policy selector 2016-01-17 17:53:38 +01:00
Torkel Ödegaard
0cb68b86fc refactor(): minor change 2016-01-17 17:24:10 +01:00
Torkel Ödegaard
723be4f612 refactoring(): unified dashboard top nav to a single dashnav component, uses new navbar component 2016-01-17 11:34:51 +01:00
Torkel Ödegaard
070af40487 refactor(): began refactoring topnav directive to be more like the new style of components, and also make it usable on all pages including dashboard 2016-01-16 23:26:29 +01:00
Torkel Ödegaard
0a58404584 fix(build): minor build script fix, fixes #3756 2016-01-16 19:16:49 +01:00
Torkel Ödegaard
c201f4c63e feat(sidemenu): added handling of click outside to hide sidemenu, also refactored grafana_ctrl to a more general grafana component 2016-01-16 18:55:13 +01:00
Torkel Ödegaard
317b5e6d86 fix(sidemenu): fixed issue with new sidemenu in optimized build, #3687 2016-01-16 16:17:29 +01:00