Torkel Ödegaard
78598df96e
fixes(): fixes for changed app -> public/app paths and fixes for optimized build
2016-02-01 19:00:40 +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
bc05cc4977
fix(phantomjs): another fix for phantomjs rendering, #3804
2016-01-21 12:57:03 +01:00
Torkel Ödegaard
4a8f82ca9b
fix(image rendering): fixed issue with image rendering, fixes #3804
2016-01-21 10:10:32 +01:00
Torkel Ödegaard
b55f8215ec
feat(apps): work on plugin directives loading
2016-01-13 22:31:29 +01:00
Torkel Ödegaard
59c928acc2
feat(tslint): added more tslint rules
2016-01-13 21:07:57 +01:00
Torkel Ödegaard
c1e94e61d0
feat(apps): lots of more work on apps, changed app_plugin to app_settings in order to to confuse the app plugin model (definition) and app org settings
2016-01-10 21:37:11 +01:00
Torkel Ödegaard
d83e24572a
feat(plugins): more refactoring
2016-01-09 23:52:13 +01:00
Torkel Ödegaard
ca3405afc5
feat(plugins): moved http settings to directive instad of just ng-include partial
2016-01-09 19:03:03 +01:00
Torkel Ödegaard
0a9f705308
tech(systemjs): more fixes for optmized build
2015-12-21 16:34:18 +01:00
Torkel Ödegaard
dabd680d6b
tech(systemjs): merged sync with master, all tests are passing
2015-12-21 16:13:24 +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
dfd5413b10
tech(systemjs): worked on making optimized builds work with systemjs builder
2015-12-21 10:02:39 +01:00
Torkel Ödegaard
7c06b5cc22
tech(systemjs): minor change
2015-12-17 13:18:32 +01:00
Torkel Ödegaard
3b8e478a6a
tech(systemjs): finally starting to get systemjs and typescript and runtime loading to work together in a manner that I want it to.. took forever
2015-12-17 11:46:10 +01:00
Torkel Ödegaard
c24935b519
minor progress
2015-12-16 17:01:34 +01:00
Torkel Ödegaard
ca84ef38f8
angular2 test
2015-12-16 12:21:13 +01:00
Torkel Ödegaard
04ff97cd72
tech(systemjs): tricky mixing systemjs and requirejs, might need to migrate
2015-12-15 20:23:55 +01:00
Torkel Ödegaard
7ee290cc57
tech(systemjs): systemjs and jspm work
2015-12-15 17:56:16 +01:00
Torkel Ödegaard
201f50b121
Merge branch 'master' into external-plugins
...
Conflicts:
pkg/api/login.go
public/app/core/routes/all.js
public/app/core/table_model.ts
public/app/panels/table/table_model.ts
public/app/plugins/panels/table/editor.ts
public/app/plugins/panels/table/table_model.ts
2015-12-14 17:28:57 +01:00
Torkel Ödegaard
e194461420
feat(grunt watch): optimized grunt watch, now only operates on changed files
2015-12-08 17:56:02 +01:00
Torkel Ödegaard
ee0e4d2b69
Merge branch 'master' into external-plugins
...
Conflicts:
public/app/plugins/panels/table/editor.ts
public/views/index.html
2015-12-02 18:30:48 +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
bd8f5e9bfd
fix(build): fixed build after change that made panels into proper plugins
2015-11-21 13:53:33 +01:00
Torkel Ödegaard
f1caae126e
feat(build): fixed build issues
2015-11-12 14:28:35 +01:00
Torkel Ödegaard
b25b31e4a0
Merge branch 'master' into develop
2015-11-09 11:25:22 +01:00
Torkel Ödegaard
e51d403420
rename: moved test file
2015-11-02 15:14:35 +01:00
Felix Bünemann
2ca6acc1e9
Fix npm 3 build failure in phantomjs task
...
npm v3.0+ by default dedupes node modules and stores them in a flat
tree, which means the hardcoded path to the location.js will no longer
be nested under the karma-phantomjs-launcher module.
This fixes issue #2999 .
2015-10-31 05:36:35 +01:00
Torkel Ödegaard
97697b93ed
refactoring: moving and renaming things
2015-10-30 15:58:20 +01:00
Torkel Ödegaard
97de8c1cc2
refactoring: move moving stuff around
2015-10-30 15:04:27 +01:00
Torkel Ödegaard
62c908a905
fix(build): fixed partials so they are included in optimized js file, fixes #2997
2015-10-22 10:02:29 -04:00
Torkel Ödegaard
af8d12124a
feat(cloudwatch): code refactoring and cleanup, trying to rewrite so the code uses promises instead of ccallbacks, #684
2015-10-01 21:20:52 +02:00
Torkel Ödegaard
205d4232b9
feat(cloudwatch): only support proxy mode, can remove frontend aws-sdk lib
2015-10-01 17:38:55 +02:00
Torkel Ödegaard
3c6a06a327
feat(cloudwatch): moved specs into plugins dir
2015-10-01 17:00:41 +02:00
Torkel Ödegaard
81a660eae4
fix(phantomjs binary): fixed PR #2832 so that it works on linux, now phantomjs based server side rendershould work on mac and linux, maybe even windows
2015-09-29 15:36:13 +02:00
fg2it
2513639499
fix for relative path
2015-09-26 11:38:37 +02:00
fg2it
8134905a86
new grunt task for setting phantomjs binary
2015-09-25 00:56:56 +02:00
Torkel Ödegaard
20f04ab352
fix(build): fixed requirejs optimized build
2015-09-21 09:36:17 +02:00
Torkel Ödegaard
4ffa26cf2c
feat() started work on more feature rich time picker
2015-09-15 13:23:36 +02:00
Torkel Ödegaard
2b95cd5081
refactor: moving routes into core, improved bundle loader
2015-09-15 08:53:06 +02:00
Torkel Ödegaard
8f45324bce
fix(): fixed requirejs build
2015-09-15 08:20:26 +02:00
Torkel Ödegaard
9dec50832d
refactor: refactoring app boot up and core structure
2015-09-14 22:54:00 +02:00
Torkel Ödegaard
de753bf330
fix(build): fixed issue with ngAnnotate not including files in core/*, fixes #2733
2015-09-14 09:33:26 +02:00
Torkel Ödegaard
d96a6a59ee
refactor: moved timepicker from a simple panel to component, removed simple panel directive
2015-09-12 11:49:27 +02:00
Torkel Ödegaard
84371f03b5
tech(typescript): more testing and migration
2015-09-10 16:47:38 +02:00
Torkel Ödegaard
20407bca89
tech(typescript): converted signup controller to typescript
2015-09-10 16:21:57 +02:00
Torkel Ödegaard
0b5f40e66c
tech(): made config system check for generated css or javascript files and panic if there are none, also if there is a public_gen directory it will use that, even if static root is set to public
2015-09-10 13:34:32 +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
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
