ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Code Issues Releases Wiki Activity
2,484 Commits 115 Branches 0 Tags 13 MiB
91f9e83e81
Commit Graph

233 Commits

Author SHA1 Message Date
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
Tim Daubenschütz
0cf63fa6c8 fix synchronization of files of fineuploader 2015-08-11 11:39:58 +02:00
Tim Daubenschütz
58c0ce4c3f fix wording for multiple uploads 2015-08-11 10:03:12 +02:00
Tim Daubenschütz
ae8bc674d2 add logging for complete as well 2015-08-03 18:50:14 +02:00
Tim Daubenschütz
92d699a831 add chunk logging 2015-08-03 18:35:56 +02:00
Tim Daubenschütz
30d84af7fb add more logs 2015-08-03 18:02:21 +02:00
Tim Daubenschütz
5d92716726 add logging in fineuploader 2015-08-03 11:45:44 +02:00
Tim Daubenschütz
6bf33f541a remove raven 2015-08-03 11:26:30 +02:00
Tim Daubenschütz
765969c5b3 log file list to sentry on error 2015-08-03 11:09:31 +02:00
Tim Daubenschütz
63b763dd25 remove onComplete call if there has been an error with fineuploader 2015-08-03 10:54:34 +02:00
Tim Daubenschütz
c9042a0934 delete password of user when submitting to sentry 2015-08-03 10:41:51 +02:00
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
TimDaubenschuetz
78049b448e Merged in AD-598-register-action-switches (pull request #14) 
Ad 598 register action switches
 2015-07-28 16:36:57 +02:00
Tim Daubenschütz
0f658b9a71 add error reason to fineuploader raven 2015-07-28 16:24:18 +02:00
diminator
3142e00ea5 Merge remote-tracking branch 'remotes/origin/master' into AD-435-hash-locally-for-when-a-artist-do 2015-07-28 12:13:40 +02:00
Tim Daubenschütz
21fc2cee28 convert cancel hashing action to anchor 2015-07-27 16:37:54 +02:00
Tim Daubenschütz
332366ec15 Integrate dropzone inactivity into user flow 2015-07-27 16:00:54 +02:00
Tim Daubenschütz
d52a89cd3e only display hashing toggle on user permissions 2015-07-27 15:34:45 +02:00
Tim Daubenschütz
2274efaed7 implement hashing toggle 2015-07-27 14:21:26 +02:00
Tim Daubenschütz
8f6b858f0a make form submittable after the files blob was successfully created 2015-07-27 09:33:31 +02:00
Tim Daubenschütz
5da577caca use standard promises instead of fineuploaders' 2015-07-27 09:28:50 +02:00
Tim Daubenschütz
d71111b6f1 fix wording for file drag and drop dialog 2015-07-27 09:23:01 +02:00
Tim Daubenschütz
d6968b40b5 Fix wording and add localization 2015-07-24 17:29:30 +02:00
Tim Daubenschütz
e53a45822b simplified error handling in progress routine 2015-07-24 16:29:57 +02:00
Tim Daubenschütz
a7a36589a7 Add abort hashing functionality 2015-07-24 16:17:27 +02:00
Tim Daubenschütz
38751ae612 add user interface feedback 2015-07-24 15:13:20 +02:00
Tim Daubenschütz
494ab209ca implement hashing progress functionality 2015-07-24 14:39:04 +02:00
Tim Daubenschütz
9dc811febb forgot one Q import 2015-07-24 13:49:16 +02:00
Tim Daubenschütz
a199fd08c1 replace es6-promise with Q 2015-07-24 13:44:28 +02:00
diminator
861f633476 concurrent upload of chunks 
fixed spool tests for bitcoin and blobs
 2015-07-23 18:14:17 +02:00
Tim Daubenschütz
01b34ec1fb add getLangText for reactfineuploader 2015-07-23 17:17:48 +02:00
Tim Daubenschütz
2f24ad8352 implement feedback for hashing functionalitxy 2015-07-23 17:05:52 +02:00
Tim Daubenschütz
4ec8f6b718 add file hashing functionality to react fine uploader 2015-07-23 16:47:32 +02:00
Tim Daubenschütz
80861813e9 documente and implement routine in react fine uploader 2015-07-23 15:57:25 +02:00
Tim Daubenschütz
71fcdff874 made react fine uploader error message more generic 2015-07-23 15:27:14 +02:00
diminator
0cc48a73e4 moved hashing to file_utils 2015-07-23 13:03:30 +02:00
diminator
1a1f14e04c add JS file hashing to fineuploader 
didnt instantiate it because needs UX
 2015-07-23 11:45:25 +02:00
Tim Daubenschütz
23e6cc17b2 make dropzone inactive when user is logged out 2015-07-21 11:09:21 +02:00
diminator
11fb512763 s3 urls anonymous and refactored 
zencoder with multiple thumbnail sizes
 2015-07-20 18:59:32 +02:00
Tim Daubenschütz
2ff47ede89 replace console logs with global logging 2015-07-17 15:52:53 +02:00
Tim Daubenschütz
af42bb8e67 error handling first cut 2015-07-17 15:41:09 +02:00
Tim Daubenschütz
13e151e83b add logging and responsive user navigation 2015-07-16 19:12:18 +02:00
Tim Daubenschütz
ee6d2789ed set csrftokens as constants 2015-07-16 18:17:45 +02:00
Tim Daubenschütz
cbfbde262f fix fineuploader bug when clicking the add files button in a form 2015-07-15 16:50:32 +02:00
Tim Daubenschütz
6a04a1a053 fix fineuploader issue after unmounting react-s3-fineuploader 2015-07-14 20:10:41 +02:00
Tim Daubenschütz
27c4e588ef fix minification bug 2015-07-14 10:52:44 +02:00
Tim Daubenschütz
acbfd8c840 remove wrong imports from fineuploader 2015-07-14 10:39:36 +02:00
Tim Daubenschütz
8fc812e574 converting fineuploader promises 2015-07-14 10:36:37 +02:00
Tim Daubenschütz
bfb052f8c0 better error handling for fineuploader 2015-07-14 10:33:15 +02:00
Tim Daubenschütz
62ae8fd08b fix warnings 2015-07-10 14:15:22 +02:00
diminator
8f78de3fb4 editions styling 
fix otherdata
collapsible styling
 2015-07-09 18:46:53 +01:00
diminator
fd8859fd22 Merge remote-tracking branch 'remotes/origin/master' into AD-419-decouple-piece-registration-from- 
Conflicts:
	js/components/ascribe_detail/edition.js
 2015-07-09 14:54:11 +01:00
diminator
9fd4c1a6fd otherdata and extradata on a piece level and templated in frontend 2015-07-09 13:37:33 +01:00
Tim Daubenschütz
6d72352580 some minor corrections 2015-07-08 10:15:58 +02:00
Sylvain Bellemare
f066008ce9 translated english text to french 2015-07-08 09:57:50 +02:00
Tim Daubenschütz
22629ac09d adjust register piece form 2015-07-07 18:07:12 +02:00
diminator
fbba3f4670 staging with cors without uglify and lang error 2015-07-02 18:54:47 +02:00
diminator
a26e8f7813 test without cors 2015-07-02 18:40:54 +02:00
Tim Daubenschütz
dd039b88e8 fix contract fineuploader bugs 2015-07-02 17:57:33 +02:00
Tim Daubenschütz
29fdb1e0d7 fix csrf bug with fineuploaders props 2015-07-02 16:51:22 +02:00
Tim Daubenschütz
b5a5481285 add editable acl to react s3 fineuploader 2015-07-01 12:13:05 +02:00
Tim Daubenschütz
1db9921dd8 use safe urls for thumbnails and links 2015-07-01 10:00:53 +02:00
Tim Daubenschütz
929c694ad7 finalized delete functionality 2015-06-30 17:57:20 +02:00
diminator
c6528d8999 other_data : delete without cascade and show acl 2015-06-30 17:12:51 +02:00
Tim Daubenschütz
e6ac475ad5 add download functionality to s3 fine uploader 2015-06-30 16:15:50 +02:00
Tim Daubenschütz
9ce6c45690 add sessions for already uploaded files and implement manual deletion 2015-06-30 15:41:39 +02:00
Tim Daubenschütz
8c3dfc4b73 made download functionality optional 2015-06-30 13:53:02 +02:00
Tim Daubenschütz
ea47f7a371 add place holder for empty piece list 2015-06-30 13:32:41 +02:00
Tim Daubenschütz
1976dee57a fix firefox simulate click issue 2015-06-30 11:56:38 +02:00
Tim Daubenschütz
31e3c23302 rename upload status variable 2015-06-30 09:20:20 +02:00
Tim Daubenschütz
52db729a4d readd delete functionality 2015-06-29 17:59:35 +02:00
Tim Daubenschütz
f1d3b3968f Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-496-add-control-buttons-to-fineupload 2015-06-29 17:37:51 +02:00
Tim Daubenschütz
a66a4e1c9f add pause and play functionality 2015-06-29 17:37:14 +02:00
diminator
c6bc34c2f7 otherdata POST and fineuploader_session OK 2015-06-29 17:21:14 +02:00
Tim Daubenschütz
dbbf9fd233 debug 2015-06-29 16:57:31 +02:00
Tim Daubenschütz
e44ae60b75 first cut pause 2015-06-29 16:46:12 +02:00
Tim Daubenschütz
6c44333f1a add file drag and drop toolbar 2015-06-29 16:00:26 +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
a87f2eb272 refactor form validation 2015-06-29 11:44:16 +02:00
Tim Daubenschütz
1a9c82d683 finalize delete and cancel functionality 2015-06-29 11:01:45 +02:00
Tim Daubenschütz
66fff1c50a implement cancel functionality 2015-06-29 10:01:54 +02:00
diminator
5916c27c45 uploader defaultprops 2015-06-29 10:00:26 +02:00
Tim Daubenschütz
12da6c1426 add todo 2015-06-25 14:18:55 +02:00
Tim Daubenschütz
08f574a42b finish delete functionality 2015-06-25 14:15:02 +02:00
Tim Daubenschütz
ae17d2cb03 first cut: delete functionality 2015-06-25 13:46:10 +02:00
Tim Daubenschütz
b7e933c943 add delete buttons 2015-06-25 13:28:49 +02:00
Tim Daubenschütz
0ce56a0821 improve usability 2015-06-25 11:29:42 +02:00
Tim Daubenschütz
845f8c9cd3 fix issues related to multiple files upload 2015-06-25 11:12:40 +02:00
Tim Daubenschütz
b9f8be6636 remove console logs 2015-06-25 10:42:35 +02:00
Tim Daubenschütz
2f7bbd01b8 fix multiple attribute for fine uploader 2015-06-25 10:35:25 +02:00
Tim Daubenschütz
bf2a766e84 implement submission for autofill firefox and chrome 2015-06-24 15:52:43 +02:00
ddejongh
6dd3e582df fineuploader + register 2015-06-23 13:55:05 +02:00
ddejongh
c8cb456709 Removed submodule react-s3 2015-06-23 10:16:53 +02:00