root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 50 Packages Projects Releases Wiki Activity
62,179 Commits 1,498 Branches 637 Tags 2.6 GiB
Commit Graph

227 Commits

Author SHA1 Message Date
Jason Wilder 9cc0be0fc2 Add grafana binary to .gitignore 
Running "go build" defaults to building a binary named
grafana in the root dir.
 2015-02-11 14:55:26 -07:00
Torkel Ödegaard 397dfc54cd Fixed bug in png rendering when having changed public url 2015-02-06 14:17:40 +01:00
Torkel Ödegaard 861e45aedf Merge remote-tracking branch 'origin/pro' 2015-02-05 10:37:41 +01:00
Torkel Ödegaard 3ab7b5c3f7 Merge branch 'master' of /home/torkel/dev/go/src/github.com/torkelo/backend 
Conflicts:
	.gitignore
	LICENSE.md
	README.md
 2015-02-05 10:10:39 +01:00
Torkel Ödegaard 4cc8a9bd18 More work on getting grafana pro to work in sub url 2015-01-05 07:59:18 +01:00
Torkel Ödegaard 318338f967 Updated zip release task 2015-01-01 22:26:57 +01:00
Torkel Ödegaard c4a48b35c0 Updated libs 2014-12-30 11:27:36 +01:00
Torkel Ödegaard 26ec858903 Moved grafana bin file to bin folder 2014-12-15 17:36:42 +01:00
Torkel Ödegaard d7ee4b4573 Added missing files 2014-11-26 09:58:36 +01:00
Torkel Ödegaard f5b1b192a0 Macaron and sqllite 2014-11-14 17:13:33 +01:00
Torkel Ödegaard d7cd2b970e OAuth remake 2014-10-07 17:56:37 -04:00
Torkel Ödegaard 450d242d5f working on oauth 2014-10-07 15:54:38 -04:00
Torkel Ödegaard 4cd53ce119 Merge branch 'cleanup-generated-files' of github.com:clkao/grafana into clkao-cleanup-generated-files 2014-08-10 09:23:44 +02:00
Chia-liang Kao 8819d559b7 move vendor css intor appropriate places and remove generated files from version control 2014-08-10 02:21:05 +08:00
Torkel Ödegaard 380f707285 workin on png rendering 2014-08-09 11:57:54 +02:00
Torkel Ödegaard 8154b4f60d search and save are 'working', barely 2014-08-08 12:35:15 +02:00
Torkel Ödegaard 02fb2baf62 Added code coverage, and sending reports to coveralls 2014-08-07 14:58:57 +02:00
Jordan Rinke f958924b79 added saving and showing temp searches also trailing comman in default.json was causing the default to fail to load for me, #633 2014-07-31 12:37:35 -07:00
Harald Kraemer f70bf61ff6 Added vim swp files to gitignore 2014-05-15 15:07:03 +02:00
Torkel Ödegaard f2f435b4cb Changed name off config.js to config.sample.js to make it easier to upgrade with having to worry about config being overwwritten, if there is no config.js file config.sample.js will be read instead (requirejs fallback). Closes #65 2014-02-06 17:10:25 +01:00
Torkel Odegaard 9d2ce9874a removed histogram panel 2014-01-06 14:50:56 +01:00
Torkel Ödegaard 54eae2e34a addded graphiteUrl to config.js 2013-12-07 14:40:14 +01:00
Torkel Ödegaard 50e42c8bdd started removing kibana stuff I do not need, thinking of doing a custom dashboard based on kibana 2013-12-05 16:45:52 +01:00
Rashid Khan d21e1c35e1 remove execute bit re: @shatlovsky 2013-10-25 07:47:54 -07:00
Spencer Alger 259562136f - Removed the "dist" directory 
- Created a grunt task to build, compress, and upload the build to s3
 - Updated the README to point users to downloads.elasticsearch.org
 2013-09-16 15:14:20 -07:00
Spencer Alger 5d9cb85ccf Merged Pull Request #484 2013-09-13 13:52:13 -07:00
Spencer Alger d778873ba5 Moved JSHint config into the standard .jshintrc file, so that it can be shared with the command line version as well as version that run within IDEs 2013-08-26 17:44:02 -07:00