Torkel Ödegaard 234d1291f9 Merge branch 'invite' ...

Conflicts:
	public/css/less/gfbox.less
	public/emails/reset_password.html
	public/emails/welcome_on_signup.html

2015-08-11 11:22:43 +02: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

tech(lib upgrade): updated angularjs to 1.4.3

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

angular-other

Moved angular-bindonce to bower

2015-06-13 22:20:39 +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(invite): more work on invite, basic creation works, added new tab directive from angular-ui and made new tab style, #2353

2015-07-17 09:51:34 +02:00

bootstrap

feat(invite): progress on invite feature, #2353

2015-08-10 13:47:06 +02:00

css

Renamed src directory to public

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

flot

Migrating to use bower for component dependencies

2015-06-13 20:53:08 +02: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

spectrum.js

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

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

ZeroClipboard.js

Renamed src directory to public

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

ZeroClipboard.swf

Renamed src directory to public

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