1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
onion/js/components/ascribe_uploader
Tim Daubenschütz 76cf9fd74d Merge branch 'AD-435-hash-locally-for-when-a-artist-do'
Conflicts:
	js/components/ascribe_forms/form_register_piece.js
	js/components/ascribe_slides_container/slides_container.js
	js/components/ascribe_uploader/file_drag_and_drop.js
	js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-07-29 09:35:14 +02:00
..
vendor Removed submodule react-s3 2015-06-23 10:16:53 +02:00
file_drag_and_drop_dialog.js only display hashing toggle on user permissions 2015-07-27 15:34:45 +02:00
file_drag_and_drop_preview_image.js implement feedback for hashing functionalitxy 2015-07-23 17:05:52 +02:00
file_drag_and_drop_preview_iterator.js add editable acl to react s3 fineuploader 2015-07-01 12:13:05 +02:00
file_drag_and_drop_preview_other.js add getLangText for reactfineuploader 2015-07-23 17:17:48 +02:00
file_drag_and_drop_preview.js add getLangText for reactfineuploader 2015-07-23 17:17:48 +02:00
file_drag_and_drop.js Merge branch 'AD-435-hash-locally-for-when-a-artist-do' 2015-07-29 09:35:14 +02:00
react_s3_fine_uploader.js Merge branch 'AD-435-hash-locally-for-when-a-artist-do' 2015-07-29 09:35:14 +02:00