63 Commits

Author	SHA1	Message	Date
Brett Sun	3aab73379a	Merge with master	2015-11-30 11:43:33 +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
Cevo	63a32d949a	transfer added	2015-11-19 19:47:33 +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	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	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
Brett Sun	3fb4ae55bf	Merge with AD-1290	2015-11-04 14:04:16 +01:00
Brett Sun	543605aae3	Move store resets to componentDidMount()	2015-11-04 13:56:43 +01:00
Brett Sun	f7259a8ab3	Merge with AD-1255	2015-11-03 11:13:32 +01:00
Tim Daubenschütz	c6f6bb398d	Replace all occurrences of with momentjs	2015-11-03 10:57:41 +01:00
Brett Sun	d2529bf015	Merge with master	2015-11-03 10:39:01 +01:00
Brett Sun	6c8016e094	Remove misleading editions prop to pieceOrEditions	2015-11-02 15:19:52 +01:00
Tim Daubenschütz	147c852b02	Replace getFullYear() with getUTCFullYear()	2015-11-02 10:32:48 +01:00
Cevo	3cf59ae2af	added public note to piece	2015-10-29 15:31:25 +01:00
Brett Sun	784098f225	Fix PropType warnings for components in ascribe_detail	2015-10-28 18:37:09 +01:00
Brett Sun	c72a5aa308	Add Lumenus specific data forms to edition and piece details	2015-10-28 11:26:54 +01:00
Tim Daubenschütz	dc813f2687	Merge pull request #4 from ascribe/AD-1075-year-before-1000-starts-with-0 ... Fix correct year extraction from date-string in edition and piece detail	2015-10-27 10:59:29 +01:00
Tim Daubenschütz	1207522266	Fix correct year extraction from date-string in edition and piece detial view	2015-10-26 15:39:33 +01:00
Tim Daubenschütz	d48da96e3b	Add login-validation to actions DetailProperty in Edition and Piece detail view	2015-10-26 11:21:22 +01:00
Tim Daubenschütz	cd3c8b8f6e	Complete visual styling	2015-10-23 10:37:23 +02:00
Tim Daubenschütz	d4de2434ee	Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh ... Conflicts: js/components/ascribe_forms/form_share_email.js js/components/ascribe_forms/form_transfer.js js/utils/general_utils.js sass/main.scss	2015-10-22 13:38:49 +02:00
Tim Daubenschütz	fad6caca63	Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity ... Conflicts: js/components/ascribe_detail/edition_container.js js/components/logout_container.js	2015-10-21 09:47:14 +02:00
Tim Daubenschütz	8d0e9a42fc	Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh ... Conflicts: package.json	2015-10-20 18:11:41 +02:00
Tim Daubenschütz	738e94a43d	Change helper texts	2015-10-20 17:22:40 +02:00
Tim Daubenschütz	f0d8e32ecf	Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity ... Conflicts: js/components/ascribe_accordion_list/accordion_list_item_piece.js js/components/ascribe_app.js js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js js/components/logout_container.js js/components/whitelabel/wallet/wallet_app.js	2015-10-19 10:30:14 +02:00
Tim Daubenschütz	c7c83083d3	change layout of AclButtonList	2015-10-15 11:32:34 +02:00
Tim Daubenschütz	d77bdb25a5	Cleanup code	2015-10-15 11:17:16 +02:00
vrde	2967a29f2e	Set title to edition/piece containers	2015-10-13 17:52:45 +02:00
diminator	aaa1a9a000	replaced fonts ... replaced spinners WIP renamed settings-property to property	2015-10-12 15:25:21 +02:00
Tim Daubenschütz	83c652a4f0	Rename pieces routes back to collection	2015-10-01 14:30:11 +02:00
Tim Daubenschütz	829f2c592b	Switch all usages of Router.Navigation and Router.State	2015-10-01 11:16:38 +02:00
Tim Daubenschütz	8cd4377a58	Change links in app to new react-router@1.0rc1 syntax	2015-09-30 18:30:50 +02:00
diminator	f64fb73aa6	cc fixes in licenses, collection and details	2015-09-29 15:58:24 +02:00
diminator	ff163df61e	PR update	2015-09-17 14:20:46 +02:00
diminator	63fffc2132	PR comments fix	2015-09-17 11:39:55 +02:00
diminator	6013303bd6	Merge remote-tracking branch 'remotes/origin/master' into AD-456-ikonotv-branded-page-for-registra ... Conflicts: js/components/ascribe_buttons/button_submit_close.js js/components/ascribe_forms/form_loan.js js/components/ascribe_forms/form_register_piece.js sass/ascribe_media_player.scss sass/main.scss	2015-09-10 17:45:51 +02:00
Tim Daubenschütz	b5e5102ea4	replace in keyword with dot notation checking	2015-09-10 14:00:59 +02:00
diminator	73ee0753c1	refactored notifications per detail	2015-09-03 17:25:22 +02:00
diminator	9334251fd3	notifications on piece details (www, ikono, cyland) and edition details	2015-09-03 15:17:12 +02:00
Tim Daubenschütz	ddfc8b9621	minor fixes	2015-08-28 14:27:02 +02:00
Tim Daubenschütz	52ae348e57	dynamic acl for acl_submit	2015-08-28 14:07:29 +02:00
Tim Daubenschütz	e9d0311f58	custom ikonotv piece page	2015-08-28 12:33:00 +02:00
Tim Daubenschütz	2c26aab8cc	add exception for loaning a piece for ikonotv	2015-08-28 12:20:36 +02:00
diminator	bc28f3d8f5	loan request actions for multiple actions	2015-08-27 13:43:26 +02:00
Tim Daubenschütz	6808c7c228	remove loan button from piece detail page	2015-08-26 16:44:24 +02:00
diminator	0be6b7f118	bug fix loadPiece	2015-08-24 11:01:42 +02:00
diminator	3b27238adf	request form on piece level ... bug fix cyland piece endpoint bug fix otherDataUploader editable	2015-08-24 10:48:40 +02:00
diminator	7a09b863b5	switch between request action and acl buttons on piece detail page	2015-08-21 16:49:04 +02:00
diminator	33cd23d11e	getlangtext	2015-08-21 16:38:18 +02:00