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 |
|
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
|
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
|
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 |
|