Dave Greenberg [Fri, 18 Sep 2015 00:27:34 +0000 (17:27 -0700)]
CRM-15378 - Add max participants and count to price option browse page.
----------------------------------------
* CRM-15378: Include Max Participants and Participant Count columns when viewing price field options
https://issues.civicrm.org/jira/browse/CRM-15378
Eileen McNaughton [Thu, 17 Sep 2015 03:09:55 +0000 (15:09 +1200)]
Merge pull request #6739 from jitendrapurohit/CRM-17205
CRM-17205 -- Fix for broken Free event registration
Eileen McNaughton [Thu, 17 Sep 2015 02:16:54 +0000 (14:16 +1200)]
Merge pull request #6728 from eileenmcnaughton/CRM-14232-add-setting-for-default-lang
CRM-14232 add setting for default contact language.
colemanw [Wed, 16 Sep 2015 12:44:55 +0000 (08:44 -0400)]
Merge pull request #6754 from colemanw/CRM-16555
CRM-16555 - Fix double-processors on backend credit card event form
eileenmcnaugton [Fri, 11 Sep 2015 07:21:23 +0000 (19:21 +1200)]
CRM-14232 add setting for default contact language.
If a contact is created & the preferred_language is not set this
setting can be used to manipulate the default.
Tests!
Conflicts:
settings/Localization.setting.php
CRM-14232 adjust options for default contact language
To reflect bgm suggestions - add current language & remove long-list of countries
CRM-14232 contact default language setting: don't use null as it has special handling
Coleman Watts [Wed, 16 Sep 2015 01:46:46 +0000 (21:46 -0400)]
CRM-16555 - Fix double-processors on backend credit card event form
Coleman Watts [Tue, 15 Sep 2015 21:17:17 +0000 (17:17 -0400)]
Comment fix
colemanw [Tue, 15 Sep 2015 15:25:01 +0000 (11:25 -0400)]
Merge pull request #6738 from eileenmcnaughton/CRM-17075
CRM-17075 convert membership_type_id field to entity_reference field in search
Monish Deb [Tue, 15 Sep 2015 06:53:09 +0000 (12:23 +0530)]
Merge pull request #6698 from jitendrapurohit/CRM-17169
CRM-17169 - Inconsistent Soft Credit Reporting
Kurund Jalmi [Tue, 15 Sep 2015 06:45:15 +0000 (12:15 +0530)]
Merge pull request #6748 from davidjosephhayes/master
Running the fetch_activities cli task stops with a fatal error when t…
Kurund Jalmi [Tue, 15 Sep 2015 06:22:41 +0000 (11:52 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-09-15-10-14-22
Conflicts:
CRM/Admin/Form/Setting/Localization.php
CRM/Event/BAO/Query.php
CRM/Export/BAO/Export.php
CRM/Financial/Page/AJAX.php
templates/CRM/Event/Form/Registration/Register.tpl
tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
tests/phpunit/api/v3/ContactTest.php
tests/phpunit/api/v3/SyntaxConformanceTest.php
Eileen McNaughton [Tue, 15 Sep 2015 01:25:45 +0000 (13:25 +1200)]
Merge pull request #6727 from eileenmcnaughton/comments
comment fixes
colemanw [Tue, 15 Sep 2015 01:24:45 +0000 (21:24 -0400)]
CRM-17075 - Open entityRef automatically
Eileen McNaughton [Tue, 15 Sep 2015 01:22:15 +0000 (13:22 +1200)]
Merge pull request #6741 from eileenmcnaughton/comments-formatting
Comments formatting
David Hayes [Mon, 14 Sep 2015 21:11:39 +0000 (16:11 -0500)]
remove whitespace at end of line
David Hayes [Mon, 14 Sep 2015 20:29:50 +0000 (15:29 -0500)]
fix formatting
Monish Deb [Mon, 14 Sep 2015 18:47:27 +0000 (00:17 +0530)]
Merge pull request #6745 from monishdeb/testFailures-master
CRM-16941 test failure fix
Dave Greenberg [Mon, 14 Sep 2015 16:48:04 +0000 (09:48 -0700)]
Merge pull request #6735 from davecivicrm/CRM-17207
CRM-17207 - Use mailto link on contact summary when outbound email is…
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
monishdeb [Mon, 14 Sep 2015 11:51:39 +0000 (17:21 +0530)]
CRM-16941 test failure fix
----------------------------------------
* CRM-16941: Search Form and api.Get fixes for Contact
https://issues.civicrm.org/jira/browse/CRM-16941
jitendrapurohit [Mon, 14 Sep 2015 11:26:21 +0000 (16:56 +0530)]
sql changes
jitendrapurohit [Mon, 7 Sep 2015 12:43:50 +0000 (18:13 +0530)]
CRM-17169 - Inconsistent Soft Credit Reporting
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 00:55:24 +0000 (12:55 +1200)]
CRM-17075 switch membership_type_id to use entity reference
This commit also adds generic handling for changing select fields to
entity reference fields with tests to ensure previous smart group
behaviour is respected by handling within the convertFormValues function.
This reverts advanced search domain filtering to ?4.4? 4.5? behaviour which does not assume only that domain's memberships should be searched on.
It make be that domain filtering + allowing an override makes most sense. I did think the pseudoconstant & getoptions use the same
mechanism, but it seems they don't. Really they should both allow the same behaviour & override
eileenmcnaugton [Mon, 14 Sep 2015 00:49:12 +0000 (12:49 +1200)]
CRM-17075 add test to lock in membership_type_id returned for all domains
Until such time as a hook allows overriding of the domain assumptions we should not limit this by domain in advanced search
(which leverages the getoptions via use of an entity reference field
eileenmcnaugton [Mon, 14 Sep 2015 00:12:16 +0000 (12:12 +1200)]
fixes to comments & remove unused vars
comment fixes
eileenmcnaugton [Sun, 13 Sep 2015 23:47:49 +0000 (11:47 +1200)]
minor test formatting tidy ups
Eileen McNaughton [Mon, 14 Sep 2015 08:59:26 +0000 (20:59 +1200)]
Merge pull request #6697 from eileenmcnaughton/CRM-17116-custom-date-search-fields
Crm 17116 custom date search fields
jitendrapurohit [Mon, 14 Sep 2015 07:20:20 +0000 (12:50 +0530)]
CRM-17205 -- Fix for broken Free event registration
David Hayes [Sun, 13 Sep 2015 23:03:30 +0000 (18:03 -0500)]
Running the fetch_activities cli task stops with a fatal error when the incomming mail parser is unable to determine the ezcMailDeliveryStatus. The fetch_activities task will continue to download and attempt to parse the offending email, dying every time. This prevents other mails from being downloaded and parsed.
Error Message: "No clue about the ezcMailDeliveryStatus"
This patch catches that error, prints it, marks the offending email ignored, and allows activities processing to continue.
colemanw [Sun, 13 Sep 2015 19:09:34 +0000 (15:09 -0400)]
Merge pull request #6734 from colemanw/CRM-17186
CRM-17186 - Add ts tags & normalize strings for paypal button
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 [Sat, 12 Sep 2015 00:24:26 +0000 (17:24 -0700)]
CRM-17207 - Use mailto link on contact summary when outbound email is disabled.
----------------------------------------
* CRM-17207: Use mailto link on contact summary emails if outbound email is disabled
https://issues.civicrm.org/jira/browse/CRM-17207
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
Coleman Watts [Fri, 11 Sep 2015 20:27:44 +0000 (16:27 -0400)]
CRM-17186 - Add ts tags & normalize strings for paypal button
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…
Dave Greenberg [Fri, 11 Sep 2015 19:12:52 +0000 (12:12 -0700)]
Merge pull request #6730 from monishdeb/migrate-onBehalf-master
CRM-16941 fix - Search Form and api.Get fixes for Contact
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
Monish Deb [Fri, 11 Sep 2015 13:39:21 +0000 (19:09 +0530)]
Merge pull request #6726 from jitendrapurohit/CRM-17206
Fix Country => State hierarachical select broken in 4.7 branch
monishdeb [Fri, 11 Sep 2015 13:37:36 +0000 (19:07 +0530)]
CRM-16941 fix - Search Form and api.Get fixes for Contact
https://issues.civicrm.org/jira/browse/CRM-16941
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
Kurund Jalmi [Fri, 11 Sep 2015 09:38:58 +0000 (15:08 +0530)]
Merge pull request #6672 from monishdeb/migrate-onBehalf-master
CRM-16873: Migrate on behalf master to profileContact
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
Eileen McNaughton [Fri, 11 Sep 2015 07:10:23 +0000 (19:10 +1200)]
Merge pull request #6724 from eileenmcnaughton/master
Test fixes
jitendrapurohit [Fri, 11 Sep 2015 06:29:52 +0000 (11:59 +0530)]
Fix Country => State hierarachical select broken in 4.7 branch
eileenmcnaugton [Fri, 11 Sep 2015 05:09:51 +0000 (17:09 +1200)]
minor tidy-ups
monishdeb [Fri, 11 Sep 2015 05:03:05 +0000 (10:33 +0530)]
upgrade fix
eileenmcnaughton [Fri, 11 Sep 2015 01:46:48 +0000 (01:46 +0000)]
test fixes
Dave Greenberg [Thu, 10 Sep 2015 23:06:23 +0000 (16:06 -0700)]
Merge pull request #6412 from colemanw/CRM-11369
CRM-11369 - Changed to Pending (pay later) and Pending (incomplete transaction)
eileenmcnaughton [Thu, 10 Sep 2015 22:24:23 +0000 (22:24 +0000)]
test fix
Eileen McNaughton [Thu, 10 Sep 2015 21:54:32 +0000 (09:54 +1200)]
Merge pull request #6570 from eileenmcnaughton/CRM-17023
CRM-12326 quicksearch speed improvements
monishdeb [Thu, 10 Sep 2015 20:00:15 +0000 (01:30 +0530)]
format fix
monishdeb [Thu, 10 Sep 2015 19:54:25 +0000 (01:24 +0530)]
CRM-16490: allow all permissioned organization for on-behalf registration
----------------------------------------
* CRM-16490: load org for permissioned relationships other than current employer
https://issues.civicrm.org/jira/browse/CRM-16490
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
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
Yashodha Chaku [Thu, 10 Sep 2015 08:35:09 +0000 (14:05 +0530)]
Merge pull request #6684 from yashodha/CRM-17146
CRM-17146: updating the contribution state in finding contriutions do…
monishdeb [Wed, 9 Sep 2015 14:04:15 +0000 (19:34 +0530)]
Optimization
monishdeb [Mon, 7 Sep 2015 15:12:34 +0000 (20:42 +0530)]
remove getPermissionedEmployer fn
Eileen McNaughton [Tue, 12 May 2015 11:30:48 +0000 (23:30 +1200)]
CRM-16490 make permissioned relationship ajax call work for other permissioned relationship types
Conflicts:
CRM/Core/Page/AJAX/Location.php
----------------------------------------
* CRM-16490: load org for permissioned relationships other than current employer
https://issues.civicrm.org/jira/browse/CRM-16490
monishdeb [Mon, 7 Sep 2015 14:28:20 +0000 (19:58 +0530)]
format fix
monishdeb [Mon, 7 Sep 2015 14:03:59 +0000 (19:33 +0530)]
alternative approach to remove snippet dependency
monishdeb [Fri, 4 Sep 2015 21:22:50 +0000 (02:52 +0530)]
Refactor phase2 for honoree block
monishdeb [Fri, 4 Sep 2015 14:57:03 +0000 (20:27 +0530)]
Fix onbehalf processing via snippet
monishdeb [Fri, 4 Sep 2015 05:26:28 +0000 (10:56 +0530)]
remove comments
monishdeb [Fri, 4 Sep 2015 05:08:47 +0000 (10:38 +0530)]
refactoring phase1
monishdeb [Tue, 21 Jul 2015 06:30:15 +0000 (12:00 +0530)]
Handle upgrade logic
monishdeb [Mon, 20 Jul 2015 19:25:24 +0000 (00:55 +0530)]
migrating to profileContact and optimization
Conflicts:
CRM/Contribute/Form/Contribution/Confirm.php
monishdeb [Fri, 17 Jul 2015 05:50:44 +0000 (11:20 +0530)]
removing dependency of onbehalf
monishdeb [Tue, 14 Jul 2015 19:46:25 +0000 (01:16 +0530)]
migrating onBehalf preprocess to profileContact
monishdeb [Mon, 20 Jul 2015 19:47:01 +0000 (01:17 +0530)]
Initial changes
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
Kurund Jalmi [Thu, 10 Sep 2015 03:16:24 +0000 (08:46 +0530)]
Merge pull request #6716 from PalanteJon/CRM-17193
CRM-17193 - CiviReport - Remove unnecessary spaces from empty CSV cel…
eileenmcnaugton [Wed, 9 Sep 2015 11:24:17 +0000 (23:24 +1200)]
CRM-17115 fix change observed in QA on participant listing
Jon goldberg [Wed, 9 Sep 2015 21:10:12 +0000 (17:10 -0400)]
CRM-17194 - CiviReport - fix date range bug on Contribution Repeat Report
Jon goldberg [Wed, 9 Sep 2015 21:07:20 +0000 (17:07 -0400)]
CRM-17193 - CiviReport - Remove unnecessary spaces from empty CSV cells when exporting reports
Dave Greenberg [Wed, 9 Sep 2015 19:28:33 +0000 (12:28 -0700)]
Merge pull request #6559 from jitendrapurohit/CRM-16877
CRM-16877 -- Include ID when editing 'block' fields (+ allow deletion…
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 19:02:27 +0000 (12:02 -0700)]
Merge pull request #6713 from JKingsnorth/CRM-17187
CRM-17187 - Minor notification message CSS improvement (tables, actio…
Dave Greenberg [Wed, 9 Sep 2015 18:45:11 +0000 (11:45 -0700)]
Merge pull request #6710 from systopia/CRM-17186
CRM-17186: added missing ts-tags
Dave Greenberg [Wed, 9 Sep 2015 17:58:33 +0000 (10:58 -0700)]
Merge pull request #6706 from davecivicrm/CRM-16875
CRM-16875 - reverse join order per Eileens comment.
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
Kurund Jalmi [Wed, 9 Sep 2015 15:18:52 +0000 (20:48 +0530)]
Merge pull request #6714 from monishdeb/46-merge
4.6 merge-forward
monishdeb [Tue, 8 Sep 2015 11:19:12 +0000 (16:49 +0530)]
4.6 Test Failure fix
jitendrapurohit [Tue, 8 Sep 2015 10:54:39 +0000 (16:24 +0530)]
CRM-17163 - Can not import contributions by matching on email
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
projects / civicrm-core.git / log