HomePhabricator

Merge branch 'master' into deployment

Authored by XenoRyet.

Description

Merge branch 'master' into deployment

6ca39c9 Localisation updates from https://translatewiki.net.
dd79602 Dynamically generate JS currency minimum amounts
00986f7 Update currency rates
b4fa73c Rearrange order of CC logos on GC form for Japan
899be81 Stop exceptioning in drupal formatMessage stub
ee8b703 Fix recurring GC false success report
80f1e48 Get around watchdog stripping tags
ccc82b1 Remove unused logfile parsing code
854204f Quit demoting log messages to debug under drupal
b671104 Localisation updates from https://translatewiki.net.

Conflicts:
tests/Adapter/GlobalCollect/RecurringTest.php
tests/GatewayPageTest.php
tests/includes/Responses/globalcollect/DO_PAYMENT_recurring.testresponse
tests/includes/Responses/globalcollect/GET_ORDERSTATUS_recurring.testresponse
tests/includes/Responses/globalcollect/SET_PAYMENT_recurring.testresponse

Change-Id: Iaa21069b0a70ba3c5816fc34d7da74be04f8bd64

Merged Changes

CommitAuthorDetailsCommitted
6ca39c9fa46aTranslation updater bot
Localisation updates from https://translatewiki.net. 
Jul 19 2015
dd79602a968cEjegg/awight
Dynamically generate JS currency minimum amounts 
Jul 19 2015
00986f7ba83bEjegg/awight
Update currency rates 
Jul 19 2015
b4fa73c0976dXenoRyet/awight
Rearrange order of CC logos on GC form for Japan 
Jul 19 2015
899be810fa33Ejegg
Stop exceptioning in drupal formatMessage stub 
Jul 17 2015
ee8b70331470Ejegg
Fix recurring GC false success report 
Jul 17 2015
80f1e488856dEjegg
Get around watchdog stripping tags 
Jul 17 2015
257239ebf4a8jenkins-bot/Gerrit Code Review
Merge "Quit demoting log messages to debug under drupal" 
Jul 17 2015
ccc82b1daa4bawight/Ejegg
Remove unused logfile parsing code 
Jul 17 2015
854204f73dcfEjegg
Quit demoting log messages to debug under drupal 
Jul 16 2015
b671104fda83Translation updater bot
Localisation updates from https://translatewiki.net. 
Jul 16 2015