root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 37 Packages Projects Releases Wiki Activity
57,790 Commits 1,553 Branches 645 Tags 2.5 GiB
Commit Graph

2918 Commits

Author SHA1 Message Date
Torkel Ödegaard 297c829bdc tech(): updatad sass-lint 2016-04-22 09:47:30 +02:00
Torkel Ödegaard 83ba6638a1 bumped version 2016-04-15 10:50:21 -04:00
Torkel Ödegaard 924800b7df bumped version 2016-04-14 14:15:47 -04:00
Torkel Ödegaard e7626befc5 updated version 2016-04-12 10:17:39 -04:00
Torkel Ödegaard 4d63b576f7 tech(): put in a real event emitter instead of rxjs based on that was broken 2016-04-07 19:47:48 -04:00
Torkel Ödegaard 44cf66d7ff refactoring(): fixing event things 2016-04-07 19:23:20 -04:00
Torkel Ödegaard 43896dc416 fix(): updated changelog and version to beta3 2016-04-05 11:29:12 -04:00
Torkel Ödegaard 6e6ebc5947 trying to fix karma issue 2016-04-03 09:43:33 -04:00
Torkel Ödegaard 2f2029a5c1 fix(dashboard): fixed dashboard layout for mobile devices, fixes #4529 2016-04-01 10:56:56 -07:00
Torkel Ödegaard 2bf305b177 build(): updated build version 2016-03-30 22:30:41 -07:00
Torkel Ödegaard 97b304abc9 build(): added unix timestamp to iteration builds 2016-03-30 10:05:30 -07:00
Torkel Ödegaard 8451de8752 tech(): changed deps in package.json 2016-03-30 08:10:22 -07:00
Torkel Ödegaard d4ada51fad build(): fixed issue with peer dependencies in package.json, fixes #4487 2016-03-29 06:16:49 +02:00
Torkel Ödegaard 637db29fad tech(): updated phantomjs npm package to use phantomjs-prebuilt 2016-03-23 13:26:38 +01:00
Torkel Ödegaard 7366cef1fe Merge branch 'master' into websocket 2016-03-22 18:33:39 +01:00
Torkel Ödegaard 1854381456 tech(): updated es6-shim, removed es5-shim, no longer needed as we upraded phantomjs to 2.x, also removed es6-promise, dont think we need it 2016-03-22 18:32:08 +01:00
bergquist bbc4c361bb fix(npm): updates phantomjs requirement 2016-03-22 17:23:15 +01:00
Torkel Ödegaard 9ddf22ea93 Merge branch 'master' into websocket 2016-03-17 10:16:05 +01:00
bergquist a08809f8fe fix(phantomjs): upgrades to 2.1.1 for ssl support 
closes #4371
 2016-03-16 16:30:08 +01:00
Torkel Ödegaard 92f20b9b7d feat(websocket): reconnection and resubscription handling, #4355 2016-03-14 19:21:32 +01:00
Torkel Ödegaard f4666df7da Merge branch 'master' of github.com:grafana/grafana 2016-03-07 18:04:06 +01:00
Torkel Ödegaard 4cd4ce504d feat(plugins): worked on markdown support for plugin page, #4275 2016-03-07 18:03:45 +01:00
bergquist b912edbbef feat(grunt): add autoprefix with postcss 
closes #4250
 2016-03-07 17:49:47 +01:00
