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
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
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
deb.monish [Fri, 1 Apr 2016 08:08:51 +0000 (13:38 +0530)]
CRM-17360: report full mysql error messages in logs
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…
yashodha [Fri, 1 Apr 2016 06:34:57 +0000 (12:04 +0530)]
fix missing semi-colon for earlier dql
eileenmcnaugton [Mon, 14 Mar 2016 11:42:23 +0000 (00:42 +1300)]
Add test for reminder (not) repeating on same day
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
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
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
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
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
Tim Otten [Thu, 31 Mar 2016 21:51:06 +0000 (14:51 -0700)]
scripts/phpunit-{ls,indiv} - Fixes for standalone PHPUnit
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.
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
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
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
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"
jitendrapurohit [Thu, 31 Mar 2016 08:58:10 +0000 (14:28 +0530)]
CRM-17902: fix null param in Participant.tpl
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
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
eileen [Wed, 30 Mar 2016 23:50:33 +0000 (12:50 +1300)]
CRM-18327 Fix filter value on the contact deleted by merge activity
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
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.
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.
colemanw [Wed, 30 Mar 2016 17:44:53 +0000 (13:44 -0400)]
Merge pull request #7764 from pradpnayak/CRM-16617-master
Crm 16617 master
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
jitendrapurohit [Wed, 30 Mar 2016 11:49:57 +0000 (17:19 +0530)]
minor fix
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
JKingsnorth [Wed, 30 Mar 2016 09:14:02 +0000 (10:14 +0100)]
CRM-18319: Remove unused scan_and_replace method
jitendrapurohit [Fri, 18 Mar 2016 13:15:16 +0000 (18:45 +0530)]
CRM-18250 - Fix Find Events on Manage Event Screen
update doc
jitendrapurohit [Wed, 30 Mar 2016 05:58:15 +0000 (11:28 +0530)]
webtest to check CRM-18284
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
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.
JKingsnorth [Tue, 29 Mar 2016 14:32:18 +0000 (15:32 +0100)]
Revert "Fix for CRM failure"
This reverts commit
a50d7d84b5970e26261fe3134a10c7f91dcb5e56.
jitendrapurohit [Tue, 29 Mar 2016 12:43:12 +0000 (18:13 +0530)]
add from clause w.r.t orderBy
Web Access [Tue, 29 Mar 2016 11:20:49 +0000 (16:50 +0530)]
Fix for CRM-18060
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
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
jitendrapurohit [Tue, 29 Mar 2016 06:57:31 +0000 (12:27 +0530)]
CRM-18284 -- include returnProperties when orderBy clause is enabled
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
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…
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
Eileen McNaughton [Tue, 29 Mar 2016 01:34:59 +0000 (14:34 +1300)]
Merge pull request #8032 from eileenmcnaughton/comment
random comment fix
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
eileen [Thu, 4 Feb 2016 04:10:20 +0000 (17:10 +1300)]
random comment fix
eileen [Mon, 28 Mar 2016 22:36:41 +0000 (11:36 +1300)]
CRM-18307 fix error on merge when undelete is off
Allen Shaw [Mon, 28 Mar 2016 18:44:58 +0000 (13:44 -0500)]
CRM-18305 - CiviMember - Auto-renew checkbox option was being displayed multiple times.
Yashodha Chaku [Mon, 28 Mar 2016 11:15:31 +0000 (16:45 +0530)]
Merge pull request #8029 from yashodha/CRM-18287
CRM-18287: Cannot cancel pledge
yashodha [Mon, 28 Mar 2016 08:38:09 +0000 (14:08 +0530)]
CRM-18287: Cannot cancel pledge
----------------------------------------
* CRM-18287: Cannot cancel pledge
https://issues.civicrm.org/jira/browse/CRM-18287
Yashodha Chaku [Mon, 28 Mar 2016 02:50:35 +0000 (08:20 +0530)]
Merge pull request #8028 from fuzionnz/CRM-18301-wordpress_drupal_config
CRM-18301. Remove Drupal config tpl from Wordpress config generation.
Chris Burgess [Sun, 27 Mar 2016 20:43:28 +0000 (09:43 +1300)]
CRM-18301. Remove Drupal config tpl from Wordpress config generation.
Monish Deb [Fri, 25 Mar 2016 15:44:52 +0000 (21:14 +0530)]
Merge pull request #8018 from josephlacey/CRM-18276
CRM-18276 Fixing truncated custom data tables array with GROUP_CONCAT
Joseph Lacey [Fri, 25 Mar 2016 15:00:00 +0000 (11:00 -0400)]
CRM-18276 fixing regression by initializing array.
----------------------------------------
* CRM-18276: Report custom data table retrieval fails when tables are more than 1024 characters
https://issues.civicrm.org/jira/browse/CRM-18276
Yashodha Chaku [Fri, 25 Mar 2016 12:55:11 +0000 (18:25 +0530)]
Merge pull request #8020 from sleewok/patch-1
Mange Groups: Fix child groups so that they can be expanded
Monish Deb [Fri, 25 Mar 2016 11:44:28 +0000 (17:14 +0530)]
Merge pull request #8013 from Vgratioulet/Core-SearchBuilder-DisplayLocationInSummary
CRM-18274 - Search Builder - display location if not primary in summary
Yashodha Chaku [Fri, 25 Mar 2016 10:29:33 +0000 (15:59 +0530)]
Merge pull request #8024 from yashodha/CRM-18290
CRM-18290: Edits to activities are not saved in CiviCase
yashodha [Fri, 25 Mar 2016 08:46:45 +0000 (14:16 +0530)]
CRM-18290: Edits to activities are not saved in CiviCase
----------------------------------------
* CRM-18290: Edits to activities are not saved in CiviCase
https://issues.civicrm.org/jira/browse/CRM-18290
Yashodha Chaku [Fri, 25 Mar 2016 06:14:47 +0000 (11:44 +0530)]
Merge pull request #8019 from joeyisking/CRM-18285
CRM-18285 Incorrectly displaying country limit
Brian Shaughnessy [Fri, 25 Mar 2016 04:47:09 +0000 (00:47 -0400)]
CRM-18245 bootstrap when triggering ipn
colemanw [Thu, 24 Mar 2016 14:37:30 +0000 (10:37 -0400)]
Merge pull request #8021 from JKingsnorth/CRM-18288
CRM-18288: Fix mergeBlock JS for location types
JKingsnorth [Thu, 24 Mar 2016 14:35:39 +0000 (14:35 +0000)]
CRM-18288: Fix mergeBlock JS for location types
sleewok [Thu, 24 Mar 2016 13:57:43 +0000 (09:57 -0400)]
Fix child groups so that they can be expanded
When managing groups you cannot expand (uncollapse) 2nd level child groups. Clicking on the arrow to view children initiates inline editing. The inline editing field is encompassing the expand icon that allows children to be viewed. This effectively breaks management of child groups from the manage groups page. Changing this line fixes the issue.
Joseph Martin [Thu, 24 Mar 2016 00:39:57 +0000 (11:39 +1100)]
CRM-18285 - Update Localization setting file to set no defaul
Joseph Martin [Thu, 24 Mar 2016 00:36:53 +0000 (11:36 +1100)]
Merge pull request #1 from civicrm/master
Pull latest changes
Joseph Lacey [Wed, 23 Mar 2016 22:16:00 +0000 (18:16 -0400)]
CRM-18276 Fixing truncated custom data tables array with GROUP_CONCAT
----------------------------------------
* CRM-18276: Report custom data table retrieval fails when tables are more than 1024 characters
https://issues.civicrm.org/jira/browse/CRM-18276
Monish Deb [Wed, 23 Mar 2016 13:11:32 +0000 (18:41 +0530)]
Merge pull request #7857 from eileenmcnaughton/CRM-18096
CRM-18096 Slow queries when rendering logging tab
Yashodha Chaku [Wed, 23 Mar 2016 11:58:38 +0000 (17:28 +0530)]
Merge pull request #8016 from yashodha/CRM-18281
CRM-18281:Fix translation for online event receipts
yashodha [Wed, 23 Mar 2016 10:28:50 +0000 (15:58 +0530)]
CRM-18281:Fix translation for online event receipts
----------------------------------------
* CRM-18281: Fix translation for online event receipts
https://issues.civicrm.org/jira/browse/CRM-18281
Monish Deb [Wed, 23 Mar 2016 09:45:25 +0000 (15:15 +0530)]
Merge pull request #7924 from lucianov88/master
CRM-14097 ISSUE - Schedule Reminder UI
Eileen McNaughton [Wed, 23 Mar 2016 07:39:45 +0000 (20:39 +1300)]
Merge pull request #8010 from mlutfy/master-crm17862
CRM-17862: Source field - in backend - one-time credit card contribution defaults to 'recurring contribution'.
Yashodha Chaku [Wed, 23 Mar 2016 05:56:14 +0000 (11:26 +0530)]
Merge pull request #8015 from cividesk/CRM-12280-4.7
Fix for CRM-18280
Monish Deb [Wed, 23 Mar 2016 05:11:54 +0000 (10:41 +0530)]
Merge pull request #7950 from JKingsnorth/CRM-18196
CRM-18196 Track mailto: links in CiviMail
projects / civicrm-core.git / log