civicrm-core.git
8 years agoCRM-18341 Pledges not being completed by completeTransaction
eileenmcnaugton [Fri, 1 Apr 2016 04:24:12 +0000 (17:24 +1300)]
CRM-18341 Pledges not being completed by completeTransaction

8 years agoMerge pull request #8092 from eileenmcnaughton/CRM-18368
Monish Deb [Sun, 10 Apr 2016 11:55:30 +0000 (17:25 +0530)]
Merge pull request #8092 from eileenmcnaughton/CRM-18368

CRM-18368 preliminary tidy-up, standarise setting of contributionStat…

8 years agoMerge pull request #8102 from monishdeb/CRM-18349
colemanw [Sat, 9 Apr 2016 00:49:33 +0000 (20:49 -0400)]
Merge pull request #8102 from monishdeb/CRM-18349

CRM-18349: Custom date field default value not set on 'On Behalf of' Profiles

8 years agoCRM-18349: Custom date field default value not set on 'On Behalf of' Profiles
deb.monish [Fri, 8 Apr 2016 06:36:49 +0000 (12:06 +0530)]
CRM-18349: Custom date field default value not set on 'On Behalf of' Profiles

8 years agoMerge pull request #8104 from JKingsnorth/CRM-18339
Monish Deb [Fri, 8 Apr 2016 12:36:24 +0000 (18:06 +0530)]
Merge pull request #8104 from JKingsnorth/CRM-18339

CRM-18339: Fix merge screen link to contact's mailings

8 years agoCRM-18339: Fix merge screen link to contact's mailings
JKingsnorth [Fri, 8 Apr 2016 11:06:59 +0000 (12:06 +0100)]
CRM-18339: Fix merge screen link to contact's mailings

8 years agoUpdate version to 4.7.7
CiviCRM [Fri, 8 Apr 2016 01:33:00 +0000 (18:33 -0700)]
Update version to 4.7.7

8 years agoMerge pull request #8098 from jitendrapurohit/CRM-18376
Monish Deb [Thu, 7 Apr 2016 13:36:17 +0000 (19:06 +0530)]
Merge pull request #8098 from jitendrapurohit/CRM-18376

CRM-18376 - Manage Group screen shows no groups

8 years agoMerge pull request #8096 from jitendrapurohit/CRM-18058
Monish Deb [Thu, 7 Apr 2016 13:13:37 +0000 (18:43 +0530)]
Merge pull request #8096 from jitendrapurohit/CRM-18058

CRM-18058: Define cmsRootPath() for Joomla

8 years agoCRM-18376 - Manage Group screen shows no groups
jitendrapurohit [Thu, 7 Apr 2016 12:44:36 +0000 (18:14 +0530)]
CRM-18376 - Manage Group screen shows no groups

8 years agoCRM-18058: Define cmsRootPath() for Joomla
jitendrapurohit [Thu, 7 Apr 2016 10:11:34 +0000 (15:41 +0530)]
CRM-18058: Define cmsRootPath() for Joomla

8 years agoMerge pull request #8095 from yashodha/CRM-18372
Yashodha Chaku [Thu, 7 Apr 2016 08:46:43 +0000 (14:16 +0530)]
Merge pull request #8095 from yashodha/CRM-18372

CRM-18372

8 years agoMerge pull request #8094 from yashodha/CRM-18371
Yashodha Chaku [Thu, 7 Apr 2016 06:46:25 +0000 (12:16 +0530)]
Merge pull request #8094 from yashodha/CRM-18371

CRM-18371 : Misspelling in the print or email receipts screen

8 years agoremove debug statement
yashodha [Thu, 7 Apr 2016 06:13:29 +0000 (11:43 +0530)]
remove debug statement

8 years agoCRM-18372 : dashboard notice error
yashodha [Thu, 7 Apr 2016 06:12:26 +0000 (11:42 +0530)]
CRM-18372 : dashboard notice error

----------------------------------------
* CRM-18372: dashboard notice error
  https://issues.civicrm.org/jira/browse/CRM-18372

