271 Commits

Author	SHA1	Message	Date
diminator	aaa1a9a000	replaced fonts ... replaced spinners WIP renamed settings-property to property	2015-10-12 15:25:21 +02:00
diminator	dc8599830b	updated glyphs, accordion pieces ok	2015-10-09 13:14:29 +02:00
TimDaubenschuetz	ad7f088081	Merged in AD-605-when-an-edition-or-piece-is-not-d (pull request #90) ... Ad 605 when an edition or piece is not d	2015-09-30 11:15:22 +02:00
TimDaubenschuetz	662b837d5d	Merged in AD-1071-naked-domain-is-not-requesting-t (pull request #85) ... Write generic function for extracting subdomain and implement troughout whole app	2015-09-30 11:10:05 +02:00
Tim Daubenschütz	90cf137c2c	Integrate error page in app + whitelabel pages	2015-09-29 16:00:58 +02:00
diminator	f64fb73aa6	cc fixes in licenses, collection and details	2015-09-29 15:58:24 +02:00
Tim Daubenschütz	d50d0faabe	Write generic function for extracting subdomain and implement troughout whole app	2015-09-29 14:58:56 +02:00
Tim Daubenschütz	e1ac3ca4c6	Add multi level ACLs for loan piece detail loan button	2015-09-28 17:39:58 +02:00
diminator	2dda22d848	fix: ikonotv redirect to collection if logged in	2015-09-28 16:57:46 +02:00
diminator	19f94110b7	fix: ikonotv redirect to collection if logged in	2015-09-28 16:57:35 +02:00
diminator	db1ef91965	bug fix filterParams=null on sluice	2015-09-28 16:29:50 +02:00
Tim Daubenschütz	cfab59c027	Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra	2015-09-25 16:23:22 +02:00
Tim Daubenschütz	f2b4c23bd7	Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra ... Conflicts: js/routes.js	2015-09-25 16:23:01 +02:00
diminator	b2cbe2c674	merged	2015-09-25 15:35:36 +02:00
diminator	e6a6c2c2a3	set collapsible default show=true	2015-09-25 15:33:01 +02:00
TimDaubenschuetz	a4975e8137	Merged in AD-1036-put-contracts-in-his-own-menu (pull request #79) ... Ad 1036 put contracts in his own menu	2015-09-25 15:29:21 +02:00
Tim Daubenschütz	e20e378533	Remove PrizeDashboard from codebase, add coa_verify to prize app	2015-09-25 11:54:12 +02:00
Tim Daubenschütz	16e7a54b27	add coa_verify route to wallet_routes to avoid crash	2015-09-25 11:51:03 +02:00
Tim Daubenschütz	7d3c14d1cc	Conditional header for + NEW WORK	2015-09-25 10:10:27 +02:00
Tim Daubenschütz	81aa052a8a	Fix load piece method in WalletPieceContainer	2015-09-25 09:53:52 +02:00
Tim Daubenschütz	2a4bc2af89	separate contract settings from account settings	2015-09-23 15:16:46 +02:00
Tim Daubenschütz	90d6ec20f6	Revert "Revert "acls on 3 levels"" ... This reverts commit c02d1ea3ac.	2015-09-22 17:38:25 +02:00
Tim Daubenschütz	c02d1ea3ac	Revert "acls on 3 levels" ... This reverts commit f1bc400faf.	2015-09-22 17:29:07 +02:00
diminator	24b7031c72	Merge remote-tracking branch 'origin/AD-943-add-custom-additional-fields' into AD-943-add-custom-additional-fields	2015-09-22 17:23:37 +02:00
diminator	f1bc400faf	acls on 3 levels ... whitelabel user piece the higher on the list, the more power (whitelabel overrides user and piece)	2015-09-22 17:23:19 +02:00
Tim Daubenschütz	52903c6982	Fix labels for buttons	2015-09-22 16:49:01 +02:00
Tim Daubenschütz	1320b5c965	cleanup form_loan and contract_agreement_list_actions	2015-09-22 16:45:24 +02:00
Tim Daubenschütz	bd5aa266b1	Merge remote-tracking branch 'origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields	2015-09-22 13:38:31 +02:00
Tim Daubenschütz	4bbc4afd61	Increase robustness by excluding meta data for pieces that have been loaned before actual launch	2015-09-22 13:37:31 +02:00
Tim Daubenschütz	878a716262	Remove 'learn more' from contract form	2015-09-22 13:20:55 +02:00
diminator	54a1049b48	Merged in AD-1029-add-filter-for-submitted-accepte (pull request #71) ... filter for submitted and accepted on ikonotv	2015-09-22 13:14:28 +02:00
diminator	5f98f65842	filter in frontend	2015-09-22 12:20:14 +02:00
Tim Daubenschütz	a8c436c40b	Change detail text in loan process	2015-09-22 11:56:30 +02:00
Tim Daubenschütz	aaa27550af	Merge branch 'AD-943-add-custom-additional-fields' of bitbucket.org:ascribe/onion into AD-943-add-custom-additional-fields	2015-09-22 11:43:53 +02:00
Tim Daubenschütz	a0ff5af62b	Make style changes	2015-09-22 11:33:59 +02:00
Tim Daubenschütz	b0b44718da	Changes to landing page text according to Elisabeth	2015-09-22 10:29:23 +02:00
diminator	b4c7b864fd	check if piece exists in props in wallet details	2015-09-22 09:20:10 +02:00
diminator	904793269b	refactored detail page for wallets	2015-09-21 18:04:15 +02:00
diminator	c837890895	Merge remote-tracking branch 'remotes/origin/AD-1029-add-filter-for-submitted-accepte' into AD-943-add-custom-additional-fields	2015-09-21 16:51:28 +02:00
diminator	a4fe0417c3	refactored and adapted for cyland	2015-09-21 16:47:29 +02:00
Tim Daubenschütz	bd99adf4c9	add componentWillReceiveProps in ikono piece detail again	2015-09-21 16:25:28 +02:00
vrde	865c21557c	Add style for buttons	2015-09-21 16:23:18 +02:00
diminator	fdbae0316f	filter for submitted and accepted on ikonotv ... MIGRATE AND ./manage.py loaddata whitelabel/fixtures/settings.json	2015-09-21 16:14:39 +02:00
Tim Daubenschütz	6102ed3bb4	update react textarea autosize	2015-09-21 16:10:25 +02:00
Tim Daubenschütz	04e331f4e5	hide additional files when not defined and already loaned to whitelabel customer	2015-09-21 15:57:27 +02:00
Tim Daubenschütz	6c2bb041f9	finalize whitelabel custom fields	2015-09-21 15:46:24 +02:00
Tim Daubenschütz	c756024702	Add whitelabel tailored extra_data forms to piece detail	2015-09-21 15:08:24 +02:00
Tim Daubenschütz	652df66cb3	Fix some issues with smelly code	2015-09-21 14:22:52 +02:00
Tim Daubenschütz	8a6674509c	Merge branch 'AD-943-add-custom-additional-fields' of bitbucket.org:ascribe/onion into AD-943-add-custom-additional-fields	2015-09-21 12:05:53 +02:00
Tim Daubenschütz	c00e003aeb	refactor input textarea to use disabled instead of editable	2015-09-21 12:05:42 +02:00