245 Commits

Author	SHA1	Message	Date
Brett Sun	4212b776ee	Merge with master	2015-12-08 20:56:24 +01:00
Brett Sun	511abc6a33	Fix missing PropType	2015-12-08 20:57:40 +01:00
Brett Sun	e0b35e0a24	Merge with master	2015-12-08 20:55:13 +01:00
Brett Sun	79780cfb3a	Add FileDragAndDropError	2015-12-08 18:22:11 +01:00
Brett Sun	a0db6d3037	Shuffle uploader props to be more readable	2015-12-08 18:09:24 +01:00
Tim Daubenschütz	49421e1fa1	Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form ... Conflicts: js/components/ascribe_detail/further_details_fileuploader.js js/components/ascribe_forms/form.js js/components/ascribe_forms/form_loan.js js/components/ascribe_forms/form_register_piece.js js/components/ascribe_forms/input_fineuploader.js js/components/ascribe_forms/property.js js/components/ascribe_forms/property_collapsible.js js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js js/components/ascribe_uploader/react_s3_fine_uploader.js js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js sass/ascribe-fonts/ascribe-fonts.scss sass/whitelabel/wallet/cyland/cyland_custom_style.scss	2015-12-07 13:39:30 +01:00
Tim Daubenschütz	2b6b78310c	Merge pull request #1 from ascribe/AD-1177-display-404-on-pieces-and-editio ... AD-1177 display 404 on pieces and editio	2015-12-07 11:49:39 +01:00
Tim Daubenschütz	3ce63c33bf	Finalize ReactError component	2015-12-07 11:48:28 +01:00
Tim Daubenschütz	45919f93a6	Merge pull request #32 from ascribe/AD-1342-Public-piece-note-doesnt-render-correctly-def-data-null ... Ad 1342 public piece note doesnt render correctly def data null	2015-12-07 11:00:39 +01:00
Tim Daubenschütz	3374862edf	Make monkeyPatched key specific to component's displayName	2015-12-07 10:57:49 +01:00
Brett Sun	d2aba04bea	Change show condition on public note to be more stylistically similar	2015-12-07 10:52:00 +01:00
Tim Daubenschütz	2130b74a96	Merge pull request #42 from ascribe/AD-1434-hide-actions-in-detail-pages-if-they-re-not-available ... Display actions only if ACLs are available	2015-12-07 10:49:07 +01:00
Tim Daubenschütz	9392a71b33	Add comment for bug fix hiding actions from detail pages	2015-12-07 10:48:46 +01:00
Brett Sun	c1959033c0	Fix comments in PR	2015-12-04 16:34:25 +01:00
Brett Sun	b43faf9b45	Fix multiple edition statuses	2015-12-04 16:29:57 +01:00
Tim Daubenschütz	8ec0634d2e	Cherry-pick from 1ac2fe7f96: ... - Integrate PropertyCollapsible's functionality to Property	2015-12-03 20:26:53 +01:00
Tim Daubenschütz	8fcb7fcb01	Fix render bug for personal piece note	2015-12-02 16:51:56 +01:00
Tim Daubenschütz	81f28a02f9	Merge branch 'master' into AD-1342-Public-piece-note-doesnt-render-correctly-def-data-null	2015-12-02 16:39:18 +01:00
Tim Daubenschütz	8b3060d613	Fix simple comments in pr	2015-12-02 12:25:11 +01:00
Tim Daubenschütz	4fe10bb887	Cosmetic changes for EditionContainer & PieceContainer	2015-11-30 18:26:27 +01:00
Tim Daubenschütz	0b2bc1c57b	Introduce ReactError mixin for handling errors in React components	2015-11-30 18:23:03 +01:00
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	2b6c9777e9	Display actions only if ACLs are available	2015-11-30 13:20:05 +01:00
Brett Sun	3aab73379a	Merge with master	2015-11-30 11:43:33 +01:00
Cevo	e482caaa99	public note is visible outside	2015-11-25 21:43:15 +01:00
Brett Sun	efdc5d32e7	Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark	2015-11-24 10:42:15 +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	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
Cevo	63a32d949a	transfer added	2015-11-19 19:47:33 +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	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	a8ccf13f91	Remove uploadStarted prop from ReactS3Fineuploader as it was replaced with setIsUploadReady	2015-11-17 12:03:22 +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	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	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	357f63fa2b	Add contract link to loan history	2015-11-16 11:45:56 +01:00
Tim Daubenschütz	8188e5ca2f	Merge branch 'master' into AD-1315-implement-submission-flow	2015-11-16 09:41:06 +01:00
Brett Sun	cef19f427c	Add comment for content registration check	2015-11-13 16:02:34 +01:00
Brett Sun	09812a1881	Forgot to unlisten to UserStore when unmounting	2015-11-13 13:33:12 +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
Tim Daubenschütz	66aef4886f	Adjust MediaContainer and MediaPlayer to newly introduced manual-thumbnail functionality	2015-11-11 10:51:45 +01:00
Brett Sun	af58687572	Add twitter text	2015-11-10 19:33:08 +01:00
Brett Sun	a9f0a46fbd	Move social share buttons to left of download button to accommodate for embed button	2015-11-10 10:29:37 +01:00
Brett Sun	8dc0470007	Add Twitter button	2015-11-09 19:01:27 +01:00
Brett Sun	d972da935a	Add Facebook Share button	2015-11-09 17:46:49 +01:00
Brett Sun	3fb4ae55bf	Merge with AD-1290	2015-11-04 14:04:16 +01:00
Brett Sun	2711c4ddb9	Move onChange() to after componentWillUnmount() for ESLint	2015-11-04 13:57:15 +01:00