public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,938 Commits 655 Branches 650 Tags
86ef33f84f12afc76eee72b829da99eda07b2fd4
Commit Graph
5938 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Utkarsh Bhatnagar 86ef33f84f fixed language 2016-02-16 00:45:07 -08:00
Utkarsh Bhatnagar 6f794b7d11 Adding gofmt test run to contributing.md 2016-02-16 00:43:48 -08:00
bergquist 48c5e26acd docs(changelog): add info about cli tool 2016-02-16 09:33:54 +01:00
Carl Bergquist 3f0679896b Merge pull request #4037 from grafana/cmd 
Move grafana/grafana-cli into grafana/grafana
 2016-02-16 09:31:15 +01:00
Carl Bergquist 96e98f6d4c Merge pull request #4045 from utkarshcmu/patch-1 
Typo in contributing.md
 2016-02-16 09:26:20 +01:00
Utkarsh Bhatnagar b067317595 Typo in contributing.md 2016-02-16 00:19:11 -08:00
Carl Bergquist 1febd578a4 Merge pull request #4020 from AxelVoitier/master 
Adding units volt-ampere (VA), kilovolt-ampere (kVA) and volt-ampere reactive (var)
 2016-02-16 09:00:19 +01:00
bergquist 4131d8b57a feat(cli): add command for upgrading one plugin 2016-02-16 08:49:27 +01:00
bergquist 36f4f1d0f3 fix(cli): add new executables to gitignore 2016-02-16 08:47:26 +01:00
Torkel Ödegaard 0ee7ac2c5e Merge pull request #4015 from onlyjob/codespell 
minor spelling corrections
 2016-02-16 07:27:12 +01:00
Dmitry Smirnov 3fd6ae597d minor spelling corrections 
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2016-02-16 12:12:04 +11:00
bergquist ea9ac0d2d2 chore(cli): improve unittests 2016-02-15 18:32:36 +01:00
bergquist 746257710b fix(cli): align code with core grafana 2016-02-15 16:11:37 +01:00
bergquist 9c50b89d64 feat(build): make build more generic for executables 2016-02-15 15:22:03 +01:00
bergquist 063b54aefe feat(cli): add grafana-cli to linux packages 2016-02-15 14:58:16 +01:00
bergquist 5adac86b43 fix(cli): remove dev text values 2016-02-15 14:19:59 +01:00
bergquist d59beec354 feat(cli): move cli into main repo 2016-02-15 14:09:34 +01:00
bergquist fe4cdc59be fix(bra): fix bra runner 2016-02-15 13:19:03 +01:00
bergquist 6e7813f2f8 feat(build): move grafana into grafana-server 2016-02-15 11:15:38 +01:00
bergquist da8782a9d0 remove unused imports 2016-02-15 10:34:47 +01:00
bergquist d523d45124 fix(playlist): dont swallow errors 2016-02-15 10:09:15 +01:00
bergquist c4d6051477 add fig option for opentsdb 2016-02-15 07:52:34 +01:00
Carl Bergquist f881ada45c Merge pull request #4032 from utkarshcmu/snap-bug 
Fixing snapshot templating bug
 2016-02-15 07:32:17 +01:00
utkarshcmu b9b3b75c0c Fixing snapshot templating bug 2016-02-14 22:13:59 -08:00
Torkel Ödegaard afa4ee9a28 Merge branch 'master' of github.com:grafana/grafana 2016-02-14 10:39:30 +01:00
Torkel Ödegaard 92f4442356 fix(influxdb): fixed annotations editor, broken recently in master due to plugin changes, fixes #4023 2016-02-14 10:39:20 +01:00
Axel Voitier e00f9611f4 Adding units volt-ampere (VA), kilovolt-ampere (kVA) and volt-ampere reactive (var). 2016-02-13 19:23:30 +01:00
Torkel Ödegaard 14952de2ee Merge pull request #4009 from utkarshcmu/viewer-bug 
Viewers restricted to edit panel
 2016-02-13 10:30:02 +01:00
utkarshcmu 23167a0bb3 Viewers restricted to edit panel 2016-02-12 07:34:56 -08: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 f797b19825 fix(build): changed from postinstall script to regular grunt task for the copying of npm dependencies into public dir, fixes #4003 2016-02-12 09:58:00 +01:00
Torkel Ödegaard 814ca99e3d fix(google tag manager): fixed link to google tag manager, fixes #4005 2016-02-12 09:52:52 +01:00
Carl Bergquist c483b2ff98 Merge pull request #3999 from mtanda/cloudwatch_custom_metrics_namespace 
(cloudwatch) custom metrics namespace support
 2016-02-12 09:47:42 +01:00
Carl Bergquist 2496202417 Merge pull request #3998 from utkarshcmu/ds-conf-box 
Added DS deletion confirmation modal
 2016-02-12 09:46:41 +01:00
Mitsuhiro Tanda 81ad469533 (cloudwatch) custom metrics namespace support 2016-02-12 00:30:33 +09:00
utkarshcmu bb77070aab Merge branch 'master' of https://github.com/grafana/grafana into ds-conf-box 2016-02-11 07:03:04 -08:00
utkarshcmu c051ff3eac Removed unused commented code 2016-02-11 07:01:45 -08:00
Torkel Ödegaard ac5f7ecdea fix(img): fixed img link on signup 2016-02-11 15:49:55 +01:00
Torkel Ödegaard 4e33e80957 fix(): clicking on items in graphites add function menu did not work, now works again, broken in recent panel refactorings 2016-02-11 15:25:34 +01:00
Torkel Ödegaard bf1b60564e fix(png rendering): fixed broken png rendering due to recent panel change 2016-02-11 14:34:15 +01:00
Torkel Ödegaard 50ddf7913a docs(): work on example app 2016-02-11 14:28:04 +01:00
Torkel Ödegaard 39bb9ce118 Merge branch 'master' of github.com:grafana/grafana 2016-02-11 13:42:33 +01:00
Torkel Ödegaard 2d8180fc9c fix(panels): restored panel name to edit mode 2016-02-11 13:42:18 +01:00
utkarshcmu fac51d92c5 Added DS deletion confirmation modal 2016-02-11 00:06:04 -08:00
Torkel Ödegaard 3b21e9fcf0 Merge pull request #3991 from utkarshcmu/small-fix 
Minor html fix
 2016-02-10 20:43:41 +01:00
utkarshcmu 4c35c83b84 Minor html fix 2016-02-10 11:13:17 -08: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 9c0b89b9b0 Merge branch 'master' of github.com:grafana/grafana 2016-02-10 13:18:13 +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