Tim Daubenschütz f42f4a02f8 Merge remote-tracking branch 'origin/master' into AD-917-show-progress-when-uploading ... Resolve merge conflicts with master for easier PR. Conflicts: js/components/ascribe_uploader/react_s3_fine_uploader.js		2015-09-14 11:14:02 +02:00
..
vendor	update fineuploader	2015-09-04 16:39:57 +02:00
file_drag_and_drop_dialog.js	style progress bar	2015-09-09 15:15:54 +02:00
file_drag_and_drop_preview_image.js	remove react-progress-bar for react-bootstrap progressbar	2015-09-09 14:11:52 +02:00
file_drag_and_drop_preview_iterator.js	replace anonymous filter functions with util functions	2015-09-10 09:54:02 +02:00
file_drag_and_drop_preview_other.js	remove react-progress-bar for react-bootstrap progressbar	2015-09-09 14:11:52 +02:00
file_drag_and_drop_preview_progress.js	replace anonymous filter functions with util functions	2015-09-10 09:54:02 +02:00
file_drag_and_drop_preview.js	show overall progress	2015-09-04 14:54:39 +02:00
file_drag_and_drop.js	style progress bar	2015-09-09 15:15:54 +02:00
react_s3_fine_uploader_utils.js	replace anonymous filter functions with util functions	2015-09-10 09:54:02 +02:00
react_s3_fine_uploader.js	Merge remote-tracking branch 'origin/master' into AD-917-show-progress-when-uploading	2015-09-14 11:14:02 +02:00