Torkel Ödegaard 2cf1193b56 Merge branch 'variable-value-formatting-rethink' 2016-03-01 19:13:11 +01:00
Torkel Ödegaard f3ad71d751 feat(templating): lots of progress on template variable context specific formats, #2918, all elasticsearch / lucene use cases seem to work now 2016-03-01 08:43:54 +01:00
Matt Toback efe25db40f Update repo in package.json to point to official 2016-03-01 11:25:54 +08:00
Torkel Ödegaard 363f36dfae ux(): tweaks 2016-02-21 15:21:01 +01:00
Torkel Ödegaard f3fe1a5320 fix(build): trying to fix build 2016-02-20 17:54:51 +01:00
Torkel Ödegaard d0d21ba9a6 ux(): updated orange color and fixed sidemenu background on dark theme 2016-02-19 15:33:24 +01:00
Torkel Ödegaard c21b353042 ux(): color/grays palate refactoring 2016-02-19 12:26:59 +01:00
Torkel Ödegaard f8e233e400 commit(): saas changs 2016-02-15 15:27:41 +01:00
Torkel Ödegaard f7e3297a0f ux(): updated navbar on all pages to new style, no subnav/dropdown yet though 2016-02-13 14:32:20 +01:00
Torkel Ödegaard e7a202fe4d Merge branch 'master' into style-changes-bulletfactory 2016-02-12 10:14:06 +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 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
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
Matthew Toback 21b0945d08 Beginnings of form restyling, nowhere near merge yet 2016-02-06 17:37:33 -05:00
Torkel Ödegaard 714129c8e3 fix(): package.json use local grunt in postinstall script 2016-02-04 22:44:25 +01:00
Torkel Ödegaard 9914714eeb removed npm frontend assets from repo, installed using npm install postinstall script 2016-01-28 14:37:24 -05:00
Torkel Ödegaard 6fae264222 feat(plugins): upgraded influxdb to new plugin format 2016-01-14 15:35:14 +01:00
Torkel Ödegaard 08caf4bbde feat(tslint): more tslint work 2016-01-13 21:22:39 +01:00
Torkel Ödegaard 59c928acc2 feat(tslint): added more tslint rules 2016-01-13 21:07:57 +01:00
David Keijser 1896bd0920 Add missing peer dependency: phantomjs 2016-01-08 16:27:43 +01:00
Torkel Ödegaard 4522b02925 tech(systemjs): almost all tests are passing 2015-12-21 16:00:58 +01:00
Torkel Ödegaard f7888886e9 tech(systemjs): working on getting tests to work 2015-12-21 11:10:16 +01:00
Torkel Ödegaard 93e424de4c tech(systemjs): work on systemjs builder 2015-12-18 15:59:27 +01:00
Torkel Ödegaard 545c39356a tech(systemjs): starting work on systemjs bundling 2015-12-17 19:18:30 +01:00
Torkel Ödegaard ca84ef38f8 angular2 test 2015-12-16 12:21:13 +01:00
Torkel Ödegaard 7ee290cc57 tech(systemjs): systemjs and jspm work 2015-12-15 17:56:16 +01:00
Torkel Ödegaard 55448de92a updated master version to 3.0.0-pre1 2015-12-14 17:10:30 +01:00
Torkel Ödegaard fcd3af30ec updated version to 2.6.0 2015-12-14 15:18:01 +01:00
Torkel Ödegaard cdc36dd171 Updated version 2015-12-08 15:41:34 +01:00
Torkel Ödegaard df366da721 updated version to 2.6.0-beta1 2015-12-04 10:39:50 +01:00
Torkel Ödegaard 8eb3e48bc7 fix(build): fixed build issues with concat not including require_config 2015-12-02 18:22:47 +01:00
Torkel Ödegaard d315ff2b96 changelog: updated master version to 2.6 and merged develop branch 2015-11-12 13:47:12 +01:00
Torkel Ödegaard 4729bea1a2 fix(dashboard): fix for collapse row by clicking on row title, fixes #3065 2015-10-28 15:04:58 +01:00
Torkel Ödegaard 6397b8c1ef docs(): updated version to 2.5.0 2015-10-28 09:31:57 +01:00
Torkel Ödegaard 22a4ef42fc version change to 2.5-pre2 2015-10-27 12:22:30 +01:00
Torkel Ödegaard d705108be5 feat(timepicker2): added date math tests 2015-09-16 18:48:41 +02:00
Torkel Ödegaard 1900c81d9f tech(nodejs upgrade): upgraded to nodejs 4.0 for grunt build 2015-09-13 12:13:47 +02:00
Torkel Ödegaard dceec44671 removed tsconfig 2015-09-10 14:36:05 +02:00
Torkel Ödegaard da832368f0 dev building and optimized builds work 2015-09-10 12:42:24 +02:00
Torkel Ödegaard abac8bccc6 tech(typescript): its looking good 2015-09-10 11:26:40 +02:00
Torkel Ödegaard 3c40310e9b tech(typescript): testing for how to migrate to typescript 2015-09-09 09:57:06 +02:00
Torkel Ödegaard 171ed497f9 version bumped to 2.5 2015-09-08 09:20:46 +02:00
Mat Schaffer be3f657073 Use SPDB license id 
This avoids an npm warning telling you to use such an id.
 2015-08-27 07:35:59 +09:00
