Commit Graph

81 Commits

Author SHA1 Message Date
Torkel Ödegaard
9192acf250 Fixed js style errors 2015-03-03 10:20:52 +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
ad2065afc7 Began work on deb and rpm packaging, #1476 2015-03-02 15:50:03 +01:00
Torkel Ödegaard
5c795e9a50 Updated readme with docker info, updated build task 2015-02-09 16:18:30 +01:00
Torkel Ödegaard
eeba128f8a Fixed release tar/zip keeping execution mode on phantomjs 2015-02-06 13:58:25 +01:00
Torkel Ödegaard
102c896046 Updated build and wercker file for new repo structure 2015-02-05 12:27:58 +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
3bf7f6ed5f Updated build post processsing to include vendor dir 2015-01-20 17:53:01 +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
7c72705bc5 more work on build process 2015-01-01 15:28:28 +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
Torkel Ödegaard
599a77c776 Added karma test step to build/relase grunt task 2014-12-30 11:05:24 +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
a4ca679b65 Merge branch 'master' of github.com:torkelo/grafana-private into dashboard_loading_refactoring 2014-06-14 14:54:55 +02:00
Torkel Ödegaard
438455bc8c finally removed elasticjs library 2014-06-13 13:58:34 +02:00
Torkel Ödegaard
e8c11251de fix for build step that replaces @grafanaVersion@ with correct version string 2014-06-09 16:59:53 +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
62af77979b Legend Current value did not display when value was zero, Fixes #460 2014-06-02 19:29:59 +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