1764 Commits

Author	SHA1	Message	Date
Brett Sun	f7b55e56a9	Split Lumenus into a generic market wallet for 23vivi	2015-11-24 12:04:08 +01:00
Brett Sun	efdc5d32e7	Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark	2015-11-24 10:42:15 +01:00
Tim Daubenschütz	e4cafd4bc3	Fix bug in FB button component & simplify injectHead util	2015-11-23 19:02:28 +01:00
Tim Daubenschütz	809ca6f40a	Restructure thumbnail creation functionality ... - Add function in Property and Form for creating refs - Change `handleSelectFiles` to `handleChangedFile` - Add `setThumbnailForFile` method to `ReactS3Fineuploader`	2015-11-23 17:59:20 +01:00
Tim Daubenschütz	59244f208a	Fix detachment of DOM <-> browser state	2015-11-23 13:59:07 +01:00
Tim Daubenschütz	56d8268ceb	Add remove button for thumbnail creation dialog	2015-11-23 12:31:53 +01:00
Brett Sun	5e45c10baa	Check for piece and edition validity by using their ids instead of titles ... Also removed a few unnecessary location props.	2015-11-23 10:46:20 +01:00
Brett Sun	6649b7d7f1	Implement pause and resume functionality to global notifications ... Also part of this change: * Handle the notification cooldown periods using status changes rather than emptying the queue * Refactor how notifications are rendered	2015-11-21 19:23:20 +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	62d7a5863a	Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form	2015-11-20 16:20:24 +01:00
Tim Daubenschütz	bccfc0906f	Revert super funny-"Important minor fix" ... We better want this not to go live This reverts commit b77fefb55c. Conflicts: js/constants/application_constants.js	2015-11-20 16:17:08 +01:00
Tim Daubenschütz	efcc24ab96	Make overall upload progress percentage more visible	2015-11-20 15:24:14 +01:00
Tim Daubenschütz	465bed94a2	Use overallProgress bar all the time	2015-11-20 15:14:25 +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	e4479dc95b	qMerge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form	2015-11-20 14:00:36 +01:00
Tim Daubenschütz	0946ddc0b3	Minor fix	2015-11-20 14:00:10 +01:00
Tim Daubenschütz	f4f89bba43	Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form	2015-11-20 13:53:03 +01:00
Cevo	dc96e908eb	piece note hidden from non-owner	2015-11-20 11:47:41 +01:00
Cevo	c0e0354ce8	fixing the public note bug	2015-11-20 11:11:03 +01:00
Tim Daubenschütz	3a234e42ec	Merge branch 'master' of github.com:ascribe/onion	2015-11-20 10:21:35 +01:00
Tim Daubenschütz	b77fefb55c	Important minor fix	2015-11-20 10:21:21 +01:00
Cevo	63a32d949a	transfer added	2015-11-19 19:47:33 +01:00
Tim Daubenschütz	c0f5351645	Fix badly indentation	2015-11-19 18:09:42 +01:00
Tim Daubenschütz	24f5d4de2b	Merge branch 'master' of github.com:ascribe/onion	2015-11-19 17:51:27 +01:00
Tim Daubenschütz	446ed311ea	Fix upload/hashing button in FileDragAndDropDialog	2015-11-19 17:51:17 +01:00
Tim Daubenschütz	1318bf5413	Fix indentation fail	2015-11-19 17:36:47 +01:00
diminator	c1f1573f27	change impressum to imprint	2015-11-19 17:35:25 +01:00
Tim Daubenschütz	2aab5d2d0d	Fix bug in RegisterPieceForm when defining no editions	2015-11-19 16:16:25 +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	399f670bed	Add variety of supported file formats & fix bug when parsing mime type	2015-11-18 17:55:27 +01:00
Tim Daubenschütz	43c6ee929b	Remove PropertyCollapsible	2015-11-18 16:32:07 +01:00
Tim Daubenschütz	25372a3edf	Include PropertyCollapsible's functionality into Property	2015-11-18 16:31:37 +01:00
Tim Daubenschütz	6d828ac959	Remove hidden prop from Property	2015-11-17 16:14:20 +01:00
Tim Daubenschütz	1ac2fe7f96	Remove all occurences of 'hidden' prop usage for Property	2015-11-17 15:52:40 +01:00
Tim Daubenschütz	971d42b36d	Add file-format-specific call to action for thumbnail generation	2015-11-17 15:46:46 +01:00
Tim Daubenschütz	60bf4b12f5	Merge pull request #29 from ascribe/AD-1281-if-contract-was-appended-to-loan ... Add contract link to loan history	2015-11-17 14:58:09 +01:00
Tim Daubenschütz	2ffc26d703	Use destructuring for ReactS3Fineuploader props	2015-11-17 13:37:01 +01:00
Tim Daubenschütz	a8ccf13f91	Remove uploadStarted prop from ReactS3Fineuploader as it was replaced with setIsUploadReady	2015-11-17 12:03:22 +01:00
Tim Daubenschütz	16840a6136	Generalize InputFineuploader's submitFileName method to submitFile	2015-11-17 11:57:18 +01:00
Tim Daubenschütz	14621b5b38	Generalize UploadButton styling	2015-11-17 11:22:24 +01:00
Tim Daubenschütz	4f0c0fe65a	Add static version of thumbnail uploader in register piece form	2015-11-17 10:38:10 +01:00
Tim Daubenschütz	efde22270c	Add error nullification in sources	2015-11-16 17:44:56 +01:00
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	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	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	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	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	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	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	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
Brett Sun	af58687572	Add twitter text	2015-11-10 19:33:08 +01:00
Brett Sun	e85747144a	Add Lumenus landing page	2015-11-10 18:49:08 +01:00
Brett Sun	84e8e4612f	Autofocus message field in consignment form and use custom labels ... For now, we’ll let the artist specify their suggested price in the consignment form’s message field.	2015-11-10 18:24:46 +01:00
Tim Daubenschütz	ea321a4a77	Finalize submission flow with validation and thumbnail creation	2015-11-10 17:35:57 +01:00
Tim Daubenschütz	447ccabf45	Delete UploadFileButton as logic can also be handled in InputFineuploader	2015-11-10 15:52:21 +01:00
Tim Daubenschütz	aec850a905	Improve validation for non-HTML5 inputs	2015-11-10 15:51:24 +01:00
Tim Daubenschütz	62eb78ae76	Add naive & manual validation to Form	2015-11-10 13:40:34 +01:00
Brett Sun	3cfa65cb82	Change instances of "Share" to be "Email"	2015-11-10 11:53:05 +01:00
Brett Sun	2dba4d5156	Use display:none for CollapsibleButton's hidden panel ... Using visibility:invisible is awkward due to the spacing it leaves when the panel is invisible. The CollapsibleParagraph behaves similarly, leaving no spacing behind when the paragraph is collapsed.	2015-11-10 10:32:08 +01:00
Brett Sun	a9f0a46fbd	Move social share buttons to left of download button to accommodate for embed button	2015-11-10 10:29:37 +01:00
Tim Daubenschütz	be7fa0c6eb	Add conditional redirect after successful registration	2015-11-10 10:15:38 +01:00
Brett Sun	61cd316a86	Merge branch 'AD-1255-refactor-aclbuttons-form-creatio' into AD-1309-change-share-to-email	2015-11-09 20:08:11 +01:00
Brett Sun	8dc0470007	Add Twitter button	2015-11-09 19:01:27 +01:00
Tim Daubenschütz	31d9b85ddd	Merge pull request #19 from ascribe/Remove-deadcode-fineuploader.min.js ... Remove s3.fine-uploader.min.js as we're using s3.fine-uploader.js for shiming anyways	2015-11-09 17:55:35 +01:00
Tim Daubenschütz	9ae6b10add	Finalizing basic submission flow with lazy evaluated form	2015-11-09 17:52:09 +01:00
Brett Sun	d972da935a	Add Facebook Share button	2015-11-09 17:46:49 +01:00
Tim Daubenschütz	deceb61c60	Implement lazy blob creation routine and increase robustness of upload button template for react-fineuploader	2015-11-09 16:58:35 +01:00
Brett Sun	7c73b7fac7	Refactor InjectInHeadMixin to be a util class instead	2015-11-09 14:32:14 +01:00
Tim Daubenschütz	3e22ad1d9d	Finalize layouting submission form	2015-11-09 10:35:23 +01:00
Tim Daubenschütz	7721d62319	Create boilerplate code for portfolioreview	2015-11-06 16:52:08 +01:00
Brett Sun	b100fdd80a	Change default collection filter for lumens admin	2015-11-06 16:13:47 +01:00
Tim Daubenschütz	b78bc66fe9	Fix minor bugs for simple_prize app	2015-11-06 15:47:55 +01:00
Brett Sun	f92fa972bf	Merge with AD-1255	2015-11-06 15:26:37 +01:00
Tim Daubenschütz	f5a5e045a6	Finalize boilerplate for portfolioreview subdomain	2015-11-06 15:18:46 +01:00
Tim Daubenschütz	5adc34faeb	Move and rename sluice prize app to 'simple_prize'	2015-11-06 15:18:36 +01:00
Brett Sun	56eff0d9ed	Improve DRYness of acl buttons ... The React dev tools don’t seem to be able to automatically pick up the displayName when using createClass from within another function, so it’s added here to give clarity when debugging.	2015-11-06 15:10:29 +01:00
Brett Sun	318a0bf4b2	Filter the collection to only show the consignable items by default	2015-11-06 14:10:54 +01:00
Brett Sun	799ccb9b8d	Show unconsign button	2015-11-06 14:01:26 +01:00
Brett Sun	fb62d2d2e0	Check for completion of additional data on front end ... In the end, it made more sense to check if all the additional details have been filled in on the front end than receiving an acl or flag from the backend.	2015-11-06 14:00:58 +01:00
Brett Sun	04e453b28c	Fix lumenus edition endpoint	2015-11-05 16:05:20 +01:00
Brett Sun	6223248ea0	Fix lumenus whitelabel api endpoints	2015-11-05 13:51:40 +01:00
Brett Sun	4ca8ca8feb	Show AdditionalDetailsModal from SubmitButton when details need to be filled in	2015-11-05 11:58:32 +01:00
Brett Sun	adf0d411d6	Fetch piece data in AdditionalDetailForm ... Although this moves state further down the hierarchy, it allows the AdditionalDataForm to be used more easily. Parent components would otherwise have to have the piece prop carried down through multiple levels or create a makeshift object.	2015-11-05 11:56:17 +01:00
Tim Daubenschütz	8892ac4225	Add additional fields to step two of cyland's loan process	2015-11-05 11:56:09 +01:00
Brett Sun	3fb4ae55bf	Merge with AD-1290	2015-11-04 14:04:16 +01:00
Brett Sun	2711c4ddb9	Move onChange() to after componentWillUnmount() for ESLint	2015-11-04 13:57:15 +01:00
Brett Sun	543605aae3	Move store resets to componentDidMount()	2015-11-04 13:56:43 +01:00
Tim Daubenschütz	c17685731a	Fix invalidateCache functionality	2015-11-04 11:36:42 +01:00
Brett Sun	85eb45b5cd	Add small changes for previous merges that were missed	2015-11-04 00:41:12 +01:00
Tim Daubenschütz	9a54ebdbd7	Merge pull request #15 from ascribe/AD-1256-refactor-modalwrapper-to-not-be- ... Refactor ModalWrapper to not require a trigger component	2015-11-03 17:21:11 +01:00
Brett Sun	3929712e9d	Prune unnecessary divs from some components	2015-11-03 12:10:43 +01:00
Brett Sun	54212627bb	Change lumens buttons for AD-1264 changes	2015-11-03 12:10:21 +01:00
Brett Sun	cd6673f255	Merge with AD-1264	2015-11-03 11:34:48 +01:00
Brett Sun	581549870f	Merge with AD-1256	2015-11-03 11:13:44 +01:00
Brett Sun	f7259a8ab3	Merge with AD-1255	2015-11-03 11:13:32 +01:00
Brett Sun	f2555aefcc	Add email prop to loan and consign button	2015-11-03 11:12:04 +01:00
Tim Daubenschütz	c6f6bb398d	Replace all occurrences of with momentjs	2015-11-03 10:57:41 +01:00
Brett Sun	3a8f91e29e	Change required prop for AD1251 changes	2015-11-03 10:49:06 +01:00
Brett Sun	68c1dd9407	Merge with AD1251	2015-11-03 10:48:28 +01:00
Brett Sun	d2529bf015	Merge with master	2015-11-03 10:39:01 +01:00
Tim Daubenschütz	4d526a5568	Merge pull request #11 from ascribe/AD-1251-refactor-inputtextareatoggables- ... Refactor InputTextAreaToggable's required property to take a bool instead of a string	2015-11-03 10:25:46 +01:00
Tim Daubenschütz	cd4157df32	Remove s3.fine-uploader.min.js as we're using s3.fine-uploader.js for shiming anyways	2015-11-03 10:21:43 +01:00
Tim Daubenschütz	ecdcbbc25e	Fix minor issue	2015-11-03 10:09:44 +01:00
Tim Daubenschütz	35e9bedf04	Convert WhitelabelFetcher to WhitelabelSource	2015-11-03 10:07:44 +01:00
Tim Daubenschütz	6a0c4b4272	Remove user_fetcher.js	2015-11-03 09:52:54 +01:00
Brett Sun	cb6e94c8f1	Forgot to use our own omit instead of lodash's	2015-11-02 18:57:56 +01:00
Brett Sun	0b4cc3123d	Remove lodash dependency	2015-11-02 18:45:06 +01:00
Brett Sun	05e3069240	Add propTypes to acl buttons	2015-11-02 18:44:09 +01:00
Brett Sun	e890cf5bb1	Cherry pick changes to excludePropFromObject()	2015-11-02 18:37:27 +01:00
Brett Sun	1a3dffe8bc	Modify excludePropFromObject to be similar to lodash.omit()	2015-11-02 18:31:01 +01:00
Brett Sun	955e20d6b6	Reduce dependency footprint of new includes ... Opted for decamelize instead of snake-case as it’s much smaller and we don’t need the extra functionality of snake-case.	2015-11-02 18:29:06 +01:00
Brett Sun	fe4e337690	Use Object.assign() instead of writing own merge function	2015-11-02 18:27:45 +01:00
Tim Daubenschütz	f0325f2473	Specify and applying naming conventions 📃 for source and store methods	2015-11-02 16:32:55 +01:00