8 years agoCRM-18371 : Misspelling in the print or email receipts screen
yashodha [Thu, 7 Apr 2016 05:15:05 +0000 (10:45 +0530)]
CRM-18371 : Misspelling in the print or email receipts screen

----------------------------------------
* CRM-18371: Misspelling in the print or email receipts screen
  https://issues.civicrm.org/jira/browse/CRM-18371

8 years agoMerge pull request #8072 from colemanw/CRM-17965
colemanw [Wed, 6 Apr 2016 16:12:04 +0000 (12:12 -0400)]
Merge pull request #8072 from colemanw/CRM-17965

CRM-17965 - Fix contribution widget on Drupal

8 years agoUpdate version to 4.7.6
CiviCRM [Wed, 6 Apr 2016 13:12:48 +0000 (06:12 -0700)]
Update version to 4.7.6

8 years agoCRM-18368 pass through contribution status id
eileenmcnaugton [Wed, 6 Apr 2016 09:11:37 +0000 (21:11 +1200)]
CRM-18368 pass through contribution status id

8 years agoCRM-18368 preliminary tidy-up, standarise setting of contributionStatusID
eileenmcnaugton [Wed, 6 Apr 2016 09:03:28 +0000 (21:03 +1200)]
CRM-18368 preliminary tidy-up, standarise setting of contributionStatusID

8 years agoMerge pull request #8088 from JKingsnorth/CRM-18345
Kurund Jalmi [Wed, 6 Apr 2016 07:39:58 +0000 (13:09 +0530)]
Merge pull request #8088 from JKingsnorth/CRM-18345

CRM-18345: Don't delete mailing data on email/phone deletion

8 years agoMerge pull request #8089 from pradpnayak/CRM-16617-master-1
Monish Deb [Wed, 6 Apr 2016 05:43:21 +0000 (11:13 +0530)]
Merge pull request #8089 from pradpnayak/CRM-16617-master-1

--CRM-16617, code fixing for install, changed the parameters of function

8 years ago--CRM-16617, code fixing for install, changed the parameters of function
Pradeep Nayak [Tue, 5 Apr 2016 20:57:36 +0000 (02:27 +0530)]
--CRM-16617, code fixing for install, changed the parameters of function

8 years agoStyle fix
JKingsnorth [Mon, 4 Apr 2016 11:11:36 +0000 (12:11 +0100)]
Style fix

8 years agoCRM-18345: Don't delete mailing data on email/phone deletion
JKingsnorth [Mon, 4 Apr 2016 10:53:12 +0000 (11:53 +0100)]
CRM-18345: Don't delete mailing data on email/phone deletion

8 years agoMerge pull request #8086 from monishdeb/CRM-18343
Monish Deb [Tue, 5 Apr 2016 12:31:34 +0000 (18:01 +0530)]
Merge pull request #8086 from monishdeb/CRM-18343

CRM-18343: Upgrade script and AJAX test fixes

8 years agoCRM-18343: Upgrade script and AJAX test fixes
deb.monish [Tue, 5 Apr 2016 11:34:43 +0000 (17:04 +0530)]
CRM-18343: Upgrade script and AJAX test fixes

8 years agoMerge pull request #8085 from yashodha/CRM-18241.upgrade
Monish Deb [Tue, 5 Apr 2016 12:24:08 +0000 (17:54 +0530)]
Merge pull request #8085 from yashodha/CRM-18241.upgrade

CRM-18241:multi-lingual upgrade fix

8 years agoMerge pull request #8042 from jitendrapurohit/CRM-18250
Monish Deb [Tue, 5 Apr 2016 11:22:24 +0000 (16:52 +0530)]
Merge pull request #8042 from jitendrapurohit/CRM-18250

CRM-18250 - Fix Find Events on Manage Event Screen

8 years agoCRM-18241:multi-lingual upgrade fix
yashodha [Tue, 5 Apr 2016 08:48:10 +0000 (14:18 +0530)]
CRM-18241:multi-lingual upgrade fix

----------------------------------------
* CRM-18241: Change field length of civicrm_option_value.label from 255 to 512
  https://issues.civicrm.org/jira/browse/CRM-18241

