ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 09:35:10 +01:00
Code Issues Releases Wiki Activity
1,852 Commits 115 Branches 0 Tags 13 MiB
2ffc26d703
Commit Graph

46 Commits

Author SHA1 Message Date
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
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