 bergquist
|
d405176367
|
chore(playlist): remove commented code
|
2016-01-29 20:33:01 +01:00 |
|
|
bergquist
|
15087251fb
|
test(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstore
|
2016-01-29 20:24:19 +01:00 |
|
|
bergquist
|
73d6b95339
|
chore(playlist): remove unused code
|
2016-01-29 20:24:06 +01:00 |
|
|
bergquist
|
d27bb4d3fb
|
style(playlist): move dashboard access to dashboard.go
|
2016-01-29 01:41:23 +01:00 |
|
|
bergquist
|
64a18874e1
|
style(playlist): remove unused code
|
2016-01-29 01:23:51 +01:00 |
|
|
bergquist
|
d66932a8a2
|
chore(playlist): extract playlist start into new file
|
2016-01-28 23:56:56 +01:00 |
|
 utkarshcmu
|
8bd07287f8
|
Fixed dashboard_tag query
|
2016-01-27 17:41:23 -08:00 |
|
|
Carl Bergquist
|
251bf7a2b4
|
Merge pull request #3840 from utkarshcmu/stats
Grafana stats view as mentioned in #3812
|
2016-01-27 19:41:10 +01:00 |
|
|
utkarshcmu
|
442db7fee1
|
Changed sql query for grafana_admin_count
|
2016-01-25 14:30:36 -08:00 |
|
|
bergquist
|
92cba94031
|
tech(fmt): remove unused code
|
2016-01-25 22:11:24 +01:00 |
|
|
bergquist
|
52403ca17e
|
feat(playlist): add usage statisics
|
2016-01-25 21:39:45 +01:00 |
|
|
utkarshcmu
|
2190392e05
|
Added grafana_admins count
|
2016-01-25 00:39:31 -08:00 |
|
|
utkarshcmu
|
da67afa51e
|
Fixed api bugs, stats endpoint working
|
2016-01-24 21:18:17 -08:00 |
|
|
utkarshcmu
|
c7fae5386d
|
Added backend API for stats
|
2016-01-24 11:01:33 -08:00 |
|
 Anthony Woods
|
f94599cd29
|
merge apiPlugins with appPlugins
|
2016-01-22 01:15:04 +08:00 |
|
|
Anthony Woods
|
dcde1422b7
|
add support for apiPlugin headers.
The header content uses text/Template. If the apiPlugin is
bundled in an App, then the appSettings.JsonData is passed
to the header template.
|
2016-01-21 11:41:59 +08:00 |
|
|
Anthony Woods
|
423eca6e7d
|
add support for fetching appSettings by appId
|
2016-01-21 11:41:02 +08:00 |
|
|
Anthony Woods
|
fd52320460
|
set includedAppId of apiPlugins
|
2016-01-21 11:39:51 +08:00 |
|
|
Anthony Woods
|
462608517b
|
set pluginDir of apiPlugin object
|
2016-01-21 11:38:27 +08:00 |
|
|
Anthony Woods
|
9586493632
|
add apiPluginHeader support
|
2016-01-21 11:37:48 +08:00 |
|
|
Anthony Woods
|
1bca28ad12
|
include the jsonData in the AppSettings DTO
|
2016-01-21 02:23: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 |
|
 Torkel Ödegaard
|
7a26d309b1
|
feat(apps): more work on apps and how apps can include panels
|
2016-01-19 18:18:53 +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 |
|
|
Torkel Ödegaard
|
3b5a583903
|
Merge branch 'master' into influxdb-policy-selector
|
2016-01-18 18:10:01 +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 |
|
|
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
|
38ddc88b20
|
fix(api): do not include null jsonData field in /api/datasources resource, closes #3755
|
2016-01-15 15:57:00 +01:00 |
|
|
bergquist
|
01d47fb280
|
fix(plugins): fix for default plugin dif
|
2016-01-15 11:22:41 +01:00 |
|
|
bergquist
|
83346a29aa
|
fix(plugins): scans default plugin path
|
2016-01-15 11:01:56 +01:00 |
|
|
Torkel Ödegaard
|
88a132b878
|
Merge branch 'dynamic-directives'
|
2016-01-14 18:57:34 +01:00 |
|
 Torkel Ödegaard
|
e38e8c740f
|
Merge pull request #3723 from schen59/master-schen
fix mismatch api path introduced by commit to issue #3600
|
2016-01-13 19:51:56 +01:00 |
|
 Shaofeng Chen
|
4ceab4abc7
|
fix mismatch api path
|
2016-01-13 10:44:31 -08:00 |
|
|
Torkel Ödegaard
|
8ff48c126a
|
fix(merge): minor merge fix
|
2016-01-13 15:51:47 +01:00 |
|
|
Torkel Ödegaard
|
6da3af5e89
|
Merge branch 'new_macaron'
|
2016-01-13 15:48:49 +01:00 |
|
|
Torkel Ödegaard
|
2cf0dc2cb2
|
fix(gofmt): fixed non formated go file
|
2016-01-13 15:43:32 +01:00 |
|
|
Torkel Ödegaard
|
bdb67d4909
|
fix(build): fixed dependency and build issue
|
2016-01-13 15:38:54 +01:00 |
|
|
bergquist
|
4fe72ebf69
|
feat(macaron): upgrades macaron version
|
2016-01-13 15:11:23 +01:00 |
|
|
Torkel Ödegaard
|
49fdf8427a
|
fix(png rendering): removed --ssl-protocol=any phantomjs param
|
2016-01-13 15:07:03 +01:00 |
|
|
Torkel Ödegaard
|
534bc83173
|
temp work on dynamic directives
|
2016-01-13 14:03:50 +01:00 |
|
|
Shaofeng Chen
|
dc427d5a2c
|
add get org by name api
|
2016-01-12 13:50:56 -08:00 |
|
|
Torkel Ödegaard
|
44f0242157
|
fix(build): fixed issue after merge
|
2016-01-12 15:45:55 +01:00 |
|
|
Torkel Ödegaard
|
e5b3f27a30
|
Merge branch 'apps'
|
2016-01-12 15:41:15 +01:00 |
|
|
Torkel Ödegaard
|
a15984b663
|
feat(apps): pages work
|
2016-01-12 15:39:29 +01:00 |
|
|
Carl Bergquist
|
f7fecdc6de
|
Merge pull request #3655 from grafana/playlist
Persistable playlists
closes #515
closes #1137
|
2016-01-12 15:20:43 +01:00 |
|