15 Commits

Author	SHA1	Message	Date
Brett Sun	efdc5d32e7	Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark	2015-11-24 10:42:15 +01:00
Cevo	63a32d949a	transfer added	2015-11-19 19:47:33 +01:00
Brett Sun	f7259a8ab3	Merge with AD-1255	2015-11-03 11:13:32 +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
Brett Sun	c72a5aa308	Add Lumenus specific data forms to edition and piece details	2015-10-28 11:26:54 +01:00
Tim Daubenschütz	576fa39167	Fix wrong pushState invocation	2015-10-27 09:59:46 +01:00
Tim Daubenschütz	e8a9cd89a4	Add resizing functionality to AclButtonList and AclInformation	2015-10-23 09:29:17 +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	ef14fc9b2e	Fix edition deletion redirect	2015-10-22 13:21:07 +02:00
Tim Daubenschütz	738e94a43d	Change helper texts	2015-10-20 17:22:40 +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
Tim Daubenschütz	a1f159fc2d	Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh ... Conflicts: js/components/ascribe_detail/edition.js js/utils/general_utils.js sass/main.scss	2015-10-15 10:06:39 +02:00
diminator	b233dbb937	PR fixes	2015-10-01 09:49:01 +02:00