subject:"\[MediaWiki\-commits\] \[Gerrit\] Merge master into deployment \- change \(wikimedia...crm\)"

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2016-07-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

0e9fe98226120eb0edd5c57e493bc6e697f84a38 Don't assume configured directories 
end in a slash
27c13d6aadcb163244ccbe0f16167092413c99a6 Fail if the message body is missing

Change-Id: I8ed9b3243878ffe60d62a9e9cbd1bfa18f68616c
---
D sites/all/modules/wmf_audit/tests/WorldpayAuditTest.php
1 file changed, 0 insertions(+), 167 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/sites/all/modules/wmf_audit/tests/WorldpayAuditTest.php 
b/sites/all/modules/wmf_audit/tests/WorldpayAuditTest.php
deleted file mode 100644
index 0bdd632..000
--- a/sites/all/modules/wmf_audit/tests/WorldpayAuditTest.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<<< HEAD   (cea316 Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wiki)
-===
- 'Worldpay Audit',
-'group' => 'Audit',
-'description' => 'Parse audit files and match with logs.',
-);
-}
-
-public function setUp() {
-   parent::setUp();
-   self::$messages = array();
-   $dirs = array(
-   'wmf_audit_log_archive_dir' => __DIR__ . '/data/logs',
-   'worldpay_audit_recon_completed_dir' => $this->getTempDir() . 
'/completed',
-   'worldpay_audit_working_log_dir' => $this->getTempDir() . 
'/working',
-   );
-
-   foreach ( $dirs as $var => $dir ) {
-   if ( !is_dir( $dir ) ) {
-   mkdir( $dir );
-   }
-   variable_set( $var, $dir );
-   }
-
-   variable_set( 'worldpay_audit_log_search_past_days', 7 );
-}
-
-public function auditTestProvider() {
-   return array(
-   array( __DIR__ . '/data/TransactionReconciliationFile', array(
-   'main' => array(
-   array(
- 'utm_source' => 'worldpay_audit',
- 'utm_medium' => 'worldpay_audit',
- 'utm_campaign' => 'worldpay_audit',
- 'date' => 1411723740,
- 'gateway_txn_id' => '19330306.0',
- 'gross' => '1',
- 'user_ip' => '1.2.3.4',
- 'first_name' => 'Test',
- 'last_name' => 'PErson',
- 'country' => 'FR',
- 'email' => 'fr-tech+testper...@wikimedia.org',
- 'contribution_tracking_id' => '19330306',
- 'currency' => 'EUR',
- 'gateway' => 'worldpay',
- 'payment_method' => 'cc',
- 'payment_submethod' => 'visa',
-   ),
-   array(
- 'utm_source' => 'worldpay_audit',
- 'utm_medium' => 'worldpay_audit',
- 'utm_campaign' => 'worldpay_audit',
- 'date' => 1411729200,
- 'gateway_txn_id' => '19343862.0',
- 'gross' => '1.33',
- 'user_ip' => '2.3.4.5',
- 'first_name' => 'Other',
- 'last_name' => 'Friend',
- 'country' => 'FR',
- 'email' => 'fr-tech+ot...@wikimedia.org',
- 'contribution_tracking_id' => '19343862',
- 'currency' => 'EUR',
- 'gateway' => 'worldpay',
- 'payment_method' => 'cc',
- 'payment_submethod' => 'visa',
-   ),
-   ),
-   ), array() ),
-   /* FIXME: broken, see T113782
-* array( __DIR__ . '/data/LynkReconciliationFile/', array(
-*   'main' => array(
-* array(
-*   'utm_source' => 'worldpay_audit',
-*   'utm_medium' => 'worldpay_audit',
-*   'utm_campaign' => 'worldpay_audit',
-*   'date' => 1409263836,
-*   'gateway_txn_id' => '5055',
-*   'gross' => '1',
-*   'user_ip' => '5.4.3.2',
-*   'first_name' => 'Bøld',
-*   'last_name' => 'Bot?ton',
-*   'street_address' => '123 Sesame St',
-*   'postal_code' => '02480',
-*   'country' => 'US',
-*   'email' => 'fr-tech+testb...@wikimedia.org',
-*   'contribution_tracking_id' => '1895',
-*   'currency' => 'USD',
-*   'gateway' => 'worldpay',
-*   'payment_method' => 'cc',
-*   'payment_submethod' => 'visa',
-* ),
-*   ),
-* ), array() ),
-*/
-   );
-}
-
-/**
- * @dataProvider auditTestProvider
- */
-public function testParseFiles( $path, $expectedMessages, 
$expecte

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2016-07-15 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/299264

Change subject: Merge master into deployment
..

Merge master into deployment

0e9fe98226120eb0edd5c57e493bc6e697f84a38 Don't assume configured directories 
end in a slash
27c13d6aadcb163244ccbe0f16167092413c99a6 Fail if the message body is missing

Change-Id: I8ed9b3243878ffe60d62a9e9cbd1bfa18f68616c
---
D sites/all/modules/wmf_audit/tests/WorldpayAuditTest.php
1 file changed, 0 insertions(+), 167 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/64/299264/1

diff --git a/sites/all/modules/wmf_audit/tests/WorldpayAuditTest.php 
b/sites/all/modules/wmf_audit/tests/WorldpayAuditTest.php
deleted file mode 100644
index 0bdd632..000
--- a/sites/all/modules/wmf_audit/tests/WorldpayAuditTest.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<<< HEAD   (cea316 Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wiki)
-===
- 'Worldpay Audit',
-'group' => 'Audit',
-'description' => 'Parse audit files and match with logs.',
-);
-}
-
-public function setUp() {
-   parent::setUp();
-   self::$messages = array();
-   $dirs = array(
-   'wmf_audit_log_archive_dir' => __DIR__ . '/data/logs',
-   'worldpay_audit_recon_completed_dir' => $this->getTempDir() . 
'/completed',
-   'worldpay_audit_working_log_dir' => $this->getTempDir() . 
'/working',
-   );
-
-   foreach ( $dirs as $var => $dir ) {
-   if ( !is_dir( $dir ) ) {
-   mkdir( $dir );
-   }
-   variable_set( $var, $dir );
-   }
-
-   variable_set( 'worldpay_audit_log_search_past_days', 7 );
-}
-
-public function auditTestProvider() {
-   return array(
-   array( __DIR__ . '/data/TransactionReconciliationFile', array(
-   'main' => array(
-   array(
- 'utm_source' => 'worldpay_audit',
- 'utm_medium' => 'worldpay_audit',
- 'utm_campaign' => 'worldpay_audit',
- 'date' => 1411723740,
- 'gateway_txn_id' => '19330306.0',
- 'gross' => '1',
- 'user_ip' => '1.2.3.4',
- 'first_name' => 'Test',
- 'last_name' => 'PErson',
- 'country' => 'FR',
- 'email' => 'fr-tech+testper...@wikimedia.org',
- 'contribution_tracking_id' => '19330306',
- 'currency' => 'EUR',
- 'gateway' => 'worldpay',
- 'payment_method' => 'cc',
- 'payment_submethod' => 'visa',
-   ),
-   array(
- 'utm_source' => 'worldpay_audit',
- 'utm_medium' => 'worldpay_audit',
- 'utm_campaign' => 'worldpay_audit',
- 'date' => 1411729200,
- 'gateway_txn_id' => '19343862.0',
- 'gross' => '1.33',
- 'user_ip' => '2.3.4.5',
- 'first_name' => 'Other',
- 'last_name' => 'Friend',
- 'country' => 'FR',
- 'email' => 'fr-tech+ot...@wikimedia.org',
- 'contribution_tracking_id' => '19343862',
- 'currency' => 'EUR',
- 'gateway' => 'worldpay',
- 'payment_method' => 'cc',
- 'payment_submethod' => 'visa',
-   ),
-   ),
-   ), array() ),
-   /* FIXME: broken, see T113782
-* array( __DIR__ . '/data/LynkReconciliationFile/', array(
-*   'main' => array(
-* array(
-*   'utm_source' => 'worldpay_audit',
-*   'utm_medium' => 'worldpay_audit',
-*   'utm_campaign' => 'worldpay_audit',
-*   'date' => 1409263836,
-*   'gateway_txn_id' => '5055',
-*   'gross' => '1',
-*   'user_ip' => '5.4.3.2',
-*   'first_name' => 'Bøld',
-*   'last_name' => 'Bot?ton',
-*   'street_address' => '123 Sesame St',
-*   'postal_code' => '02480',
-*   'country' => 'US',
-*   'email' => 'fr-tech+testb...@wikimedia.org',
-*   'contribution_tracking_id' => '1895',
-*   'currency' => 'USD',
-*   'gateway' => 'worldpay',
-*   'payment_method' => 'cc',
-*   'payment_submethod' => 'visa',
-* ),
-*   ),
-* ), array() ),
-*/
-   );
-}
-
-/**
- * @dataProvider auditTestProvider
- */
-public function

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2016-05-17 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

8aebfd2 Update Spanish TY letter

Change-Id: I5729341d967f22657c9d1dca95cd3d9cc618506c
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Verified; Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/289243
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5729341d967f22657c9d1dca95cd3d9cc618506c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2016-05-17 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/289243

Change subject: Merge master into deployment
..

Merge master into deployment

8aebfd2 Update Spanish TY letter

Change-Id: I5729341d967f22657c9d1dca95cd3d9cc618506c
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/43/289243/1


-- 
To view, visit https://gerrit.wikimedia.org/r/289243
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5729341d967f22657c9d1dca95cd3d9cc618506c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2016-05-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

d54b714 wire 'cancel' in to another spot [redux]

Change-Id: I427057519a6a0baf9321ab1a112d4b0d1db7366d
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Cdentinger: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/286533
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I427057519a6a0baf9321ab1a112d4b0d1db7366d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Cdentinger 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2016-05-02 Thread Cdentinger (Code Review)

Cdentinger has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/286533

Change subject: Merge master into deployment
..

Merge master into deployment

d54b714 wire 'cancel' in to another spot [redux]

Change-Id: I427057519a6a0baf9321ab1a112d4b0d1db7366d
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/33/286533/1


-- 
To view, visit https://gerrit.wikimedia.org/r/286533
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I427057519a6a0baf9321ab1a112d4b0d1db7366d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Cdentinger 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2016-04-28 Thread Ejegg (Code Review)

Ejegg has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

4f5f562 Support cancell?ed donations
894652b Update CiviCRM submodule for logging changes & activity view fix
19183f6 update wikimedia/smash-pig to 6ac4bba6aad3013bf2ddf967806f6b7f5e3647e7
be3fd39 BaseAuditProcessor&record_is_cancel()
f895b0b update wikimedia/smash-pig to bc16fd9c319c8ca7e8795883f1e45ba51c0bd9e5

Updated vendor submodule

Change-Id: If1aff4f3f3780754c11162ef93c2248b454b504d
---
M vendor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/vendor b/vendor
index b2799d7..533c62e 16
--- a/vendor
+++ b/vendor
-Subproject commit b2799d7790eb6c789d362960c4a0ed08a22d4c55
+Subproject commit 533c62eaae96be7d6fbd8ed6b04e6c3c98a46fad

-- 
To view, visit https://gerrit.wikimedia.org/r/286090
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If1aff4f3f3780754c11162ef93c2248b454b504d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Cdentinger 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2016-04-28 Thread Cdentinger (Code Review)

Cdentinger has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/286090

Change subject: Merge master into deployment
..

Merge master into deployment

4f5f562 Support cancell?ed donations
894652b Update CiviCRM submodule for logging changes & activity view fix
19183f6 update wikimedia/smash-pig to 6ac4bba6aad3013bf2ddf967806f6b7f5e3647e7
be3fd39 BaseAuditProcessor&record_is_cancel()
f895b0b update wikimedia/smash-pig to bc16fd9c319c8ca7e8795883f1e45ba51c0bd9e5

Updated vendor submodule

Change-Id: If1aff4f3f3780754c11162ef93c2248b454b504d
---
M vendor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/90/286090/1

diff --git a/vendor b/vendor
index b2799d7..533c62e 16
--- a/vendor
+++ b/vendor
-Subproject commit b2799d7790eb6c789d362960c4a0ed08a22d4c55
+Subproject commit 533c62eaae96be7d6fbd8ed6b04e6c3c98a46fad

-- 
To view, visit https://gerrit.wikimedia.org/r/286090
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If1aff4f3f3780754c11162ef93c2248b454b504d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Cdentinger 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2016-04-27 Thread Cdentinger (Code Review)