8 years agoMerge pull request #8023 from lcdservices/CRM-18245
Monish Deb [Tue, 5 Apr 2016 08:41:08 +0000 (14:11 +0530)]
Merge pull request #8023 from lcdservices/CRM-18245

CRM-18245 bootstrap when triggering ipn

8 years agoMerge pull request #8084 from yashodha/CRM-18317
Yashodha Chaku [Tue, 5 Apr 2016 06:56:47 +0000 (12:26 +0530)]
Merge pull request #8084 from yashodha/CRM-18317

CRM-18317

8 years agoMerge branch 'master' of https://github.com/rollox/civicrm-core into CRM-18317
yashodha [Tue, 5 Apr 2016 05:27:33 +0000 (10:57 +0530)]
Merge branch 'master' of https://github.com/rollox/civicrm-core into CRM-18317

Conflicts:
CRM/Utils/System/Drupal.php

----------------------------------------
* CRM-18317: Links to Drupal system broken if hook altered by a module
  https://issues.civicrm.org/jira/browse/CRM-18317

8 years agoMerge pull request #8025 from monishdeb/CRM-18236
Monish Deb [Tue, 5 Apr 2016 05:17:44 +0000 (10:47 +0530)]
Merge pull request #8025 from monishdeb/CRM-18236

CRM-18236: Scheduled reminder sends multiple reminders when reference date has changed

8 years agoCRM-18236 fix
deb.monish [Fri, 25 Mar 2016 10:50:15 +0000 (16:20 +0530)]
CRM-18236 fix

8 years agoMerge pull request #8081 from jitendrapurohit/CRM-18358
Monish Deb [Mon, 4 Apr 2016 13:20:37 +0000 (18:50 +0530)]
Merge pull request #8081 from jitendrapurohit/CRM-18358

CRM-18358: js break when custom date field included in 'On behalf' an…

8 years agoCRM-18358: js break when custom date field included in 'On behalf' and 'Honor' Profile
jitendrapurohit [Mon, 4 Apr 2016 11:05:06 +0000 (16:35 +0530)]
CRM-18358: js break when custom date field included in 'On behalf' and 'Honor' Profile

8 years agoMerge pull request #8067 from saurabhbatra96/CRM-18279
Yashodha Chaku [Mon, 4 Apr 2016 09:57:14 +0000 (15:27 +0530)]
Merge pull request #8067 from saurabhbatra96/CRM-18279

CRM-18279 - Export not working with PHP < 5.5

8 years agoMerge pull request #8074 from cividesk/CRM-18353-4.7
Yashodha Chaku [Mon, 4 Apr 2016 09:16:52 +0000 (14:46 +0530)]
Merge pull request #8074 from cividesk/CRM-18353-4.7

skip url from IDS check

8 years agoMerge pull request #8054 from twomice/CRM-18305
Yashodha Chaku [Mon, 4 Apr 2016 07:59:51 +0000 (13:29 +0530)]
Merge pull request #8054 from twomice/CRM-18305

CRM-18305 - CiviMember - Auto-renew option displayed multiple times

8 years agoMerge pull request #8060 from monishdeb/CRM-17360
Monish Deb [Mon, 4 Apr 2016 06:55:05 +0000 (12:25 +0530)]
Merge pull request #8060 from monishdeb/CRM-17360

CRM-17360: report full mysql error messages in logs

8 years agoMerge pull request #8077 from eileenmcnaughton/CRM-18355
Eileen McNaughton [Mon, 4 Apr 2016 05:49:19 +0000 (17:49 +1200)]
Merge pull request #8077 from eileenmcnaughton/CRM-18355

CRM-18355 Fix repeat transaction for test contributions

8 years agoCRM-18355 Fix repeat transaction for test contributions
eileenmcnaugton [Mon, 4 Apr 2016 03:07:48 +0000 (15:07 +1200)]
CRM-18355 Fix repeat transaction for test contributions

8 years agoskip url from IDS check
sunil [Sun, 3 Apr 2016 09:14:33 +0000 (14:44 +0530)]
skip url from IDS check

