1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 17:33:14 +01:00
Commit Graph

2086 Commits

Author SHA1 Message Date
Tim Daubenschütz
e016ee7446 Merge pull request #12 from ascribe/AD-1242-Frontend-caching-using-local-storage
Implement functionality for feature-detecting webStorage
2015-11-16 17:37:29 +01:00
Tim Daubenschütz
6db353e1a9 Fix indentation 2015-11-16 17:18:24 +01:00
Tim Daubenschütz
f8c923daec Adjust naming for promise-based callback functions in sources 2015-11-16 17:16:13 +01:00
Tim Daubenschütz
5316c818b4 Merge pull request #25 from ascribe/AD-1309-change-share-to-email
Change Share button to Email
2015-11-16 17:01:30 +01:00
Tim Daubenschütz
ed3624198a Merge branch 'master' into AD-1309-change-share-to-email
Conflicts:
	js/components/ascribe_buttons/acls/acl_button.js
2015-11-16 16:55:33 +01:00
Tim Daubenschütz
9a706ebb7d Merge pull request #26 from ascribe/AD-56-add-social-share-functionality
Add social sharing for Facebook and Twitter
2015-11-16 16:52:06 +01:00
Tim Daubenschütz
ac07107210 Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark
Conflicts:
	js/constants/application_constants.js
	js/utils/requests.js
2015-11-16 16:38:35 +01:00
Tim Daubenschütz
9d0b4fcd6e Merge pull request #28 from ascribe/AD-1340-add-details-video-upload-errors
Add additional logging to video upload errors
2015-11-16 16:34:03 +01:00
Tim Daubenschütz
c100a3b307 Merge branch 'master' into AD-1340-add-details-video-upload-errors
Conflicts:
	js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-11-16 16:33:39 +01:00
Tim Daubenschütz
2570890df2 Merge pull request #27 from ascribe/AD-812-cannot-reupload-video-without-refresh
Clear previously selected files from input element when upload fails
2015-11-16 16:24:28 +01:00
Tim Daubenschütz
e42df2bb36 Merge branch 'master' into AD-812-cannot-reupload-video-without-refresh
Conflicts:
	js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-11-16 16:23:23 +01:00
Tim Daubenschütz
339421a4b7 Merge branch 'master' into AD-56-add-social-share-functionality
Conflicts:
	js/components/ascribe_detail/media_container.js
	js/components/ascribe_media/media_player.js
2015-11-16 15:54:49 +01:00
Tim Daubenschütz
76c6cd37a3 Merge pull request #18 from ascribe/AD-1264-refactor-reacts3fineuploader-to-
Refactor ReactS3FineUploader to be independent of react-router's location
2015-11-16 15:27:51 +01:00
Tim Daubenschütz
da73d40fd6 Merge branch 'master' into AD-1264-refactor-reacts3fineuploader-to-
Cleared all conflicts

Conflicts:
	js/components/ascribe_forms/form.js
	js/components/ascribe_forms/input_fineuploader.js
	js/components/ascribe_uploader/react_s3_fine_uploader.js
	js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
	js/utils/requests.js
