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
monishdeb [Mon, 5 Oct 2015 04:54:41 +0000 (10:24 +0530)]
Relationship count fix
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
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
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
colemanw [Mon, 28 Sep 2015 16:03:08 +0000 (12:03 -0400)]
Merge pull request #6822 from colemanw/editGroup
Only allow group inline edit when appropriate
Coleman Watts [Mon, 28 Sep 2015 02:38:50 +0000 (22:38 -0400)]
Only allow group inline edit when appropriate
Coleman Watts [Sun, 27 Sep 2015 18:28:14 +0000 (14:28 -0400)]
Add unit tests for CRM_Utils_Type
Coleman Watts [Sun, 27 Sep 2015 15:24:25 +0000 (11:24 -0400)]
Fixes for CRM_Utils_Type
colemanw [Sat, 26 Sep 2015 15:53:31 +0000 (11:53 -0400)]
Merge pull request #6805 from colemanw/case
Fix submitting multiple addRole popups on caseView
Coleman Watts [Sat, 26 Sep 2015 15:53:05 +0000 (11:53 -0400)]
Fix submitting multiple addRole popups on caseView
Monish Deb [Fri, 25 Sep 2015 07:18:55 +0000 (12:48 +0530)]
Merge pull request #6796 from monishdeb/CRM-17270
CRM-17270 fix - Custom country multi-select fields used in a Drupal V…
eileenmcnaugton [Thu, 24 Sep 2015 15:15:45 +0000 (03:15 +1200)]
CRM-17278 autorenew not checked in some circumstances
monishdeb [Thu, 24 Sep 2015 13:18:18 +0000 (18:48 +0530)]
CRM-17270 fix - Custom country multi-select fields used in a Drupal View display the four digit ID number instead of the name of the country
https://issues.civicrm.org/jira/browse/CRM-17270
eileenmcnaugton [Thu, 24 Sep 2015 12:17:48 +0000 (00:17 +1200)]
CRM-17275 Contact.duplicate api test
eileenmcnaugton [Thu, 24 Sep 2015 12:08:10 +0000 (00:08 +1200)]
CRM-17275 Import - allow contact WITH external identifier to match one without
eileenmcnaugton [Thu, 24 Sep 2015 09:34:53 +0000 (21:34 +1200)]
CRM-17275 Import parser: add test for what IS workding
jitendrapurohit [Thu, 24 Sep 2015 11:06:50 +0000 (16:36 +0530)]
CRM-17251 - Book-keeping report displays rows inaccurately when contribution amount has been edited
Yashodha Chaku [Thu, 24 Sep 2015 07:52:35 +0000 (13:22 +0530)]
Merge pull request #6777 from yashodha/CRM-17237
CRM-17237: Add Dedupe Rule allows user to save invalid (empty) RESERV…
Dave Greenberg [Tue, 22 Sep 2015 23:05:01 +0000 (16:05 -0700)]
Merge pull request #6520 from mlutfy/4.6-crm17034
CRM-17034 : PriceField tax_amount should not be rounded
Eileen McNaughton [Tue, 22 Sep 2015 22:37:35 +0000 (10:37 +1200)]
Merge pull request #6783 from eileenmcnaughton/CRM-17258
CRM-17258 add created_id, owner_id to report_instances
Dave Greenberg [Tue, 22 Sep 2015 18:27:35 +0000 (11:27 -0700)]
Merge pull request #6778 from eileenmcnaughton/CRM-17255
CRM-17255 group.api ACLS : do not exclude hidden groups for ACL users
Monish Deb [Tue, 22 Sep 2015 14:36:45 +0000 (20:06 +0530)]
Merge pull request #6786 from monishdeb/CRM-17247
CRM-17247 fix - Vaildation fails silently on required fields (Drupal …
monishdeb [Tue, 22 Sep 2015 09:46:20 +0000 (15:16 +0530)]
CRM-17247 fix - Vaildation fails silently on required fields (Drupal user editing)
https://issues.civicrm.org/jira/browse/CRM-17247
yashodha [Tue, 22 Sep 2015 05:35:23 +0000 (11:05 +0530)]
notice fix
eileen [Mon, 21 Sep 2015 22:51:15 +0000 (10:51 +1200)]
CRM-17258 add created_id, owner_id to report_instances
Monish Deb [Mon, 21 Sep 2015 14:19:34 +0000 (19:49 +0530)]
Merge pull request #6767 from colemanw/CRM-17131
CRM-17131 - Fix where clause
yashodha [Mon, 21 Sep 2015 13:31:28 +0000 (19:01 +0530)]
minor fixes
yashodha [Mon, 21 Sep 2015 11:38:19 +0000 (17:08 +0530)]
CRM-17237: more fixes
----------------------------------------
* CRM-17237: Add Dedupe Rule allows user to save invalid (empty) RESERVED rule
https://issues.civicrm.org/jira/browse/CRM-17237
eileenmcnaugton [Mon, 21 Sep 2015 08:25:37 +0000 (20:25 +1200)]
CRM-17255 group.api ACLS : do not exclude hidden groups for ACL users
This commit prevents hidden groups from being filtered out of api results by the check
permission function. The api permission check is fairly new so this only hones the check
yashodha [Mon, 21 Sep 2015 08:05:09 +0000 (13:35 +0530)]
CRM-17237: Add Dedupe Rule allows user to save invalid (empty) RESERVED rule
----------------------------------------
* CRM-17237: Add Dedupe Rule allows user to save invalid (empty) RESERVED rule
https://issues.civicrm.org/jira/browse/CRM-17237
Monish Deb [Fri, 18 Sep 2015 22:22:29 +0000 (03:52 +0530)]
Merge pull request #6769 from monishdeb/CRM-17191
CRM-17246 fix - Contact name showing in Contribution summary report
monishdeb [Fri, 18 Sep 2015 20:08:55 +0000 (01:38 +0530)]
format fix
monishdeb [Fri, 18 Sep 2015 19:53:49 +0000 (01:23 +0530)]
CRM-17246 fix - Contact name showing in Contribution summary report
https://issues.civicrm.org/jira/browse/CRM-17246
Coleman Watts [Fri, 18 Sep 2015 18:09:49 +0000 (14:09 -0400)]
CRM-17131 - Fix where clause
Monish Deb [Fri, 18 Sep 2015 17:41:29 +0000 (23:11 +0530)]
Merge pull request #6766 from monishdeb/CRM-17191
Crm 17191
monishdeb [Fri, 18 Sep 2015 13:44:57 +0000 (19:14 +0530)]
notice and format fixes
Jamie McClelland [Thu, 10 Sep 2015 12:45:33 +0000 (08:45 -0400)]
CRM-17191 - removing redundant if clause.
Jamie McClelland [Thu, 10 Sep 2015 12:38:48 +0000 (08:38 -0400)]
CRM-17191 - ensure Participant list report works with custom Grouping
Previously, we got a trace back if a user defined a group by clause.
I've removed what appears to be crufty code that tries to add the
group by fields to an ORDER BY statement - which conflicts with the
existing ORDER BY statement and seems unnecessary. Also, if the user
wants to group by another field, we should not group by the participant
id.
Yashodha Chaku [Fri, 18 Sep 2015 10:19:44 +0000 (15:49 +0530)]
Merge pull request #6756 from agileware/4.6-crm-17055
CRM-17055: Confirmation email on unpaid events produces syntax error …
eileen [Fri, 18 Sep 2015 00:26:39 +0000 (12:26 +1200)]
CRM-17242 notice fix
colemanw [Thu, 17 Sep 2015 15:32:42 +0000 (11:32 -0400)]
Merge pull request #6762 from pradpnayak/CRM-17234
--CRM-17234, renamed css file so that its not ignored by drupal
Pradeep Nayak [Thu, 17 Sep 2015 07:23:39 +0000 (12:53 +0530)]
--CRM-17234, renamed css file so that its not ignored by drupal
Dave Greenberg [Wed, 16 Sep 2015 17:51:09 +0000 (10:51 -0700)]
Merge pull request #6715 from guanhuan/faulty-trnx-cancel-pending
Correct CRM-17183 financial entry for cancelling a pending payment
Guanhuan Chen [Wed, 16 Sep 2015 14:17:20 +0000 (15:17 +0100)]
update api_v3_ContributionTest.testCreateUpdateContributionCancelPending
Francis Whittle [Wed, 16 Sep 2015 07:18:06 +0000 (17:18 +1000)]
CRM-17055: Confirmation email on unpaid events produces syntax error with invoicing
----------------------------------------
* CRM-17055: Confirmation email on unpaid events produces syntax error with invoicing
https://issues.civicrm.org/jira/browse/CRM-17055
colemanw [Tue, 15 Sep 2015 19:53:51 +0000 (15:53 -0400)]
Merge pull request #6722 from mlutfy/46-crm17199
CRM-17199: Partial fix for ContributionPage honore title/text multi-lingual.
Yashodha Chaku [Tue, 15 Sep 2015 06:39:07 +0000 (12:09 +0530)]
Merge pull request #6718 from eileenmcnaughton/CRM-17197-no-recur-for-select-field-memberships
CRM-17197 no recur for select field memberships
Eileen McNaughton [Tue, 15 Sep 2015 01:25:45 +0000 (13:25 +1200)]
Merge pull request #6727 from eileenmcnaughton/comments
comment fixes
Dave Greenberg [Mon, 14 Sep 2015 16:32:09 +0000 (09:32 -0700)]
Merge pull request #6744 from seamuslee001/CRM-16584
CRM-16584 Remove line causing fatal error
Seamus Lee [Mon, 14 Sep 2015 10:30:33 +0000 (10:30 +0000)]
CRM-16584 Remove line causing fatal error
eileenmcnaugton [Mon, 14 Sep 2015 08:20:50 +0000 (20:20 +1200)]
CRM-17215 fix auto-renew not showing on radio options
Fix the scenario where auto-renew is blocked because multiple duration configurations are available
in a price set but need not be blocked as they are mutually exclusive
Eileen McNaughton [Sun, 13 Sep 2015 14:56:59 +0000 (02:56 +1200)]
Merge pull request #6737 from eileenmcnaughton/test
fix date format in test
eileenmcnaugton [Sun, 13 Sep 2015 14:56:18 +0000 (02:56 +1200)]
fix date format in test
Dave Greenberg [Fri, 11 Sep 2015 20:39:13 +0000 (13:39 -0700)]
Merge pull request #6711 from pradpnayak/CRM-16904
CRM-16904, updated 4th parameter to use base url
Dave Greenberg [Fri, 11 Sep 2015 20:34:13 +0000 (13:34 -0700)]
Merge pull request #6638 from pradpnayak/CRM-16542-PaypalExp
--CRM-16542, fixed code for form rule for Paypal Express
colemanw [Fri, 11 Sep 2015 20:12:04 +0000 (16:12 -0400)]
Merge pull request #6607 from guanhuan/update-event-templates
Add crm-public-form-item class to event forms
Dave Greenberg [Fri, 11 Sep 2015 19:19:42 +0000 (12:19 -0700)]
Merge pull request #6731 from pradpnayak/CRM-17208
CRM-17208, moved $params before pre hook so that it can be altered in…
Monish Deb [Fri, 11 Sep 2015 18:51:28 +0000 (00:21 +0530)]
Merge pull request #6729 from jitendrapurohit/apitestfix
Test fix for CRM-13160
Pradeep Nayak [Fri, 11 Sep 2015 14:29:23 +0000 (19:59 +0530)]
CRM-17208, moved $params before pre hook so that it can be altered in pre hook
----------------------------------------
* CRM-17208: Allow $params to be changed in pre hook
https://issues.civicrm.org/jira/browse/CRM-17208
jitendrapurohit [Fri, 11 Sep 2015 13:29:51 +0000 (18:59 +0530)]
added comment
jitendrapurohit [Fri, 11 Sep 2015 13:17:33 +0000 (18:47 +0530)]
test fix for CRM-13160
Yashodha Chaku [Fri, 11 Sep 2015 08:46:13 +0000 (14:16 +0530)]
Merge pull request #6720 from yashodha/CRM-17015
CRM-17015: “Sold out” error message when registering event with PayPal …
eileenmcnaugton [Fri, 11 Sep 2015 07:23:30 +0000 (19:23 +1200)]
comment fixes
Eileen McNaughton [Fri, 11 Sep 2015 07:22:30 +0000 (19:22 +1200)]
Merge pull request #6725 from eileenmcnaughton/CRM-14232
minor tidy-ups to comments & spelling
eileenmcnaugton [Fri, 11 Sep 2015 05:09:51 +0000 (17:09 +1200)]
minor tidy-ups
Eileen McNaughton [Thu, 10 Sep 2015 18:35:23 +0000 (06:35 +1200)]
Merge pull request #6631 from eileenmcnaughton/CRM-17115
CRM-17115 extra/ stdise fields on CiviReport
Dave Greenberg [Thu, 10 Sep 2015 17:41:41 +0000 (10:41 -0700)]
Merge pull request #6717 from PalanteJon/CRM-17194
CRM-17194 - CiviReport - fix date range bug on Contribution Repeat Re…
Dave Greenberg [Thu, 10 Sep 2015 16:45:21 +0000 (09:45 -0700)]
Merge pull request #6613 from pradpnayak/CRM-16542
-- CRM-16542, fixed regression for billing block
Guanhuan Chen [Thu, 10 Sep 2015 14:31:45 +0000 (15:31 +0100)]
Correct CRM-17183 financial entry for cancelling a pending payment
Mathieu Lutfy [Thu, 10 Sep 2015 14:02:12 +0000 (10:02 -0400)]
CRM-17199: Fix ContributionPage honore title/text multi-lingual.
Pradeep Nayak [Thu, 10 Sep 2015 11:06:44 +0000 (16:36 +0530)]
CRM-16904, updated 4th parameter to use base url
----------------------------------------
* CRM-16904:
https://issues.civicrm.org/jira/browse/CRM-16904
Monish Deb [Thu, 10 Sep 2015 10:16:47 +0000 (15:46 +0530)]
Merge pull request #6719 from monishdeb/46-test-fix
CRM-17188 fix - [4.6 branch] Add transactions to batch step stuck at …
yashodha [Thu, 10 Sep 2015 09:36:26 +0000 (15:06 +0530)]
minor fix
projects / civicrm-core.git / log