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 …
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
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
monishdeb [Thu, 10 Sep 2015 07:56:37 +0000 (13:26 +0530)]
format fix
monishdeb [Thu, 10 Sep 2015 07:50:51 +0000 (13:20 +0530)]
CRM-17188 fix - [4.6 branch] Add transactions to batch step stuck at processing
https://issues.civicrm.org/jira/browse/CRM-17188
yashodha [Thu, 10 Sep 2015 06:05:42 +0000 (11:35 +0530)]
CRM-17015: “Sold out” eSor mestge when registering event with PayPal Express payment (event is not full though)
----------------------------------------
* CRM-17015: “Sold out” error message when registering event with PayPal Express payment (event is not full though)
https://issues.civicrm.org/jira/browse/CRM-17015
eileenmcnaugton [Wed, 9 Sep 2015 11:24:17 +0000 (23:24 +1200)]
CRM-17115 fix change observed in QA on participant listing
eileenmcnaugton [Thu, 10 Sep 2015 02:26:26 +0000 (14:26 +1200)]
CRM-17197 - Autorenew is not offered when the price_field is select
Note that this proposed fix moves the final div down. It seems to make sense to move the help_post div down too
although I didn't go that far
Jon goldberg [Wed, 9 Sep 2015 21:10:12 +0000 (17:10 -0400)]
CRM-17194 - CiviReport - fix date range bug on Contribution Repeat Report
Dave Greenberg [Wed, 9 Sep 2015 19:12:10 +0000 (12:12 -0700)]
Merge pull request #6709 from pradpnayak/CRM-16906
Crm 16906
Dave Greenberg [Wed, 9 Sep 2015 17:57:00 +0000 (10:57 -0700)]
Merge pull request #6708 from seamuslee001/CRM-14599
CRM-14599 - Exclude deleted contacts from test mailing
Seamus Lee [Wed, 9 Sep 2015 02:23:17 +0000 (02:23 +0000)]
CRM-14599 - Exclude deleted contacts from test mailing
Eileen McNaughton [Wed, 9 Sep 2015 01:44:55 +0000 (13:44 +1200)]
Merge pull request #6704 from monishdeb/46-test-fix
4.6 Test fixes
Dave Greenberg [Tue, 8 Sep 2015 21:28:05 +0000 (14:28 -0700)]
Merge pull request #6686 from guanhuan/cancellation-credit-note
Credit note upon cancellation
Monish Deb [Tue, 8 Sep 2015 14:31:55 +0000 (20:01 +0530)]
Merge pull request #6703 from jitendrapurohit/CRM-17163
CRM-17163 - Can not import contributions by matching on email
monishdeb [Tue, 8 Sep 2015 11:19:12 +0000 (16:49 +0530)]
4.6 Test Failure fix
Monish Deb [Tue, 8 Sep 2015 11:17:31 +0000 (16:47 +0530)]
Merge pull request #6557 from monishdeb/CRM-16858
CRM-16858 fix - Participant Status & ID error in adv.search builder
jitendrapurohit [Tue, 8 Sep 2015 10:54:39 +0000 (16:24 +0530)]
CRM-17163 - Can not import contributions by matching on email
eileenmcnaugton [Tue, 8 Sep 2015 08:29:17 +0000 (20:29 +1200)]
CRM-17115 reinstate link on gender to reports
eileenmcnaugton [Mon, 7 Sep 2015 21:26:29 +0000 (09:26 +1200)]
CRM-17115 fix enotices from qa
Guanhuan Chen [Mon, 7 Sep 2015 11:48:34 +0000 (12:48 +0100)]
Apply modifications to invoice templates
Guanhuan Chen [Mon, 7 Sep 2015 11:47:11 +0000 (12:47 +0100)]
Setup upgrade script for default invoice msg template modification
Guanhuan Chen [Mon, 7 Sep 2015 11:32:11 +0000 (12:32 +0100)]
Allow credit note to be downloaded on cancellations
Guanhuan Chen [Mon, 7 Sep 2015 11:25:42 +0000 (12:25 +0100)]
Allow credit note for cancellations
Eileen McNaughton [Mon, 7 Sep 2015 00:51:32 +0000 (12:51 +1200)]
Merge pull request #6585 from eileenmcnaughton/CRM-17003
CRM-17003 previous commit caused wrong formatting in access tab on re…
Eileen McNaughton [Mon, 7 Sep 2015 00:49:44 +0000 (12:49 +1200)]
Merge pull request #6678 from eileenmcnaughton/CRM-17120-46
CRM-17120 swap out uncached function for cached function
Eileen McNaughton [Sun, 6 Sep 2015 21:06:18 +0000 (09:06 +1200)]
Merge pull request #6688 from eileenmcnaughton/test-fix
test fix - fix dumb error when in test check
Kurund Jalmi [Sun, 6 Sep 2015 01:11:41 +0000 (18:11 -0700)]
removed echo
Dave Greenberg [Sat, 5 Sep 2015 15:42:34 +0000 (08:42 -0700)]
Merge pull request #6675 from nganivet/CRM-17149
CRM-17149: full fix
monishdeb [Sat, 5 Sep 2015 08:45:01 +0000 (14:15 +0530)]
= operator fix
monishdeb [Fri, 28 Aug 2015 11:18:34 +0000 (16:48 +0530)]
format fix
monishdeb [Fri, 28 Aug 2015 11:07:37 +0000 (16:37 +0530)]
participant role switch case separation
monishdeb [Thu, 27 Aug 2015 05:14:19 +0000 (10:44 +0530)]
minor fix
monishdeb [Wed, 26 Aug 2015 12:51:16 +0000 (18:21 +0530)]
minor changes for partcipant.Get
monishdeb [Wed, 26 Aug 2015 12:36:56 +0000 (18:06 +0530)]
Participant role fix
monishdeb [Mon, 24 Aug 2015 06:52:23 +0000 (12:22 +0530)]
additional changes
monishdeb [Fri, 21 Aug 2015 10:30:49 +0000 (16:00 +0530)]
tests/phpunit/api/v3/MappingFieldTest.php
eileenmcnaugton [Sat, 5 Sep 2015 04:57:36 +0000 (16:57 +1200)]
test fix - fix dumb error when in test check
Kurund Jalmi [Fri, 4 Sep 2015 21:46:07 +0000 (14:46 -0700)]
Merge pull request #6446 from colemanw/CRM-13160
CRM-13160 - Fix deleting relationshipType from MembershipType
Kurund Jalmi [Fri, 4 Sep 2015 04:53:42 +0000 (21:53 -0700)]
Merge pull request #6649 from jitendrapurohit/CRM-16514
CRM-16514 -- Scheduled reminder for event sends email repeatedly
Eileen McNaughton [Fri, 4 Sep 2015 02:17:33 +0000 (14:17 +1200)]
Merge pull request #6677 from eileenmcnaughton/CRM-17152
CRM-17152 fix non-static method called statically
eileenmcnaugton [Fri, 4 Sep 2015 00:53:11 +0000 (12:53 +1200)]
CRM-17115 kowtow to @seamuslee & @colemanw
Nicolas Ganivet [Fri, 4 Sep 2015 00:41:47 +0000 (18:41 -0600)]
corrects style issue
eileenmcnaugton [Fri, 4 Sep 2015 00:33:39 +0000 (12:33 +1200)]
comment fix
eileenmcnaugton [Thu, 3 Sep 2015 23:38:54 +0000 (11:38 +1200)]
CRM-17120 use cached function to retrieve option label
eileenmcnaugton [Thu, 3 Sep 2015 23:37:46 +0000 (11:37 +1200)]
CRM-17120 add test to getFinancialTransactionsList function
eileenmcnaugton [Thu, 3 Sep 2015 22:48:32 +0000 (10:48 +1200)]
CRM-17152 fix non-static method called statically
Nicolas Ganivet [Thu, 3 Sep 2015 17:57:13 +0000 (11:57 -0600)]
CRM-17149: full fix
Eileen McNaughton [Thu, 3 Sep 2015 08:20:33 +0000 (20:20 +1200)]
Merge pull request #6658 from eileenmcnaughton/CRM-17120
Crm 17120
projects / civicrm-core.git / log