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

..

clean.js

feat(grunt watch): optimized grunt watch, now only operates on changed files

2015-12-08 17:56:02 +01:00

compress.js

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

concat.js

fix(build): fixed build issues with concat not including require_config

2015-12-02 18:22:47 +01:00

connect.js

Fixed ngmin build issue introduced in route refactoring, Fixes #622

2014-07-29 08:13:23 +02:00

copy.js

dev building and optimized builds work

2015-09-10 12:42:24 +02:00

cssmin.js

dev building and optimized builds work

2015-09-10 12:42:24 +02:00

filerev.js

dev building and optimized builds work

2015-09-10 12:42:24 +02:00

git-describe.js

Modularize grunt tasks

2013-11-14 16:07:14 -07:00

htmlmin.js

fix(build): fixed build after change that made panels into proper plugins

2015-11-21 13:53:33 +01:00

jscs.js

fix(build): fixed build after change that made panels into proper plugins

2015-11-21 13:53:33 +01:00

jshint.js

fix(build): fixed build after change that made panels into proper plugins

2015-11-21 13:53:33 +01:00

karma.js

feat() started work on more feature rich time picker

2015-09-15 13:23:36 +02:00

less.js

tech(typescript): its looking good

2015-09-10 11:26:40 +02:00

meta.js

Modularize grunt tasks

2013-11-14 16:07:14 -07:00

ngAnnotate.js

fix(build): fixed issue with ngAnnotate not including files in core/*, fixes #2733

2015-09-14 09:33:26 +02:00

ngtemplates.js

feat(build): fixed build issues

2015-11-12 14:28:35 +01:00

phantomjs.js

Fix npm 3 build failure in phantomjs task

2015-10-31 05:36:35 +01:00

requirejs.js

fix(build): fixed build after change that made panels into proper plugins

2015-11-21 13:53:33 +01:00

tslint.js

refactor: refactoring app boot up and core structure

2015-09-14 22:54:00 +02:00

typescript.js

feat() started work on more feature rich time picker

2015-09-15 13:23:36 +02:00

uglify.js

tech(typescript): converted signup controller to typescript

2015-09-10 16:21:57 +02:00

usemin.js

dev building and optimized builds work

2015-09-10 12:42:24 +02:00

watch.js

feat(grunt watch): optimized grunt watch, now only operates on changed files

2015-12-08 17:56:02 +01:00