2015-11-16 15:27:00 +01:00
Tim Daubenschütz
dd8fe34bb6 Define more strict props & re-change method name to componentWillUpdate again 2015-11-16 15:15:55 +01:00
Tim Daubenschütz
b35d6a1013 Merge pull request #22 from ascribe/AD-1298-for-cyland-add-extra-fields
Add additional fields to step two of cyland's loan process
2015-11-16 14:11:34 +01:00
Tim Daubenschütz
286dd114af Merge pull request #16 from ascribe/AD-1255-refactor-aclbuttons-form-creatio
Ad 1255 refactor aclbuttons form creatio
2015-11-16 13:50:13 +01:00
Tim Daubenschütz
a95dfe6439 Remove unused imports from AclButton 2015-11-16 13:49:40 +01:00
Tim Daubenschütz
357f63fa2b Add contract link to loan history 2015-11-16 11:45:56 +01:00
Tim Daubenschütz
893862886f Merge pull request #24 from ascribe/AD-1315-implement-submission-flow
Ad 1315 implement submission flow
2015-11-16 09:43:34 +01:00
Tim Daubenschütz
8188e5ca2f Merge branch 'master' into AD-1315-implement-submission-flow 2015-11-16 09:41:06 +01:00
Tim Daubenschütz
1c172fd887 Last minute editions for usability 2015-11-16 09:39:45 +01:00
Brett Sun
536ce12aac Remove duplicate sentry logging on errors 2015-11-13 17:33:01 +01:00
Brett Sun
1b4bf58129 Log additional details when chunk signing fails 2015-11-13 17:32:20 +01:00
Tim Daubenschütz
633ebc8fb9 Last minute edits 2015-11-13 17:07:21 +01:00
Tim Daubenschütz
5d7f6bf6ed Fix redirect on email submission 2015-11-13 16:51:31 +01:00
Brett Sun
8db531fb87 Add xhr details to sentry logging
FineUploader’s s3.XhrUploadHandler was also fixed to pass down the xhr
object when initiating a multipart upload fails.
2015-11-13 16:16:54 +01:00
Brett Sun
66a38314e3 Merge branch 'AD-812-cannot-reupload-video-without-refresh' into AD-1340-add-details-video-upload-errors 2015-11-13 16:07:46 +01:00
Brett Sun
eae22a2e04 Move logging of upload errors to be before cancellation of uploads
Although logging isn’t affected by the cancelation of uploads, it may
cause confusion for readers if the uploads are cancelled before the
error is logged.
2015-11-13 16:04:55 +01:00
Brett Sun
cef19f427c Add comment for content registration check 2015-11-13 16:02:34 +01:00
Brett Sun
00d93d912b Move 3rd party api urls to AppConstants 2015-11-13 13:33:27 +01:00
Brett Sun
09812a1881 Forgot to unlisten to UserStore when unmounting 2015-11-13 13:33:12 +01:00
Brett Sun
7bc5492236 Clear previously selected files from input element when ReactS3FineUploader fails 2015-11-13 12:20:52 +01:00
Brett Sun
4336190b5e Fix FineUploader to handle cancellations in the onError() callback
Calling cancel() in the onError() callback would cause an error as the
upload handler tries to clear the upload’s xhr requests after cancel
already clears them.
2015-11-13 12:10:51 +01:00
Tim Daubenschütz
c852eaf143 Merge pull request #17 from ascribe/AD-1259-All-dates-showing-up-as-2014
Replace Javascript's Date object with momentjs
2015-11-13 09:58:12 +01:00
Tim Daubenschütz
19bdf59f46 Include feedback from PR for destructuring props 2015-11-13 09:57:22 +01:00
Tim Daubenschütz
8b335cfb07 Include feedback from PR 2015-11-13 09:48:22 +01:00
Tim Daubenschütz
f5c76af6cb Complete list of supported image file formats on the web 2015-11-12 14:52:03 +01:00
Tim Daubenschütz
da09bd8649 Add link to ToS to submission form 2015-11-12 14:48:57 +01:00
Tim Daubenschütz
45d5821abb Refactor UploadButton to resemble HTML5 file chooser input 2015-11-12 14:18:08 +01:00
Tim Daubenschütz
d1b931715d Add spinner to submission for and make submittable on default with providing error messages 2015-11-12 13:21:10 +01:00
Tim Daubenschütz
1a67cd66f5 Add labeling functionality to UploadButton 2015-11-12 13:08:23 +01:00
Tim Daubenschütz
b6773549ee Add proper CI colors 2015-11-12 12:04:38 +01:00
Tim Daubenschütz
3be275aefd Add artist contact information 2015-11-12 11:51:33 +01:00
Tim Daubenschütz
5b594e9d82 left-align uploader buttons 2015-11-12 11:27:55 +01:00
Tim Daubenschütz
e6d839f6a0 Add proper validation for multiple uploaders in submission form 2015-11-12 10:46:08 +01:00
Tim Daubenschütz
62f19467b7 Changing behavior for ReactS3Fineuploader not having access to createBlobRoutine 2015-11-11 18:17:32 +01:00
Tim Daubenschütz
0438f461c2 Implement static feedback for submitted pieces 2015-11-11 16:27:50 +01:00
Tim Daubenschütz
66aef4886f Adjust MediaContainer and MediaPlayer to newly introduced manual-thumbnail functionality 2015-11-11 10:51:45 +01:00
Brett Sun
f3b0b4ffc1 Adjust info text for email 2015-11-10 19:35:42 +01:00