Tim Daubenschütz 8f9c699b69 Merge branch 'master' into AD-716-aclbutton-doesnt-respect-modals-r ...

Conflicts:
	js/components/ascribe_buttons/submit_to_prize_button.js
	js/components/ascribe_forms/form.js
	js/components/ascribe_forms/form_loan.js

2015-08-07 14:10:05 +02:00

..

alert_mixin.js

add es6lint to build process and fix most (not really) errors and warnings

2015-06-05 11:06:36 +02:00

form_mixin.js

add functionality for submit to prize button and fix delete button

2015-07-14 23:53:49 +02:00

inject_in_head_mixin.js

replace es6-promise with Q

2015-07-24 13:44:28 +02:00