1897 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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	0946ddc0b3	Minor fix	2015-11-20 14:00:10 +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
Tim Daubenschütz	0842f3c5bc	Merge pull request #31 from ascribe/AD-1347-Help-text-for-buttons-is-missing-transfe ... transfer added	2015-11-20 09:59:58 +01:00
Cevo	63a32d949a	transfer added	2015-11-19 19:47:33 +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
diminator	c1f1573f27	change impressum to imprint	2015-11-19 17:35:25 +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	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	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