Eileen McNaughton [Fri, 15 Apr 2016 03:31:42 +0000 (15:31 +1200)]
CRM-17846 Fixing lock name to be less than 64 characters for MySQL 5.7 compatib (#8133)
* Fixing lock name to be less than 64 characters for MySQL 5.7 compatibility
Removing spaces to make Jenkins happy
Updating Lock to keep the name param and add an id to use for the actual lock
Fixing spacing/comment issues
Using lock id instead of when checking if lock used
Changing behaviour when a lock is attempted using an existing name so as to return FALSE and leave the _hasLock FALSE
Revert "Changing behaviour when a lock is attempted using an existing name so as to return FALSE and leave the _hasLock FALSE"
This reverts commit
4fcb4d2f5b161c69a4f86f09ac363e97791f023e.
* CRM-17846 further fix to make lock mechanism work
* CRM-18746 add Code Comments
Monish Deb [Thu, 14 Apr 2016 23:18:19 +0000 (04:48 +0530)]
CRM-18414: On changing payment processor selection on Contribution page, disable submit button (#8143)
Monish Deb [Thu, 14 Apr 2016 14:40:04 +0000 (20:10 +0530)]
Merge pull request #8123 from monishdeb/CRM-17125
CRM-17125: add contact billing address when no contribution address
Monish Deb [Thu, 14 Apr 2016 11:54:49 +0000 (17:24 +0530)]
Merge pull request #8101 from colemanw/CRM-18379
CRM-18379 - Fix custom date fields in profiles
Eileen McNaughton [Thu, 14 Apr 2016 09:00:39 +0000 (21:00 +1200)]
Per CRM-17860 these require_once for files in CiviTest can go (#8134)
With this require once I could not run the test in isolation but it was fine once I removed it
Yashodha Chaku [Thu, 14 Apr 2016 07:35:59 +0000 (13:05 +0530)]
Merge pull request #8138 from eileenmcnaughton/CRM-18128
CRM-18128 rever unbuffered usage for now
eileen [Thu, 14 Apr 2016 07:08:42 +0000 (19:08 +1200)]
CRM-18128 rever unbuffered usage for now
Eileen McNaughton [Thu, 14 Apr 2016 04:05:31 +0000 (16:05 +1200)]
Update complete transaction test to reflect date change (#8135)
This is a new test & the expected receive date is changed by the setting of trxn_date but the check was not updated
deb.monish [Wed, 13 Apr 2016 15:32:20 +0000 (21:02 +0530)]
added unit test
Yashodha Chaku [Wed, 13 Apr 2016 12:22:50 +0000 (17:52 +0530)]
Merge pull request #8121 from colemanw/CRM-18393
CRM-18393 - Fix checkboxes to actually work
Johan Vervloet [Tue, 13 Oct 2015 11:45:02 +0000 (13:45 +0200)]
CRM-17125 - don't ignore 'is_billing'-parameter in Address BAO.
If you want the billing address on a receipt, and if you use the
getValues function of the Address BAO to retrieve it, the
'is_billing'-parameter should not be ignored by the BAO.
----------------------------------------
* CRM-17125: Add contact billing adress to contribution message when no contribution address
https://issues.civicrm.org/jira/browse/CRM-17125
Tim Mallezie [Wed, 2 Sep 2015 08:42:58 +0000 (10:42 +0200)]
check there is an address for contact
Tim Mallezie [Tue, 1 Sep 2015 10:59:27 +0000 (12:59 +0200)]
crm-17125 add contact billing address when no contribution address
Monish Deb [Wed, 13 Apr 2016 11:05:16 +0000 (16:35 +0530)]
Merge pull request #8119 from eileenmcnaughton/CRM-18303
CRM-18303 call sendConfirmation api from completeOrder to cause reload
Monish Deb [Wed, 13 Apr 2016 09:43:13 +0000 (15:13 +0530)]
Merge pull request #8097 from eileenmcnaughton/enotice
e-notice fix, experienced when processing an offsite payment form con…
Monish Deb [Wed, 13 Apr 2016 07:22:08 +0000 (12:52 +0530)]
Merge pull request #8124 from monishdeb/CRM-18396
CRM-18396: Type error when deduping contacts with custom file field
Yashodha Chaku [Wed, 13 Apr 2016 06:18:30 +0000 (11:48 +0530)]
Merge pull request #8110 from omarabuhussein/add-contact-summary-tab-dynamically-master
CRM-18390 - Adding contact summary tab dynamically
Tim Otten [Tue, 12 Apr 2016 22:19:46 +0000 (15:19 -0700)]
CRM_AllTests - Fix hidden GroupTest/TransactionTest interaction (#8115)
There's a hidden test interaction where CRM_Contact_BAO_GroupTest causes
CRM_Core_TransactionTest to fail, and this seems to involve munging the
active DB connection.
With this revision, CRM_Contact_BAO_GroupTest uses the same DB connection as
everything else.
The failure was reproducible using this command:
```
env CIVICRM_UF=UnitTests PHPUNIT_TESTS="CRM_Contact_BAO_GroupTest::testGroupData CRM_Core_TransactionTest::testBasicCommit" phpunit4 tests/phpunit/EnvTests.php
```
Eileen [Tue, 12 Apr 2016 13:13:13 +0000 (13:13 +0000)]
CRM-18303 call sendConfirmation api from completeOrder to make template params more reliable, api reloads the contribution
deb.monish [Tue, 12 Apr 2016 20:22:36 +0000 (01:52 +0530)]
CRM-18396: Type error when deduping contacts with custom file field
Coleman Watts [Tue, 12 Apr 2016 14:38:22 +0000 (10:38 -0400)]
CRM-18393 - Fix checkboxes to actually work
Eileen McNaughton [Tue, 12 Apr 2016 14:15:35 +0000 (02:15 +1200)]
CRM-18303 follow up - add test for membership form (#8120)
Eileen [Tue, 12 Apr 2016 12:31:54 +0000 (12:31 +0000)]
CRM-18303 Test for sending contribution on complete trxn
Yashodha Chaku [Tue, 12 Apr 2016 09:40:16 +0000 (15:10 +0530)]
Merge pull request #8108 from scardinius/crm-18229
CRM-18229 Set up campaign_id on A/B Test Mailing
omar abu hussein [Mon, 11 Apr 2016 22:05:13 +0000 (01:05 +0300)]
CRM-18390 - Adding contact summary tab dynamically
Monish Deb [Tue, 12 Apr 2016 08:00:40 +0000 (13:30 +0530)]
Merge pull request #8057 from eileenmcnaughton/CRM-18341
CRM-18341 Pledges not being completed by completeTransaction
Eileen McNaughton [Tue, 12 Apr 2016 06:30:15 +0000 (18:30 +1200)]
CRM-17859 unit test (#8113)
Saurabh Batra [Tue, 12 Apr 2016 05:20:53 +0000 (10:50 +0530)]
CRM-17859 - import contacts from CSV: sanitise / cleanup non-breaking… (#7813)
* CRM-17859 - import contacts from CSV: sanitise / cleanup non-breaking spaces from records
https://issues.civicrm.org/jira/browse/CRM-17859
* Update String.php
Eileen McNaughton [Tue, 12 Apr 2016 00:55:59 +0000 (12:55 +1200)]
Merge pull request #8111 from eileenmcnaughton/master
Amend comments & default port for Redis
eileen [Tue, 12 Apr 2016 00:31:58 +0000 (12:31 +1200)]
Fix for frequently failing api_v3_JobTest::testCallSendReminderLimitTo test.
The issue is that the test sets the membership with a join date in one hour's time. For 23 hours of the day the join date is on the same date as 'today' but for one hour it is not, and there is no valid status in a default set up for the period before the join date, hence we get an error
Change-Id: I3fb8a70e774b2ed70e857808911628ec5ce5cd79
eileen [Mon, 11 Apr 2016 23:42:50 +0000 (11:42 +1200)]
Amend comments & default port for Redis
Eileen McNaughton [Mon, 11 Apr 2016 23:21:29 +0000 (11:21 +1200)]
Merge pull request #8068 from colemanw/CRM-17832
CRM-17832 - Fix method call to Redis
scardinius [Mon, 11 Apr 2016 15:36:57 +0000 (17:36 +0200)]
CRM-18229 Set up campaign_id on A/B Test Mailing
Monish Deb [Mon, 11 Apr 2016 07:29:58 +0000 (12:59 +0530)]
Merge pull request #8103 from monishdeb/CRM-18343
Fixes to Group Page PHPUnit test fixes
eileenmcnaugton [Wed, 6 Apr 2016 10:20:54 +0000 (22:20 +1200)]
CRM-18369 fix repeattransaction function signature
eileenmcnaugton [Fri, 1 Apr 2016 04:24:12 +0000 (17:24 +1300)]
CRM-18341 Pledges not being completed by completeTransaction
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…
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
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
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
JKingsnorth [Fri, 8 Apr 2016 11:06:59 +0000 (12:06 +0100)]
CRM-18339: Fix merge screen link to contact's mailings
deb.monish [Fri, 8 Apr 2016 09:14:52 +0000 (14:44 +0530)]
replace hardcoded base url with CIVICRM_UF_BASEURL
Joseph Lacey [Mon, 28 Mar 2016 20:57:13 +0000 (16:57 -0400)]
Further fixes to Group Page PHPUnit test, deals with new returned structure and few other bugs.
Joseph Lacey [Thu, 25 Feb 2016 22:40:31 +0000 (17:40 -0500)]
Changing setup for Group Page AJAX PHPUnit tests.
Joseph Lacey [Wed, 24 Feb 2016 20:49:02 +0000 (15:49 -0500)]
Fixing remaining Group Page AJAX PHPUnit tests.
Joseph Lacey [Wed, 17 Feb 2016 18:23:26 +0000 (13:23 -0500)]
Removing return array note which is no longer the case with DataTables v2.
Joseph Lacey [Wed, 17 Feb 2016 18:11:07 +0000 (13:11 -0500)]
Fixes to Group Page PHPUnit test
deb.monish [Fri, 8 Apr 2016 08:36:08 +0000 (14:06 +0530)]
revert PR 8065
CiviCRM [Fri, 8 Apr 2016 01:33:00 +0000 (18:33 -0700)]
Update version to 4.7.7
Coleman Watts [Thu, 7 Apr 2016 20:34:39 +0000 (16:34 -0400)]
CRM-18379 - Fix custom date fields in profiles
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
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
jitendrapurohit [Thu, 7 Apr 2016 12:44:36 +0000 (18:14 +0530)]
CRM-18376 - Manage Group screen shows no groups
eileenmcnaugton [Thu, 7 Apr 2016 11:12:15 +0000 (23:12 +1200)]
e-notice fix, experienced when processing an offsite payment form contribution page
jitendrapurohit [Thu, 7 Apr 2016 10:11:34 +0000 (15:41 +0530)]
CRM-18058: Define cmsRootPath() for Joomla
Yashodha Chaku [Thu, 7 Apr 2016 08:46:43 +0000 (14:16 +0530)]
Merge pull request #8095 from yashodha/CRM-18372
CRM-18372
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
yashodha [Thu, 7 Apr 2016 06:13:29 +0000 (11:43 +0530)]
remove debug statement
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
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
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
CiviCRM [Wed, 6 Apr 2016 13:12:48 +0000 (06:12 -0700)]
Update version to 4.7.6
eileenmcnaugton [Wed, 6 Apr 2016 09:11:37 +0000 (21:11 +1200)]
CRM-18368 pass through contribution status id
eileenmcnaugton [Wed, 6 Apr 2016 09:03:28 +0000 (21:03 +1200)]
CRM-18368 preliminary tidy-up, standarise setting of contributionStatusID
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
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
Pradeep Nayak [Tue, 5 Apr 2016 20:57:36 +0000 (02:27 +0530)]
--CRM-16617, code fixing for install, changed the parameters of function
JKingsnorth [Mon, 4 Apr 2016 11:11:36 +0000 (12:11 +0100)]
Style fix
JKingsnorth [Mon, 4 Apr 2016 10:53:12 +0000 (11:53 +0100)]
CRM-18345: Don't delete mailing data on email/phone deletion
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
deb.monish [Tue, 5 Apr 2016 11:34:43 +0000 (17:04 +0530)]
CRM-18343: Upgrade script and AJAX test fixes
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
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
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
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
Yashodha Chaku [Tue, 5 Apr 2016 06:56:47 +0000 (12:26 +0530)]
Merge pull request #8084 from yashodha/CRM-18317
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
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
deb.monish [Fri, 25 Mar 2016 10:50:15 +0000 (16:20 +0530)]
CRM-18236 fix
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…
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
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
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
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
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
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
eileenmcnaugton [Mon, 4 Apr 2016 03:07:48 +0000 (15:07 +1200)]
CRM-18355 Fix repeat transaction for test contributions
sunil [Sun, 3 Apr 2016 09:14:33 +0000 (14:44 +0530)]
skip url from IDS check
Coleman Watts [Sat, 2 Apr 2016 14:02:52 +0000 (10:02 -0400)]
CRM-17965 - Fix contribution widget on Drupal
Coleman Watts [Sat, 2 Apr 2016 01:32:19 +0000 (21:32 -0400)]
CRM-17832 - Fix method call to Redis
Saurabh Batra [Fri, 1 Apr 2016 21:37:53 +0000 (03:07 +0530)]
CRM-18279 - https://issues.civicrm.org/jira/browse/CRM-18279
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
deb.monish [Fri, 1 Apr 2016 14:25:38 +0000 (19:55 +0530)]
CRM-18343: Ajax CRM test failure fixes
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
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
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 …
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
Web Access [Fri, 1 Apr 2016 09:03:20 +0000 (14:33 +0530)]
Minor fix: CRM-18282
minor fix
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…
jitendrapurohit [Fri, 1 Apr 2016 10:06:05 +0000 (15:36 +0530)]
CRM-18312: Contribution Details Report Soft Credits, Soft Credit for columns
projects / civicrm-core.git / log