1607 Commits

Author	SHA1	Message	Date
Tim Daubenschütz	8fcb7fcb01	Fix render bug for personal piece note	2015-12-02 16:51:56 +01:00
Tim Daubenschütz	81f28a02f9	Merge branch 'master' into AD-1342-Public-piece-note-doesnt-render-correctly-def-data-null	2015-12-02 16:39:18 +01:00
Brett Sun	2381bd22ac	Change nested destructuring formatting	2015-12-02 16:05:21 +01:00
Brett Sun	07834414c7	Set default name for marketplace wallets to be 'Market' until the white label name loads	2015-12-02 14:26:15 +01:00
Brett Sun	916ec7aace	Rearrange handleDrop() to flow more naturally	2015-12-02 13:52:17 +01:00
Tim Daubenschütz	fe24a5e15a	Remove all occurrences of inactivity mgmt of ReactS3Fineuploader	2015-12-02 12:37:21 +01:00
Tim Daubenschütz	8b3060d613	Fix simple comments in pr	2015-12-02 12:25:11 +01:00
Tim Daubenschütz	85340a9126	Fix bug that threw an error when passing nullish prop to PieceListFilterDisplay	2015-12-02 12:23:38 +01:00
Tim Daubenschütz	4fe10bb887	Cosmetic changes for EditionContainer & PieceContainer	2015-11-30 18:26:27 +01:00
Tim Daubenschütz	0b2bc1c57b	Introduce ReactError mixin for handling errors in React components	2015-11-30 18:23:03 +01:00
Tim Daubenschütz	5a6c827f0b	Merge branch 'master' into AD-1177-display-404-on-pieces-and-editio ... Conflicts: js/components/ascribe_detail/edition_container.js js/components/ascribe_detail/piece_container.js	2015-11-30 15:00:39 +01:00
Tim Daubenschütz	2b6c9777e9	Display actions only if ACLs are available	2015-11-30 13:20:05 +01:00
Tim Daubenschütz	6500af121a	Merge pull request #36 from ascribe/AD-706-close-expandable-navigation-after-click ... Bug fix for collapsing nav	2015-11-30 11:59:47 +01:00
Brett Sun	b4ddec3427	Merge with AD-1443	2015-11-30 11:46:57 +01:00
Brett Sun	3aab73379a	Merge with master	2015-11-30 11:43:33 +01:00
Brett Sun	ea52c54e3a	Fix check for determining if a piece's edition list is open	2015-11-30 11:27:15 +01:00
Brett Sun	539c34db48	Fix typo for getDefaultProps() in consign form	2015-11-30 11:19:59 +01:00
Brett Sun	0c02c033e5	Fix consign form when labels aren't give as props	2015-11-27 23:53:54 +01:00
Dimitri De Jonghe	a21e450a93	Merge pull request #39 from ascribe/AD-1403-api-webhooks ... webhooks in settings page	2015-11-27 18:04:41 +01:00
diminator	d03d1355ff	copy for webhooks	2015-11-27 18:02:25 +01:00
Brett Sun	5137fa01a9	Add note for navBar state hack	2015-11-27 14:13:30 +01:00
Tim Daubenschütz	7146f00c05	Refactor webhooks: add source, clear state on create hide create on no items left	2015-11-27 13:36:42 +01:00
diminator	1c25f8e776	webhooks in settings without acl	2015-11-27 03:24:37 +01:00
Cevo	e482caaa99	public note is visible outside	2015-11-25 21:43:15 +01:00
Tim Daubenschütz	88d1edd45c	Add pageExitWarning for SlidesContainer	2015-11-25 15:01:23 +01:00
Tim Daubenschütz	64030473cd	Merge pull request #33 from ascribe/AD-1270-piece-detail-hangs-on-empty-piece-title ... Check for piece and edition validity by using their ids instead of titles	2015-11-25 11:25:42 +01:00
Tim Daubenschütz	5423f5dcd7	Bug fix for collapsing nav	2015-11-25 11:16:09 +01:00
Tim Daubenschütz	7d4d61e2e6	Restyle progress bar and fix bug in fileSelector	2015-11-25 10:54:29 +01:00
Brett Sun	c270977eb9	Fix default filter on piece list	2015-11-24 19:26:45 +01:00
Brett Sun	e228a4bf15	Dynamically get marketplace name for submit button	2015-11-24 18:18:49 +01:00
Brett Sun	2e03ab584a	Fix api endpoints	2015-11-24 18:17:38 +01:00
Brett Sun	a72fea5db4	Add 23vivi routes	2015-11-24 12:08:37 +01:00
Brett Sun	ee61369d46	Update market api endpoints	2015-11-24 12:04:18 +01:00
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
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	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	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	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