Cdentinger has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/285685

Change subject: Merge master into deployment
..

Merge master into deployment

4f5f562 Support cancell?ed donations
894652b Update CiviCRM submodule for logging changes & activity view fix
19183f6 update wikimedia/smash-pig to 6ac4bba6aad3013bf2ddf967806f6b7f5e3647e7

Updated composer.lock

Change-Id: I181ab4d3d26601a659256427d8f21a7180e37132
---
M vendor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/85/285685/1

diff --git a/vendor b/vendor
index 9562e57..37f4a4f 16
--- a/vendor
+++ b/vendor
-Subproject commit 9562e577736b3c268236a86250505d4b01c7655d
+Subproject commit 37f4a4f7bc9f9b399c656f36a7d0864056ffd067

-- 
To view, visit https://gerrit.wikimedia.org/r/285685
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I181ab4d3d26601a659256427d8f21a7180e37132
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Cdentinger 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2016-04-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

786fef8 Only scream about missing parents for negative txns
25d5579 bump smash-pig lib

Change-Id: I692af4673e6567b5bde4f7ccf125fa239e7cbfb4
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Cdentinger: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/283482
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I692af4673e6567b5bde4f7ccf125fa239e7cbfb4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Cdentinger 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2016-04-14 Thread Cdentinger (Code Review)

Cdentinger has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/283482

Change subject: Merge master into deployment
..

Merge master into deployment

786fef8 Only scream about missing parents for negative txns
25d5579 bump smash-pig lib

Change-Id: I692af4673e6567b5bde4f7ccf125fa239e7cbfb4
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/82/283482/1


-- 
To view, visit https://gerrit.wikimedia.org/r/283482
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I692af4673e6567b5bde4f7ccf125fa239e7cbfb4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Cdentinger 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2016-04-12 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

d6f9a8b142d3fa478bb5b47dbe78f1a681e3142f New column headers for JP Morgan
eaa2d2e74f88351a15cd7a9b12d4c008348e8dd8 Split out contribution save hook
de93632e477fe24a0ffad78a639bcf9aa13855e7 Fix source field on partial refunds
c33e3505fce9511e544fdf29c9f8b5e187d6232c Whitespace + readability

Change-Id: Idf27e6c6731fd60d5b5aba52441f992f1ab267b3
---
D sites/all/modules/offline2civicrm/tests/JpMorganFileTest.php
D sites/all/modules/offline2civicrm/tests/data/jpmorgan.csv
D sites/all/modules/wmf_civicrm/tests/phpunit/InstallFunctionsTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
4 files changed, 0 insertions(+), 414 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/sites/all/modules/offline2civicrm/tests/JpMorganFileTest.php 
b/sites/all/modules/offline2civicrm/tests/JpMorganFileTest.php
deleted file mode 100644
index 415049d..000
--- a/sites/all/modules/offline2civicrm/tests/JpMorganFileTest.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<<< HEAD   (a20ac4 Merge master into deployment)
-===
-strtime = '04/02/2000';
-$this->epochtime = wmf_common_date_parse_string('2000-04-02');
-$this->setExchangeRates( $this->epochtime, array( 'USD' => 1, 'EUR' => 
3 ) );
-}
-
-function testParseRow() {
-$data = array(
-'Account Name' => 'Testes EUR_Public',
-'Currency' => 'EUR',
-'Customer Reference' => 'UNAVAILABLE',
-'Bank Reference' => '1234TEST',
-'Transaction Date' => '04/01/2000',
-'Description' => 'FOO CREDIT RECEIVED',
-'Value Date' => $this->strtime,
-'Credit Amount' => '5.50',
-);
-$expected_normal = array(
-'contact_source' => 'check',
-'contact_type' => 'Individual',
-'country' => 'US',
-'currency' => 'EUR',
-'date' => 954547200,
-'direct_mail_appeal' => 'White Mail',
-'email' => 'nob...@wikimedia.org',
-'gateway_account' => 'Testes EUR_Public',
-'gateway' => 'jpmorgan',
-'gateway_txn_id' => '1234TEST',
-'gift_source' => 'Community Gift',
-'gross' => '5.50',
-'no_thank_you' => 'No Contact Details',
-'payment_instrument' => 'JP Morgan EUR',
-'restrictions' => 'Unrestricted - General',
-'settlement_date' => $this->epochtime,
-);
-
-$importer = new JpMorganFileProbe( "no URI" );
-$output = $importer->_parseRow( $data );
-
-$this->stripSourceData( $output );
-$this->assertEquals( $expected_normal, $output );
-}
-
-function testImport() {
-//FIXME
-$_GET['q'] = '';
-//FIXME
-civicrm_initialize();
-
-// Clean slate.
-$contributions = wmf_civicrm_get_contributions_from_gateway_id( 
'jpmorgan', '1234TEST' );
-if ( $contributions ) {
-foreach ( $contributions as $existing ) {
-$success = civicrm_api_classapi()->Contribution->Delete( array(
-'id' => $existing['id'],
-'version' => 3,
-) );
-$this->assertTrue( $success );
-}
-}
-
-$this->setExchangeRates( wmf_common_date_parse_string( '2000-04-01' ), 
array( 'USD' => 1, 'EUR' => 3 ) );
-
-$importer = new JpMorganFileProbe( __DIR__ . "/data/jpmorgan.csv" );
-$importer->import();
-
-$contribution = wmf_civicrm_get_contributions_from_gateway_id( 
'jpmorgan', '1234TEST' );
-$this->assertEquals( 1, count( $contribution ) );
-$this->assertEquals( $contribution[0]['trxn_id'], 'JPMORGAN 1234TEST' 
);
-}
-
-/**
- * @expectedException WmfException
- * @expectedExceptionCode WmfException::INVALID_FILE_FORMAT
- * @expectedExceptionMessage Duplicate column headers: CURRENCY, reference
- */
-function testImportDuplicateHeaders() {
-//FIXME
-$_GET['q'] = '';
-//FIXME
-civicrm_initialize();
-
-$importer = new JpMorganFileProbe( __DIR__ . 
"/data/duplicate_header.csv" );
-$importer->import();
-}
-}
->>> BRANCH (c33e35 Whitespace + readability)
diff --git a/sites/all/modules/offline2civicrm/tests/data/jpmorgan.csv 
b/sites/all/modules/offline2civicrm/tests/data/jpmorgan.csv
deleted file mode 100644
index c11e60a..000
--- a/sites/all/modules/offline2civicrm/tests/data/jpmorgan.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-<<< HEAD   (a20ac4 Merge master into deployment)
-===
-Account Name,Currency,Customer Reference,Bank Reference,Transaction 
Date,Description,Value Date,Credit Amount
-Testes EUR_Public,EUR,UNAVAILABLE,1234TEST,04/01/2000,FO

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2016-04-12 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/283003

Change subject: Merge master into deployment
..

Merge master into deployment

d6f9a8b142d3fa478bb5b47dbe78f1a681e3142f New column headers for JP Morgan
eaa2d2e74f88351a15cd7a9b12d4c008348e8dd8 Split out contribution save hook
de93632e477fe24a0ffad78a639bcf9aa13855e7 Fix source field on partial refunds
c33e3505fce9511e544fdf29c9f8b5e187d6232c Whitespace + readability

Change-Id: Idf27e6c6731fd60d5b5aba52441f992f1ab267b3
---
D sites/all/modules/offline2civicrm/tests/JpMorganFileTest.php
D sites/all/modules/offline2civicrm/tests/data/jpmorgan.csv
D sites/all/modules/wmf_civicrm/tests/phpunit/InstallFunctionsTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
4 files changed, 0 insertions(+), 414 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/03/283003/1

diff --git a/sites/all/modules/offline2civicrm/tests/JpMorganFileTest.php 
b/sites/all/modules/offline2civicrm/tests/JpMorganFileTest.php
deleted file mode 100644
index 415049d..000
--- a/sites/all/modules/offline2civicrm/tests/JpMorganFileTest.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<<< HEAD   (a20ac4 Merge master into deployment)
-===
-strtime = '04/02/2000';
-$this->epochtime = wmf_common_date_parse_string('2000-04-02');
-$this->setExchangeRates( $this->epochtime, array( 'USD' => 1, 'EUR' => 
3 ) );
-}
-
-function testParseRow() {
-$data = array(
-'Account Name' => 'Testes EUR_Public',
-'Currency' => 'EUR',
-'Customer Reference' => 'UNAVAILABLE',
-'Bank Reference' => '1234TEST',
-'Transaction Date' => '04/01/2000',
-'Description' => 'FOO CREDIT RECEIVED',
-'Value Date' => $this->strtime,
-'Credit Amount' => '5.50',
-);
-$expected_normal = array(
-'contact_source' => 'check',
-'contact_type' => 'Individual',
-'country' => 'US',
-'currency' => 'EUR',
-'date' => 954547200,
-'direct_mail_appeal' => 'White Mail',
-'email' => 'nob...@wikimedia.org',
-'gateway_account' => 'Testes EUR_Public',
-'gateway' => 'jpmorgan',
-'gateway_txn_id' => '1234TEST',
-'gift_source' => 'Community Gift',
-'gross' => '5.50',
-'no_thank_you' => 'No Contact Details',
-'payment_instrument' => 'JP Morgan EUR',
-'restrictions' => 'Unrestricted - General',
-'settlement_date' => $this->epochtime,
-);
-
-$importer = new JpMorganFileProbe( "no URI" );
-$output = $importer->_parseRow( $data );
-
-$this->stripSourceData( $output );
-$this->assertEquals( $expected_normal, $output );
-}
-
-function testImport() {
-//FIXME
-$_GET['q'] = '';
-//FIXME
-civicrm_initialize();
-
-// Clean slate.
-$contributions = wmf_civicrm_get_contributions_from_gateway_id( 
'jpmorgan', '1234TEST' );
-if ( $contributions ) {
-foreach ( $contributions as $existing ) {
-$success = civicrm_api_classapi()->Contribution->Delete( array(
-'id' => $existing['id'],
-'version' => 3,
-) );
-$this->assertTrue( $success );
-}
-}
-
-$this->setExchangeRates( wmf_common_date_parse_string( '2000-04-01' ), 
array( 'USD' => 1, 'EUR' => 3 ) );
-
-$importer = new JpMorganFileProbe( __DIR__ . "/data/jpmorgan.csv" );
-$importer->import();
-
-$contribution = wmf_civicrm_get_contributions_from_gateway_id( 
'jpmorgan', '1234TEST' );
-$this->assertEquals( 1, count( $contribution ) );
-$this->assertEquals( $contribution[0]['trxn_id'], 'JPMORGAN 1234TEST' 
);
-}
-
-/**
- * @expectedException WmfException
- * @expectedExceptionCode WmfException::INVALID_FILE_FORMAT
- * @expectedExceptionMessage Duplicate column headers: CURRENCY, reference
- */
-function testImportDuplicateHeaders() {
-//FIXME
-$_GET['q'] = '';
-//FIXME
-civicrm_initialize();
-
-$importer = new JpMorganFileProbe( __DIR__ . 
"/data/duplicate_header.csv" );
-$importer->import();
-}
-}
->>> BRANCH (c33e35 Whitespace + readability)
diff --git a/sites/all/modules/offline2civicrm/tests/data/jpmorgan.csv 
b/sites/all/modules/offline2civicrm/tests/data/jpmorgan.csv
deleted file mode 100644
index c11e60a..000
--- a/sites/all/modules/offline2civicrm/tests/data/jpmorgan.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-<<< HEAD   (a20ac4 Merge master into deployment)
-===
-Account Name,Currency,Customer Reference,Bank Reference,Transaction 
Date,Description,Value Date,Credit Amount
-

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2016-04-06 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

eaa26a6641842d410468b51ec776d9e81493b30f Extend the fredge payment_submethod 
column to 32 chars

Change-Id: I9ce1f6987cc13df74567703d3a515436d6185963
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Awight: Verified; Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/282070
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ce1f6987cc13df74567703d3a515436d6185963
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2016-04-06 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/282070

Change subject: Merge master into deployment
..

Merge master into deployment

eaa26a6641842d410468b51ec776d9e81493b30f Extend the fredge payment_submethod 
column to 32 chars

Change-Id: I9ce1f6987cc13df74567703d3a515436d6185963
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/70/282070/1


-- 
To view, visit https://gerrit.wikimedia.org/r/282070
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ce1f6987cc13df74567703d3a515436d6185963
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2016-03-30 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/280282