8 years agoCRM-17965 - Fix contribution widget on Drupal
Coleman Watts [Sat, 2 Apr 2016 14:02:52 +0000 (10:02 -0400)]
CRM-17965 - Fix contribution widget on Drupal

8 years agoCRM-18279 - https://issues.civicrm.org/jira/browse/CRM-18279
Saurabh Batra [Fri, 1 Apr 2016 21:37:53 +0000 (03:07 +0530)]
CRM-18279 - https://issues.civicrm.org/jira/browse/CRM-18279

8 years agoMerge pull request #8065 from monishdeb/CRM-18343
Monish Deb [Fri, 1 Apr 2016 15:45:37 +0000 (21:15 +0530)]
Merge pull request #8065 from monishdeb/CRM-18343

CRM-18343: Ajax CRM test failure fixes

8 years agoCRM-18343: Ajax CRM test failure fixes
deb.monish [Fri, 1 Apr 2016 14:25:38 +0000 (19:55 +0530)]
CRM-18343: Ajax CRM test failure fixes

8 years agoMerge pull request #8064 from yashodha/CRM-17878
Yashodha Chaku [Fri, 1 Apr 2016 14:10:20 +0000 (19:40 +0530)]
Merge pull request #8064 from yashodha/CRM-17878

CRM-17878: on behalf still seems to be loading on thankyou page

8 years agoCRM-17878: on behalf still seems to be loading on thankyou page
yashodha [Fri, 1 Apr 2016 13:26:03 +0000 (18:56 +0530)]
CRM-17878: on behalf still seems to be loading on thankyou page

----------------------------------------
* CRM-17878: If 'on behalf of organisation' is set to 'optional' and then not chosen, it creates contact with no name and adds the relationship
  https://issues.civicrm.org/jira/browse/CRM-17878

8 years agoMerge pull request #8062 from jitendrapurohit/CRM-18312
Monish Deb [Fri, 1 Apr 2016 12:41:17 +0000 (18:11 +0530)]
Merge pull request #8062 from jitendrapurohit/CRM-18312

CRM-18312: Contribution Details Report Soft Credits, Soft Credit for …

8 years agoMerge pull request #8052 from rohankatkar/CRM-18282
Monish Deb [Fri, 1 Apr 2016 12:33:14 +0000 (18:03 +0530)]
Merge pull request #8052 from rohankatkar/CRM-18282

CRM-18282: Custom Field values from Profile in Contribution Page not saved in new Membership

8 years agoMinor fix: CRM-18282
Web Access [Fri, 1 Apr 2016 09:03:20 +0000 (14:33 +0530)]
Minor fix: CRM-18282

minor fix

8 years agoMerge pull request #8061 from yashodha/CRM-18299
Yashodha Chaku [Fri, 1 Apr 2016 10:53:51 +0000 (16:23 +0530)]
Merge pull request #8061 from yashodha/CRM-18299

CRM-18299: Auto-Renew chkbox does not display if Pay Later is selecte…

8 years agoCRM-18312: Contribution Details Report Soft Credits, Soft Credit for columns
jitendrapurohit [Fri, 1 Apr 2016 10:06:05 +0000 (15:36 +0530)]
CRM-18312: Contribution Details Report Soft Credits, Soft Credit for columns

8 years agoCRM-18299: Auto-Renew chkbox does not display if Pay Later is selected in configuration
yashodha [Fri, 1 Apr 2016 08:34:38 +0000 (14:04 +0530)]
CRM-18299: Auto-Renew chkbox does not display if Pay Later is selected in configuration

----------------------------------------
* CRM-18299: Auto-Renew chkbox does not display if Pay Later is selected in configuration
  https://issues.civicrm.org/jira/browse/CRM-18299

8 years agoCRM-17360: report full mysql error messages in logs
deb.monish [Fri, 1 Apr 2016 08:08:51 +0000 (13:38 +0530)]
CRM-17360: report full mysql error messages in logs

