ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 17:45:10 +01:00
Code Issues Releases Wiki Activity
1,734 Commits 115 Branches 0 Tags 13 MiB
19bdf59f46
Commit Graph

215 Commits

Author SHA1 Message Date
Tim Daubenschütz
19bdf59f46 Include feedback from PR for destructuring props 2015-11-13 09:57:22 +01:00
Tim Daubenschütz
8892ac4225 Add additional fields to step two of cyland's loan process 2015-11-05 11:56:09 +01:00
Brett Sun
543605aae3 Move store resets to componentDidMount() 2015-11-04 13:56:43 +01:00
Tim Daubenschütz
384ec0f445 Fix correct year extraction from date-string in 
AccordionListItemWallet
WalletPieceContainer
 2015-10-26 16:20:33 +01:00
Tim Daubenschütz
42733740db Fix correct year extraction from date-string in 
AccordionListItemPrize
PrizePieceContainer
CylandAccordionListItem
IkonotvAccordionListItem
 2015-10-26 16:07:31 +01:00
Tim Daubenschütz
b77beb0b1e Replace last occurences of ascribe-spool-chunked 2015-10-22 17:17:38 +02:00
Tim Daubenschütz
7f97ce9828 Handle deletion method for WalletPieceContainer 2015-10-21 23:45:53 +02:00
Tim Daubenschütz
fad6caca63 Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 
Conflicts:
	js/components/ascribe_detail/edition_container.js
	js/components/logout_container.js
 2015-10-21 09:47:14 +02:00
vrde
e220ee6fbb Merge branch 'AD-697-update-title-in-the-browser' 2015-10-20 15:06:41 +02:00
vrde
7ce98d0433 Fix comments on PR 2015-10-19 17:24:49 +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
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
diminator
c24021302f Merge remote-tracking branch 'remotes/origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 
Conflicts:
	js/components/whitelabel/wallet/components/cyland/cyland_hero.js
 2015-10-14 17:25:53 +02:00
diminator
b54beae322 cyland 
cc
 2015-10-14 17:13:16 +02:00
Tim Daubenschütz
713eea03cc Better robustness for slides container and register form for cyland 2015-10-14 16:20:51 +02:00
diminator
317d2611ba spinners part2 
scrollbar

uploader styles

property blur
 2015-10-14 16:17:10 +02:00
vrde
21c84774c8 Add document title for wallets 2015-10-13 17:29:53 +02:00
TimDaubenschuetz
7af4e0912e Merged in AD-972-remove-50mb-limit-in-additional-f (pull request #98) 
Ad 972 remove 50mb limit in additional f
 2015-10-13 16:42:04 +02:00
Tim Daubenschütz
4627381c16 add getLangText 2015-10-13 16:41:35 +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
Tim Daubenschütz
002bab8e79 Increase additional data file size 2015-10-13 10:13:53 +02:00
diminator
8d970a65c4 spinners in forms 
button wide
 2015-10-12 17:55:02 +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
d760fe13d0 Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page 
Conflicts:
	js/components/whitelabel/wallet/components/cyland/ascribe_detail/cyland_piece_container.js
 2015-10-12 14:18:53 +02:00
Tim Daubenschütz
f38ce126b7 Correct handleSuccess of AclButtonList 2015-10-12 10:37:08 +02:00
Tim Daubenschütz
69afc6165a Incorporate new RedirectProxyRoute into whitelabel pages 2015-10-09 15:19:24 +02:00
Tim Daubenschütz
b95906d83e Fix whitelabel styling 2015-10-01 16:11:29 +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
d399027dd6 Fix isActive reference 2015-10-01 14:34:46 +02:00
Tim Daubenschütz
83c652a4f0 Rename pieces routes back to collection 2015-10-01 14:30:11 +02:00
Tim Daubenschütz
17fd470e6b Upgrade react-router-bootstrap 2015-10-01 14:00:56 +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
Tim Daubenschütz
eebe936023 Change: router rendering, router location, route configs, notFound routes, redirect routes, 2015-09-30 17:09:46 +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
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