Change subject: Merge master into deployment
..

Merge master into deployment

a4c982e Add CiviCRM activity to put against the deleted contact
18f35f0 Revert "Thank you letters for exec director transition"
c033f6f Remove obsolete TY letters
f9b1361 New TY letters for executive director transition

Change-Id: Ic2965b7b25d6c9b4f37980a896a4ccbf7707f83d
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/82/280282/1


-- 
To view, visit https://gerrit.wikimedia.org/r/280282
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2965b7b25d6c9b4f37980a896a4ccbf7707f83d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2016-03-30 Thread Ejegg (Code Review)

Ejegg has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

a4c982e Add CiviCRM activity to put against the deleted contact
18f35f0 Revert "Thank you letters for exec director transition"
c033f6f Remove obsolete TY letters
f9b1361 New TY letters for executive director transition

Change-Id: Ic2965b7b25d6c9b4f37980a896a4ccbf7707f83d
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Verified; Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/280282
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2965b7b25d6c9b4f37980a896a4ccbf7707f83d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2016-03-19 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/277832

Change subject: Merge master into deployment
..

Merge master into deployment

2b03784 Thank You letters for executive director transition
2f51f34 Simplify option value retrieval, fail fast
68fad07 CiviCRM submodule update, lybunt, export

Change-Id: Id1e5d934a7993851b508d61b8fffd292ee03b96a
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/32/277832/1


-- 
To view, visit https://gerrit.wikimedia.org/r/277832
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1e5d934a7993851b508d61b8fffd292ee03b96a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2016-03-19 Thread Ejegg (Code Review)

Ejegg has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

2b03784 Thank You letters for executive director transition
2f51f34 Simplify option value retrieval, fail fast
68fad07 CiviCRM submodule update, lybunt, export

Change-Id: Id1e5d934a7993851b508d61b8fffd292ee03b96a
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/277832
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id1e5d934a7993851b508d61b8fffd292ee03b96a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-12-09 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

358859d04603346274f2d96f78d099d8e384b2a1 Queue consumer can import multiple 
messages from JSON
411f7f6d23008a460c77e1a30b06049ef798060f Update WMF's mailing address in 
thank-you letter

Change-Id: Ib3a52eb3f3bade7b5f313604a6e4bd8c6f1d962c
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Awight: Verified; Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/258079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3a52eb3f3bade7b5f313604a6e4bd8c6f1d962c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-12-09 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/258079

Change subject: Merge master into deployment
..

Merge master into deployment

358859d04603346274f2d96f78d099d8e384b2a1 Queue consumer can import multiple 
messages from JSON
411f7f6d23008a460c77e1a30b06049ef798060f Update WMF's mailing address in 
thank-you letter

Change-Id: Ib3a52eb3f3bade7b5f313604a6e4bd8c6f1d962c
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/79/258079/1


-- 
To view, visit https://gerrit.wikimedia.org/r/258079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3a52eb3f3bade7b5f313604a6e4bd8c6f1d962c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-12-04 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

fdb59a41f36124112f54e3f3fd69adfe620d5a5e Update contribution_type -> 
financial_type in audit script

Change-Id: Idf72515dce938e69f67f6e4950410e815742b2e1
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Awight: Verified; Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/257001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idf72515dce938e69f67f6e4950410e815742b2e1
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-12-04 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/257001

Change subject: Merge master into deployment
..

Merge master into deployment

fdb59a41f36124112f54e3f3fd69adfe620d5a5e Update contribution_type -> 
financial_type in audit script

Change-Id: Idf72515dce938e69f67f6e4950410e815742b2e1
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/01/257001/1


-- 
To view, visit https://gerrit.wikimedia.org/r/257001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf72515dce938e69f67f6e4950410e815742b2e1
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-11-25 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

88a79666ee63073d58537262754033fbca5a04bb update civicrm submodule

Change-Id: Ia522cf44b6fbccbde1eb4a14f2aae220598b11ba
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Awight: Verified; Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/255489
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia522cf44b6fbccbde1eb4a14f2aae220598b11ba
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-11-25 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/255489

Change subject: Merge master into deployment
..

Merge master into deployment

88a79666ee63073d58537262754033fbca5a04bb update civicrm submodule

Change-Id: Ia522cf44b6fbccbde1eb4a14f2aae220598b11ba
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/89/255489/1


-- 
To view, visit https://gerrit.wikimedia.org/r/255489
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia522cf44b6fbccbde1eb4a14f2aae220598b11ba
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-11-19 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

c6284f33e19389619442bf9b613dbe14057237e8 Make LYBUNT report work for calendar 
and fiscal year
93809b307778bf650039106e4adb0e0880cb04e2 Yet another variation in the Coinbase 
naming scheme

Change-Id: Ic6180ad6146ad07e152d2c965c35c1c547baa888
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Awight: Verified; Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/254341
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic6180ad6146ad07e152d2c965c35c1c547baa888
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-11-19 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/254341

Change subject: Merge master into deployment
..

Merge master into deployment

c6284f33e19389619442bf9b613dbe14057237e8 Make LYBUNT report work for calendar 
and fiscal year
93809b307778bf650039106e4adb0e0880cb04e2 Yet another variation in the Coinbase 
naming scheme

Change-Id: Ic6180ad6146ad07e152d2c965c35c1c547baa888
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/41/254341/1


-- 
To view, visit https://gerrit.wikimedia.org/r/254341
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6180ad6146ad07e152d2c965c35c1c547baa888
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-11-18 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

968203e28d9df3e376a1148564b2473d59702a6a Unset time limit after loop
2976b9f433c0adca1d75e502a28df80240b0f0c2 Update civicrm submodule

Change-Id: If7566c35843e634647f1c86e93a9139b828ecad0
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Awight: Verified; Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/254084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If7566c35843e634647f1c86e93a9139b828ecad0
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-11-18 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/254084

Change subject: Merge master into deployment
..

Merge master into deployment

968203e28d9df3e376a1148564b2473d59702a6a Unset time limit after loop
2976b9f433c0adca1d75e502a28df80240b0f0c2 Update civicrm submodule

Change-Id: If7566c35843e634647f1c86e93a9139b828ecad0
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/84/254084/1


-- 
To view, visit https://gerrit.wikimedia.org/r/254084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If7566c35843e634647f1c86e93a9139b828ecad0
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-11-18 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

ebc160a68f858bc558bfc2d056c6a009b6a0fcdf Add test for Fix thank_you to not use 
ported 4.2 custom api
16a3cdf62cee4f9d3e94f9841661fdf262541483 Add test message fixtures for the 
fredge queue
e004790fc14e84bd3ad352dd0fcff36ce0704855 Explicitly load BaseChecksFileTest in 
test bootstrap
3818abc255c487d57352dbec3c37ea9c52ea01ba Remove check for currency in validate 
hook on the basis CiviCRM handles this
fb1938b39a450d86627ba4181103dbc3fc48559c Change spacing to match surrounding 
rows
acf2c3d794ff84dc64783f8ef98fe2f39b4b15ff Add test for thousands separator in 
contribution import
b13d58b94367d8e5a68cc8d623a55ccdd9c05692 Remove commas from currency fields
6d99c83fb73fc1976254e440060b178d12cc7b6c Prevent PHP timeout when importing 
large files

Change-Id: Id36bb775d5e435f43739c5198c6efe4a0d19c232
---
M sites/all/modules/offline2civicrm/offline2civicrm.info
D sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
3 files changed, 0 insertions(+), 577 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/sites/all/modules/offline2civicrm/offline2civicrm.info 
b/sites/all/modules/offline2civicrm/offline2civicrm.info
index ffcfc77..a09fd68 100644
--- a/sites/all/modules/offline2civicrm/offline2civicrm.info
+++ b/sites/all/modules/offline2civicrm/offline2civicrm.info
@@ -24,7 +24,3 @@
 files[] = TrilogyFile.php
 files[] = WmfImportFile.php
 files[] = WmfOrgImportFile.php
-<<< HEAD   (230ceb Merge branch 'master' into deployment)
-===
-
->>> BRANCH (6d99c8 Prevent PHP timeout when importing large files)
diff --git 
a/sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
deleted file mode 100644
index 66aab2f..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<<< HEAD   (230ceb Merge branch 'master' into deployment)
-===
- 'Organization',
-'organization_name' => 'The Evil Empire',
-));
-wmf_civicrm_tag_contact_for_review($contact);
-$entityTags = civicrm_api3('EntityTag', 'get', array('entity_id' => 
$contact['id']));
-$this->assertArrayHasKey(civicrm_api3('Tag', 'getvalue', array('name' 
=> 'Review', 'return' => 'id')), $entityTags['values']);
-}
-
-/**
- * Test wmf_ensure_language_exists
- *
- * Maintenance note: the civicrm entity_tag get api returns an odd syntax.
- *
- * If that ever gets fixed it may break this test - but only the test would
- * need to be altered to adapt.
- *
- * @throws \CiviCRM_API3_Exception
- */
-public function testEnsureLanguageExists() {
-civicrm_initialize();
-wmf_civicrm_ensure_language_exists('en_IL');
-$languages = civicrm_api3('OptionValue', 'get', array(
-'option_group_name' => 'languages',
-'name' => 'en_IL',
-));
-$this->assertEquals(1, $languages['count']);
-}
-
-/**
- * Test wmf custom api entity get detail.
- *
- * @todo consider moving test to thank_you module or helper function out 
of there.
- *
- * @throws \CiviCRM_API3_Exception
- */
-public function testGetEntityTagDetail() {
-civicrm_initialize();
-$contact = $this->callAPISuccess('Contact', 'create', array(
-'first_name' => 'Papa',
-'last_name' => 'Smurf',
-'contact_type' => 'Individual',
-));
-$contribution = $this->callAPISuccess('Contribution', 'create', array(
-'contact_id' => $contact['id'],
-'total_amount' => 40,
-'financial_type_id' => 'Donation',
-));
-
-$tag1 = $this->ensureTagExists('smurfy');
-$tag2 = $this->ensureTagExists('smurfalicious');
-
-$this->callAPISuccess('EntityTag', 'create', array('entity_id' => 
$contribution['id'], 'entity_table' => 'civicrm_contribution', 'tag_id' => 
'smurfy'));
-$this->callAPISuccess('EntityTag', 'create', array('entity_id' => 
$contribution['id'], 'entity_table' => 'civicrm_contribution', 'tag_id' => 
'smurfalicious'));
-
-$smurfiestTags = wmf_thank_you_get_tag_names($contribution['id']);
-$this->assertEquals(array('smurfy', 'smurfalicious'), $smurfiestTags);
-
-$this->callAPISuccess('Tag', 'delete', array('id' => $tag1));
-$this->callAPISuccess('Tag', 'delete', array('id' => $tag2));
-}
-
-/**
- * Helper function to protect test against cleanup issues.
- *
- * @param string $name
- * @return int
- */
-public function ensureTagExists($name) {
-$tags = $this->callAPISuccess(

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-11-18 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/254018

Change subject: Merge master into deployment
..

Merge master into deployment

ebc160a68f858bc558bfc2d056c6a009b6a0fcdf Add test for Fix thank_you to not use 
ported 4.2 custom api
16a3cdf62cee4f9d3e94f9841661fdf262541483 Add test message fixtures for the 
fredge queue
e004790fc14e84bd3ad352dd0fcff36ce0704855 Explicitly load BaseChecksFileTest in 
test bootstrap
3818abc255c487d57352dbec3c37ea9c52ea01ba Remove check for currency in validate 
hook on the basis CiviCRM handles this
fb1938b39a450d86627ba4181103dbc3fc48559c Change spacing to match surrounding 
rows
acf2c3d794ff84dc64783f8ef98fe2f39b4b15ff Add test for thousands separator in 
contribution import
b13d58b94367d8e5a68cc8d623a55ccdd9c05692 Remove commas from currency fields
6d99c83fb73fc1976254e440060b178d12cc7b6c Prevent PHP timeout when importing 
large files

Change-Id: Id36bb775d5e435f43739c5198c6efe4a0d19c232
---
M sites/all/modules/offline2civicrm/offline2civicrm.info
D sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
3 files changed, 0 insertions(+), 577 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/18/254018/1

diff --git a/sites/all/modules/offline2civicrm/offline2civicrm.info 
b/sites/all/modules/offline2civicrm/offline2civicrm.info
index ffcfc77..a09fd68 100644
--- a/sites/all/modules/offline2civicrm/offline2civicrm.info
+++ b/sites/all/modules/offline2civicrm/offline2civicrm.info
@@ -24,7 +24,3 @@
 files[] = TrilogyFile.php
 files[] = WmfImportFile.php
 files[] = WmfOrgImportFile.php
-<<< HEAD   (230ceb Merge branch 'master' into deployment)
-===
-
->>> BRANCH (6d99c8 Prevent PHP timeout when importing large files)
diff --git 
a/sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
deleted file mode 100644
index 66aab2f..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<<< HEAD   (230ceb Merge branch 'master' into deployment)
-===
- 'Organization',
-'organization_name' => 'The Evil Empire',
-));
-wmf_civicrm_tag_contact_for_review($contact);
-$entityTags = civicrm_api3('EntityTag', 'get', array('entity_id' => 
$contact['id']));
-$this->assertArrayHasKey(civicrm_api3('Tag', 'getvalue', array('name' 
=> 'Review', 'return' => 'id')), $entityTags['values']);
-}
-
-/**
- * Test wmf_ensure_language_exists
- *
- * Maintenance note: the civicrm entity_tag get api returns an odd syntax.
- *
- * If that ever gets fixed it may break this test - but only the test would
- * need to be altered to adapt.
- *
- * @throws \CiviCRM_API3_Exception
- */
-public function testEnsureLanguageExists() {
-civicrm_initialize();
-wmf_civicrm_ensure_language_exists('en_IL');
-$languages = civicrm_api3('OptionValue', 'get', array(
-'option_group_name' => 'languages',
-'name' => 'en_IL',
-));
-$this->assertEquals(1, $languages['count']);
-}
-
-/**
- * Test wmf custom api entity get detail.
- *
- * @todo consider moving test to thank_you module or helper function out 
of there.
- *
- * @throws \CiviCRM_API3_Exception
- */
-public function testGetEntityTagDetail() {
-civicrm_initialize();
-$contact = $this->callAPISuccess('Contact', 'create', array(
-'first_name' => 'Papa',
-'last_name' => 'Smurf',
-'contact_type' => 'Individual',
-));
-$contribution = $this->callAPISuccess('Contribution', 'create', array(
-'contact_id' => $contact['id'],
-'total_amount' => 40,
-'financial_type_id' => 'Donation',
-));
-
-$tag1 = $this->ensureTagExists('smurfy');
-$tag2 = $this->ensureTagExists('smurfalicious');
-
-$this->callAPISuccess('EntityTag', 'create', array('entity_id' => 
$contribution['id'], 'entity_table' => 'civicrm_contribution', 'tag_id' => 
'smurfy'));
-$this->callAPISuccess('EntityTag', 'create', array('entity_id' => 
$contribution['id'], 'entity_table' => 'civicrm_contribution', 'tag_id' => 
'smurfalicious'));
-
-$smurfiestTags = wmf_thank_you_get_tag_names($contribution['id']);
-$this->assertEquals(array('smurfy', 'smurfalicious'), $smurfiestTags);
-
-$this->callAPISuccess('Tag', 'delete', array('id' => $tag1));
-$this->callAPISuccess('Tag', 'delete', array('id' => $tag2));
-}
-
-/**
- * Helper function to protect test against cleanup issues.
- *
- * @param string $name
- * @return int
- */
-public function ensureTagExis

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-11-03 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

