1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
onion/js/components/ascribe_uploader/ascribe_file_drag_and_drop
Tim Daubenschütz fad6caca63 Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
Conflicts:
	js/components/ascribe_detail/edition_container.js
	js/components/logout_container.js
2015-10-21 09:47:14 +02:00
..
file_drag_and_drop_dialog.js Merged in AD-727-missing-redirects-to-login-page (pull request #95) 2015-10-19 10:13:54 +02:00
file_drag_and_drop_preview_image.js spinners part2 2015-10-14 16:17:10 +02:00
file_drag_and_drop_preview_iterator.js Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract 2015-09-15 13:47:36 +02:00
file_drag_and_drop_preview_other.js spinners part2 2015-10-14 16:17:10 +02:00
file_drag_and_drop_preview_progress.js minor getLangText edition 2015-09-16 15:23:01 +02:00
file_drag_and_drop_preview.js minor corrections 2015-09-16 14:07:55 +02:00
file_drag_and_drop.js Merged in AD-947-fileuploader-button-does-not-work (pull request #100) 2015-10-19 14:53:02 +02:00