66 Commits

Author	SHA1	Message	Date
Brett Sun	826ca08073	Merge with master	2016-02-05 10:38:59 +01:00
Brett Sun	443be236f5	Whitespace fix for comments	2016-01-11 16:26:36 +01:00
Brett Sun	e7c29d0d98	Cyland Admin should also not be able to register work ... As per (AD-1504)[https://ascribe.atlassian.net/browse/AD-1504], Cyland admin should not be able to register work, but instead use another account to get loaned work.	2015-12-16 13:59:31 +01:00
Brett Sun	1de06b0ac5	Only show register work route if user can submit to wallet for IkonoTV, Lumenus	2015-12-14 18:59:10 +01:00
Brett Sun	b3b94b6f60	Fix spacing of WalletRoutes	2015-12-14 18:58:33 +01:00
Tim Daubenschütz	50377ba478	Generalize ProxyHandler to take arbitrary redirect functions	2015-12-08 11:17:04 +01:00
Tim Daubenschütz	7cb5fa6758	Rename AuthProxyHandler to ProxyHandler and remove default export	2015-12-08 10:38:32 +01:00
Tim Daubenschütz	e1c2c2514c	Move AuthProxyHandler one directory up	2015-12-08 10:23:37 +01:00
diminator	f76ebffbe2	fix: acl_wallet_submit on 23vivi register piece	2015-12-07 11:17:42 +01:00
Brett Sun	904a6ce15a	Merge pull request #46 from ascribe/AD-1149-style-23vivi ... AD-1149 Style 23vivi	2015-12-04 13:39:09 +01:00
Brett Sun	328d60b279	Rename ContractAgreementForm to avoid confusion with ContractAgreementProperty	2015-12-03 15:22:37 +01:00
Brett Sun	3be033cdd5	Add thumbnail placeholder for 23vivi	2015-12-02 19:31:50 +01:00
Tim Daubenschütz	8b3060d613	Fix simple comments in pr	2015-12-02 12:25:11 +01:00
Brett Sun	a72fea5db4	Add 23vivi routes	2015-11-24 12:08:37 +01:00
Brett Sun	f7b55e56a9	Split Lumenus into a generic market wallet for 23vivi	2015-11-24 12:04:08 +01:00
Brett Sun	e85747144a	Add Lumenus landing page	2015-11-10 18:49:08 +01:00
Brett Sun	c72a5aa308	Add Lumenus specific data forms to edition and piece details	2015-10-28 11:26:54 +01:00
Brett Sun	ba777781b7	Add sliding piece registration with dummy additional form	2015-10-22 11:13:44 +02:00
Brett Sun	0c51eb374e	Add Lumenus specific piece list	2015-10-21 17:37:29 +02:00
Brett Sun	7116133337	AD-1194 Create front-end host configs ... Default route components to be replaced with Lumenus specific ones.	2015-10-21 14:10:21 +02:00
Tim Daubenschütz	8bb971d9df	Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page ... Conflicts: js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js js/components/whitelabel/wallet/components/cyland/cyland_landing.js	2015-10-15 11:55:44 +02:00
vrde	7c231a4c5e	Restore baseUrl in router	2015-10-13 14:19:08 +02:00
Tim Daubenschütz	2121c6af3d	Rename whitelabel component director to ikonotv specific prefix	2015-10-13 11:39:33 +02:00
Tim Daubenschütz	e4c7f9e071	Rename whitelabel component director to cyland specific prefix	2015-10-13 11:23:21 +02:00
vrde	12d3fb289e	Rename RedirectProxyHandler to AuthProxyHandler	2015-10-12 17:00:53 +02:00
vrde	04abf31354	Remove ProxyRoute	2015-10-12 16:51:18 +02:00
Tim Daubenschütz	69afc6165a	Incorporate new RedirectProxyRoute into whitelabel pages	2015-10-09 15:19:24 +02:00
Tim Daubenschütz	9a17e44df1	Refactor of wallet app routing	2015-10-01 15:57:46 +02:00
Tim Daubenschütz	8ba6f11dfe	Fix AccordionListTable item links and missing location propagation	2015-10-01 14:54:56 +02:00
Tim Daubenschütz	eebe936023	Change: router rendering, router location, route configs, notFound routes, redirect routes,	2015-09-30 17:09:46 +02:00
Tim Daubenschütz	90cf137c2c	Integrate error page in app + whitelabel pages	2015-09-29 16:00:58 +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
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	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	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	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
diminator	08405dd310	Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields	2015-09-16 20:46:52 +02:00
Tim Daubenschütz	5c49fd6f14	implement ikonotv landing page according to mockups	2015-09-16 18:31:46 +02:00
diminator	b29bf38f13	ikono slides	2015-09-15 13:15:29 +02:00
diminator	b45c68b2dc	Merge remote-tracking branch 'remotes/origin/AD-885-convert-roles-to-acls' into AD-924-apply-contractagreements-to-loan- ... Conflicts: ownership/serializers.py	2015-09-10 18:54:25 +02:00
diminator	1106cebf98	Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-885-convert-roles-to-acls	2015-09-10 18:10:06 +02:00
Tim Daubenschütz	cb6c4aaf0e	integrate acl into navrouteslist + little refactor on those components	2015-09-08 14:20:06 +02:00
diminator	22aa0139ae	terms and conditions page with accept/deny ... Needed: copyright societies in backend	2015-09-07 12:03:59 +02:00
diminator	9b7a69bc20	contract agreement notifications	2015-09-04 11:49:55 +02:00
Tim Daubenschütz	7e1815bb1f	refactor account settings into multiple files	2015-08-31 16:36:24 +02:00
Tim Daubenschütz	d9f3f2a9d7	rename contract_form to form_contract	2015-08-28 15:55:39 +02:00