Torkel Ödegaard 90169d6a05 Bumped master version to 2.2.0-pre1 2015-08-11 11:18:39 +02:00
Torkel Ödegaard be7a3a0940 pumped version to 2.1.1 2015-08-11 10:48:19 +02:00
Torkel Ödegaard 956a2bbdbe Updated version 2015-08-05 16:06:55 +02:00
Torkel Ödegaard 925ead51b6 Updated version to 2.1 2015-08-04 16:19:48 +02:00
Torkel Ödegaard 2c00267d58 Changed to more strict sinon version to work around issue in latest sinon 2015-06-10 15:08:32 +02:00
Torkel Ödegaard 8c0e1060e6 Graph: Define series color using regex rule, Closes #590 2015-05-14 12:34:30 +02:00
Torkel Ödegaard a4a8cd05d2 Updated to nodejs packages and karma code coverage setup 2015-05-02 16:59:19 +02:00
Torkel Ödegaard 59fcd3914d corrected master version 2015-05-01 08:08:31 +02:00
Torkel Ödegaard 5175cf70ef fixed version in package.json 2015-04-27 15:07:13 +02:00
Torkel Ödegaard 380b7f4d94 updated version to 2.1.0-pre1 2015-04-24 15:57:20 +02:00
Torkel Ödegaard 2c52224013 /api/login/ping Fix for issue when behind reverse proxy and subpath, Fixes #1857 2015-04-23 08:24:30 +02:00
Torkel Ödegaard 9cc5e981dd Bumped version to 2.0.2 2015-04-22 17:51:50 +02:00
Torkel Ödegaard dabdf1b7fd Graph Panel + Legend Table mode: Many series casued zero height graph, now legend will never reduce the height of the graph below 50% of row height, Fixes #1832 2015-04-21 18:46:44 +02:00
Torkel Ödegaard 9540e12e2e Updated version to 2.0.1 to work around rpm and deb versioning scheme does not support regular semver prerelease naming standard, it seems like 2.0.0-beta3 is newer than 2.0.0 for rpm and deb packages. 2015-04-20 13:21:42 +02:00
Torkel Ödegaard b5a77d4f4a Updated version to 2.0.0 and updated changelog 2015-04-20 11:54:36 +02:00
Torkel Ödegaard 3db2aaada6 Bumped version to rc1 2015-04-15 15:17:19 +02:00
Torkel Ödegaard 0b1c1bb8b4 updated package version 2015-04-13 14:06:33 +02:00
Torkel Ödegaard 8ee7d5c2d5 Deb package is starting to work 2015-04-10 11:05:56 +02:00
Torkel Ödegaard 76ea0f432a updated master version to beta2 2015-03-31 19:20:34 +02:00
Torkel Ödegaard fb0629a913 Bumbped version to 2.0.0-beta1 2015-03-30 15:45:02 +02:00
Torkel Ödegaard 6a9256bb00 Bumped version to prebeta3 2015-03-29 13:07:40 +02:00
Torkel Ödegaard c4b8a9853e updated grunt-jscs dependency 2015-03-25 16:06:13 +01:00
Torkel Ödegaard 2b22d11923 Updated version to prebeta2 2015-03-10 13:55:08 +01:00
Torkel Ödegaard e75acce6ed updated package.json upgrade of grunt contrib uglify 2015-03-10 13:46:50 +01:00
Torkel Ödegaard 30294740bd Updated build script, changed deb and rpm config path to /etc/grafana, #1476 2015-03-04 16:23:30 +01:00
Torkel Ödegaard 14766ad38e Updated wercker, moved s3sync to deploy step 2015-03-04 09:12:32 +01:00
Torkel Ödegaard c6d4b5cc86 Working on build steps 2015-03-03 17:42:50 +01:00
Torkel Ödegaard 6850a4d25d Progress on deb and rpm packaging, init.d script etc, #1476 2015-03-02 17:21:52 +01:00
Torkel Ödegaard f4e26bba3f Removed unused node package 2015-02-05 12:39:47 +01:00
Torkel Ödegaard 16acdfc7c3 Merge branch 'master' of github.com:torkelo/grafana-private into pro 2015-02-03 13:36:25 +01:00
Torkel Ödegaard 858d7be8cf Migrated from ngmin to ngAnnotate 2015-02-03 13:36:04 +01:00
Torkel Ödegaard 1ca4ecc241 Updated grunt-jscs dependency version 2015-02-03 13:05:14 +01:00
Torkel Ödegaard 5a3d3f5098 updated build and release tasks 2015-01-04 17:51:48 +01:00
Torkel Ödegaard 33e3fc70b2 trying to get revision asset replacements to work with different paths 2014-12-31 19:01:10 +01:00
Torkel Ödegaard 9c3cd87bee more work on two grunt build modes, backend/standalone modes 2014-12-31 16:19:45 +01:00
Torkel Ödegaard 38f348e642 Updated version to 1.9.1 2014-12-29 11:21:25 +01:00
Torkel Ödegaard 24519cbf78 Updated version to 1.9.0 2014-12-02 11:21:18 -08:00
Torkel Ödegaard e197163019 Changed version to 1.9-rc1 2014-11-17 11:19:17 +01:00
Torkel Ödegaard 282c834d9f updated package.json 2014-09-30 17:58:02 +02:00
Torkel Ödegaard bf361d2b02 Updated package.json version and latest.json, preparation for 1.8.1 release 2014-09-30 09:03:14 +02:00
Torkel Ödegaard 352ad3385a Updated changelog and package.json to new version 1.8.0 2014-09-22 12:59:21 +02:00
Torkel Ödegaard 4883b2a296 Fixed issue with using template variables in panel titles, and text panel, when selecting All option in variable 2014-09-11 13:54:59 +02:00
Torkel Ödegaard 647feb7b33 Progress on new filter/templating editor 2014-08-26 14:17:46 +02:00
Torkel Ödegaard c6489d9b01 Lots of progress on per series overrides 2014-08-19 15:22:03 +02:00
Torkel Ödegaard 3d9a4dcbf3 Merge branch '1.7.x' 
Conflicts:
	src/css/bootstrap.dark.min.css
	src/css/bootstrap.light.min.css
	src/css/default.min.css
 2014-08-11 13:35:15 +02:00
