IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-01 21:19:28 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,343 Commits 5,114 Branches 538 Tags 1.9 GiB
2451282563
Commit Graph

177 Commits

Author SHA1 Message Date
Torkel Ödegaard
82061c7c3b experiments 2015-09-09 20:37:27 +02:00
Torkel Ödegaard
a8197df1c1 more experiments for mixing javascript and typescript 2015-09-09 19:34:24 +02:00
Torkel Ödegaard
3c40310e9b tech(typescript): testing for how to migrate to typescript 2015-09-09 09:57:06 +02:00
Michaël Lhomme
0dc263d919 Disable load timeout in requirejs 2015-08-17 21:41:04 +02:00
Torkel Ödegaard
fd319bd5f5 Moved requirejs to bower, #677 2015-06-13 23:01:54 +02:00
Torkel Ödegaard
a4a8cd05d2 Updated to nodejs packages and karma code coverage setup 2015-05-02 16:59:19 +02:00
Torkel Odegaard
05bed2fd8a Fixed folder location for readme and license files in bin tar / zip package 2015-04-21 08:20:34 +02:00
Torkel Ödegaard
3d8beb918b Docs updates and update to tar package 2015-04-20 12:33:32 +02:00
Torkel Odegaard
c9a28ddd38 Windows build: updates to build stuff to create better windows packages 2015-04-20 08:10:23 +02:00
Torkel Ödegaard
b48b2ac656 Updated grunt tasks for the src -> public directory change 2015-03-29 13:06:53 +02:00
Torkel Ödegaard
722d74a41b Removed unused animate.min.css 2015-03-25 21:27:57 +01:00
Torkel Ödegaard
5f0e7cd52a Added custom cache control headers for static content 2015-03-23 18:28:59 -04:00
Torkel Ödegaard
4b3224702c Fixed asset revving issue with css files 2015-03-13 11:11:31 +01:00
Bruno Binet
ae41fa3011 fix uglify TypeError 
This patch fix the following uglify error:
TypeError: Cannot assign to read only property 'warnings' of true
Or we can upgrade grunt-contrib-uglify to latest v0.8.0 version which
should also fix the issue.

This issue has been reported on grunt-contrib-uglify bug tracker:
https://github.com/gruntjs/grunt-contrib-uglify/issues/298
 2015-03-10 11:27:17 +01:00
Torkel Ödegaard
d043ee9407 Fixed js concat issue 2015-03-04 10:04:59 +01:00
Torkel Ödegaard
0db55b6194 Work on deb and rpm packages, both seem to work now, #1476 2015-03-03 17:14:58 +01:00
Torkel Ödegaard
7e0f1a57af Progress on deb and rpm packaging, renamed config files, added file logging, #1476 2015-03-03 10:18:37 +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
7fef460fa2 Fix for paths to partials 2015-02-02 22:15:15 +01:00
Torkel Ödegaard
5a3d3f5098 updated build and release tasks 2015-01-04 17:51:48 +01:00
Torkel Ödegaard
318338f967 Updated zip release task 2015-01-01 22:26:57 +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
f8ddfec98c progress on being able to use exact same code base for backend and standalone version, building optimized build needs a little more work 2014-12-31 14:18:34 +01:00
Torkel Ödegaard
75c77a44c9 Merge branch 'master' of github.com:torkelo/grafana-private into pro 
Conflicts:
	src/app/app.js
	src/app/controllers/all.js
	src/app/routes/all.js
	src/app/services/datasourceSrv.js
	src/test/test-main.js
 2014-12-31 12:07:22 +01:00
Torkel Ödegaard
11b44f2b01 changes to make requirejs optimizer complete 2014-12-31 11:50:34 +01:00
Torkel Ödegaard
d1e33ec071 Moved routes 2014-12-31 11:48:15 +01:00
Mat Schaffer
85e50ece2e Allow for plugin testing. 
With this change in place you can include plugin specs in `grunt test` by creating a `src/config.js` like that includes something like this:

```js
      plugins: {
        // list of plugin panels
        panels: [],
        // requirejs modules in plugins folder that should be loaded
        // for example custom datasources
        dependencies: ['grafana-plugins/atlasDatasource'],
        specs: ['grafana-plugins/specs/atlasDatasource-specs']
      }
```
 2014-12-23 12:01:50 -08:00