8 years agoMerge pull request #8059 from yashodha/4.7.CRM-18241
Yashodha Chaku [Fri, 1 Apr 2016 07:18:17 +0000 (12:48 +0530)]
Merge pull request #8059 from yashodha/4.7.CRM-18241

CRM-18241: Change field length of civicrm_option_value.label from 255…

8 years agofix missing semi-colon for earlier dql
yashodha [Fri, 1 Apr 2016 06:34:57 +0000 (12:04 +0530)]
fix missing semi-colon for earlier dql

8 years agoAdd test for reminder (not) repeating on same day
eileenmcnaugton [Mon, 14 Mar 2016 11:42:23 +0000 (00:42 +1300)]
Add test for reminder (not) repeating on same day

8 years agoCRM-18241: Change field length of civicrm_option_value.label from 255 to 512
yashodha [Fri, 1 Apr 2016 05:48:27 +0000 (11:18 +0530)]
CRM-18241: Change field length of civicrm_option_value.label from 255 to 512

----------------------------------------
* CRM-18241: Change field length of civicrm_option_value.label from 255 to 512
  https://issues.civicrm.org/jira/browse/CRM-18241

8 years agoMerge pull request #8051 from JMAConsulting/CRM-18337
Yashodha Chaku [Fri, 1 Apr 2016 04:19:33 +0000 (09:49 +0530)]
Merge pull request #8051 from JMAConsulting/CRM-18337

CRM-18337, used https for social media url

8 years agoMerge pull request #8056 from eileenmcnaughton/master
Eileen McNaughton [Fri, 1 Apr 2016 03:20:59 +0000 (16:20 +1300)]
Merge pull request #8056 from eileenmcnaughton/master

Update test pledgeCreate function signature

8 years agoUpdate test pledgeCreate function signature
eileenmcnaugton [Fri, 1 Apr 2016 01:58:11 +0000 (14:58 +1300)]
Update test pledgeCreate function signature

This is more flexible & inline with the signature of similar functions

8 years agoMerge pull request #8055 from totten/master-phpunit-ls
Tim Otten [Thu, 31 Mar 2016 22:57:59 +0000 (15:57 -0700)]
Merge pull request #8055 from totten/master-phpunit-ls

scripts/phpunit-{ls,indiv} - Fixes for standalone PHPUnit

8 years agoscripts/phpunit-{ls,indiv} - Fixes for standalone PHPUnit
Tim Otten [Thu, 31 Mar 2016 21:51:06 +0000 (14:51 -0700)]
scripts/phpunit-{ls,indiv} - Fixes for standalone PHPUnit

8 years agoCRM-18305 - CiviMember - Auto-renew checkbox option was being displayed multiple...
Allen Shaw [Thu, 31 Mar 2016 21:19:21 +0000 (16:19 -0500)]
CRM-18305 - CiviMember - Auto-renew checkbox option was being displayed multiple times.

With support for contribution pages with and without price sets.

8 years agoMerge pull request #8050 from jitendrapurohit/CRM-17902
Yashodha Chaku [Thu, 31 Mar 2016 13:19:47 +0000 (18:49 +0530)]
Merge pull request #8050 from jitendrapurohit/CRM-17902

CRM-17902: fix null param in Participant.tpl

8 years agoCRM-18282: Custom Field values from Profile in Contribution Page not saved in new...
Web Access [Thu, 31 Mar 2016 13:18:50 +0000 (18:48 +0530)]
CRM-18282: Custom Field values from Profile in Contribution Page not saved in new Membership

8 years agoCRM-18337, used https for social media url
Pradeep Nayak [Thu, 31 Mar 2016 12:43:08 +0000 (18:13 +0530)]
CRM-18337, used https for social media url

----------------------------------------
* CRM-18337: Use https for all social media url
  https://issues.civicrm.org/jira/browse/CRM-18337

8 years agoMerge pull request #8039 from JKingsnorth/CRM-18311
Monish Deb [Thu, 31 Mar 2016 10:22:06 +0000 (15:52 +0530)]
Merge pull request #8039 from JKingsnorth/CRM-18311

CRM-18311 Revert "Fix for CRM failure"

