1653 Commits

Author	SHA1	Message	Date
Brett Sun	3be033cdd5	Add thumbnail placeholder for 23vivi	2015-12-02 19:31:50 +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
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	3d017392c1	Only use previous filterBy on refreshing edition lists if no filterBy argument was given ... Also fix the behaviour of refresh using the list’s current length rather than the previous page size.	2015-11-30 11:32:48 +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
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
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
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	47f56b5505	Add 23vivi to app costs	2015-11-24 18:17:51 +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
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	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
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	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