Commit Graph

45 Commits

Author SHA1 Message Date
Brett Sun a4292f09c3 Merge with master 2016-02-05 17:06:16 +01:00
Brett Sun 215cc3b841 Move file name to under file upload preview for smaller screens 2016-01-27 11:33:45 +01:00
Brett Sun 627b2f75fe Extract extension using file name rather that mime type for uploader preview
Also adds ellipsis overflow to the extension name to prevent long
extensions from resizing the preview element and removes redundant
`.file-drag-and-drop-preview-table-wrapper` class
2016-01-26 13:41:15 +01:00
Brett Sun 5b7a5de332 Merge with master 2016-01-19 17:02:04 +01:00
Brett Sun eda479a51c Change header to be just logo in print 2015-12-23 09:36:08 +01:00
Brett Sun ebd575caa3 Add prop to hide label of UploadButton 2015-12-21 11:46:46 +01:00
Brett Sun 17a3ecbd44 Add thin cross icon to FileDragAndDropError 2015-12-08 20:48:39 +01:00
Brett Sun e0b35e0a24 Merge with master 2015-12-08 20:55:13 +01:00
Brett Sun 79780cfb3a Add FileDragAndDropError 2015-12-08 18:22:11 +01:00
Tim Daubenschütz 7d4d61e2e6 Restyle progress bar and fix bug in fileSelector 2015-11-25 10:54:29 +01:00
Tim Daubenschütz 56d8268ceb Add remove button for thumbnail creation dialog 2015-11-23 12:31:53 +01:00
Tim Daubenschütz e134db8915 minor layouting optimizations 2015-11-23 11:05:02 +01:00
Tim Daubenschütz 943d62dd8c Fix vertical centering of FileDragAndDrop previews and replace glyphicon checkmark 2015-11-20 17:59:26 +01:00
Tim Daubenschütz efcc24ab96 Make overall upload progress percentage more visible 2015-11-20 15:24:14 +01:00
Tim Daubenschütz 96ad05cef4 Unknot (and maybe reknot) layouting for FileDragAndDrop 2015-11-20 15:02:39 +01:00
Tim Daubenschütz 1cf8ac2f31 Various small changes for FileDragAndDrop
Changed:
  - If only one file submitted: hide file-specific progress bar + filename extension
  - Fix bug for when uploaded file is deleteable (avoid error)
  - Add checkmark for when file was actually submitted
2015-11-20 14:30:24 +01:00
Tim Daubenschütz 6d08540d8b Sync thumbnail uploader to digitalWork uploader in RegisterPieceForm 2015-11-19 11:45:29 +01:00
Tim Daubenschütz 2dcd375850 Add functionality for displaying file name upon uploading single file 2015-11-19 10:43:40 +01:00
Tim Daubenschütz 1a67cd66f5 Add labeling functionality to UploadButton 2015-11-12 13:08:23 +01:00
Tim Daubenschütz 61cb4c87a9 Replace ascribe-green-color with new ascribe-blue-color 2015-10-21 11:34:12 +02:00
diminator 317d2611ba spinners part2
scrollbar

uploader styles

property blur
2015-10-14 16:17:10 +02:00
Tim Daubenschütz 6a5b66bda5 fix alignment of download button and file type in fineuploader 2015-09-28 17:25:45 +02:00
Tim Daubenschütz 40777cfeae Center dialog text for hashing files in file_drag_and_drop 2015-09-28 10:07:17 +02:00
Tim Daubenschütz 83b20e6472 First cut: Upload button for contract settings 2015-09-15 16:35:45 +02:00
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
Tim Daubenschütz 8255c8dc6f style progress bar 2015-09-09 15:15:54 +02:00
Tim Daubenschütz 8e98a7bff7 show overall progress 2015-09-04 14:54:39 +02:00
vrde 99af814492 Lint scss 2015-08-31 19:04:47 +02:00
Tim Daubenschütz 0cf63fa6c8 fix synchronization of files of fineuploader 2015-08-11 11:39:58 +02:00
Tim Daubenschütz 2274efaed7 implement hashing toggle 2015-07-27 14:21:26 +02:00
Tim Daubenschütz 38751ae612 add user interface feedback 2015-07-24 15:13:20 +02:00
Tim Daubenschütz 75590dbb34 fix position of spinner in fine uploader 2015-07-10 14:34:14 +02:00
Tim Daubenschütz c945fc315b various visual changes 2015-07-08 14:37:20 +02:00
Tim Daubenschütz c1e50cbe78 visual edits to fineuploader 2015-07-08 10:03:06 +02:00
Tim Daubenschütz 22629ac09d adjust register piece form 2015-07-07 18:07:12 +02:00
Tim Daubenschütz 1db9921dd8 use safe urls for thumbnails and links 2015-07-01 10:00:53 +02:00
Tim Daubenschütz 2a5bd9173e fix image scaling 2015-06-30 16:53:22 +02:00
Tim Daubenschütz 52db729a4d readd delete functionality 2015-06-29 17:59:35 +02:00
Tim Daubenschütz e44ae60b75 first cut pause 2015-06-29 16:46:12 +02:00
Tim Daubenschütz dcb3e00e3a styling for mobile 2015-06-29 14:36:55 +02:00
Tim Daubenschütz 867ebec134 fix styling for fineuploader 2015-06-29 13:41:37 +02:00
Tim Daubenschütz 08f574a42b finish delete functionality 2015-06-25 14:15:02 +02:00
Tim Daubenschütz b7e933c943 add delete buttons 2015-06-25 13:28:49 +02:00
Tim Daubenschütz 845f8c9cd3 fix issues related to multiple files upload 2015-06-25 11:12:40 +02:00
ddejongh c8cb456709 Removed submodule react-s3 2015-06-23 10:16:53 +02:00