Brett Sun
3929712e9d
Prune unnecessary divs from some components
2015-11-03 12:10:43 +01:00
Brett Sun
54212627bb
Change lumens buttons for AD-1264 changes
2015-11-03 12:10:21 +01:00
Brett Sun
cd6673f255
Merge with AD-1264
2015-11-03 11:34:48 +01:00
Brett Sun
f7259a8ab3
Merge with AD-1255
2015-11-03 11:13:32 +01:00
Brett Sun
3a8f91e29e
Change required prop for AD1251 changes
2015-11-03 10:49:06 +01:00
Brett Sun
d2529bf015
Merge with master
2015-11-03 10:39:01 +01:00
Brett Sun
a513af984d
Update cyland for FineUploader changes
2015-11-02 10:41:59 +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
82b49fc653
Add additional required properties for Lumenus
...
Currently uses the FurtherDetailsFileuploader, just relabeled, to
handle the marketplace image. For now, this allows us to avoid creating
another property in the backend to handle the image, but could be
replaced or modified in the future if we do want to create another
property.
2015-10-27 17:54:35 +01:00
Brett Sun
633939b7fa
Use AclButton in LumenusSubmitButton
...
Instead of copying functionality from AclButton to add a default email,
LumenusSubmitButton just returns one with preset settings.
2015-10-27 17:01:50 +01:00
Brett Sun
ac1b43d24b
Set the consignee email by using the server's white label settings
...
Consignee email is available through the white label settings we get
from the server, so we don’t need to hardcode them into the constants.
Separated out AclButtonList from PieceListbulkModal to make the modal
more flexible and separated in concerns.
2015-10-26 19:17:06 +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
Brett Sun
84c459c426
Revert changes to allow piece list to filter ACLs
...
We can do this with the backend instead.
2015-10-26 11:09:04 +01:00
Brett Sun
3dedc93d2e
Force consignee to be submissions@lumenus.co
...
Special white label form settings only defined for consign form for
now, but could be added to others as needed.
2015-10-23 14:19:44 +02:00
Tim Daubenschütz
b77beb0b1e
Replace last occurences of ascribe-spool-chunked
2015-10-22 17:17:38 +02:00
Brett Sun
e226477424
Merge with master
2015-10-22 14:18:23 +02:00
Brett Sun
7ba7e26d5b
Fix typo in edition api url
2015-10-22 14:14:06 +02:00
Brett Sun
ba777781b7
Add sliding piece registration with dummy additional form
2015-10-22 11:13:44 +02:00
Tim Daubenschütz
7f97ce9828
Handle deletion method for WalletPieceContainer
2015-10-21 23:45:53 +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
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