8 years agoCRM-17902: fix null param in Participant.tpl
jitendrapurohit [Thu, 31 Mar 2016 08:58:10 +0000 (14:28 +0530)]
CRM-17902: fix null param in Participant.tpl

8 years agoMerge pull request #8046 from eileenmcnaughton/CRM-18327
Yashodha Chaku [Thu, 31 Mar 2016 06:35:07 +0000 (12:05 +0530)]
Merge pull request #8046 from eileenmcnaughton/CRM-18327

CRM-18327 Fix filter value  on the contact deleted by merge activity

8 years agoMerge pull request #7874 from davialexandre/fix_17452
Monish Deb [Thu, 31 Mar 2016 04:57:50 +0000 (10:27 +0530)]
Merge pull request #7874 from davialexandre/fix_17452

CRM-17452: CiviCase overrides case status if Sequence is used

8 years agoCRM-18327 Fix filter value on the contact deleted by merge activity
eileen [Wed, 30 Mar 2016 23:50:33 +0000 (12:50 +1300)]
CRM-18327 Fix filter value  on the contact deleted by merge activity

8 years agoCRM-18317 - Links to Drupal system broken if hook altered by a module
rollox [Wed, 30 Mar 2016 23:04:19 +0000 (00:04 +0100)]
CRM-18317 - Links to Drupal system broken if hook altered by a module

Let Drupal (6 or 7) handle the generation of system links to 'admin/.../permissions' so that the urls can be hook altered if necessary by modules like Rename Admin Paths:
https://www.drupal.org/project/rename_admin_paths

8 years agoCRM-18317 - Links to Drupal system broken if hook altered by a module
rollox [Wed, 30 Mar 2016 22:29:03 +0000 (23:29 +0100)]
CRM-18317 - Links to Drupal system broken if hook altered by a module

Let Drupal output the system url for 'user/' . $uid instead of Civi, so that any Drupal hooks that alter this path have a chance to do so.

8 years agoCRM-18317 - Links to Drupal system broken if hook altered by a module
rollox [Wed, 30 Mar 2016 22:19:46 +0000 (23:19 +0100)]
CRM-18317 - Links to Drupal system broken if hook altered by a module

Let Drupal render the system url for 'user/password' instead of Civi, so that any Drupal hooks that alter this path have a chance to do so.

8 years agoMerge pull request #7764 from pradpnayak/CRM-16617-master
colemanw [Wed, 30 Mar 2016 17:44:53 +0000 (13:44 -0400)]
Merge pull request #7764 from pradpnayak/CRM-16617-master

Crm 16617 master

8 years agoMerge pull request #8043 from JKingsnorth/CRM-18319
Yashodha Chaku [Wed, 30 Mar 2016 13:16:25 +0000 (18:46 +0530)]
Merge pull request #8043 from JKingsnorth/CRM-18319

CRM-18319: Remove unused scan_and_replace method

8 years agominor fix
jitendrapurohit [Wed, 30 Mar 2016 11:49:57 +0000 (17:19 +0530)]
minor fix

8 years agoMerge pull request #8037 from jitendrapurohit/CRM-18284
Monish Deb [Wed, 30 Mar 2016 11:01:59 +0000 (16:31 +0530)]
Merge pull request #8037 from jitendrapurohit/CRM-18284

CRM-18284 -- Cannot create mailing labels from all found contacts if they are sorted

8 years agoCRM-18319: Remove unused scan_and_replace method
JKingsnorth [Wed, 30 Mar 2016 09:14:02 +0000 (10:14 +0100)]
CRM-18319: Remove unused scan_and_replace method

8 years agoCRM-18250 - Fix Find Events on Manage Event Screen
jitendrapurohit [Fri, 18 Mar 2016 13:15:16 +0000 (18:45 +0530)]
CRM-18250 - Fix Find Events on Manage Event Screen

update doc

8 years agowebtest to check CRM-18284
jitendrapurohit [Wed, 30 Mar 2016 05:58:15 +0000 (11:28 +0530)]
webtest to check CRM-18284