8c7c95e4aa97fc0ea25c233e6000b49ba2abfa3f Fix reference to contribution_type_id

Change-Id: If48f55f214eca19cb7b5214842fab37f0b7e8fad
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Awight: Verified; Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/250733
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If48f55f214eca19cb7b5214842fab37f0b7e8fad
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-11-03 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/250733

Change subject: Merge master into deployment
..

Merge master into deployment

8c7c95e4aa97fc0ea25c233e6000b49ba2abfa3f Fix reference to contribution_type_id

Change-Id: If48f55f214eca19cb7b5214842fab37f0b7e8fad
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/33/250733/1


-- 
To view, visit https://gerrit.wikimedia.org/r/250733
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If48f55f214eca19cb7b5214842fab37f0b7e8fad
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

d450e0987638ce184b179eaa46d06dac09ec1636 T99836 remove apiv2 Entity Tag call
4954e2b0f7b9250235e234d055f2eac96d40ba93 T99836 Civi46: adapt to pre-hook 
standardisation
a3b0f4e3a998dc9fceb4df6f952b72776323e842 T99836 Civi46 update refund test for 
changed parameter
d20af19ae79e14bc9978237a021fc519aebdfbdf T99836 Civi46 adapt to DAO BAO rename 
to CRM_Mailing_DAO_MailingJob
f195411e6fdca9a473a6d1089f5f460671623769 Merge from master : Revert commits on 
wrong branch
a21248171b8aa72638d21971cd1cd98be9a77e65 T99836 Civi46: remove calls to 
pesudoconstant:phoneType
3b6ff2d948ffc7548c4aa98f6ed5ff0b1b7009cc Revert "Revert "4.6 upgrade 
preparation, replace contribution_type with financial_type""
c4a478385737f6574a4db0feaa827d1c2e7ae015 T99836 Civi46: reapply commits 
reverted in master
b5d216cd9502d20ce9c8d40ba2f337843502761f Civi46 adjust expected return array in 
testImport
e1ca55aac6ccba0118f928627f8de5e976d1819e Civi46: adapt to pre-hook 
standardisation (2)
0fcd2b6331efabeadd858b26e7f6bd5e93e66445 T9936 Civi46: remove calls to 
pseudoconstants:individualPrefix & Suffix
6ca9074dceb447dbdfaa7672af84c3d0049c05dd T99836 Civi46: ensure that preferred 
language exists when creating a contact
11b5b0b457fc120ca8b0fc305c7e94434b3454a2 T99836 Civi46 fix ensure_prefix & 
ensure_suffix for 4.6
ab3f5b3dee52d95efeab51bc197a6f957d74f2ae T99836 fix dumb typo in test
1f790b5db6fa93d759b5532106e470e941ea5467 Civi46: fix another call to 
ContributionType
3b9784512c59358d3a2ff74c5d24d3982590c507 Civi46 update CiviCRM submodule version
e73520c3185d67f3a4a89f9cd3326a047c176ce1 Civi46 update refund test for changed 
parameter (no 2)
e2f05147f8f81f04e1cfdfdfd5360377989714b7 Civi46 adjust function to get tests 
passing
ad0105535f3f5ad42d543a990780b8ae0f3dce38 Civi46 remove call to old function.
10bd261fc6f05997cedcd0d2934c3f552c957fb4 Campaign option values must exist
8cfd0f0f96dc6517bc47823f194d20ff19e7f599 Civi46 Update report urls to open as 
criteria
0b6a9e6aa12722ebff8abbb7fb0daf2729303895 Civi46 set contact_default_language on 
upgrade
949b0baa83f1b889777c11759f257b23dc20cd94 Civi46 alter gitreview in branch to 
prevent (more) mishaps
e32ebcaddff5a9ad754b6b1072846df90d78fda7 Civi46 reset Navigation menu
13c60e5143cb3fda73ef2109d1047caa3f555820 Remove custom quicksearch hook
4794db30a6141b7b517268f0d8ab1457f123bcee Fix e-strict errors
612fe63e2f50b8c6e1d0633fe356e840c3f9e7c1 Update field name to -financial_type
8ca2979cd5be0da249848758d5c01512940367e6 Add test class for reports
ff8dd92f9be4455bad03a26dd48c9c4136078586 Remove bad code
e16c3ba85e66248194116cb56b4d5b45ce91919f Initialize CiviCRM before calling api 
functions in upgrade
ae9de8bc2b8e516c9651c58b76f9c1d3ff4842a3 Set search to default to contribution 
date range
78dee8f09e1cd7ec11fdab4cbeaef6bd6f419022 Fail gracefully if campaigns were 
added using the native Civi interface
0a981c725657ec5d540f1635309099bc5c41b2fe increment CiviCRM submodule version
dbd63c5258f8d48c0bf01bb5eeaa7b5de6b0dace Revert "Revert "4.6 upgrade 
preparation, replace contribution_type with financial_type""
90ea74330310798c0737981d800c93d3cf4a4950 Revert "Revert commits on wrong branch"
6c9443d54b123bb47c61e19cb715fd602daf2c01 Remove trailing spaces
1a55f9977aa914af0f7400436bf86c3e528c4202 Reintroduce minor change lost in merge
061a230cf361a817b6aa8bec83a21f93d385929d Adjust civicrm submodule to reflect 
merged version
67e139c03f5075ab9c365c60b02e05cdc89d4c83 Add banner_history module to consume 
BH log id associations
0367ae2b724ef9653baf9d3e364e3ea720082b8c Only copy valid campaigns to appeal 
field
43472e62d5b3d07b6c689a18683aa01e5f6e1c18 Update references to 
civicrm_contribution_recur.next_sched_recur_date to new field name
e10e74a0043d3d753550433a9f22e601af517a3d Fix thank_you to not use ported 4.2 
custom api
74656eb3dc345b6fcfb47b32b14f1946257fc793 bump civicrm submodule
33f36e26cdba8061f3f556420db981086f607dac Civi method to fetch tags has changed
7d891ceee3eb1d5c9e71f2c2d4ca30d2053ffc11 Update civicrm submodule

Conflicts:
civicrm
sites/all/modules/queue2civicrm/tests/includes/QueueConsumer.php
sites/all/modules/wmf_campaigns/tests/WmfCampaignTest.php
sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php

sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php

Change-Id: Ib564e1c0b36b40af4d60f4ca50bec251f7eb4b01
---
M civicrm
D sites/all/modules/queue2civicrm/tests/includes/QueueConsumer.php
D sites/all/modules/wmf_campaigns/tests/WmfCampaignTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
D

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-11-02 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/250588

Change subject: Merge master into deployment
..

Merge master into deployment

d450e0987638ce184b179eaa46d06dac09ec1636 T99836 remove apiv2 Entity Tag call
4954e2b0f7b9250235e234d055f2eac96d40ba93 T99836 Civi46: adapt to pre-hook 
standardisation
a3b0f4e3a998dc9fceb4df6f952b72776323e842 T99836 Civi46 update refund test for 
changed parameter
d20af19ae79e14bc9978237a021fc519aebdfbdf T99836 Civi46 adapt to DAO BAO rename 
to CRM_Mailing_DAO_MailingJob
f195411e6fdca9a473a6d1089f5f460671623769 Merge from master : Revert commits on 
wrong branch
a21248171b8aa72638d21971cd1cd98be9a77e65 T99836 Civi46: remove calls to 
pesudoconstant:phoneType
3b6ff2d948ffc7548c4aa98f6ed5ff0b1b7009cc Revert "Revert "4.6 upgrade 
preparation, replace contribution_type with financial_type""
c4a478385737f6574a4db0feaa827d1c2e7ae015 T99836 Civi46: reapply commits 
reverted in master
b5d216cd9502d20ce9c8d40ba2f337843502761f Civi46 adjust expected return array in 
testImport
e1ca55aac6ccba0118f928627f8de5e976d1819e Civi46: adapt to pre-hook 
standardisation (2)
0fcd2b6331efabeadd858b26e7f6bd5e93e66445 T9936 Civi46: remove calls to 
pseudoconstants:individualPrefix & Suffix
6ca9074dceb447dbdfaa7672af84c3d0049c05dd T99836 Civi46: ensure that preferred 
language exists when creating a contact
11b5b0b457fc120ca8b0fc305c7e94434b3454a2 T99836 Civi46 fix ensure_prefix & 
ensure_suffix for 4.6
ab3f5b3dee52d95efeab51bc197a6f957d74f2ae T99836 fix dumb typo in test
1f790b5db6fa93d759b5532106e470e941ea5467 Civi46: fix another call to 
ContributionType
3b9784512c59358d3a2ff74c5d24d3982590c507 Civi46 update CiviCRM submodule version
e73520c3185d67f3a4a89f9cd3326a047c176ce1 Civi46 update refund test for changed 
parameter (no 2)
e2f05147f8f81f04e1cfdfdfd5360377989714b7 Civi46 adjust function to get tests 
passing
ad0105535f3f5ad42d543a990780b8ae0f3dce38 Civi46 remove call to old function.
10bd261fc6f05997cedcd0d2934c3f552c957fb4 Campaign option values must exist
8cfd0f0f96dc6517bc47823f194d20ff19e7f599 Civi46 Update report urls to open as 
criteria
0b6a9e6aa12722ebff8abbb7fb0daf2729303895 Civi46 set contact_default_language on 
upgrade
949b0baa83f1b889777c11759f257b23dc20cd94 Civi46 alter gitreview in branch to 
prevent (more) mishaps
e32ebcaddff5a9ad754b6b1072846df90d78fda7 Civi46 reset Navigation menu
13c60e5143cb3fda73ef2109d1047caa3f555820 Remove custom quicksearch hook
4794db30a6141b7b517268f0d8ab1457f123bcee Fix e-strict errors
612fe63e2f50b8c6e1d0633fe356e840c3f9e7c1 Update field name to -financial_type
8ca2979cd5be0da249848758d5c01512940367e6 Add test class for reports
ff8dd92f9be4455bad03a26dd48c9c4136078586 Remove bad code
e16c3ba85e66248194116cb56b4d5b45ce91919f Initialize CiviCRM before calling api 
functions in upgrade
ae9de8bc2b8e516c9651c58b76f9c1d3ff4842a3 Set search to default to contribution 
date range
78dee8f09e1cd7ec11fdab4cbeaef6bd6f419022 Fail gracefully if campaigns were 
added using the native Civi interface
0a981c725657ec5d540f1635309099bc5c41b2fe increment CiviCRM submodule version
dbd63c5258f8d48c0bf01bb5eeaa7b5de6b0dace Revert "Revert "4.6 upgrade 
preparation, replace contribution_type with financial_type""
90ea74330310798c0737981d800c93d3cf4a4950 Revert "Revert commits on wrong branch"
6c9443d54b123bb47c61e19cb715fd602daf2c01 Remove trailing spaces
1a55f9977aa914af0f7400436bf86c3e528c4202 Reintroduce minor change lost in merge
061a230cf361a817b6aa8bec83a21f93d385929d Adjust civicrm submodule to reflect 
merged version
67e139c03f5075ab9c365c60b02e05cdc89d4c83 Add banner_history module to consume 
BH log id associations
0367ae2b724ef9653baf9d3e364e3ea720082b8c Only copy valid campaigns to appeal 
field
43472e62d5b3d07b6c689a18683aa01e5f6e1c18 Update references to 
civicrm_contribution_recur.next_sched_recur_date to new field name
e10e74a0043d3d753550433a9f22e601af517a3d Fix thank_you to not use ported 4.2 
custom api
74656eb3dc345b6fcfb47b32b14f1946257fc793 bump civicrm submodule
33f36e26cdba8061f3f556420db981086f607dac Civi method to fetch tags has changed
7d891ceee3eb1d5c9e71f2c2d4ca30d2053ffc11 Update civicrm submodule

