Anthony Woods
40d946a6e3
add drop table to ensure existing installs get new schema
2016-01-26 04:18:18 +08:00
Torkel Ödegaard
11e35f7b68
Merge remote-tracking branch 'origin/master' into panelbase
2016-01-25 10:00:25 -05: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
Torkel Ödegaard
4f7fb40d9b
feat(panel plugin): improving panel plugin model
2016-01-24 16:39:25 -05:00
utkarshcmu
c7fae5386d
Added backend API for stats
2016-01-24 11:01:33 -08:00
Anthony Woods
32f78d465b
add secureJsonData to appSettings model.
...
- adds the new column to the DB table.
- data stored in the DB is encrypted
- update appRouteHeaders templates to use the jsonData and
decrypted secureJsonData
2016-01-23 06:17:22 +08:00
Anthony Woods
ab3b586838
add encryption util functions
2016-01-23 03:15:39 +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
utkarshcmu
aa1d28835d
Fixed angularjs variable names
2016-01-19 23:23:44 -08:00
utkarshcmu
281ec60085
UI and backend working
2016-01-19 22:04:38 -08:00
utkarshcmu
09f5e6f4dc
Merge branch 'master' of https://github.com/utkarshcmu/grafana into snapshot-view
2016-01-19 21:05:50 -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
ca55d1f315
Minor bug fixes
2016-01-19 05:05:24 -08:00
utkarshcmu
41fd0ed467
Merge branch 'master' of https://github.com/grafana/grafana into snapshot-view
2016-01-19 05:05:03 -08:00
utkarshcmu
bcb44b7b31
UI and backend connectivity implemented
2016-01-19 05:02:22 -08:00
utkarshcmu
1ab1154010
Optimized backend queries
2016-01-19 04:09:57 -08:00
utkarshcmu
8f067a5ed2
Added backend functionality for searching snapshots
2016-01-19 01:37:36 -08: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
