91 Commits

Author	SHA1	Message	Date
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	757ee40e4e	add 404 routine to PieceContainer	2015-10-19 15:58:05 +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
diminator	edec430109	public and private note in edition and piece ... connection in frontend	2015-08-21 15:04:38 +02:00
diminator	5c6b753acb	piece loan history	2015-08-20 15:50:30 +02:00
diminator	ffdb4847db	piece bitcoin id	2015-08-20 14:01:02 +02:00
diminator	5b2ab6c1e2	bug fix acls ... otherdata frontend MIGRATE + loaddate whitelabel	2015-08-20 11:32:11 +02:00
diminator	fc82c866fb	cyland refactor ... whitelabel + cyland app	2015-08-17 20:52:36 +02:00
diminator	d24b325062	bug fix loadPiece	2015-08-13 14:16:44 +02:00
diminator	22727c2703	refactored piece container and detail	2015-08-11 17:12:12 +02:00
vrde	0065c3d792	Fix bug in polling	2015-07-15 18:00:43 +02:00
vrde	e19a20a60f	add polling to piece	2015-07-15 17:13:45 +02:00
diminator	a86befb2d7	fixed signup serializer, acl_editions_view ... piece container whitelabel	2015-07-15 11:39:08 +02:00
Tim Daubenschütz	733c95a070	loading feedback for piece and edition page	2015-07-13 15:21:09 +02:00
Tim Daubenschütz	3ae10c5e50	first cut loading spinner pieces	2015-07-13 15:00:12 +02:00
diminator	8ac26275f5	piece view	2015-07-08 22:54:07 +02:00