8 years agoMerge pull request #8038 from rohankatkar/CRM-18060
Yashodha Chaku [Wed, 30 Mar 2016 03:14:55 +0000 (08:44 +0530)]
Merge pull request #8038 from rohankatkar/CRM-18060

Fix for CRM-18060

8 years agoCRM-17452 fix
Davi Alexandre [Fri, 26 Feb 2016 22:41:09 +0000 (19:41 -0300)]
CRM-17452 fix

This fixes CRM-17452 by changing SequenceListener to check if
all the case activities are closed, instead of checking only the ones
belonging to the Sequence.

8 years agoRevert "Fix for CRM failure"
JKingsnorth [Tue, 29 Mar 2016 14:32:18 +0000 (15:32 +0100)]
Revert "Fix for CRM failure"

This reverts commit a50d7d84b5970e26261fe3134a10c7f91dcb5e56.

8 years agoadd from clause w.r.t orderBy
jitendrapurohit [Tue, 29 Mar 2016 12:43:12 +0000 (18:13 +0530)]
add from clause w.r.t orderBy

8 years agoFix for CRM-18060
Web Access [Tue, 29 Mar 2016 11:20:49 +0000 (16:50 +0530)]
Fix for CRM-18060

8 years agoMerge pull request #8012 from agh1/multi-paypal-ipn-47
Monish Deb [Tue, 29 Mar 2016 07:43:17 +0000 (13:13 +0530)]
Merge pull request #8012 from agh1/multi-paypal-ipn-47

CRM-18107 PayPal Standard IPN fails with multiple processors

8 years agoMerge pull request #8030 from twomice/CRM-18305
Yashodha Chaku [Tue, 29 Mar 2016 06:58:16 +0000 (12:28 +0530)]
Merge pull request #8030 from twomice/CRM-18305

CRM-18305 - CiviMember - Auto-renew option displayed multiple times

8 years agoCRM-18284 -- include returnProperties when orderBy clause is enabled
jitendrapurohit [Tue, 29 Mar 2016 06:57:31 +0000 (12:27 +0530)]
CRM-18284 -- include returnProperties when orderBy clause is enabled

8 years agoMerge pull request #8031 from eileenmcnaughton/CRM-18307-trash
Yashodha Chaku [Tue, 29 Mar 2016 05:07:04 +0000 (10:37 +0530)]
Merge pull request #8031 from eileenmcnaughton/CRM-18307-trash

CRM-18307 fix error on merge when undelete is off

8 years agoMerge pull request #7894 from eileenmcnaughton/CRM-18128-buffer
Monish Deb [Tue, 29 Mar 2016 05:04:14 +0000 (10:34 +0530)]
Merge pull request #7894 from eileenmcnaughton/CRM-18128-buffer

CRM-18128 Return more rows per query and use unbuffered query to mana…

8 years agoFix test error, I think this syntax is less tolerated by some php versions.
eileen [Tue, 29 Mar 2016 00:46:46 +0000 (13:46 +1300)]
Fix test error, I think this syntax is less tolerated by some php versions.

The code is unrelated to the PR but the PR must have triggered tests to run on this exposing test-grumpiness

8 years agoMerge pull request #8032 from eileenmcnaughton/comment
Eileen McNaughton [Tue, 29 Mar 2016 01:34:59 +0000 (14:34 +1300)]
Merge pull request #8032 from eileenmcnaughton/comment

random comment fix

8 years agoCRM-18128 Return more rows per query and use unbuffered query to manage the memory
eileen [Tue, 1 Mar 2016 04:48:06 +0000 (17:48 +1300)]
CRM-18128 Return more rows per query and use unbuffered query to manage the memory

The Limit was set in order to protect memory use. However, if means running often slow queries many times for large exports .. trying another way

8 years agorandom comment fix
eileen [Thu, 4 Feb 2016 04:10:20 +0000 (17:10 +1300)]
random comment fix

8 years agoCRM-18307 fix error on merge when undelete is off
eileen [Mon, 28 Mar 2016 22:36:41 +0000 (11:36 +1300)]
CRM-18307 fix error on merge when undelete is off