Conflicts:
civicrm
sites/all/modules/queue2civicrm/tests/includes/QueueConsumer.php
sites/all/modules/wmf_campaigns/tests/WmfCampaignTest.php
sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php

sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php

Change-Id: Ib564e1c0b36b40af4d60f4ca50bec251f7eb4b01
---
M civicrm
D sites/all/modules/queue2civicrm/tests/includes/QueueConsumer.php
D sites/all/modules/wmf_campaigns/tests/WmfCampaignTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
D sites/all/modules/wmf_civicrm/tes

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-10-07 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

22c0e8553a6fc444c0349332020595dcd03b3c7c Add Direct Mail Appeal column to 
Trilogy Importer
8fc9f90a5c7955d1f5dd1ad664fc620459cf20cd Fix JPMorgan Importer
ef3e8edd6df5115ce953711307ff60648bf93ceb Remove recurring clause from Bengali 
thank-you letter
2bc597c5d4839afcf555f81cec35cf92b6967efb Remove unused recurring info template 
partial

Change-Id: Ida5559be6aeb8fa51a42f75b1ca5e2a1028f9625
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Awight: Verified; Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/244218
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida5559be6aeb8fa51a42f75b1ca5e2a1028f9625
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-10-07 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/244218

Change subject: Merge master into deployment
..

Merge master into deployment

22c0e8553a6fc444c0349332020595dcd03b3c7c Add Direct Mail Appeal column to 
Trilogy Importer
8fc9f90a5c7955d1f5dd1ad664fc620459cf20cd Fix JPMorgan Importer
ef3e8edd6df5115ce953711307ff60648bf93ceb Remove recurring clause from Bengali 
thank-you letter
2bc597c5d4839afcf555f81cec35cf92b6967efb Remove unused recurring info template 
partial

Change-Id: Ida5559be6aeb8fa51a42f75b1ca5e2a1028f9625
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/18/244218/1


-- 
To view, visit https://gerrit.wikimedia.org/r/244218
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida5559be6aeb8fa51a42f75b1ca5e2a1028f9625
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-09-28 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/241701

Change subject: Merge master into deployment
..

Merge master into deployment

a1b45739e790884b9a6f5515587ae14210cec882 Explain some disablement
4e57ae2b4e09b615fcd3b42d51f071ded9a0de8e T99836 remove trailing spaces
5d53dad615b60d3b1a5eb10553aff83fefeb22e1 Update SmashPig lib

Change-Id: Ice98ad33ce6166cf3161b54342c3f036be019f3b
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/01/241701/1


-- 
To view, visit https://gerrit.wikimedia.org/r/241701
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice98ad33ce6166cf3161b54342c3f036be019f3b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-09-25 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/241135

Change subject: Merge master into deployment
..

Merge master into deployment

a1b45739e790884b9a6f5515587ae14210cec882 Explain some disablement
4e57ae2b4e09b615fcd3b42d51f071ded9a0de8e T99836 remove trailing spaces

Change-Id: I0d980202bd5c8f59732ca78f079e378db64b289c
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/35/241135/1


-- 
To view, visit https://gerrit.wikimedia.org/r/241135
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d980202bd5c8f59732ca78f079e378db64b289c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-09-18 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

faaa78ddda6ebc296757a252412a303847b0765d Update to the 20150904 thank you letter
28c668f15d2b8295e8b61fa7681bec8609736a8a Correctly encode HTML entities in our 
debugging block.

Change-Id: I9d8c5e6ddd9cccf6544cdea2884f14bc0e3fb881
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/239529
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9d8c5e6ddd9cccf6544cdea2884f14bc0e3fb881
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-09-18 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/239529

Change subject: Merge master into deployment
..

Merge master into deployment

faaa78ddda6ebc296757a252412a303847b0765d Update to the 20150904 thank you letter
28c668f15d2b8295e8b61fa7681bec8609736a8a Correctly encode HTML entities in our 
debugging block.

Change-Id: I9d8c5e6ddd9cccf6544cdea2884f14bc0e3fb881
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/29/239529/1


-- 
To view, visit https://gerrit.wikimedia.org/r/239529
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d8c5e6ddd9cccf6544cdea2884f14bc0e3fb881
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-09-01 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

Change-Id: I46786f9bb6ae5f69a60f8f76a92d4b0df75a5704
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Awight: Verified; Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/235374
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I46786f9bb6ae5f69a60f8f76a92d4b0df75a5704
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-09-01 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/235374

Change subject: Merge master into deployment
..

Merge master into deployment

Change-Id: I46786f9bb6ae5f69a60f8f76a92d4b0df75a5704
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/74/235374/1


-- 
To view, visit https://gerrit.wikimedia.org/r/235374
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I46786f9bb6ae5f69a60f8f76a92d4b0df75a5704
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-08-27 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

5ff7c0deb69e56f5045a30e8fe65a54845842fd5 Follow breaking change in MediaWiki 
API response
78e452984716fe78d5d56e5ce68cc3d1eef695fe Update DonationInterface

Change-Id: I518c453c70bebdb729e5b1e302c2296506079975
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/23
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I518c453c70bebdb729e5b1e302c2296506079975
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-08-27 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/23

Change subject: Merge master into deployment
..

Merge master into deployment

5ff7c0deb69e56f5045a30e8fe65a54845842fd5 Follow breaking change in MediaWiki 
API response
78e452984716fe78d5d56e5ce68cc3d1eef695fe Update DonationInterface

Change-Id: I518c453c70bebdb729e5b1e302c2296506079975
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/44/23/1


-- 
To view, visit https://gerrit.wikimedia.org/r/23
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I518c453c70bebdb729e5b1e302c2296506079975
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-06-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

7f4e85737efb2eefb0db989cf253d8e982dcd247 Use integers for WmfException codes
5961da7d2cf608a176ea9a8320139acfc7c83f3d Throw exception on duplicate row 
headers in import
beafbe187a55c9135f1a53b3963fd9b45ff061ae Fix a few values in Engage import test
0881feb382a661ce5be4df94aba67778f30d098d Add php-queue and predis to 
composer.json, update
66a0325e7283bf9300d1ebb5f2753e97dc21c7f0 Ignore empty rows and columns
c7e299370b0bf1c78a9aedba203e701fea43e863 Protect against some corner cases; 
comment
2646f2e0e8a55cb23b130a8d491b6689ce77d8e9 Always parse dates as UTC
2bc5dbb903b5e00c234e028e157748e2c76adc73 Fix offline2civicrm tests
6b5d79b479d33a96e875ba4d10266e9184e904d3 Port mw-vagrant install scripts into 
this repo
041d533974bd6039c2d7a4ef0175210a8a0ff89c Add new Location Types.
be377b5a572f9527be456955c42df3091fe8a4f0 ci-settings: point MySQL db to 
127.0.0.1
a79a17fe7556d5e687635460d1ff80384d503acc comments
7e81817b677af81215787af1208d008b53587747 Generic import specification
c1490d18eb1ac5d232ee29deaa3501e05a89f9ad Don't use Name or Title fields if this 
is not an Organization contact.
0a1f82af2df71a19b3659a6b80d99271a1258cd7 Port contribution import tests as pure 
fixture data
53a86251f8dcca80aa8ef5a3f7ece87232341542 Implement soft credit import
59731d66da0be3688e4db1c98318bfb9b06ac4d5 Rename function, it's not specific to 
contributions
dde86b02246e1cdea7ee0d966133ca09da51ce38 Renumber 6000-series updates
df81eb47d329908470090711470dab28e8da33a5 Use RAII for fixtures
15c080c477dcad53c33b7e9981c9c5c41fb26475 Write test for contact_groups import
2aeb20da51d6b34ca07aca0e47ade6b28155f742 Revert "Use RAII for fixtures"
afb246485bb41620257decb2bce299f0cee1986d Revert "Write test for contact_groups 
import"

Conflicts:
phpunit.xml
sites/all/modules/offline2civicrm/ChecksFile.php
sites/all/modules/offline2civicrm/offline2civicrm.common.inc
sites/all/modules/offline2civicrm/offline2civicrm.info
sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
sites/all/modules/offline2civicrm/tests/ForeignChecksFileTest.php
sites/all/modules/offline2civicrm/tests/JpMorganFileTest.php
sites/all/modules/offline2civicrm/tests/PayPalChecksFileTest.php
sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php
sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
sites/all/modules/wmf_civicrm/tests/phpunit/NormalizeMessageTest.php
sites/all/modules/wmf_civicrm/wmf_civicrm.info

sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
sites/all/modules/wmf_common/tests/phpunit/WmfTransactionTest.php

Change-Id: I1ecca1b8b09a36c77987bd951a119b84f4ab8948
---
D phpunit.xml
M sites/all/modules/offline2civicrm/ChecksFile.php
M sites/all/modules/offline2civicrm/offline2civicrm.common.inc
M sites/all/modules/offline2civicrm/offline2civicrm.info
D sites/all/modules/offline2civicrm/tests/ChecksFileTest.php
D sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
D sites/all/modules/offline2civicrm/tests/ForeignChecksFileTest.php
D sites/all/modules/offline2civicrm/tests/JpMorganFileTest.php
D sites/all/modules/offline2civicrm/tests/PayPalChecksFileTest.php
D sites/all/modules/offline2civicrm/tests/data/duplicate_header.csv
D sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php
D sites/all/modules/offline2civicrm/tests/includes/ChecksFileProbe.php
D sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
D sites/all/modules/wmf_civicrm/tests/includes/CiviFixtures.php
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/NormalizeMessageTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/SoftCreditTest.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.info
D sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
D sites/all/modules/wmf_common/tests/phpunit/WmfTransactionTest.php
20 files changed, 0 insertions(+), 1,274 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/phpunit.xml b/phpunit.xml
deleted file mode 100644
index a002ee6..000
--- a/phpunit.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<<< HEAD   (bd8a00 Use a different Queue object for each queue)
-===
-http://www.w3.org/2001/XMLSchema-instance";
-xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/3.7/phpunit.xsd";
-bootstrap="sites/default/bootstrap-phpunit.php">
-
-
-  
-sites/all/modules/large_donation/tests
-  
-  
-sites/all/modules/offline2civicrm/tests
-
sites/all/modules/offline2civicrm/tests/includes/Ba

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-06-24 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/220672

