ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 09:35:10 +01:00
Code Issues Releases Wiki Activity
4c2cc61592
onion/js/components/ascribe_uploader
History
Tim Daubenschütz ab1cab2091 Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra 
Clear some merge conflicts and also some wrong merges.

BAD GIT!!!

Conflicts:
	js/components/ascribe_forms/property.js
	js/components/ascribe_uploader/react_s3_fine_uploader_utils.js
	sass/ascribe_uploader.scss
2015-09-15 13:30:24 +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 Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra 2015-09-15 13:30:24 +02:00
react_s3_fine_uploader.js Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra 2015-09-15 13:30:24 +02:00