HomePhabricator

Merge branch 'master' into deployment

Authored by Ejegg.

Description

Merge branch 'master' into deployment

1afab3e Parse more of AstroPay's error descriptions
cb1e381 Add country-specific versions of fiscal_number
3b868b0 Check error['context'] to place error messages
ea35c3e Use old error forms for AstroPay fail page
8205cfb Generate new order IDs for each NewInvoice call
4ac357a Move deleteMessage out of legacy antimessage function
4a00d5e Localisation updates from https://translatewiki.net.
fc023c9 Localisation updates from https://translatewiki.net.
85821e3 Localisation updates from https://translatewiki.net.
f801889 Give Japan forms correct selection weight
d3d31c5 Localisation updates from https://translatewiki.net.
643abbe Undo last commit's fiscal number normalization
082a3f5 Validate fiscal number when exists, require for AstroPay
df64fe1 Localisation updates from https://translatewiki.net.

Conflicts:
tests/Adapter/Astropay/AstropayTest.php
tests/Adapter/GatewayAdapterTest.php
tests/Adapter/Worldpay/WorldpayTest.php
tests/DataValidatorTest.php
tests/includes/Responses/astropay/NewInvoice_1.testresponse

Change-Id: Id7f7faae0c5c64f218791c4ae713442642cd7426

Merged Changes

CommitAuthorDetailsCommitted
1afab3efe512Ejegg/awight
Parse more of AstroPay's error descriptions 
Jul 28 2015
cb1e3814fe72Ejegg/awight
Add country-specific versions of fiscal_number 
Jul 28 2015
3b868b0f4cfdEjegg/awight
Check error['context'] to place error messages 
Jul 27 2015
ea35c3e3a314Ejegg/awight
Use old error forms for AstroPay fail page 
Jul 27 2015
8205cfbbcc22Ejegg/awight
Generate new order IDs for each NewInvoice call 
Jul 27 2015
4ac357a0c49cawight/Ejegg
Move deleteMessage out of legacy antimessage function 
Jul 27 2015
4a00d5ef935bTranslation updater bot
Localisation updates from https://translatewiki.net. 
Jul 26 2015
fc023c9c58f7Translation updater bot
Localisation updates from https://translatewiki.net. 
Jul 25 2015
85821e3cfc1fTranslation updater bot
Localisation updates from https://translatewiki.net. 
Jul 24 2015
f8018893a0f6Ejegg
Give Japan forms correct selection weight 
Jul 23 2015
d3d31c59cc59Translation updater bot
Localisation updates from https://translatewiki.net. 
Jul 22 2015
643abbe63700Ejegg
Undo last commit's fiscal number normalization 
Jul 21 2015
082a3f507515Ejegg/awight
Validate fiscal number when exists, require for AstroPay 
Jul 21 2015
df64fe1e0d54Translation updater bot
Localisation updates from https://translatewiki.net. 
Jul 21 2015