Tim Daubenschütz
b2a3c9545b
minor corrections
2015-09-16 14:07:55 +02:00
Tim Daubenschütz
f16a012771
Merge remote-tracking branch 'origin/master' into AD-957-custom-upload-button-for-contract
...
Sync with master
Conflicts:
js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-09-16 13:45:24 +02:00
Tim Daubenschütz
17cb2223c2
finalize contract update button
2015-09-16 09:47:22 +02:00
Tim Daubenschütz
83b20e6472
First cut: Upload button for contract settings
2015-09-15 16:35:45 +02:00
Tim Daubenschütz
33ec380f4c
fix minor merge conflict error
2015-09-15 14:20:30 +02:00
Tim Daubenschütz
fbbbd1de89
Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract
...
Fix merge conflicts
Conflicts:
js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js
js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js
js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-09-15 13:47:36 +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
TimDaubenschuetz
e025de878b
Merged in AD-917-show-progress-when-uploading (pull request #54 )
...
Ad 917 show progress when uploading
2015-09-15 13:15:52 +02:00
Tim Daubenschütz
6c8135d6ac
fix length of undefined bug in fineuploadeer
2015-09-15 13:13:58 +02:00
Tim Daubenschütz
c5ef3cacd5
add ContractSettingsUpdateButton boilerplate code
2015-09-15 11:50:23 +02:00
Tim Daubenschütz
c08f46bd69
separate FileDragAndDrop component
2015-09-15 11:13:17 +02:00
Tim Daubenschütz
8b1193f05b
implement template functionality for react fineuploader
2015-09-15 10:43:45 +02:00
Tim Daubenschütz
280f3bc73a
Add input filter for specific file extensions to react fineuploader
2015-09-15 10:15:56 +02:00
Tim Daubenschütz
24f0d84fbc
finalize contract settings layout
2015-09-14 17:38:26 +02:00
Tim Daubenschütz
209d141939
extend fileClassToUpload functionality and implement it in contract settings
2015-09-14 17:02:47 +02:00
Tim Daubenschütz
d47ead1bff
add fileclassToUpload to react fineuploader
2015-09-14 16:33:32 +02:00
Tim Daubenschütz
6c713714ec
make contract creation implicit
2015-09-14 16:15:01 +02:00
Tim Daubenschütz
73c2a7c544
rename fineuploader's submitKey method to submitFile
2015-09-14 14:46:03 +02:00
Tim Daubenschütz
f78dbf9e1a
Merge remote-tracking branch 'origin/master' into AD-887-list-contracts-in-settings
...
Conflicts:
js/components/ascribe_forms/property.js
2015-09-14 14:23:36 +02:00
Tim Daubenschütz
e087e9f332
PR Feedback: Provide source for types, change function validation, fix bool statement in Property.js
2015-09-14 11:36:24 +02:00
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
diminator
6013303bd6
Merge remote-tracking branch 'remotes/origin/master' into AD-456-ikonotv-branded-page-for-registra
...
Conflicts:
js/components/ascribe_buttons/button_submit_close.js
js/components/ascribe_forms/form_loan.js
js/components/ascribe_forms/form_register_piece.js
sass/ascribe_media_player.scss
sass/main.scss
2015-09-10 17:45:51 +02:00
Tim Daubenschütz
82b9b68338
Merge branch 'master' of bitbucket.org:ascribe/onion
2015-09-10 16:14:02 +02:00
Tim Daubenschütz
1d184973f4
reset method for react s3 fineuploader
2015-09-10 11:22:42 +02:00
Tim Daubenschütz
b4756be60a
replace anonymous filter functions with util functions
2015-09-10 09:54:02 +02:00
Tim Daubenschütz
1fabea93ff
refactor file size calculation
2015-09-10 09:30:04 +02:00
Tim Daubenschütz
2ba27d3847
add documentation for exception
2015-09-09 17:21:55 +02:00
Tim Daubenschütz
384e0e3e6f
only show progress bar if files are greater than 10MB
2015-09-09 16:32:08 +02:00
Tim Daubenschütz
2cc4284118
minor cleanup
2015-09-09 16:22:20 +02:00
Tim Daubenschütz
8255c8dc6f
style progress bar
2015-09-09 15:15:54 +02:00
Tim Daubenschütz
801227cfee
remove react-progress-bar for react-bootstrap progressbar
2015-09-09 14:11:52 +02:00
Tim Daubenschütz
3197fad1b6
fix bug in progress method
2015-09-07 17:49:38 +02:00
Tim Daubenschütz
1c4bf9915c
refactor setState actions to fix overriding values bug
2015-09-07 12:02:01 +02:00
Tim Daubenschütz
bf6b5e00a6
update fineuploader
2015-09-04 16:39:57 +02:00
Tim Daubenschütz
bb6deb3f68
refactor setStatus method of fineuploader
2015-09-04 15:13:38 +02:00
Tim Daubenschütz
8e98a7bff7
show overall progress
2015-09-04 14:54:39 +02:00
Tim Daubenschütz
ac28ef4ee0
remove raven
2015-09-04 18:15:42 +02:00
Tim Daubenschütz
4374235c1b
use log global again
2015-09-03 17:55:15 +02:00
Tim Daubenschütz
3b61ac5c6a
remove mangle and fix bug in react-fineuploader
2015-09-04 17:31:58 +02:00
Tim Daubenschütz
a4a0e9d149
catch error in onComplete for fineuploader
2015-09-04 15:54:49 +02:00
Tim Daubenschütz
b4abe7a245
generic form submission determination for fineuploader
2015-09-01 14:42:09 +02:00
Tim Daubenschütz
96fdb598f7
change api endpoints to contractblobs
2015-08-31 17:29:43 +02:00
Tim Daubenschütz
90f89e4498
other loan contract to contract renaming
2015-08-31 11:05:33 +02:00
Tim Daubenschütz
18634ffe50
fix additional files button bug
2015-08-24 14:16:13 +02:00
Tim Daubenschütz
f54d7bb85c
fix validation method
2015-08-24 13:57:02 +02:00
Tim Daubenschütz
07ae8cc9bb
Merge branch 'AD-613-cyland-white-label-page' of bitbucket.org:ascribe/onion into AD-613-cyland-white-label-page
2015-08-24 13:13:08 +02:00
Tim Daubenschütz
c14ab4dcd4
fix fineuploader notification bug
2015-08-24 13:12:59 +02:00
diminator
b76c752966
Merge remote-tracking branch 'remotes/origin/master' into AD-661-due-1208-implement-jury-rating-an
...
Conflicts:
ownership/test/test_api.py
piece/models.py
2015-08-24 12:20:54 +02:00
Tim Daubenschütz
3b46dbb9f5
add upload busy function to fineuploader
2015-08-21 11:11:31 +02:00
Tim Daubenschütz
ad8be7e34a
separate pre-sending form submission functionality
2015-08-18 13:15:22 +02:00