Torkel Ödegaard
01bd662046 Graph: legend fix for bug when running optimized build, Fixes #1045 2014-11-11 21:06:01 +01:00
Torkel Ödegaard
17114778b7 Panel: fixed bug introduced in recent commit that caused blank title in optimized build, #1041 2014-11-11 15:00:31 +01:00
Torkel Ödegaard
c12d830162 Panel: added search typeahead for dashboard links, #1041 2014-11-11 13:38:34 +01:00
Torkel Ödegaard
e5bb7f7c2d CustomDatasource: fixed build optimization issue with custom datasources, Fixes #994 2014-10-28 19:00:46 +01:00
Torkel Ödegaard
77f380c94b Graph: shared tooltip improvements, info tooltip when point counts are not the same, #850 2014-10-01 10:30:24 +02:00
Torkel Ödegaard
4798aa4789 Fixes to requirejs build task to include all modules, Fixes #779 2014-09-09 08:24:04 +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
21b7c6a2c0 Moved css files, removed generated css files from source control, consolidated (concat) css more, now only two css files, dark and light 2014-08-10 09:46:55 +02: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
Chia-liang Kao
8194c62f4e Fix release build rules following 23c9f97 and #659 2014-08-09 18:40:40 +08:00
Torkel Ödegaard
02fb2baf62 Added code coverage, and sending reports to coveralls 2014-08-07 14:58:57 +02:00
Torkel Ödegaard
d70c81f03b more angular 1.3 upgrade fixes 2014-08-06 09:10:18 +02:00
Torkel Ödegaard
fa3b84a615 Elastic search annotations are working, need to refactor and unify datasource abstraction more, #201 2014-07-29 17:24:42 +02:00
Torkel Ödegaard
77e5e75b2f Fixed ngmin build issue introduced in route refactoring, Fixes #622 2014-07-29 08:13:23 +02:00
Torkel Ödegaard
77bfd85e9e Changed all kibana words to grafana 2014-07-28 18:11:52 +02:00
Torkel Ödegaard
b47047a91d Merge branch 'master' into annotations_redesign 2014-07-16 13:18:21 +02:00
Torkel Ödegaard
1c56ac7e48 changed css concat order 2014-07-16 13:17:55 +02:00
Torkel Ödegaard
438455bc8c finally removed elasticjs library 2014-06-13 13:58:34 +02:00
Torkel Ödegaard
ce8bdabab8 Adding JSCS (javascript style checker) 2014-06-07 07:05:42 +02:00
Torkel Ödegaard
0f7a55d031 improved asset (css/js) build pipeline, added revision to css and js. Will remove issues related to the browser cache when upgrading grafana and improve load performance (Fixes #418) 2014-06-02 20:29:30 +02:00
Torkel Ödegaard
f799ded434 worked on css and js asset reving, and angular partial precaching, still need to fix panel module.html, issue #418 2014-06-01 16:57:59 +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
c19fafa581 Improvement to series toggling, CTRL+MouseClick on series name will now hide all others (Closes #350) 2014-05-01 11:18:23 +02:00
Torkel Ödegaard
8ca589cdf5 Support for async scripted dashboards, and accesss to jquery, window & document, Closes #274) 2014-04-16 14:57:35 +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
6795383461 Fixes #106. Css fix for Firefox and using top menu dropdowns in panel fullscren / edit mode 2014-04-06 09:53:07 +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
06fe572113 more work on filterSrv unit tests 2014-03-23 07:03:43 +01:00
Torkel Ödegaard
5a0fa8c09f added phantomjs karma test to run in travis 2014-03-18 20:04:04 +01:00
Torkel Ödegaard
2c414d8e45 even more work on light theme (#77) 2014-02-14 07:40:41 +01:00
Torkel Ödegaard
1fada5dd0b build/grunt script fixes 2014-02-10 18:05:52 +01:00
Torkel Odegaard
869bebed6e more work on annotations 2014-02-09 19:31:06 +01:00
Torkel Odegaard
682740a020 fix for requirejs optimizer and config.js fallback 2014-02-08 20:30:19 +01:00
Torkel Ödegaard
38caeb3e2f grunt release task changes 2014-01-19 16:24:47 +01:00
Torkel Odegaard
3e0b9261e4 changed background color and column gutter 2014-01-07 22:08:32 +01:00
Torkel Ödegaard
cef4349b2a added lexer/parser support for templated metric expressions, karma test runner is working 2014-01-01 18:40:25 +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
aec9a42ee1 Skeleton API docs 2013-12-02 12:43:39 -07:00
Rashid Khan
e95503fef3 Doc updates 2013-11-26 12:21:10 -07:00
Rashid Khan
22993c46a5 Added scratchy tasks and config.js docs 2013-11-26 07:38:16 -07:00
Rashid Khan
a926358af8 Added grunt server command 2013-11-15 14:29:27 -07:00
Rashid Khan
4c7f52797f fixing build with subfolders 2013-11-15 09:44:06 -07:00
Rashid Khan
92a485bd29 Add baseDir variable 2013-11-14 21:29:41 -07:00
Rashid Khan
ec964a13b9 Modularize grunt tasks 2013-11-14 16:07:14 -07:00