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

..

angular

tech(lib upgrade): updated angularjs to 1.4.3

2015-08-08 12:31:37 +02:00

angular-bindonce

Moved angular-bindonce to bower

2015-06-13 22:20:39 +02:00

angular-mocks

tech(lib upgrade): updated angularjs to 1.4.3

2015-08-08 12:31:37 +02:00

angular-native-dragdrop

Removed unnecessary components.

2015-11-01 09:48:27 -08:00

angular-other

feat(timepickerv2): big progress on new design of new timepicker, #2761

2015-09-17 22:44:59 +02:00

angular-route

tech(lib upgrade): updated angularjs to 1.4.3

2015-08-08 12:31:37 +02:00

angular-sanitize

tech(lib upgrade): updated angularjs to 1.4.3

2015-08-08 12:31:37 +02:00

angular-ui

feat(timepicker2): more progress

2015-09-18 10:36:47 +02:00

bootstrap

fix(type ahead): fixed highlight, and made the highlight more distinct, also rolled back #2436 due to its issues on linux and windows, fixes #2527

2015-08-18 10:09:12 +02:00

css

feat(timepickerv2): big progress on new design of new timepicker, #2761

2015-09-17 22:44:59 +02:00

flot

Cleaned up jquery.flot.events.js

2015-12-07 20:16:52 +01:00

jquery

Migrating to use bower for component dependencies

2015-06-13 20:53:08 +02:00

requirejs

tech(lib upgrade): updated angularjs to 1.4.3

2015-08-08 12:31:37 +02:00

requirejs-text

Moved requirejs to bower, #677

2015-06-13 23:01:54 +02:00

tagsinput

Began work on dashboard: editable flag, that actually stops users from changing anything, #1834

2015-04-23 15:26:48 +02:00

crypto.min.js

Renamed src directory to public

2015-03-29 12:57:28 +02:00

filesaver.js

Renamed src directory to public

2015-03-29 12:57:28 +02:00

license.json

Renamed src directory to public

2015-03-29 12:57:28 +02:00

lodash.js

Renamed src directory to public

2015-03-29 12:57:28 +02:00

modernizr-2.6.1.js

Renamed src directory to public

2015-03-29 12:57:28 +02:00

moment.js

Renamed src directory to public

2015-03-29 12:57:28 +02:00

showdown.js

Merge branch 'master' into external-plugins

2015-12-02 18:30:48 +01:00

spectrum.js

Upgraded to JQuery 2.1.1 -> 2.1.3, and spectrum.js, Fixes #1932

2015-05-04 14:36:46 +02:00

zero_clipboard.js

refactoring: move moving stuff around

2015-10-30 15:04:27 +01:00

zero_clipboard.swf

refactoring: move moving stuff around

2015-10-30 15:04:27 +01:00