1880 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	638804837e	Merge pull request #41 from ascribe/make-mobile-mailbox-full-width ... Make header notification full width on mobile	2015-11-30 12:01:19 +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	720cf472c8	Make header notification full width on mobile	2015-11-28 23:37:46 +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	6888aaa8d9	Merge pull request #37 from ascribe/AD-1345-remind-users-not-to-leave-long-submission-form ... Ad 1345 remind users not to leave long submission form	2015-11-27 17:34:12 +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
Tim Daubenschütz	4c16562b5f	Merge pull request #38 from ascribe/bump-rackt-history-1-13-1 ... Bump Rackt/History to 1.13.1	2015-11-27 09:41:57 +01:00
diminator	1c25f8e776	webhooks in settings without acl	2015-11-27 03:24:37 +01:00
Brett Sun	3b6481eda0	Bump Rackt/History to 1.13.1 ... Gracefully handle when sessionStorage is unavailable	2015-11-26 11:45:40 +01:00
Tim Daubenschütz	88d1edd45c	Add pageExitWarning for SlidesContainer	2015-11-25 15:01:23 +01:00
Tim Daubenschütz	121a1dbb8d	Bump react-router to 1.0.0 because of found bug	2015-11-25 15:00:56 +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	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
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	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