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
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
Borislav Zlatanov [Tue, 13 Oct 2015 17:34:59 +0000 (20:34 +0300)]
CRM-17357 Fix php fatal error on receipt PDF creation
----------------------------------------
* CRM-17357: PHP fatal error during creation of receipt PDF
https://issues.civicrm.org/jira/browse/CRM-17357
Tim Otten [Wed, 14 Oct 2015 16:21:55 +0000 (17:21 +0100)]
Merge pull request #6939 from futurefirst/4.6-list-single-json
CRM-17385 - Client side of "single JSON file" extensions directory download
colemanw [Wed, 14 Oct 2015 14:59:03 +0000 (10:59 -0400)]
Merge pull request #6948 from colemanw/CRM-17384
CRM-17384 - Remove duplicate support menu
Kurund Jalmi [Wed, 14 Oct 2015 09:25:32 +0000 (10:25 +0100)]
Merge pull request #6954 from kurund/CRM-17393
worked on CRM-17393
Kurund Jalmi [Wed, 14 Oct 2015 09:25:09 +0000 (10:25 +0100)]
Merge pull request #6950 from totten/4.6-report-dashlet
CRM-17328 - Fix dashlet/report ID mappings
Kurund Jalmi [Wed, 14 Oct 2015 00:22:34 +0000 (01:22 +0100)]
worked on CRM-17393
Tim Otten [Tue, 13 Oct 2015 21:47:06 +0000 (22:47 +0100)]
CRM-17328 - Fix dashlet/report ID mappings
civibuild has been failing to configure the dashboard because some ID's are
invalid, and some ID's are no longer pointing to the originally prescribed
reports.
Coleman Watts [Tue, 13 Oct 2015 20:12:12 +0000 (16:12 -0400)]
CRM-17384 - Remove duplicate support menu
Yashodha Chaku [Tue, 13 Oct 2015 07:14:10 +0000 (12:44 +0530)]
Merge pull request #6900 from chanunc/4.6
Fix invoice email doesnot sent out when completed payment using Paypal
David Knoll [Mon, 12 Oct 2015 22:48:43 +0000 (23:48 +0100)]
Merge pull request #2 from totten/futurefirst-4.6-list-single-json
CRM-17385 - CRM_Extension_BrowserTest
Dave Greenberg [Mon, 12 Oct 2015 21:02:33 +0000 (14:02 -0700)]
Merge pull request #6803 from eileenmcnaughton/CRM-11338-paypal-fee
CRM-11338 retrieve fee_amount from paypal
Dave Greenberg [Mon, 12 Oct 2015 20:54:27 +0000 (13:54 -0700)]
Merge pull request #6851 from eileenmcnaughton/CRM-17176-location-46
CRM-17306 fix location update action
Tim Otten [Mon, 12 Oct 2015 20:35:20 +0000 (21:35 +0100)]
CRM-17385 - CRM_Extension_BrowserTest
David Knoll [Mon, 12 Oct 2015 17:40:31 +0000 (18:40 +0100)]
Client side of "single JSON file" extensions directory download
Kurund Jalmi [Sun, 11 Oct 2015 14:04:10 +0000 (15:04 +0100)]
Merge pull request #6912 from yashodha/CRM-17351
CRM-17351: Unable to mark price set field as inactive
Eileen McNaughton [Sun, 11 Oct 2015 01:49:16 +0000 (14:49 +1300)]
Merge pull request #6895 from jake-mw/CRM-16669
CRM-16669 - ensure financialType is loaded for cc transactions
colemanw [Sat, 10 Oct 2015 16:47:14 +0000 (12:47 -0400)]
Merge pull request #6922 from eileenmcnaughton/CRM-17000
CRM-17000 bypass separatevalues for getfields for performance
eileen [Fri, 9 Oct 2015 23:29:22 +0000 (12:29 +1300)]
CRM-17000 bypass separatevalues for getfields for performance
Eileen McNaughton [Fri, 9 Oct 2015 20:46:04 +0000 (09:46 +1300)]
CRM-11338 further fix on fee amount
Kurund Jalmi [Fri, 9 Oct 2015 15:03:54 +0000 (16:03 +0100)]
Merge pull request #6921 from kurund/CRM-16785
CRM-16785, exclude code coverage
Kurund Jalmi [Fri, 9 Oct 2015 14:59:50 +0000 (15:59 +0100)]
CRM-16785, exclude code coverage
----------------------------------------
* CRM-16785: non-free file "packages/PHP/CodeCoverage/Report/HTML/Renderer/Template/highcharts.js"
https://issues.civicrm.org/jira/browse/CRM-16785
yashodha [Thu, 8 Oct 2015 13:53:28 +0000 (19:23 +0530)]
CRM-17351: remove whitespace
----------------------------------------
* CRM-17351: Unable to mark price set field as inactive
https://issues.civicrm.org/jira/browse/CRM-17351
Monish Deb [Thu, 8 Oct 2015 12:06:00 +0000 (17:36 +0530)]
Merge pull request #6911 from monishdeb/CRM-17353
CRM-17353 fix - Membership Dashboard has links with eg status1,2,3 wh…
yashodha [Thu, 8 Oct 2015 11:06:30 +0000 (16:36 +0530)]
CRM-17351: more fixes for unsetting option
----------------------------------------
* CRM-17351: Unable to mark price set field as inactive
https://issues.civicrm.org/jira/browse/CRM-17351
Yashodha Chaku [Thu, 8 Oct 2015 08:31:19 +0000 (14:01 +0530)]
Merge pull request #6898 from yashodha/CRM-17299
CRM-17299: Yes or No custom fields not displayed correctly in table
yashodha [Thu, 8 Oct 2015 06:44:18 +0000 (12:14 +0530)]
CRM-17351: Unable to mark price set field as inactive
----------------------------------------
* CRM-17351: Unable to mark price set field as inactive
https://issues.civicrm.org/jira/browse/CRM-17351
monishdeb [Thu, 8 Oct 2015 04:55:08 +0000 (10:25 +0530)]
CRM-17353 fix - Membership Dashboard has links with eg status1,2,3 which do not cause filter to be applied
https://issues.civicrm.org/jira/browse/CRM-17353
Eileen McNaughton [Wed, 7 Oct 2015 23:02:35 +0000 (12:02 +1300)]
Merge pull request #6824 from eileenmcnaughton/CRM-17293
CRM-17293 align payment processor interface between 4.6 & 4.7
colemanw [Wed, 7 Oct 2015 18:49:25 +0000 (14:49 -0400)]
Merge pull request #6910 from colemanw/pdf
Fix template checkboxes in Print PDF form
Coleman Watts [Wed, 7 Oct 2015 18:41:55 +0000 (14:41 -0400)]
Fix template checkboxes in Print PDF form
CiviCRM [Wed, 7 Oct 2015 12:58:14 +0000 (05:58 -0700)]
Update version to 4.6.10
yashodha [Wed, 7 Oct 2015 06:48:01 +0000 (12:18 +0530)]
make sure it works for non-boolean options as well
colemanw [Wed, 7 Oct 2015 01:35:29 +0000 (21:35 -0400)]
Merge pull request #6549 from pradpnayak/CRM-16620
--CRM-16620, replaced 'nothing' to NULL
colemanw [Wed, 7 Oct 2015 00:36:34 +0000 (20:36 -0400)]
Merge pull request #6897 from jitendrapurohit/CRMtestfixes
4.6 - CRM Test Fixes
colemanw [Wed, 7 Oct 2015 00:35:11 +0000 (20:35 -0400)]
Merge pull request #6899 from colemanw/crmDatepicker
crmDatepicker fixes and documentation
colemanw [Wed, 7 Oct 2015 00:05:16 +0000 (20:05 -0400)]
Merge pull request #6875 from colemanw/CRM-17323
CRM-17323 - Add sid token to registration/membership links
colemanw [Tue, 6 Oct 2015 21:26:46 +0000 (17:26 -0400)]
Merge pull request #6853 from eileenmcnaughton/CRM-17256-46
CRM-17256 populate created_id on report creation
Dave Greenberg [Tue, 6 Oct 2015 19:15:19 +0000 (12:15 -0700)]
Merge pull request #6904 from davecivicrm/CRM-17344
CRM-17344 - Fix footer button markup in Manage Reports Template.
Dave Greenberg [Tue, 6 Oct 2015 19:14:14 +0000 (12:14 -0700)]
CRM-17344 - Fix footer button markup in Manage Reports Template.
----------------------------------------
* CRM-17344: buttons without text on Manage Reports page
https://issues.civicrm.org/jira/browse/CRM-17344
colemanw [Tue, 6 Oct 2015 18:55:40 +0000 (14:55 -0400)]
Merge pull request #6903 from colemanw/CRM-14748
CRM-14748 - Clarify rest url in api explorer
Coleman Watts [Tue, 6 Oct 2015 18:46:07 +0000 (14:46 -0400)]
CRM-14748 - Clarify rest url in api explorer
colemanw [Tue, 6 Oct 2015 18:34:12 +0000 (14:34 -0400)]
Merge pull request #6883 from eileenmcnaughton/CRM-17355
CRM-17335 toward eliminating use of leaky static
Coleman Watts [Tue, 6 Oct 2015 16:42:00 +0000 (12:42 -0400)]
Update civicrm.org links to use https
Coleman Watts [Tue, 6 Oct 2015 13:44:45 +0000 (09:44 -0400)]
CRM-16907 - Preserve other links in the help menu
Chanunc [Tue, 6 Oct 2015 14:48:52 +0000 (15:48 +0100)]
Fix invoice email doesnot sent out when completed payment using Paypal
Coleman Watts [Tue, 6 Oct 2015 13:40:53 +0000 (09:40 -0400)]
crmDatepicker fixes and documentation
yashodha [Tue, 6 Oct 2015 13:29:46 +0000 (18:59 +0530)]
CRM-17299: Yes or No custom fields not displayed correctly in table
----------------------------------------
* CRM-17299: "Yes or No" custom fields not displayed correctly in table
https://issues.civicrm.org/jira/browse/CRM-17299
jitendrapurohit [Tue, 6 Oct 2015 10:19:41 +0000 (15:49 +0530)]
minor changes
jitendrapurohit [Tue, 6 Oct 2015 10:08:51 +0000 (15:38 +0530)]
4.6 - CRM Test Fixes
Jake Martin White [Tue, 6 Oct 2015 03:49:05 +0000 (03:49 +0000)]
CRM-16669 - ensure financialType is loaded for credit card transactions so is_deductible can be checked to determine non_deductible amount
Eileen McNaughton [Mon, 5 Oct 2015 22:56:21 +0000 (11:56 +1300)]
Merge pull request #6870 from eileenmcnaughton/CRM-17234
CRM-17324 Log upgrade steps
Dave Greenberg [Mon, 5 Oct 2015 18:10:45 +0000 (11:10 -0700)]
Merge pull request #6781 from monishdeb/CRM-17067
CRM-17067 fix
Dave Greenberg [Mon, 5 Oct 2015 18:05:27 +0000 (11:05 -0700)]
Merge pull request #6871 from eileenmcnaughton/CRM-17326
CRM-17326 add isset check to timezone retrieval
Dave Greenberg [Mon, 5 Oct 2015 17:21:01 +0000 (10:21 -0700)]
Merge pull request #6843 from guanhuan/creditnote-id-sequence
Fix credit note sequence issue
eileenmcnaugton [Mon, 5 Oct 2015 04:55:40 +0000 (17:55 +1300)]
CRM-17335 toward eliminating use of leaky static
(note this is an ongoing thing - I'm not pro-actively tackling these ATM)
monishdeb [Mon, 5 Oct 2015 04:54:41 +0000 (10:24 +0530)]
Relationship count fix
Coleman Watts [Sat, 3 Oct 2015 17:53:22 +0000 (13:53 -0400)]
CRM-17323 - Store site id in settings
Coleman Watts [Sat, 3 Oct 2015 02:03:19 +0000 (22:03 -0400)]
Fix html escaping of external menu links
Coleman Watts [Sat, 3 Oct 2015 01:29:27 +0000 (21:29 -0400)]
CRM-17323 - Add sid token to registration/membership links
monishdeb [Mon, 21 Sep 2015 14:39:14 +0000 (20:09 +0530)]
Revert CRM-17067 fix
----------------------------------------
* CRM-17067: New relationship permission enforcement has result to related membership not created via public pages
https://issues.civicrm.org/jira/browse/CRM-17067
monishdeb [Mon, 21 Sep 2015 14:17:36 +0000 (19:47 +0530)]
minor change
monishdeb [Mon, 21 Sep 2015 13:49:45 +0000 (19:19 +0530)]
Revert "revert CRM-16711 fix "
This reverts commit
1ca927cc816b21e779ebc0e9e5e2dd3bd275debd.
monishdeb [Wed, 26 Aug 2015 06:00:20 +0000 (11:30 +0530)]
format fixes
monishdeb [Wed, 26 Aug 2015 05:28:02 +0000 (10:58 +0530)]
CRM-17067 fix - New relationship permission enforcement has result to related membership not created via public pages
https://issues.civicrm.org/jira/browse/CRM-17067
Coleman Watts [Fri, 2 Oct 2015 20:04:15 +0000 (16:04 -0400)]
CRM-16907 - Fix navigation upgrade script
Guanhuan Chen [Fri, 2 Oct 2015 15:35:14 +0000 (16:35 +0100)]
Condense credit note number query
eileen [Thu, 1 Oct 2015 23:56:47 +0000 (12:56 +1300)]
CRM-17326 add isset check to timezone retrieval
This addresses an e-notice
Change-Id: I82d3314bc2e28cca64ec9f4ed4d64477c50b7303
colemanw [Thu, 1 Oct 2015 23:35:17 +0000 (19:35 -0400)]
Merge pull request #6868 from eileenmcnaughton/CRM-17322
CRM-17322 output upgrade as text
Adam Roses Wight [Thu, 1 Oct 2015 08:10:25 +0000 (01:10 -0700)]
Log upgrade steps
This puts the meter back into thermometer watching. Prints a granular
log line for each upgrade migration patch.
TODO:
* The Drush harness should install a logging callback that captures Civi
output and displays it on the console.
Bug: T99842
Change-Id: I8977b6b06b4eac9cd7e5ac5768c783d8560abfe3
Adam Roses Wight [Thu, 1 Oct 2015 08:50:24 +0000 (01:50 -0700)]
CRM-17322 output upgrade as text
This adds the 'text' array to the output params. There is a patch in drush to
print this rather than the html. wp-cli could do with such a patch too but out-of-scope here
Change-Id: Ib8ea9a2e056e225904cb96b2d0de815148ad3f8b
Guanhuan Chen [Thu, 1 Oct 2015 12:18:15 +0000 (13:18 +0100)]
Add unit test for createCreditNoteId
Guanhuan Chen [Thu, 1 Oct 2015 12:17:39 +0000 (13:17 +0100)]
Add credit note id if a contribution is created with cancelled/refunded status
Guanhuan Chen [Thu, 1 Oct 2015 11:46:28 +0000 (12:46 +0100)]
Refactor redundant code with reusable function
Guanhuan Chen [Tue, 29 Sep 2015 16:54:27 +0000 (17:54 +0100)]
Generate a sequential credit note id when a contribution is cancelled or refunded
Guanhuan Chen [Tue, 29 Sep 2015 15:59:41 +0000 (16:59 +0100)]
Fix credit note sequence issue
Kurund Jalmi [Wed, 30 Sep 2015 13:22:37 +0000 (18:52 +0530)]
Merge pull request #6859 from eileenmcnaughton/CRM-17311-46
CRM-17311 wrap call to watchdog in function_exists
eileenmcnaugton [Wed, 30 Sep 2015 10:19:50 +0000 (23:19 +1300)]
CRM-17311 wrap call to watchdog in function_exists
Monish Deb [Wed, 30 Sep 2015 09:50:36 +0000 (15:20 +0530)]
Merge pull request #6856 from monishdeb/46-upgrade-fix
4.6.5 upgrade failure fix
monishdeb [Wed, 30 Sep 2015 07:30:20 +0000 (13:00 +0530)]
4.6.5 upgrade failure
eileenmcnaugton [Wed, 30 Sep 2015 04:19:08 +0000 (17:19 +1300)]
CRM-17256 populate created_id on report creation
eileenmcnaugton [Wed, 30 Sep 2015 00:21:46 +0000 (13:21 +1300)]
CRM-17306 fix location update action
Conflicts:
tests/phpunit/api/v3/SyntaxConformanceTest.php
Please enter the commit message for your changes. Lines starting
colemanw [Tue, 29 Sep 2015 21:51:45 +0000 (17:51 -0400)]
Merge pull request #6797 from eileenmcnaughton/CRM-17278
CRM-17278 autorenew not checked in some circumstances
Eileen McNaughton [Tue, 29 Sep 2015 21:33:20 +0000 (10:33 +1300)]
Merge pull request #6795 from jitendrapurohit/CRM-17251
CRM-17251 - Book-keeping report displays rows inaccurately when contr…
colemanw [Tue, 29 Sep 2015 21:24:30 +0000 (17:24 -0400)]
Merge pull request #6740 from eileenmcnaughton/CRM-17215
CRM-17215 fix auto-renew not showing on radio options
Eileen McNaughton [Tue, 29 Sep 2015 06:11:01 +0000 (19:11 +1300)]
Merge pull request #6763 from eileenmcnaughton/CRM-17242
CRM-17242 notice fix
colemanw [Tue, 29 Sep 2015 02:41:48 +0000 (22:41 -0400)]
Merge pull request #6817 from colemanw/positive
Fixes for CRM_Utils_Type
Coleman Watts [Tue, 29 Sep 2015 00:22:33 +0000 (20:22 -0400)]
Fix test failures
Dave Greenberg [Mon, 28 Sep 2015 22:26:12 +0000 (18:26 -0400)]
Merge pull request #6794 from eileenmcnaughton/CRM-17275
CRM-17275 Importing contact with external ID match null
projects / civicrm-core.git / log