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
Monish Deb [Wed, 23 Mar 2016 05:06:28 +0000 (10:36 +0530)]
Merge pull request #7940 from seamuslee001/CRM-18181
CRM-18181 Get all mailings that use mailings that an acled user can see
Nicolas Ganivet [Wed, 23 Mar 2016 03:11:07 +0000 (21:11 -0600)]
Fix for CRM-18280
Monish Deb [Tue, 22 Mar 2016 12:23:10 +0000 (17:53 +0530)]
Merge pull request #7970 from otetard/CRM-18235
CRM-18235: Allow to define `returnPath` in `CRM_Utils_Mail::send()`.
Véronique Gratioulet [Tue, 22 Mar 2016 10:10:17 +0000 (11:10 +0100)]
CRM-18274 - Search Builder - display location if not primary in summary
for state, country, county, civicrm_address fields, phone, email
adds '(location_name)' after the field name in the summary if a location
is not primary.
it completes some code that was already there
Monish Deb [Tue, 22 Mar 2016 06:48:23 +0000 (12:18 +0530)]
Merge pull request #8005 from joeyisking/CRM-18270
CRM-18270 Activity description not rendering html
Yashodha Chaku [Tue, 22 Mar 2016 03:50:00 +0000 (09:20 +0530)]
Merge pull request #8009 from yashodha/fix.CRM-18249
fix version and year
Andrew Hunt [Mon, 21 Mar 2016 22:20:19 +0000 (18:20 -0400)]
CRM-18107 PayPal Standard IPN fails if payment processor id != payment processor type id
Mathieu Lutfy [Mon, 21 Mar 2016 20:19:14 +0000 (16:19 -0400)]
CRM-17862: PHP style fix.
Mathieu Lutfy [Mon, 21 Mar 2016 20:08:33 +0000 (16:08 -0400)]
CRM-17862: Source field - in backend - one-time credit card contribution defaults to 'recurring contribution'.
yashodha [Mon, 21 Mar 2016 14:30:03 +0000 (20:00 +0530)]
some more minor fixes
yashodha [Mon, 21 Mar 2016 13:57:21 +0000 (19:27 +0530)]
some more minor fixes
yashodha [Mon, 21 Mar 2016 12:56:03 +0000 (18:26 +0530)]
some indentation fixes
yashodha [Mon, 21 Mar 2016 10:16:33 +0000 (15:46 +0530)]
fix version and year
Yashodha Chaku [Mon, 21 Mar 2016 10:14:34 +0000 (15:44 +0530)]
Merge pull request #8008 from sushantpaste/note-css
Fixes for Note preview CSS
sushantpaste [Mon, 21 Mar 2016 09:14:56 +0000 (14:44 +0530)]
Fixes for Note preview CSS
sushantpaste [Mon, 21 Mar 2016 09:10:29 +0000 (14:40 +0530)]
Fixes for Note preview CSS
Monish Deb [Mon, 21 Mar 2016 08:02:52 +0000 (13:32 +0530)]
Merge pull request #7995 from monishdeb/CRM-18071
Crm 18071
Monish Deb [Mon, 21 Mar 2016 07:54:49 +0000 (13:24 +0530)]
Merge pull request #8001 from monishdeb/CRM-18219
CRM-18219,CRM-9067 fixes on onbehalf
Yashodha Chaku [Mon, 21 Mar 2016 06:16:56 +0000 (11:46 +0530)]
Merge pull request #8006 from yashodha/CRM-18263
CRM-18263: copy profile broken
yashodha [Mon, 21 Mar 2016 05:00:09 +0000 (10:30 +0530)]
CRM-18263: copy profile broken
----------------------------------------
* CRM-18263: copy profile broken
https://issues.civicrm.org/jira/browse/CRM-18263
Joseph Martin [Mon, 21 Mar 2016 04:18:45 +0000 (15:18 +1100)]
Updated formatting
Joseph Martin [Mon, 21 Mar 2016 02:59:00 +0000 (13:59 +1100)]
CRM-18270 Activity description not rendering html
colemanw [Sat, 19 Mar 2016 00:22:39 +0000 (20:22 -0400)]
Merge pull request #8004 from PalanteJon/CRM-18264
CRM-18264 - Fix potential upgrade crash when adding Getting Started d…
colemanw [Fri, 18 Mar 2016 22:30:28 +0000 (18:30 -0400)]
Merge pull request #7959 from JMAConsulting/CRM-18163
CRM-18163 Unsupervised Organization Rule for On Behalf Of Contributions
Jon goldberg [Fri, 18 Mar 2016 19:47:16 +0000 (15:47 -0400)]
CRM-18264 - Fix potential upgrade crash when adding Getting Started dashlet
colemanw [Fri, 18 Mar 2016 13:44:05 +0000 (09:44 -0400)]
Merge pull request #7993 from JKingsnorth/CRM-18257
[WIP] CRM-18257: WYSIWYG fullPage config option
deb.monish [Fri, 18 Mar 2016 13:23:00 +0000 (18:53 +0530)]
CRM-18219,CRM-9067 fixes on onbehalf
Yashodha Chaku [Fri, 18 Mar 2016 12:27:58 +0000 (17:57 +0530)]
Merge pull request #7989 from fuzionnz/CRM-17952
CRM-17952. Escape HTML on "Headers, Footers, and Automated Messages"
Monish Deb [Fri, 18 Mar 2016 10:21:01 +0000 (15:51 +0530)]
Merge pull request #7977 from JMAConsulting/CRM-18219
CRM-18219 Fixed bug related to required sign up for on behalf orgs
JKingsnorth [Fri, 18 Mar 2016 09:28:49 +0000 (09:28 +0000)]
CRM18257: Add fullPage WYSIWYG style to message templates
JKingsnorth [Fri, 18 Mar 2016 09:07:56 +0000 (09:07 +0000)]
Make variable declaration less verbose
Monish Deb [Fri, 18 Mar 2016 08:51:35 +0000 (14:21 +0530)]
Merge pull request #7992 from jitendrapurohit/CRM-18255
Minor fix for CRM-16173, CRM-16831 - change labels, add separator, etc
Yashodha Chaku [Fri, 18 Mar 2016 06:53:57 +0000 (12:23 +0530)]
Merge pull request #7998 from josephlacey/CRM-18188
CRM-18188 Fixing duplicate rules on required fields when creating tabbed contact custom data
jitendrapurohit [Thu, 17 Mar 2016 09:15:57 +0000 (14:45 +0530)]
Minor fix for CRM-16173, CRM-16831 - change labels, add separator, etc
minor fix
Tim Otten [Thu, 17 Mar 2016 22:17:19 +0000 (15:17 -0700)]
Merge pull request #7997 from TobiasLounsbury/CRM-18223-generic-hook
Added call to hook_civicrm_fieldOptions()...
Joseph Lacey [Thu, 17 Mar 2016 21:24:32 +0000 (17:24 -0400)]
CRM-18188 Fixing duplicate rules on required fields when creating tabbed contact custom data.
----------------------------------------
* CRM-18188: Tabbed Custom Data Required Field Submit Values Ignored
https://issues.civicrm.org/jira/browse/CRM-18188
Tobias Lounsbury [Thu, 17 Mar 2016 20:01:41 +0000 (13:01 -0700)]
Added call to hook_civicrm_fieldOptions() from within CRM_Core_PseudoConstant::get() for fields that validate against a callback.
deb.monish [Thu, 17 Mar 2016 17:31:45 +0000 (23:01 +0530)]
CRM-18071 fix
minor fix
style fix
style fix
JKingsnorth [Thu, 17 Mar 2016 15:53:50 +0000 (15:53 +0000)]
CRM-18257: fullPage configuration option
Eileen McNaughton [Thu, 17 Mar 2016 08:11:21 +0000 (21:11 +1300)]
Merge pull request #7861 from laryn/patch-8
CRM-18092: Add batch info to bookkeeping report
Mattias Michaux [Thu, 17 Mar 2016 07:14:12 +0000 (20:14 +1300)]
CRM-17952. Escape HTML in body_text field on "Headers, Footers, and Automated Messages"
Pradeep Nayak [Wed, 16 Mar 2016 21:22:30 +0000 (02:52 +0530)]
CRM-18163, fixed problem related to CRM-15182
----------------------------------------
* CRM-18163: Unsupervised Organization Rule for On Behalf Of Contributions
https://issues.civicrm.org/jira/browse/CRM-18163
* CRM-15182: on behalf of: preloaded org is not preserved
https://issues.civicrm.org/jira/browse/CRM-15182
Eileen McNaughton [Wed, 16 Mar 2016 20:53:47 +0000 (09:53 +1300)]
Merge pull request #7818 from JMAConsulting/CRM-16526-1
CRM-16526 [needs-review] Financial ACL API tests
colemanw [Wed, 16 Mar 2016 15:14:46 +0000 (11:14 -0400)]
Merge pull request #7986 from colemanw/CRM-18243
CRM-18243 - Remove call to deprecated function
projects / civicrm-core.git / log