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
..
detail_property.js	Complete visual styling	2015-10-23 10:37:23 +02:00
edition_action_panel.js	Remove misleading editions prop to pieceOrEditions	2015-11-02 15:19:52 +01:00
edition_container.js	Move onChange() to after componentWillUnmount() for ESLint	2015-11-04 13:57:15 +01:00
edition.js	Replace all occurrences of with momentjs	2015-11-03 10:57:41 +01:00
further_details_fileuploader.js	Remove warning for missing prop from FurtherDetailsFileUploader	2015-11-02 10:42:15 +01:00
further_details.js	Handle deletion method for WalletPieceContainer	2015-10-21 23:45:53 +02:00
history_iterator.js	piece loan history	2015-08-20 15:50:30 +02:00
license_detail.js	cc fixes in licenses, collection and details	2015-09-29 15:58:24 +02:00
media_container.js	Adjust MediaContainer and MediaPlayer to newly introduced manual-thumbnail functionality	2015-11-11 10:51:45 +01:00
note.js	bug fix show public note for anonymous	2015-09-28 17:11:15 +02:00
piece_container.js	Merge pull request #16 from ascribe/AD-1255-refactor-aclbuttons-form-creatio	2015-11-16 13:50:13 +01:00
piece.js	refactored piece container and detail	2015-08-11 17:12:12 +02:00