ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-24 18:36:10 +01:00
Code Issues Releases Wiki Activity
1,801 Commits 115 Branches 0 Tags 13 MiB
da73d40fd6
Commit Graph

224 Commits

Author SHA1 Message Date
Tim Daubenschütz
da73d40fd6 Merge branch 'master' into AD-1264-refactor-reacts3fineuploader-to- 
Cleared all conflicts

Conflicts:
	js/components/ascribe_forms/form.js
	js/components/ascribe_forms/input_fineuploader.js
	js/components/ascribe_uploader/react_s3_fine_uploader.js
	js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
	js/utils/requests.js
 2015-11-16 15:27:00 +01:00
Tim Daubenschütz
b35d6a1013 Merge pull request #22 from ascribe/AD-1298-for-cyland-add-extra-fields 
Add additional fields to step two of cyland's loan process
 2015-11-16 14:11:34 +01:00
Tim Daubenschütz
286dd114af Merge pull request #16 from ascribe/AD-1255-refactor-aclbuttons-form-creatio 
Ad 1255 refactor aclbuttons form creatio
 2015-11-16 13:50:13 +01:00
Tim Daubenschütz
c852eaf143 Merge pull request #17 from ascribe/AD-1259-All-dates-showing-up-as-2014 
Replace Javascript's Date object with momentjs
 2015-11-13 09:58:12 +01:00
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
c6f6bb398d Replace all occurrences of with momentjs 2015-11-03 10:57:41 +01:00
Brett Sun
8540e3de36 Bring over missed changes for cyland for changes to form utils 2015-11-02 15:36:18 +01:00
Brett Sun
6c8016e094 Remove misleading editions prop to pieceOrEditions 2015-11-02 15:19:52 +01:00
Brett Sun
a513af984d Update cyland for FineUploader changes 2015-11-02 10:41:59 +01:00
Tim Daubenschütz
147c852b02 Replace getFullYear() with getUTCFullYear() 2015-11-02 10:32:48 +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