Torkel Ödegaard a3fca638ee updated version to 1.7.0 (removed rc1 pre-release tag) 2014-08-11 12:23:00 +02:00
Torkel Ödegaard eb9a7267bd began work on inspection console to visualize metric requests, and other useful troubleshooting info and inspection 2014-08-10 14:35:56 +02:00
Torkel Ödegaard 02fb2baf62 Added code coverage, and sending reports to coveralls 2014-08-07 14:58:57 +02:00
Torkel Ödegaard c3a6ae1622 added more graphite target controller tests 2014-08-07 13:44:09 +02:00
Torkel Ödegaard 76aab2a2ac added graphiteTargetCtrl specs 2014-08-07 10:42:05 +02:00
Torkel Ödegaard 0aa5505d7f Updated readme, and other small changes for 1.7.0-rc1 release 2014-08-05 12:27:03 +02:00
Torkel Odegaard e62dc00d7b Fix for build issues on windows, Fixes #574 2014-07-28 11:08:19 +02:00
Torkel Ödegaard 32b11b104f updated version to 1.6.1 2014-06-24 15:06:51 +02:00
Torkel Ödegaard 810f46c450 updated karma dependencies in package.json 2014-06-16 12:40:41 +02:00
Torkel Ödegaard 393dfd1e96 changed version to 1.6.0 2014-06-16 12:24:04 +02:00
Torkel Ödegaard 191f9daf4d update changelog 2014-06-07 08:16:34 +02:00
Torkel Ödegaard ce8bdabab8 Adding JSCS (javascript style checker) 2014-06-07 07:05:42 +02:00
Torkel Ödegaard d499f4e0d0 build system changes 2014-05-31 15:32:00 +02:00
Torkel Ödegaard fc7b4df98a working on angular partials pre caching, reving 2014-05-31 15:20:12 +02:00
Torkel Ödegaard 36b1dce7e4 trying to get css, and js build file revisioning working 2014-05-31 00:22:49 -07:00
Torkel Ödegaard 877ef36bc7 added css concat task 2014-05-30 22:46:39 -07:00
Torkel Ödegaard d8e2192179 Updated version to 1.5.4 2014-05-13 19:08:46 +02:00
Torkel Odegaard 15288b0e84 version bump to 1.5.3 2014-04-17 22:27:19 +02:00
Torkel Ödegaard 4029dc3165 Added jshint file for unit tests, and grunt task to verify test syntax. 2014-04-06 10:47:14 +02:00
Torkel Ödegaard 94fea502b9 Closes #209, sub folder with project name and version suffix in release zip files 2014-03-24 12:51:49 +01:00
Torkel Ödegaard 5a0fa8c09f added phantomjs karma test to run in travis 2014-03-18 20:04:04 +01:00
Torkel Ödegaard 9ebf769b4d Fixes #191, update graph after adding new function and not changing default value 2014-03-11 13:00:28 +01:00
Torkel Odegaard 3f64f5a5fc updated readme and version bump 2014-03-09 18:02:04 +01:00
Torkel Ödegaard 8904a6f4e9 version bump to 1.4.0 and link to annotations wiki article 2014-02-21 14:27:38 +01:00
Torkel Ödegaard f9f259195d bumped version 2014-02-13 08:17:31 +01:00
Torkel Ödegaard a55b9bb8e1 version bump 2014-02-10 17:54:31 +01:00
Torkel Odegaard b8a0ca082a updated readme and bumped version to v1.1.1 2014-02-08 20:10:59 +01: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 Ödegaard d2bae43d26 Adding travis-ci build 2014-02-01 11:26:22 +01:00
Torkel Ödegaard 1c17c8661a Fixes #43, add grunt-cli as dev dependency 2014-01-29 09:17:17 +01:00
Torkel Ödegaard 58dbb01e76 Added new config setting timezoneOffset, usefull when your graphite server is on a different timezone thant your users browsers. This is not optimal (for example if your users have different timezones) can be improved by finding a way to query the timezone different between browser and graphite server. Or fix so that the &tz graphite parameter works for json, then all absolute filters can use UTC time. #31 2014-01-24 17:00:54 +01:00
Torkel Ödegaard a8ba77f40c bumbed version 2014-01-23 13:57:52 +01:00
Torkel Ödegaard 0e4dc5a888 clean up unused code, left over from kibana 2014-01-21 21:11:09 +01:00
Torkel Ödegaard 62edf0d266 updated readme and bumped version 2014-01-21 08:38:30 +01:00
Torkel Ödegaard 0097e5fecd updated readme 2014-01-19 17:38:34 +01:00
Torkel Ödegaard e4b52905d1 preparing for first release 2014-01-19 16:13:28 +01:00
Torkel Ödegaard c13ac8a36f fix: lexer enhancement to support asterix and dash in metric segment 2014-01-14 20:57:07 +01:00
Torkel Ödegaard 9480077f02 switched to karma for running tests 2014-01-01 15:01:01 +01:00
Torkel Ödegaard 4f0042bed1 trying to get more functions to work 2013-12-22 21:24:09 +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 22993c46a5 Added scratchy tasks and config.js docs 2013-11-26 07:38:16 -07:00
Rashid Khan 06b855ffbb Added grunt server command 2013-11-15 14:27:48 -07:00
Rashid Khan ec964a13b9 Modularize grunt tasks 2013-11-14 16:07:14 -07:00
Rashid Khan 113c6fc572 Fixed missing default mandate on filters 2013-10-28 12:57:14 -07:00
Rashid Khan 036f6c5501 Merge remote-tracking branch 'chris-rock/master' 2013-10-25 09:49:46 -07:00
Rashid Khan 4a22648db5 updated version 2013-10-25 09:49:44 -07:00
Rashid Khan d21e1c35e1 remove execute bit re: @shatlovsky 2013-10-25 07:47:54 -07:00
Chris 3d9f4e252f Fix problem with node v0.10.18 and grunt-contrib 2013-10-19 01:17:43 +02:00
Rashid Khan 928332b694 Updated version 2013-10-17 15:06:31 -07:00
Rashid Khan 19614722cf tick size auto scale 2013-10-01 15:52:18 -07:00
Rashid Khan bfd6ea5913 Switched to grunt-contrib-compress, added tar.gz archive 2013-09-19 13:45:09 -07:00
Spencer Alger 412cefed78 Cleaned up the Grunt config a bit, removed an unneeded dep 2013-09-19 10:17:42 -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 ab93bcecb2 Added a cache busting config option to RequireJS that will add the latest commit sha to urls (only in dist build). 2013-09-13 19:14:14 -07:00
Spencer Alger 5d9cb85ccf Merged Pull Request #484 2013-09-13 13:52:13 -07:00
Rashid Khan 58256acb81 Switch styles to LESS build, add inspector.html, update flot 2013-07-31 11:25:15 -07:00
Rashid Khan 5a3028f784 Linted, moved shared functions to kbn object 2013-07-20 14:56:59 -07:00