26 Commits

Author	SHA1	Message	Date
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
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
Tim Daubenschütz	89f68abcec	add: Loan form for Ikonotv	2015-08-28 12:11:29 +02:00
Tim Daubenschütz	86efb66663	add collapsible appendix to send contract form	2015-08-27 17:33:51 +02:00
Tim Daubenschütz	65148e24de	remove contract form from ikonotv codebase and integrate it into ascribe-core	2015-08-27 14:56:49 +02:00
Tim Daubenschütz	64d23f82df	refactoring of the general architecture	2015-08-27 14:47:33 +02:00
Tim Daubenschütz	9d7a9bd028	add router/navigation integration into whole project	2015-08-27 14:34:15 +02:00
Tim Daubenschütz	cd49a9c402	Create generic links in nav using routes	2015-08-25 16:33:26 +02:00
diminator	188cca4834	ikono register	2015-08-19 09:31:36 +02:00
diminator	e933b334c2	loan contract form	2015-08-18 16:24:36 +02:00
diminator	e862fa39a9	Merge remote-tracking branch 'remotes/origin/AD-803-refactor-acls' into AD-456-ikonotv-branded-page-for-registra ... Conflicts: web/settings.py	2015-08-18 12:36:38 +02:00
diminator	8ae7edaa1c	ikonotv initial setup	2015-08-18 12:08:01 +02:00
diminator	fc82c866fb	cyland refactor ... whitelabel + cyland app	2015-08-17 20:52:36 +02:00
Tim Daubenschütz	8612f73e96	separate cc register form	2015-08-12 09:30:24 +02:00
Tim Daubenschütz	ac45283968	first iteration: whitelabel pages depending on customer	2015-08-11 17:40:26 +02:00
Tim Daubenschütz	eb6e3cb20a	finishing boilerplate for wallet app + prefixing whitelabel specific files	2015-08-11 14:47:28 +02:00