Change subject: Merge master into deployment
..

Merge master into deployment

7f4e85737efb2eefb0db989cf253d8e982dcd247 Use integers for WmfException codes
5961da7d2cf608a176ea9a8320139acfc7c83f3d Throw exception on duplicate row 
headers in import
beafbe187a55c9135f1a53b3963fd9b45ff061ae Fix a few values in Engage import test
0881feb382a661ce5be4df94aba67778f30d098d Add php-queue and predis to 
composer.json, update
66a0325e7283bf9300d1ebb5f2753e97dc21c7f0 Ignore empty rows and columns
c7e299370b0bf1c78a9aedba203e701fea43e863 Protect against some corner cases; 
comment
2646f2e0e8a55cb23b130a8d491b6689ce77d8e9 Always parse dates as UTC
2bc5dbb903b5e00c234e028e157748e2c76adc73 Fix offline2civicrm tests
6b5d79b479d33a96e875ba4d10266e9184e904d3 Port mw-vagrant install scripts into 
this repo
041d533974bd6039c2d7a4ef0175210a8a0ff89c Add new Location Types.
be377b5a572f9527be456955c42df3091fe8a4f0 ci-settings: point MySQL db to 
127.0.0.1
a79a17fe7556d5e687635460d1ff80384d503acc comments
7e81817b677af81215787af1208d008b53587747 Generic import specification
c1490d18eb1ac5d232ee29deaa3501e05a89f9ad Don't use Name or Title fields if this 
is not an Organization contact.
0a1f82af2df71a19b3659a6b80d99271a1258cd7 Port contribution import tests as pure 
fixture data
53a86251f8dcca80aa8ef5a3f7ece87232341542 Implement soft credit import
59731d66da0be3688e4db1c98318bfb9b06ac4d5 Rename function, it's not specific to 
contributions
dde86b02246e1cdea7ee0d966133ca09da51ce38 Renumber 6000-series updates
df81eb47d329908470090711470dab28e8da33a5 Use RAII for fixtures
15c080c477dcad53c33b7e9981c9c5c41fb26475 Write test for contact_groups import
2aeb20da51d6b34ca07aca0e47ade6b28155f742 Revert "Use RAII for fixtures"
afb246485bb41620257decb2bce299f0cee1986d Revert "Write test for contact_groups 
import"

Conflicts:
phpunit.xml
sites/all/modules/offline2civicrm/ChecksFile.php
sites/all/modules/offline2civicrm/offline2civicrm.common.inc
sites/all/modules/offline2civicrm/offline2civicrm.info
sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
sites/all/modules/offline2civicrm/tests/ForeignChecksFileTest.php
sites/all/modules/offline2civicrm/tests/JpMorganFileTest.php
sites/all/modules/offline2civicrm/tests/PayPalChecksFileTest.php
sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php
sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
sites/all/modules/wmf_civicrm/tests/phpunit/NormalizeMessageTest.php
sites/all/modules/wmf_civicrm/wmf_civicrm.info

sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
sites/all/modules/wmf_common/tests/phpunit/WmfTransactionTest.php

Change-Id: I1ecca1b8b09a36c77987bd951a119b84f4ab8948
---
D phpunit.xml
M sites/all/modules/offline2civicrm/ChecksFile.php
M sites/all/modules/offline2civicrm/offline2civicrm.common.inc
M sites/all/modules/offline2civicrm/offline2civicrm.info
D sites/all/modules/offline2civicrm/tests/ChecksFileTest.php
D sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
D sites/all/modules/offline2civicrm/tests/ForeignChecksFileTest.php
D sites/all/modules/offline2civicrm/tests/JpMorganFileTest.php
D sites/all/modules/offline2civicrm/tests/PayPalChecksFileTest.php
D sites/all/modules/offline2civicrm/tests/data/duplicate_header.csv
D sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php
D sites/all/modules/offline2civicrm/tests/includes/ChecksFileProbe.php
D sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
D sites/all/modules/wmf_civicrm/tests/includes/CiviFixtures.php
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/NormalizeMessageTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/SoftCreditTest.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.info
D sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
D sites/all/modules/wmf_common/tests/phpunit/WmfTransactionTest.php
20 files changed, 0 insertions(+), 1,274 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/72/220672/1

diff --git a/phpunit.xml b/phpunit.xml
deleted file mode 100644
index a002ee6..000
--- a/phpunit.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<<< HEAD   (bd8a00 Use a different Queue object for each queue)
-===
-http://www.w3.org/2001/XMLSchema-instance";
-xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/3.7/phpunit.xsd";
-bootstrap="sites/default/bootstrap-phpunit.php">
-
-
-  
-sites/all/modules/large_donation/tests
-  
-  
-sites/all/modules/offline2civicrm/tests
-

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-05-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

29a7c48fd4fd9da228b64fd9555368755818dece Validate contribution amount as decimal
35edb4583564cf563d709828f900b2784e4038ee Rename AZ Lockbox -> Engage

