public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,856 Commits 655 Branches 650 Tags
d95eabfeec00a2386a64db9461e119ff0c8ac4f6
Commit Graph
3255 Commits
Author SHA1 Message Date
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
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
bergquist 1ec97e5199 feat(playlist): shortens urls 2016-01-12 14:36:04 +01:00
bergquist 458d15063d fix(playlist): remove invalid logging 2016-01-12 14:28:19 +01:00
bergquist e8786b0747 feat(playlist): renames timespan to interval 2016-01-12 13:56:47 +01:00
Torkel Ödegaard ffe1407217 feat(apps): minor progress 2016-01-12 10:20:04 +01:00
Mitsuhiro Tanda 7d8519f5f0 add seoul region 2016-01-12 18:15:29 +09:00
bergquist b79f04493d style(playlist): abstract DTO creation 2016-01-12 08:36:25 +01:00
bergquist 07fdf6491c fix(playlist): new url for viewing playlist 2016-01-12 08:17:44 +01:00
bergquist 98dccb8641 feat(playlist): refactor FE to support playlistitems 2016-01-12 08:17:44 +01:00
bergquist 8a38991270 feat(playlist): changes to relation table 
Also introduces an abstraction between playlist and dashboard.
This will make it possible to att search, and tag filtering to
playlists without any major refactoring
 2016-01-12 08:17:44 +01:00
Torkel Ödegaard e081a5c5a0 feat(apps): worked on pinning apps 2016-01-11 18:03:08 +01:00
Torkel Ödegaard 4da31291d2 feat(apps): minor progress to apps list 2016-01-11 10:44:04 +01:00
Torkel Ödegaard c1e94e61d0 feat(apps): lots of more work on apps, changed app_plugin to app_settings in order to to confuse the app plugin model (definition) and app org settings 2016-01-10 21:37:11 +01:00
Torkel Ödegaard ab79348af5 feat(plugins): minor fix for external plugins with staticRoot 2016-01-09 23:56:39 +01:00
Torkel Ödegaard 1ffcea1952 feat(plugins): major improvement in plugins golang code 2016-01-09 23:34:20 +01:00
Torkel Ödegaard c5635f9c89 feat(plugins): changed what datasources should return, they should now return the datasource constructor 2016-01-09 13:21:16 +01:00