Torkel Ödegaard
6cdc1e4d37
feat(ux): minor tweaks and fixes, added hover submenu dropdowns
2016-02-12 11:21:42 +01:00
Torkel Ödegaard
e7a202fe4d
Merge branch 'master' into style-changes-bulletfactory
2016-02-12 10:14:06 +01:00
Torkel Ödegaard
b5dc1727d2
fix(postgres): If password or user is empty use empty quotes for connection string, #3985
2016-02-12 10:10:07 +01:00
Torkel Ödegaard
53f5cb6553
fix(api): org name taken error now returns HTTP status code 409, closes
2016-02-12 10:01:52 +01:00
Torkel Ödegaard
2ea548850e
Merge branch 'master' into style-changes-bulletfactory
...
Conflicts:
pkg/api/index.go
public/less/sidemenu.less
2016-02-11 21:23:54 +01:00
Mitsuhiro Tanda
81ad469533
(cloudwatch) custom metrics namespace support
2016-02-12 00:30:33 +09:00
Trent White
ff913333a2
update sidebar
2016-02-11 09:53:48 -05:00
Torkel Ödegaard
37c6a1ddf0
feat(app routes): worked on app routes, added unit test, changed Grafana-Context header to start with X to be standard compliant, got cloud saas queries to work via app route feature and header template
2016-02-10 16:43:35 +01:00
Torkel Ödegaard
ae39ec8585
feat(plugins): changed so that plugins can load css async via util function exposed from app/plugins/sdk
2016-02-10 13:09:39 +01:00
Torkel Ödegaard
257b824d4f
feat(plugins): better logging and handling of loading plugins, try to create plugins dir if it does not exist, fixes #3974
2016-02-10 11:03:12 +01:00
Torkel Ödegaard
baff9b0267
feat(apps): lots of work making apps easier to develop, module paths are handled automatically
2016-02-09 22:10:36 +01:00
Torkel Ödegaard
fe2e6b8a80
feat(apps): began work on support for apps that contain data sources
2016-02-09 18:37:08 +01:00
Torkel Ödegaard
fb74ebb4ea
:Merge branch 'master' of github.com:grafana/grafana
2016-02-09 18:17:43 +01:00
Torkel Ödegaard
8784be9a14
feat(plugins): made it possible to have relative plugin template urls
2016-02-09 18:17:32 +01:00
woodsaj
f953033ba7
add support for screenshots in plugins.
...
Allow plugin creators to include screenshots of their plugin
in action. Primarily for use in Grafana.net info pages.
2016-02-09 22:36:42 +08:00
Torkel Ödegaard
f0ecbd3878
feat(apps): removed some on hover stuff from sidemenu to make it ready to merge to master
2016-02-09 14:20:41 +01:00
Torkel Ödegaard
9dcfe6dc39
feat(apps): more work on app pages and sidemenu subnav
2016-02-09 14:06:23 +01:00
Torkel Ödegaard
18eb9d6076
feat(apps): began work on app pages
2016-02-09 11:17:49 +01:00
Torkel Ödegaard
99a053bbdd
feat(): removed unused routes and minor fixes
2016-02-08 16:57:29 +01:00
Torkel Ödegaard
273fbaac68
refactor(): minor changes
2016-02-05 10:37:14 +01:00
Torkel Ödegaard
fcc960e9a2
Merge pull request #3792 from utkarshcmu/snapshot-view
...
UI Review: Snapshot view
2016-02-05 08:49:23 +01:00
Torkel Ödegaard
db27bbb162
Merge pull request #3918 from utkarshcmu/metadata
...
Added metadata fields under Settings tab
2016-02-05 08:47:57 +01:00
Mitsuhiro Tanda
ccb063df06
(cloudwatch) add test for custom metrics
2016-02-04 13:07:02 +09:00
Mitsuhiro Tanda
b90a078be0
(cloudwatch) change implementation to testable
2016-02-04 13:07:02 +09:00
Mitsuhiro Tanda
73ec486434
(cloudwatch) custom metrics support
2016-02-04 13:07:02 +09:00
utkarshcmu
00a6efa15e
Excluded total calculations from backend
2016-02-01 23:26:11 -08:00
utkarshcmu
338afc80d5
Merge branch 'master' of https://github.com/grafana/grafana into metadata
2016-02-01 10:32:36 -08:00
Torkel Ödegaard
e737dab5ca
removed /app route, confusing when some assets use public/app/.. route and some use just app/... all public static assets should no use public route, app route is no more
2016-02-01 18:19:02 +01:00
Torkel Ödegaard
0b25a29a9c
Merge branch 'panelbase'
2016-02-01 17:11:08 +01:00
Dieter Plaetinck
fbc90e038c
prevent needless cpu burning in unused levels. fix #3898
2016-02-01 17:49:37 +13:00
Dieter Plaetinck
bf943ddba3
actually make use of the LogLevel type
...
why else would it be defined?
and this is sane anyway.
2016-02-01 17:48:42 +13:00
Torkel Ödegaard
3f945e886b
merge sync with master
2016-01-31 19:51:23 +01:00
Torkel Ödegaard
12460af0ec
Merge pull request #3830 from raintank/apiPlugin
...
Add secureJsonData field to appSettings model
2016-01-29 17:17:37 -05:00
bergquist
34eb5acee7
feat(dataproxy): remove 'SetCookie' from reponse
...
set cookie could potentialll leak information about the
datasource if in proxy mode.
closes #3845
2016-01-29 23:17:11 +01:00
Daniel Lee
21632d22ab
Merge pull request #3882 from bergquist/playlist_tags
...
Add support for playlist based on tags
2016-01-29 21:32:58 +01:00
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
Daniel Lee
74decb4bdc
fix(dataproxy): no trailing slash if proxypath is empty
...
The JoinUrlFragments function adds a trailing slash if to the proxy url
if the proxy path is an empty string. This fix removes that trailing
slash. Fixes #3847
2016-01-29 18:44:33 +01:00
Anthony Woods
2e9272c778
Merge remote-tracking branch 'upstream/master' into apiPlugin
2016-01-30 01:38:01 +08:00
Anthony Woods
79e7ae4424
fix sql query in GetAdminStats. fixes #3883
2016-01-29 09:38:51 +08: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
972ac99b7c
Added more metadata
2016-01-28 09:53:19 -08:00
utkarshcmu
b30dcce4bc
Added dtos and UI for more metadata
2016-01-28 00:52:52 -08:00
utkarshcmu
58121d89fc
Updated http_api docs
2016-01-27 22:02:33 -08:00
utkarshcmu
6a1192172d
Api stores dashboard creator
2016-01-27 21:55:54 -08:00
utkarshcmu
8bd07287f8
Fixed dashboard_tag query
2016-01-27 17:41:23 -08:00
utkarshcmu
753fd164d7
Added createdBy in metadata ui and dashboard table
2016-01-27 17:11:21 -08:00