Change-Id: I3f33c7e674168f0ad1113252f8b9ccd897ee1f95
---
D sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
D sites/all/modules/offline2civicrm/tests/includes/EngageChecksFileProbe.php
2 files changed, 0 insertions(+), 138 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php 
b/sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
deleted file mode 100644
index 078ac6d..000
--- a/sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
+++ /dev/null
@@ -1,131 +0,0 @@
- '1234',
-'Contribution Type' => 'Arizona Lockbox',
-'Total Amount' => '50',
-'Source' => 'USD 50.00',
-'Postmark Date' => '',
-'Received Date' => '4/1/14',
-'Payment Instrument' => 'Check',
-'Check Number' => '2020',
-'Restrictions' => 'Unrestricted - General',
-'Gift Source' => 'Community Gift',
-'Direct Mail Appeal' => 'White Mail',
-'Prefix' => 'Mrs.',
-'First Name' => 'Sub',
-'Last Name' => 'Tell',
-'Suffix' => '',
-'Street Address' => '1000 Markdown Markov',
-'Additional Address 1' => '',
-'Additional Address 2' => '',
-'City' => 'Best St. Louis',
-'State' => 'MA',
-'Postal Code' => '2468',
-'Country' => '',
-'Phone' => '(123) 456-',
-'Email' => '',
-'Thank You Letter Date' => '5/1/14',
-'AC Flag' => 'Y',
-);
-$expected_normal = array(
-'check_number' => '2020',
-'city' => 'Best St. Louis',
-'contact_source' => 'check',
-'contact_type' => 'Individual',
-'contribution_source' => 'USD 50.00',
-'country' => 'US',
-'currency' => 'USD',
-'date' => 1396335600,
-'direct_mail_appeal' => 'White Mail',
-'email' => 'nob...@wikimedia.org',
-'first_name' => 'Sub',
-'gateway' => 'arizonalockbox',
-'gateway_txn_id' => 'e59ed825ea04516fb2abf1c130d47525',
-'gift_source' => 'Community Gift',
-'gross' => '50.00',
-'import_batch_number' => '1234',
-'last_name' => 'Tell',
-'payment_method' => 'Check',
-'postal_code' => '02468',
-'raw_contribution_type' => 'Arizona Lockbox',
-'restrictions' => 'Unrestricted - General',
-'state_province' => 'MA',
-'street_address' => '1000 Markdown Markov',
-'thankyou_date' => 1398927600,
-);
-
-$importer = new EngageChecksFileProbe( "null URI" );
-$output = $importer->_parseRow( $data );
-
-$this->stripSourceData( $output );
-$this->assertEquals( $expected_normal, $output );
-}
-
-function testParseRow_Organization() {
-$data = array(
-'Batch' => '1235',
-'Contribution Type' => 'Arizona Lockbox',
-'Total Amount' => '51',
-'Source' => 'USD 51.00',
-'Postmark Date' => '',
-'Received Date' => '4/1/14',
-'Payment Instrument' => 'Check',
-'Check Number' => '20201',
-'Restrictions' => 'Restricted-Foundation',
-'Gift Source' => 'Foundation Gift',
-'Direct Mail Appeal' => 'White Mail',
-'Organization Name' => 'One Pacific Entitlement',
-'Street Address' => '1000 Markdown Markov',
-'Additional Address 1' => '',
-'Additional Address 2' => '',
-'City' => 'Best St. Louis',
-'State' => 'MA',
-'Postal Code' => '123-LAX',
-'Country' => 'FR',
-'Phone' => '+357 (123) 456-',
-'Email' => '',
-'Thank You Letter Date' => '5/1/14',
-'AC Flag' => '',
-);
-$expected_normal = array(
-'check_number' => '20201',
-'city' => 'Best St. Louis',
-'contact_source' => 'check',
-'contact_type' => 'Organization',
-'contribution_source' => 'USD 51.00',
-'country' => 'FR',
-'currency' => 'USD',
-'date' => 1396335600,
-'direct_mail_appeal' => 'White Mail',
-'email' => 'nob...@wikimedia.org',
-'gateway' => 'arizonalockbox',
-'gateway_txn_id' => '6dbb8d844c7509076e2a275fb76d

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-05-15 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/211179

Change subject: Merge master into deployment
..

Merge master into deployment

29a7c48fd4fd9da228b64fd9555368755818dece Validate contribution amount as decimal
35edb4583564cf563d709828f900b2784e4038ee Rename AZ Lockbox -> Engage

Change-Id: I3f33c7e674168f0ad1113252f8b9ccd897ee1f95
---
D sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
D sites/all/modules/offline2civicrm/tests/includes/EngageChecksFileProbe.php
2 files changed, 0 insertions(+), 138 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/79/211179/1

diff --git a/sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php 
b/sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
deleted file mode 100644
index 078ac6d..000
--- a/sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
+++ /dev/null
@@ -1,131 +0,0 @@
- '1234',
-'Contribution Type' => 'Arizona Lockbox',
-'Total Amount' => '50',
-'Source' => 'USD 50.00',
-'Postmark Date' => '',
-'Received Date' => '4/1/14',
-'Payment Instrument' => 'Check',
-'Check Number' => '2020',
-'Restrictions' => 'Unrestricted - General',
-'Gift Source' => 'Community Gift',
-'Direct Mail Appeal' => 'White Mail',
-'Prefix' => 'Mrs.',
-'First Name' => 'Sub',
-'Last Name' => 'Tell',
-'Suffix' => '',
-'Street Address' => '1000 Markdown Markov',
-'Additional Address 1' => '',
-'Additional Address 2' => '',
-'City' => 'Best St. Louis',
-'State' => 'MA',
-'Postal Code' => '2468',
-'Country' => '',
-'Phone' => '(123) 456-',
-'Email' => '',
-'Thank You Letter Date' => '5/1/14',
-'AC Flag' => 'Y',
-);
-$expected_normal = array(
-'check_number' => '2020',
-'city' => 'Best St. Louis',
-'contact_source' => 'check',
-'contact_type' => 'Individual',
-'contribution_source' => 'USD 50.00',
-'country' => 'US',
-'currency' => 'USD',
-'date' => 1396335600,
-'direct_mail_appeal' => 'White Mail',
-'email' => 'nob...@wikimedia.org',
-'first_name' => 'Sub',
-'gateway' => 'arizonalockbox',
-'gateway_txn_id' => 'e59ed825ea04516fb2abf1c130d47525',
-'gift_source' => 'Community Gift',
-'gross' => '50.00',
-'import_batch_number' => '1234',
-'last_name' => 'Tell',
-'payment_method' => 'Check',
-'postal_code' => '02468',
-'raw_contribution_type' => 'Arizona Lockbox',
-'restrictions' => 'Unrestricted - General',
-'state_province' => 'MA',
-'street_address' => '1000 Markdown Markov',
-'thankyou_date' => 1398927600,
-);
-
-$importer = new EngageChecksFileProbe( "null URI" );
-$output = $importer->_parseRow( $data );
-
-$this->stripSourceData( $output );
-$this->assertEquals( $expected_normal, $output );
-}
-
-function testParseRow_Organization() {
-$data = array(
-'Batch' => '1235',
-'Contribution Type' => 'Arizona Lockbox',
-'Total Amount' => '51',
-'Source' => 'USD 51.00',
-'Postmark Date' => '',
-'Received Date' => '4/1/14',
-'Payment Instrument' => 'Check',
-'Check Number' => '20201',
-'Restrictions' => 'Restricted-Foundation',
-'Gift Source' => 'Foundation Gift',
-'Direct Mail Appeal' => 'White Mail',
-'Organization Name' => 'One Pacific Entitlement',
-'Street Address' => '1000 Markdown Markov',
-'Additional Address 1' => '',
-'Additional Address 2' => '',
-'City' => 'Best St. Louis',
-'State' => 'MA',
-'Postal Code' => '123-LAX',
-'Country' => 'FR',
-'Phone' => '+357 (123) 456-',
-'Email' => '',
-'Thank You Letter Date' => '5/1/14',
-'AC Flag' => '',
-);
-$expected_normal = array(
-'check_number' => '20201',
-'city' => 'Best St. Louis',
-'contact_source' => 'check',
-'contact_type' => 'Organization',
-'contribution_source' => 'USD 51.00',
-'country' => 'FR',
-'currency' => 'USD',
-'date' => 1396335600,
-'direct_mail_appeal' => 'White Mail',
-'email' => 'nob...@wikimedia.org',
-'gateway' => 'arizonalockbox',
-

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-05-04 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

+ 514d77b7f895821396aa8669e53287644d6a17e4 Fix an undefined variable warning
+ 4df5167f093d000ef6c5dd9528e628c524312984 Validate source field on manual 
donation entry
+ 98e46a059b6b6122a43478dbfbcc294ec119b49f Don't list currencies in two places
+ b92d88fb8ec723bb8ee45069be9cdf5fe155458a Make sure source has a real 
currency, too
+ 034fbff6e88ee871b16cd7bfa6b9b8a5bb47c1c9 Update advanced_help and services

Change-Id: I4d1c532c6450d919acb0f83b77494196517cff30
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Awight: Verified; Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/208710
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4d1c532c6450d919acb0f83b77494196517cff30
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-05-04 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/208710

Change subject: Merge master into deployment
..

Merge master into deployment

+ 514d77b7f895821396aa8669e53287644d6a17e4 Fix an undefined variable warning
+ 4df5167f093d000ef6c5dd9528e628c524312984 Validate source field on manual 
donation entry
+ 98e46a059b6b6122a43478dbfbcc294ec119b49f Don't list currencies in two places
+ b92d88fb8ec723bb8ee45069be9cdf5fe155458a Make sure source has a real 
currency, too
+ 034fbff6e88ee871b16cd7bfa6b9b8a5bb47c1c9 Update advanced_help and services

Change-Id: I4d1c532c6450d919acb0f83b77494196517cff30
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/10/208710/1


-- 
To view, visit https://gerrit.wikimedia.org/r/208710
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d1c532c6450d919acb0f83b77494196517cff30
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-04-30 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

b3b3eaa817c340dbd5d5bd90db0c67ec93f41705 Fix stupid casting mistake
2001f76d0cd00f3d245be2488ae10be16bd05ab3 Add Astropay to Gateway Reconciliation 
report
df6225ad075005cb303d7bcc0c73cf14c5ffa636 Protect thank-you job from nonfatal 
exception

Change-Id: I61767b28a93d8bb362c780904013b300bfab6471
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 0 insertions(+), 30 deletions(-)

Approvals:
  Awight: Verified; Looks good to me, approved



diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index dc13118..c31093a 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -2029,36 +2029,6 @@
 
 switch ( $formName ) {
 case 'CRM_Contribute_Form_Contribution':
-<<< HEAD   (59f03d Revert "Set up rules for hand-keyed contributions made 
by En)
-===
-// Only run this validation for users having the Engage role.
-if ( !wmf_civicrm_user_has_role( 'Engage Direct Mail' ) ) {
-break;
-}
-
-$engage_contribution_type_id = wmf_civicrm_get_civi_id( 
'contribution_type_id', 'Engage' );
-if ( $fields['contribution_type_id'] !== $engage_contribution_type_id 
) {
-$errors['contribution_type_id'] = t("Must use the \"Engage\" 
contribution type.");
-}
-
-// Gift Source (sic field named "Campaign") is limited.
-$gift_source_field_name = wmf_civicrm_evil_get_custom_field_in_form( 
'Campaign', $fields );
-if ( $gift_source_field_name ) {
-$allowed_sources = array(
-'Combined Federal Campaign',
-'Donor Advised Fund',
-'Matching Gift',
-'Payroll Deduction',
-);
-if ( !in_array( $fields[$gift_source_field_name], $allowed_sources 
) ) {
-$errors[$gift_source_field_name] = t('Must choose a Gift 
Source from the following list: ') . implode( ', ', $allowed_sources );
-}
-}
-
-$postmark_field_name = wmf_civicrm_evil_get_custom_field_in_form( 
'postmark_date', $fields );
-// If the receive_date is in Dec or Jan, make sure we have a postmark 
date,
-// to be generous to donors' tax stuff.
->>> BRANCH (538929 Merge "Protect thank-you job from nonfatal exception")
 $date = strptime( $fields['receive_date'], "%m/%d/%Y" );
 $azl_type_id = wmf_civicrm_get_civi_id( 'contribution_type_id', 
"Arizona Lockbox" );
 $custom_field_name = wmf_civicrm_evil_get_custom_field_in_form( 
'postmark_date', $fields );

-- 
To view, visit https://gerrit.wikimedia.org/r/207896
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I61767b28a93d8bb362c780904013b300bfab6471
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-04-30 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/207896

Change subject: Merge master into deployment
..

Merge master into deployment

b3b3eaa817c340dbd5d5bd90db0c67ec93f41705 Fix stupid casting mistake
2001f76d0cd00f3d245be2488ae10be16bd05ab3 Add Astropay to Gateway Reconciliation 
report
df6225ad075005cb303d7bcc0c73cf14c5ffa636 Protect thank-you job from nonfatal 
exception

Change-Id: I61767b28a93d8bb362c780904013b300bfab6471
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 0 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/96/207896/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index dc13118..c31093a 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -2029,36 +2029,6 @@
 
 switch ( $formName ) {
 case 'CRM_Contribute_Form_Contribution':
-<<< HEAD   (59f03d Revert "Set up rules for hand-keyed contributions made 
by En)
-===
-// Only run this validation for users having the Engage role.
-if ( !wmf_civicrm_user_has_role( 'Engage Direct Mail' ) ) {
-break;
-}
-
-$engage_contribution_type_id = wmf_civicrm_get_civi_id( 
'contribution_type_id', 'Engage' );
-if ( $fields['contribution_type_id'] !== $engage_contribution_type_id 
) {
-$errors['contribution_type_id'] = t("Must use the \"Engage\" 
contribution type.");
-}
-
-// Gift Source (sic field named "Campaign") is limited.
-$gift_source_field_name = wmf_civicrm_evil_get_custom_field_in_form( 
'Campaign', $fields );
-if ( $gift_source_field_name ) {
-$allowed_sources = array(
-'Combined Federal Campaign',
-'Donor Advised Fund',
-'Matching Gift',
-'Payroll Deduction',
-);
-if ( !in_array( $fields[$gift_source_field_name], $allowed_sources 
) ) {
-$errors[$gift_source_field_name] = t('Must choose a Gift 
Source from the following list: ') . implode( ', ', $allowed_sources );
-}
-}
-
-$postmark_field_name = wmf_civicrm_evil_get_custom_field_in_form( 
'postmark_date', $fields );
-// If the receive_date is in Dec or Jan, make sure we have a postmark 
date,
-// to be generous to donors' tax stuff.
->>> BRANCH (538929 Merge "Protect thank-you job from nonfatal exception")
 $date = strptime( $fields['receive_date'], "%m/%d/%Y" );
 $azl_type_id = wmf_civicrm_get_civi_id( 'contribution_type_id', 
"Arizona Lockbox" );
 $custom_field_name = wmf_civicrm_evil_get_custom_field_in_form( 
'postmark_date', $fields );

-- 
To view, visit https://gerrit.wikimedia.org/r/207896
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I61767b28a93d8bb362c780904013b300bfab6471
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-03-31 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

37f7e4700c57f4d98ec9e7c60bca114bcd2951fb Correct role name

Change-Id: I3f9985c5a30b9f4dec81064b0ec76fd025bd39e3
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Awight: Verified; Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/200890
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f9985c5a30b9f4dec81064b0ec76fd025bd39e3
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-03-31 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/200890

Change subject: Merge master into deployment
..

Merge master into deployment

37f7e4700c57f4d98ec9e7c60bca114bcd2951fb Correct role name

Change-Id: I3f9985c5a30b9f4dec81064b0ec76fd025bd39e3
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/90/200890/1


-- 
To view, visit https://gerrit.wikimedia.org/r/200890
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f9985c5a30b9f4dec81064b0ec76fd025bd39e3
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-03-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

e8c9df5532d1fdb2f6581b9cb4b0cef22b3ca02a ci-settings: Update environment 
variable test
4634c403a0d5348210b48e04223afefdc2ea6e03 Set up rules for hand-keyed 
contributions made by Engage staff

Change-Id: I3509bc195abcc401d8b0ead23c1a5cc298e8bbd6
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/200883
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3509bc195abcc401d8b0ead23c1a5cc298e8bbd6
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-03-31 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/200883

Change subject: Merge master into deployment
..

Merge master into deployment

e8c9df5532d1fdb2f6581b9cb4b0cef22b3ca02a ci-settings: Update environment 
variable test
4634c403a0d5348210b48e04223afefdc2ea6e03 Set up rules for hand-keyed 
contributions made by Engage staff

Change-Id: I3509bc195abcc401d8b0ead23c1a5cc298e8bbd6
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/83/200883/1


-- 
To view, visit https://gerrit.wikimedia.org/r/200883
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3509bc195abcc401d8b0ead23c1a5cc298e8bbd6
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-02-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

c5262a82e66f148713f733380cb372a881a578b2 Don't reject mismatching refund amounts

Change-Id: Id0a8d09cafdb94e892dfcfd6c105c2dca7cbb5f5
---
D sites/all/modules/wmf_civicrm/tests/phpunit/NormalizeMessageTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
2 files changed, 0 insertions(+), 237 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/sites/all/modules/wmf_civicrm/tests/phpunit/NormalizeMessageTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/NormalizeMessageTest.php
deleted file mode 100644
index bdddb48..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/NormalizeMessageTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<<< HEAD   (f594a6 Merge master into deployment)
-===
- 'WmfCivicrm message normalization',
-'group' => 'Pipeline',
-'description' => 'Checks for queue message normalization behavior',
-);
-}
-
-public function testDoubleNormalization() {
-// Start with a message already in normal form, to make comparison easy
-$original_msg = array(
-'anonymous' => 0,
-'check_number' => '',
-'city' => '',
-'comment' => '',
-'contact_id' => mt_rand(),
-'contact_tags' => array(),
-'contribution_recur_id' => mt_rand(),
-'contribution_tags' => array(),
-'contribution_tracking_id' => mt_rand(),
-'contribution_tracking_update' => '1',
-'contribution_type' => 'cash', // FIXME
-'contribution_type_id' => '9', // FIXME
-'country' => 'IL',
-'create_date' => time() + 11,
-'currency' => 'USD',
-'date' => time() + 1,
-'effort_id' => '2',
-'email' => 'test...@localhost.net',
-'fee' => 0.5,
-'first_name' => 'test',
-'gateway' => 'paypal',
-'gateway_txn_id' => '1234AB1234-2',
-'gross' => 5.8,
-'last_name' => 'es',
-'letter_code' => '',
-'middle_name' => '',
-'net' => 5.29,
-'optout' => 0,
-'organization_name' => '',
-'original_currency' => 'ILS',
-'original_gross' => '20.00',
-'payment_date' => time(),
-'payment_instrument_id' => '25',
-'payment_instrument' => 'Paypal',
-'postal_code' => '',
-'postmark_date' => null,
-'recurring' => '1',
-'source_enqueued_time' => time() + 2,
-'source_host' => 'thulium',
-'source_name' => 'PayPal IPN (legacy)',
-'source_run_id' => mt_rand(),
-'source_type' => 'listener',
-'source_version' => 'legacy',
-'start_date' => time() + 10,
-'state_province' => '',
-'street_address' => '',
-'subscr_id' => 'TEST-S-1234567' . mt_rand(),
-'supplemental_address_1' => '',
-'supplemental_address_2' => '',
-'thankyou_date' => '',
-'txn_type' => 'subscr_payment',
-'utm_campaign' => '',
-);
-
-$msg = $original_msg;
-$normal_msg_1 = wmf_civicrm_normalize_msg( $msg );
-$this->assertEquals( $original_msg, $normal_msg_1 );
-$normal_msg_2 = wmf_civicrm_normalize_msg( $normal_msg_1 );
-$this->assertEquals( $original_msg, $normal_msg_2 );
-}
-}
->>> BRANCH (c5262a Don't reject mismatching refund amounts)
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
deleted file mode 100644
index 8d60cf7..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
+++ /dev/null
@@ -1,159 +0,0 @@
- 'Refund',
-'group' => 'Pipeline',
-'description' => 'Test refund handling.',
-);
-}
-
-public function setUp() {
-parent::setUp();
-civicrm_initialize();
-
-$results = civicrm_api3( 'contact', 'create', array(
-'contact_type' => 'Individual',
-'first_name' => 'Test',
-'last_name' => 'Es',
-) );
-$this->contact_id = $results['id'];
-
-$this->original_currency = 'EUR';
-$this->original_amount = '1.23';
-$this->gateway_txn_id = mt_rand();
-$time = time();
-$this->trxn_id = "TEST_GATEWAY {$this->gateway_txn_id} {$time}";
-
-$results = civicrm_api3( 'contribution', 'create', array(
-'contact_id' => $this->contact_id,
-'contribution_type' => 'Cash',
-'total_amount' => $this->original_amount,
-'contribution_source' => $this->ori

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-02-23 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/192392

Change subject: Merge master into deployment
..

Merge master into deployment

c5262a82e66f148713f733380cb372a881a578b2 Don't reject mismatching refund amounts

Change-Id: Id0a8d09cafdb94e892dfcfd6c105c2dca7cbb5f5
---
D sites/all/modules/wmf_civicrm/tests/phpunit/NormalizeMessageTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
2 files changed, 0 insertions(+), 237 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/92/192392/1

diff --git 
a/sites/all/modules/wmf_civicrm/tests/phpunit/NormalizeMessageTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/NormalizeMessageTest.php
deleted file mode 100644
index bdddb48..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/NormalizeMessageTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<<< HEAD   (f594a6 Merge master into deployment)
-===
- 'WmfCivicrm message normalization',
-'group' => 'Pipeline',
-'description' => 'Checks for queue message normalization behavior',
-);
-}
-
-public function testDoubleNormalization() {
-// Start with a message already in normal form, to make comparison easy
-$original_msg = array(
-'anonymous' => 0,
-'check_number' => '',
-'city' => '',
-'comment' => '',
-'contact_id' => mt_rand(),
-'contact_tags' => array(),
-'contribution_recur_id' => mt_rand(),
-'contribution_tags' => array(),
-'contribution_tracking_id' => mt_rand(),
-'contribution_tracking_update' => '1',
-'contribution_type' => 'cash', // FIXME
-'contribution_type_id' => '9', // FIXME
-'country' => 'IL',
-'create_date' => time() + 11,
-'currency' => 'USD',
-'date' => time() + 1,
-'effort_id' => '2',
-'email' => 'test...@localhost.net',
-'fee' => 0.5,
-'first_name' => 'test',
-'gateway' => 'paypal',
-'gateway_txn_id' => '1234AB1234-2',
-'gross' => 5.8,
-'last_name' => 'es',
-'letter_code' => '',
-'middle_name' => '',
-'net' => 5.29,
-'optout' => 0,
-'organization_name' => '',
-'original_currency' => 'ILS',
-'original_gross' => '20.00',
-'payment_date' => time(),
-'payment_instrument_id' => '25',
-'payment_instrument' => 'Paypal',
-'postal_code' => '',
-'postmark_date' => null,
-'recurring' => '1',
-'source_enqueued_time' => time() + 2,
-'source_host' => 'thulium',
-'source_name' => 'PayPal IPN (legacy)',
-'source_run_id' => mt_rand(),
-'source_type' => 'listener',
-'source_version' => 'legacy',
-'start_date' => time() + 10,
-'state_province' => '',
-'street_address' => '',
-'subscr_id' => 'TEST-S-1234567' . mt_rand(),
-'supplemental_address_1' => '',
-'supplemental_address_2' => '',
-'thankyou_date' => '',
-'txn_type' => 'subscr_payment',
-'utm_campaign' => '',
-);
-
-$msg = $original_msg;
-$normal_msg_1 = wmf_civicrm_normalize_msg( $msg );
-$this->assertEquals( $original_msg, $normal_msg_1 );
-$normal_msg_2 = wmf_civicrm_normalize_msg( $normal_msg_1 );
-$this->assertEquals( $original_msg, $normal_msg_2 );
-}
-}
->>> BRANCH (c5262a Don't reject mismatching refund amounts)
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
deleted file mode 100644
index 8d60cf7..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
+++ /dev/null
@@ -1,159 +0,0 @@
- 'Refund',
-'group' => 'Pipeline',
-'description' => 'Test refund handling.',
-);
-}
-
-public function setUp() {
-parent::setUp();
-civicrm_initialize();
-
-$results = civicrm_api3( 'contact', 'create', array(
-'contact_type' => 'Individual',
-'first_name' => 'Test',
-'last_name' => 'Es',
-) );
-$this->contact_id = $results['id'];
-
-$this->original_currency = 'EUR';
-$this->original_amount = '1.23';
-$this->gateway_txn_id = mt_rand();
-$time = time();
-$this->trxn_id = "TEST_GATEWAY {$this->gateway_txn_id} {$time}";
-
-$results = civicrm_api3( 'contribution', 'create', array(
-'contact_id' => $this->contact_id,
-'contribution_type' => 'Cash',
-'total_amount' => $this->original_amoun

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-02-20 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

81e1e561db5735edaa961de52290e74ea5bf8fd7 update civicrm submodule
262a9b00a9b84b45e7d3b373228da791a5df7cb1 update civicrm submodule
a1732e149f19b2c08aa0db374f9f0315da8b21ec New thank you translation: sv
e5d47790c5521083d8ea9b4f98cb154fb480725e other new thank you translations

Change-Id: I2eab7f70bf307cf8f8e3fc8b6c1103db244aea5d
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/191896
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2eab7f70bf307cf8f8e3fc8b6c1103db244aea5d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-02-20 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/191896

Change subject: Merge master into deployment
..

Merge master into deployment

81e1e561db5735edaa961de52290e74ea5bf8fd7 update civicrm submodule
262a9b00a9b84b45e7d3b373228da791a5df7cb1 update civicrm submodule
a1732e149f19b2c08aa0db374f9f0315da8b21ec New thank you translation: sv
e5d47790c5521083d8ea9b4f98cb154fb480725e other new thank you translations

Change-Id: I2eab7f70bf307cf8f8e3fc8b6c1103db244aea5d
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/96/191896/1


-- 
To view, visit https://gerrit.wikimedia.org/r/191896
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2eab7f70bf307cf8f8e3fc8b6c1103db244aea5d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-02-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

795d0d7d307845d704c93885cf713b563683f1c8 Don't die when log message is missing 
user
ef656f46d6af0fdd46544e853bdc1cc6515bca85 Fix typo in nightly audit code

Change-Id: Ibc43338817e6c9e12ba74808bdc857fa6d7adde7
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/188948
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc43338817e6c9e12ba74808bdc857fa6d7adde7
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-02-05 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/188948

Change subject: Merge master into deployment
..

Merge master into deployment

795d0d7d307845d704c93885cf713b563683f1c8 Don't die when log message is missing 
user
ef656f46d6af0fdd46544e853bdc1cc6515bca85 Fix typo in nightly audit code

Change-Id: Ibc43338817e6c9e12ba74808bdc857fa6d7adde7
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/48/188948/1


-- 
To view, visit https://gerrit.wikimedia.org/r/188948
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc43338817e6c9e12ba74808bdc857fa6d7adde7
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-01-29 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/187641

Change subject: Merge master into deployment
..

Merge master into deployment

054931b9f3120a315dea64a09a8a6846a104dcf0 update civicrm submodule

Change-Id: Idd844295bbb93b9ace194f53a9a1b0e06f37b0c4
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/41/187641/1


-- 
To view, visit https://gerrit.wikimedia.org/r/187641
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd844295bbb93b9ace194f53a9a1b0e06f37b0c4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-01-29 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

054931b9f3120a315dea64a09a8a6846a104dcf0 update civicrm submodule

Change-Id: Idd844295bbb93b9ace194f53a9a1b0e06f37b0c4
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/187641
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idd844295bbb93b9ace194f53a9a1b0e06f37b0c4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-01-06 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

5d85b6b63460c82749c7f10182ff326dd37b9d93 Add Alipay payment instrument

Change-Id: Id84dcb17fb439099a4f95afd434add60431075ab
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/183146
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id84dcb17fb439099a4f95afd434add60431075ab
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-01-06 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/183146

Change subject: Merge master into deployment
..

Merge master into deployment

5d85b6b63460c82749c7f10182ff326dd37b9d93 Add Alipay payment instrument

Change-Id: Id84dcb17fb439099a4f95afd434add60431075ab
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/46/183146/1


-- 
To view, visit https://gerrit.wikimedia.org/r/183146
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id84dcb17fb439099a4f95afd434add60431075ab
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2014-12-19 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

Change-Id: Ic28f19afac8e557497c181422ff117cca8595de4
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/181147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic28f19afac8e557497c181422ff117cca8595de4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2014-12-19 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/181147

Change subject: Merge master into deployment
..

Merge master into deployment

Change-Id: Ic28f19afac8e557497c181422ff117cca8595de4
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/47/181147/1


-- 
To view, visit https://gerrit.wikimedia.org/r/181147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic28f19afac8e557497c181422ff117cca8595de4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2014-12-17 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

e8b195e5fc6c3ab820102021954a2d66d9690759 Trim all strings in a message when 
dequeueing
2ed534dcd899e6015de6ff56528ae38d8a1a03a2 Comment about archiving logic
024a6eda4a15a7178173ef9276b8ca6968d16cd6 correct composer.json
8d363b301fd8aeff0caccf96d977e71a92a438db update civicrm submodule

Change-Id: I1a9ef5af40ce2c21fa056c131c61a5fdb5736649
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/180695
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1a9ef5af40ce2c21fa056c131c61a5fdb5736649
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2014-12-17 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/180695

Change subject: Merge master into deployment
..

Merge master into deployment

e8b195e5fc6c3ab820102021954a2d66d9690759 Trim all strings in a message when 
dequeueing
2ed534dcd899e6015de6ff56528ae38d8a1a03a2 Comment about archiving logic
024a6eda4a15a7178173ef9276b8ca6968d16cd6 correct composer.json
8d363b301fd8aeff0caccf96d977e71a92a438db update civicrm submodule

Change-Id: I1a9ef5af40ce2c21fa056c131c61a5fdb5736649
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/95/180695/1


-- 
To view, visit https://gerrit.wikimedia.org/r/180695
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a9ef5af40ce2c21fa056c131c61a5fdb5736649
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2014-12-10 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

1dcac78261dbf1b75876e134538d3a627b26f4b9 Make WMF Audit config available from 
the admin menu
4f5d2e7a4faaf4b6a3ef2b11dd46bb921b87429f Legal-recommended update to English TY 
text

Change-Id: I3f43b7ad759a0007644e31f53eb940371010e4f2
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/179034
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f43b7ad759a0007644e31f53eb940371010e4f2
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2014-10-30 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

c4aab18e94919afe4c2cf578645cb2066e92496b Fix on/off switch for TY adding 
CiviMail records
18a0eaa311f943af7eadb99c8db14ffd4ffce965 update civicrm submodule

Change-Id: Iddc9a1dbc8a4cd4084bb13899c58f9685fc115a8
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Awight: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/170257
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iddc9a1dbc8a4cd4084bb13899c58f9685fc115a8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2014-10-30 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/170257

Change subject: Merge master into deployment
..

Merge master into deployment

c4aab18e94919afe4c2cf578645cb2066e92496b Fix on/off switch for TY adding 
CiviMail records
18a0eaa311f943af7eadb99c8db14ffd4ffce965 update civicrm submodule

Change-Id: Iddc9a1dbc8a4cd4084bb13899c58f9685fc115a8
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/57/170257/1


-- 
To view, visit https://gerrit.wikimedia.org/r/170257
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iddc9a1dbc8a4cd4084bb13899c58f9685fc115a8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

74 matches

Mail list logo