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
|
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
|
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 |
|
Torkel Ödegaard
|
38ddc88b20
|
fix(api): do not include null jsonData field in /api/datasources resource, closes #3755
|
2016-01-15 15:57:00 +01:00 |
|
Torkel Ödegaard
|
7ad72ba905
|
ux(): minor style fixes to pages
|
2016-01-15 15:51:30 +01:00 |
|
Torkel Ödegaard
|
36e8af05a2
|
ux(more style updates)
|
2016-01-15 15:05:13 +01:00 |
|
Torkel Ödegaard
|
2bfded3c5f
|
ux(): general ux polish
|
2016-01-15 14:42:59 +01:00 |
|
Torkel Ödegaard
|
842a59535d
|
feat(sidenav): more polish to new sidenamv
|
2016-01-15 13:20:32 +01:00 |
|
Torkel Ödegaard
|
d4e1a715eb
|
fix(datasources): many datasources did not work in optimized build due to missing ngInject comment
|
2016-01-15 12:51:55 +01:00 |
|
Torkel Ödegaard
|
954c0e9fae
|
Merge branch 'master' into new-nav
|
2016-01-15 11:23:22 +01:00 |
|
Torkel Ödegaard
|
f6a3b53fb5
|
fix(firefox): fixed js issue that made master build break in firefox
|
2016-01-15 11:23:08 +01:00 |
|
bergquist
|
01d47fb280
|
fix(plugins): fix for default plugin dif
|
2016-01-15 11:22:41 +01:00 |
|
Torkel Ödegaard
|
dfcb82d233
|
feat(sidenav): more work on new side nav
|
2016-01-15 11:13:02 +01:00 |
|
bergquist
|
83346a29aa
|
fix(plugins): scans default plugin path
|
2016-01-15 11:01:56 +01:00 |
|
Torkel Ödegaard
|
317c5ba88d
|
Merge pull request #3747 from utkarshcmu/api-docs
Added Orgs API docs
|
2016-01-15 07:51:42 +01:00 |
|
utkarshcmu
|
caa26f594e
|
Added Orgs API
|
2016-01-14 14:40:12 -08:00 |
|
Torkel Ödegaard
|
aa9a92d2e0
|
poc(new nav): added new menu button to other pages that dashboard
|
2016-01-14 22:30:39 +01:00 |
|
Torkel Ödegaard
|
4f227ae92e
|
poc(new sidenav/topnaav)
|
2016-01-14 22:26:41 +01:00 |
|
Torkel Ödegaard
|
cd0256d40d
|
poc(new nav): beginings....
|
2016-01-14 21:20:56 +01:00 |
|
Torkel Ödegaard
|
2ccc19185c
|
fix(text panel): fix for text panel in optimized builds, introduced in recent commit due to plugin api changes
|
2016-01-14 19:14:02 +01:00 |
|
Torkel Ödegaard
|
b4d595e561
|
feat(plugins): updated changelog with notice about plugin api changes
|
2016-01-14 19:01:13 +01:00 |
|
Torkel Ödegaard
|
88a132b878
|
Merge branch 'dynamic-directives'
|
2016-01-14 18:57:34 +01:00 |
|