Jaap Jansma [Sat, 21 Nov 2015 08:55:31 +0000 (09:55 +0100)]
fixed #CRM-17601 commit was incomplete last time
Jaap Jansma [Fri, 20 Nov 2015 13:03:02 +0000 (14:03 +0100)]
Fixed #CRM-17601 show custom fields on case reports
Monish Deb [Fri, 20 Nov 2015 05:38:06 +0000 (11:08 +0530)]
Merge pull request #7257 from monishdeb/testFailures
CRM-17520 webtest fix
monishdeb [Fri, 20 Nov 2015 05:33:44 +0000 (11:03 +0530)]
CRM-17520 webtest fix
----------------------------------------
* CRM-17520: Wrong Non-deductable amount after doing back-office contribution with is_deductible = TRUE and no premium
https://issues.civicrm.org/jira/browse/CRM-17520
Coleman Watts [Fri, 20 Nov 2015 00:40:57 +0000 (19:40 -0500)]
Merge branch 'aydun-CRM-16203' into 4.6
Conflicts:
CRM/Report/Form.php
colemanw [Thu, 19 Nov 2015 23:34:03 +0000 (18:34 -0500)]
Merge pull request #7176 from christianwach/crm-17543
CRM-17543 Bootstrapping WordPress triggers multiple PHP warnings and plugin load failures
colemanw [Thu, 19 Nov 2015 23:32:37 +0000 (18:32 -0500)]
Merge pull request #7254 from monishdeb/CRM-17417
CRM-17417 and CRM-17418 fixes
monishdeb [Thu, 19 Nov 2015 17:30:34 +0000 (23:00 +0530)]
format fix
Monish Deb [Thu, 19 Nov 2015 14:06:03 +0000 (19:36 +0530)]
Merge pull request #7246 from agileware/4.6-CRM-17417
CRM-17417: Tax is reapplied when editing a contribution associated with a membership or participant
monishdeb [Thu, 19 Nov 2015 14:03:38 +0000 (19:33 +0530)]
CRM-17417 and CRM-17418 fixes
----------------------------------------
* CRM-17417: Tax is reapplied when editing a contribution associated with a membership or participant entity unless the status is changed.
https://issues.civicrm.org/jira/browse/CRM-17417
* CRM-17418: Cancelling a taxable contribution writes incorrect values to the database
https://issues.civicrm.org/jira/browse/CRM-17418
colemanw [Thu, 19 Nov 2015 01:53:31 +0000 (20:53 -0500)]
Merge pull request #7247 from colemanw/explorer
Api explorer - fix getfields action list
Coleman Watts [Wed, 18 Nov 2015 22:58:05 +0000 (17:58 -0500)]
Api explorer - fix getfields action list
Vaibhav Sagar [Wed, 18 Nov 2015 22:45:45 +0000 (09:45 +1100)]
CRM-17417: Modify conditional so that tax is not reapplied on edit.
----------------------------------------
* CRM-17417: Tax is reapplied when editing a contribution associated with a membership or participant entity unless the status is changed.
https://issues.civicrm.org/jira/browse/CRM-17417
Pradeep Nayak [Thu, 12 Nov 2015 05:02:07 +0000 (10:32 +0530)]
--CRM-17418, fixed amount during cancelling completed contribution when tax is enabled
Monish Deb [Wed, 18 Nov 2015 15:54:11 +0000 (21:24 +0530)]
Merge pull request #7240 from sudhabisht/WebtestFix46
Webtest Fix
Sudha Bisht [Wed, 18 Nov 2015 10:51:43 +0000 (16:21 +0530)]
Webtest Fix
Yashodha Chaku [Wed, 18 Nov 2015 08:40:19 +0000 (14:10 +0530)]
Merge pull request #6733 from pradpnayak/CRM-16801
--CRM-16801, Replaced $_REQUEST with $_POST
Monish Deb [Wed, 18 Nov 2015 07:26:34 +0000 (12:56 +0530)]
Merge pull request #7229 from yashodha/CRM-17564
CRM-17564: Dedupe rule doesnt appear to be working correctly
Monish Deb [Tue, 17 Nov 2015 19:00:21 +0000 (00:30 +0530)]
Merge pull request #7233 from sudhabisht/WebtestFix46
Webtest Fix
Monish Deb [Tue, 17 Nov 2015 15:03:11 +0000 (20:33 +0530)]
Merge pull request #7227 from yashodha/CRM-17563
CRM-17563
Sudha Bisht [Tue, 17 Nov 2015 13:53:47 +0000 (19:23 +0530)]
Fix
Sudha Bisht [Tue, 17 Nov 2015 13:45:27 +0000 (19:15 +0530)]
Minor fix
Sudha Bisht [Tue, 17 Nov 2015 13:27:46 +0000 (18:57 +0530)]
WebtestFix
yashodha [Tue, 17 Nov 2015 10:33:13 +0000 (16:03 +0530)]
CRM-17564: minor fix
----------------------------------------
* CRM-17564: Dedupe rule doesnt appear to be working correctly...
https://issues.civicrm.org/jira/browse/CRM-17564
yashodha [Tue, 17 Nov 2015 09:54:03 +0000 (15:24 +0530)]
CRM-17564: Dedupe rule doesnt appear to be working correctly
----------------------------------------
* CRM-17564: Dedupe rule doesnt appear to be working correctly...
https://issues.civicrm.org/jira/browse/CRM-17564
yashodha [Tue, 17 Nov 2015 07:47:59 +0000 (13:17 +0530)]
minor format fix
yashodha [Tue, 17 Nov 2015 06:35:09 +0000 (12:05 +0530)]
CRM-17563: Dedupe rules - changes not saved when editing existing rule
----------------------------------------
* CRM-17563: Dedupe rules - changes not saved when editing existing rule
https://issues.civicrm.org/jira/browse/CRM-17563
Dave Greenberg [Mon, 16 Nov 2015 23:57:44 +0000 (15:57 -0800)]
Merge pull request #7221 from agh1/sort-event-date-46
CRM-17579 Reports - sort by event start date in participant report
Andrew Hunt [Mon, 16 Nov 2015 19:24:51 +0000 (14:24 -0500)]
CRM-17579 Reports - sort by event start date in participant report
----------------------------------------
* CRM-17579: Sort by event date in participant report
https://issues.civicrm.org/jira/browse/CRM-17579
Dave Greenberg [Mon, 16 Nov 2015 19:18:01 +0000 (11:18 -0800)]
Merge pull request #7217 from jitendrapurohit/CRM-17565
CRM-17565 -- Clicking case status link on case dashboard does not ope…
Monish Deb [Mon, 16 Nov 2015 17:34:42 +0000 (23:04 +0530)]
Merge pull request #7219 from sudhabisht/WebtestFix46
Webtest Fix
Sudha Bisht [Mon, 16 Nov 2015 13:17:26 +0000 (18:47 +0530)]
Webtest Fix
yashodha [Mon, 16 Nov 2015 12:45:05 +0000 (18:15 +0530)]
CRM-17563: Dedupe rules - changes not saved when editing existing rule
----------------------------------------
* CRM-17563: Dedupe rules - changes not saved when editing existing rule
https://issues.civicrm.org/jira/browse/CRM-17563
jitendrapurohit [Mon, 16 Nov 2015 07:25:06 +0000 (12:55 +0530)]
CRM-17565 -- Clicking case status link on case dashboard does not open in search correctly
colemanw [Fri, 13 Nov 2015 22:07:53 +0000 (17:07 -0500)]
Merge pull request #7180 from GinkgoFJG/CRM-17192
CRM-17192: Fixes problem with failure to prepopulate crmEntityRefs with multiple values.
Tim Otten [Wed, 11 Nov 2015 21:46:06 +0000 (13:46 -0800)]
Merge pull request #7128 from totten/4.6-casechange-hook
CRM_Utils_Hook::caseChange - Fix firing
Dave Greenberg [Wed, 11 Nov 2015 20:02:19 +0000 (12:02 -0800)]
Merge pull request #7185 from davecivicrm/CRM-17537
CRM-17357 - Conditional label for Name / Email search fields based on…
Dave Greenberg [Wed, 11 Nov 2015 19:52:28 +0000 (11:52 -0800)]
CRM-17357 - Conditional label for Name / Email search fields based on search setting.
----------------------------------------
* CRM-17357: PHP fatal error during creation of receipt PDF
https://issues.civicrm.org/jira/browse/CRM-17357
Dave Greenberg [Wed, 11 Nov 2015 19:43:37 +0000 (11:43 -0800)]
Merge pull request #7166 from eileenmcnaughton/CRM-17536
CRM-17536 fix quicksearch label for when email search is disabled
Dave Greenberg [Wed, 11 Nov 2015 19:03:55 +0000 (11:03 -0800)]
Merge pull request #7182 from totten/4.6-gencode-mem
xml/GenCode - Expand memory limit
Tim Otten [Wed, 11 Nov 2015 01:30:00 +0000 (17:30 -0800)]
xml/GenCode - Expand memory limit
GenCode processes translations in all locales. Loading all locales is
memory-intensive (est ~20mb per locale based on `memory_get_usage()`).
The locales are tracked in `CRM_Core_I18n::singleton()`. The behavior is
actually good for typical usage (1-2 locales per page-view), but it breaks
down when one request needs to work with all locales. If it mattered more,
we'd probably implement some cache-management to deallocate older/unused
locales. But for GenCode, it's OK to bump up memory requirements as high as
1gb.
Dave Greenberg [Wed, 11 Nov 2015 00:15:38 +0000 (16:15 -0800)]
Merge pull request #7163 from mollux/4.6-CRM-17533
CRM-17533 - Added is_view check to prevent editing read only custom fields.
Frank J. Gómez [Tue, 10 Nov 2015 21:25:20 +0000 (16:25 -0500)]
CRM-17192: Fixes problem with failure to prepopulate crmEntityRefs with multiple values.
eileen [Mon, 9 Nov 2015 17:57:33 +0000 (09:57 -0800)]
CRM-17536 fix quicksearch label for when email search is disabled
Bug: T118036
Monish Deb [Tue, 10 Nov 2015 12:38:32 +0000 (18:08 +0530)]
Merge pull request #7135 from yashodha/CRM-17485
CRM-17485: Event participant role filter not working in Participant l…
Christian Wach [Tue, 10 Nov 2015 10:29:21 +0000 (10:29 +0000)]
codestyling update
Christian Wach [Tue, 10 Nov 2015 10:12:11 +0000 (10:12 +0000)]
pass user ID not user object to `wp_set_current_user()`
Christian Wach [Tue, 10 Nov 2015 10:10:54 +0000 (10:10 +0000)]
do not load theme files when bootstrapping WordPress
Christian Wach [Tue, 10 Nov 2015 10:07:07 +0000 (10:07 +0000)]
declare WordPress Multisite globals
yashodha [Tue, 10 Nov 2015 08:29:38 +0000 (13:59 +0530)]
CRM-17485: Event participant role filter not working in Participant list Count Report
----------------------------------------
* CRM-17485: Event participant role filter not working in Participant list Count Report
https://issues.civicrm.org/jira/browse/CRM-17485
Mattias Michaux [Mon, 9 Nov 2015 19:37:56 +0000 (20:37 +0100)]
Reworked patch to be smaller and error proof.
Mattias Michaux [Mon, 9 Nov 2015 11:14:49 +0000 (12:14 +0100)]
Added is_view check to prevent editing read only custom fields.
colemanw [Sat, 7 Nov 2015 00:35:04 +0000 (19:35 -0500)]
Merge pull request #7151 from colemanw/CRM-17323
CRM-17323 - Fix site registration links
Dave Greenberg [Fri, 6 Nov 2015 21:37:48 +0000 (13:37 -0800)]
Merge pull request #7141 from agh1/report-print-header
Issues with printing reports
Coleman Watts [Fri, 6 Nov 2015 19:17:04 +0000 (14:17 -0500)]
CRM-17323 - Fix site registration links
yashodha [Fri, 6 Nov 2015 11:30:40 +0000 (17:00 +0530)]
CRM-17485: Event participant role filter not working in Participant list Count Report
----------------------------------------
* CRM-17485: Event participant role filter not working in Participant list Count Report
https://issues.civicrm.org/jira/browse/CRM-17485
Andrew Hunt [Thu, 5 Nov 2015 21:14:16 +0000 (16:14 -0500)]
CRM-13682 Reports - make div the page break rather than table
Table page break confuses dompdf
Andrew Hunt [Thu, 5 Nov 2015 21:05:48 +0000 (16:05 -0500)]
CRM-13682 Reports - break up table on page break section
Andrew Hunt [Thu, 5 Nov 2015 19:54:37 +0000 (14:54 -0500)]
CRM-17511 Reports - default header getting emptied
yashodha [Thu, 5 Nov 2015 07:12:28 +0000 (12:42 +0530)]
CRM-17485: Event participant role filter not working in Participant list Count Report
----------------------------------------
* CRM-17485: Event participant role filter not working in Participant list Count Report
https://issues.civicrm.org/jira/browse/CRM-17485
Dave Greenberg [Thu, 5 Nov 2015 00:40:24 +0000 (16:40 -0800)]
Merge pull request #7116 from JKingsnorth/CRM-17488
CRM-17488 Fix bounce status on mailing detail report
colemanw [Wed, 4 Nov 2015 22:16:03 +0000 (17:16 -0500)]
Merge pull request #7130 from colemanw/CRM-17493
CRM-17493 - Fix datatable when popup forms disabled
Coleman Watts [Wed, 4 Nov 2015 22:15:01 +0000 (17:15 -0500)]
CRM-17493 - Fix datatable when popup forms disabled
Dave Greenberg [Wed, 4 Nov 2015 20:00:48 +0000 (12:00 -0800)]
Merge pull request #7126 from monishdeb/4.6
CRM-17497 fix - Adding relationship with multi-valued custom field fails
Tim Otten [Wed, 4 Nov 2015 18:24:49 +0000 (10:24 -0800)]
CRM_Utils_Hook::caseChange - Fix firing
The event fired correctly with the Symfony dispatcher, but the hooks did not
fire correctly. Fix the hooks.
CiviCRM [Wed, 4 Nov 2015 10:05:31 +0000 (02:05 -0800)]
Update version to 4.6.11
JKingsnorth [Wed, 4 Nov 2015 09:34:24 +0000 (09:34 +0000)]
CRM-17488 Correct capitalization of values
monishdeb [Wed, 4 Nov 2015 08:07:59 +0000 (13:37 +0530)]
CRM-17497 fix - Adding relationship with multi-valued custom field fails
https://issues.civicrm.org/jira/browse/CRM-17497
Dave Greenberg [Tue, 3 Nov 2015 20:17:09 +0000 (12:17 -0800)]
Merge pull request #7119 from seamuslee001/CRM-17471-4.6
Crm 17471 Fix situation where search options not updating for change in membership status
Monish Deb [Tue, 3 Nov 2015 05:00:27 +0000 (10:30 +0530)]
Merge pull request #6901 from monishdeb/4.6
CRM-17339 fix - Error when importing contributions matched on name an…
Monish Deb [Tue, 3 Nov 2015 05:00:16 +0000 (10:30 +0530)]
Merge pull request #7041 from monishdeb/CRM-17343
CRM-17343 fix - Invoice email does not send out when completing payme…
Seamus Lee [Sat, 31 Oct 2015 23:09:12 +0000 (23:09 +0000)]
CRM - 17471 Fix Issue where updated status labels aren't displayed in search
CRM-17471 Fix issue where updated statuses aren't represented in PseudoConstant, by flushing the cache
Change membershipStatus psuedoConstant to use label column not name
Alter buildSearchForm rather than PseudoConstant to be more safe
Dave Greenberg [Mon, 2 Nov 2015 18:19:15 +0000 (10:19 -0800)]
Merge pull request #7111 from kurund/CRM-17393
CRM-17393, changed the incorrect logic
Dave Greenberg [Mon, 2 Nov 2015 18:17:04 +0000 (10:17 -0800)]
Merge pull request #7101 from colemanw/footer
Footer tpl cleanup
JKingsnorth [Mon, 2 Nov 2015 15:43:17 +0000 (15:43 +0000)]
CRM-17488 Fix bounce status on mailing detail report
Kurund Jalmi [Mon, 2 Nov 2015 12:01:49 +0000 (17:31 +0530)]
CRM-17393, changed the incorrect logic
Coleman Watts [Sun, 1 Nov 2015 13:38:18 +0000 (08:38 -0500)]
Footer tpl cleanup
Kurund Jalmi [Sun, 1 Nov 2015 11:20:59 +0000 (16:50 +0530)]
Merge pull request #7076 from totten/4.6-weight-sgn
CRM-17466 - Refine error message
Dave Greenberg [Fri, 30 Oct 2015 18:56:53 +0000 (11:56 -0700)]
Merge pull request #7072 from monishdeb/CRM-17457
CRM-17457 fix - Enotices when skip participant is used
monishdeb [Fri, 30 Oct 2015 14:18:42 +0000 (19:48 +0530)]
additional notices on enabling tax invoice
Tim Otten [Thu, 29 Oct 2015 21:08:24 +0000 (14:08 -0700)]
CRM-17466 - Refine error message
monishdeb [Thu, 29 Oct 2015 06:19:27 +0000 (11:49 +0530)]
CRM-17457 fix - Enotices when skip participant is used
https://issues.civicrm.org/jira/browse/CRM-17457
Dave Greenberg [Tue, 27 Oct 2015 23:15:00 +0000 (16:15 -0700)]
Merge pull request #7037 from seamuslee001/CRM-17436
CRM-17436 Make the Date and time filter on ContributionAggregate sear…
monishdeb [Mon, 26 Oct 2015 11:47:09 +0000 (17:17 +0530)]
remove unecessary validation rule
monishdeb [Tue, 6 Oct 2015 15:22:36 +0000 (20:52 +0530)]
CRM-17339 fix - Error when importing contributions matched on name and email
https://issues.civicrm.org/jira/browse/CRM-17339
seamuslee001 [Fri, 23 Oct 2015 21:24:31 +0000 (08:24 +1100)]
Fix $endTime variable as was missing _ for formValues
monishdeb [Fri, 23 Oct 2015 10:42:54 +0000 (16:12 +0530)]
CRM-17343 fix - Invoice email does not send out when completing payment using Paypal
https://issues.civicrm.org/jira/browse/CRM-17343
Seamus Lee [Fri, 23 Oct 2015 03:35:34 +0000 (03:35 +0000)]
PHPCS fix
Seamus Lee [Fri, 23 Oct 2015 03:31:14 +0000 (03:31 +0000)]
CRM-17436 Make the Date and time filter on ContributionAggregate search aware of time filtering
colemanw [Thu, 22 Oct 2015 13:48:01 +0000 (09:48 -0400)]
Merge pull request #7025 from davecivicrm/CRM-17395
CRM-17395 - Backporting to 4.6 branch since it is a minor fix for pai…
Eileen McNaughton [Thu, 22 Oct 2015 03:23:12 +0000 (16:23 +1300)]
Merge pull request #7026 from davecivicrm/CRM-17363
CRM-17363 - Conditional inclusion of Social Network bar in petitions.
Dave Greenberg [Thu, 22 Oct 2015 00:59:16 +0000 (17:59 -0700)]
CRM-17363 - Conditional inclusion of Social Network bar in petitions.
----------------------------------------
* CRM-17363: Petition: Social Network Buttons are displayed on certain condition although switched off
https://issues.civicrm.org/jira/browse/CRM-17363
Dave Greenberg [Thu, 22 Oct 2015 00:16:01 +0000 (17:16 -0700)]
CRM-17395 - Backporting to 4.6 branch since it is a minor fix for paid issue queue.
----------------------------------------
* CRM-17395: Activities report - filter by target contact does not appear to work
https://issues.civicrm.org/jira/browse/CRM-17395
colemanw [Wed, 21 Oct 2015 01:04:46 +0000 (21:04 -0400)]
Merge pull request #6963 from agileware/4.6-CRM-17402
CRM-17402: Defer loading Google Maps API
Eileen McNaughton [Mon, 19 Oct 2015 19:36:26 +0000 (08:36 +1300)]
Merge pull request #7006 from lcdservices/CRM-17419
CRM-17419 fix exception error condition
Brian Shaughnessy [Mon, 19 Oct 2015 15:25:10 +0000 (11:25 -0400)]
CRM-17419 fix exception error condition
colemanw [Fri, 16 Oct 2015 17:14:15 +0000 (13:14 -0400)]
Merge pull request #6980 from colemanw/entityRef
entityRef - Use deep-merge to combine data-params and options
Yashodha Chaku [Fri, 16 Oct 2015 09:07:05 +0000 (14:37 +0530)]
Merge pull request #6961 from colemanw/BorislavZlatanov-CRM-17357
CRM-17357 - Fix error on receipt PDF creation (rebased)
Coleman Watts [Fri, 16 Oct 2015 02:48:10 +0000 (22:48 -0400)]
entityRef - Use deep-merge to combine data-params and options
Francis Whittle [Thu, 15 Oct 2015 00:00:32 +0000 (11:00 +1100)]
CRM-17402: Defer loading Google Maps API
----------------------------------------
* CRM-17402: Google Maps API sometimes tries to call initMap callback before it is defined.
https://issues.civicrm.org/jira/browse/CRM-17402
projects / civicrm-core.git / log