colemanw [Sun, 26 Jul 2015 20:13:13 +0000 (16:13 -0400)]
Merge pull request #6305 from joannechester/patch-3
CRM-16492-Change help text for creating smart group
joannechester [Sun, 26 Jul 2015 13:07:36 +0000 (23:07 +1000)]
crm-16492-change-help-text-on-creating-smart-group
Kurund Jalmi [Sun, 26 Jul 2015 03:14:30 +0000 (08:44 +0530)]
Merge pull request #6303 from lcdservices/CRM-16916
CRM-16916 fix validation when formatting field present
Brian Shaughnessy [Sat, 25 Jul 2015 23:28:49 +0000 (19:28 -0400)]
CRM-16916 fix validation when formatting field present
colemanw [Fri, 24 Jul 2015 00:42:17 +0000 (20:42 -0400)]
Merge pull request #6145 from colemanw/CRM-9386
CRM-9386 - Fix api saving inherited memberships
Dave Greenberg [Thu, 23 Jul 2015 21:23:59 +0000 (14:23 -0700)]
Merge pull request #6292 from colemanw/CRM-16872
CRM-16872 - Ensure errors are displayed from semi-ajax forms
Coleman Watts [Thu, 23 Jul 2015 20:01:39 +0000 (16:01 -0400)]
Fix 'View Primary' membership button css
Coleman Watts [Sun, 5 Jul 2015 18:42:51 +0000 (14:42 -0400)]
CRM-9386 - Fix api saving inherited memberships
Coleman Watts [Thu, 23 Jul 2015 16:15:06 +0000 (12:15 -0400)]
CRM-16872 - Ensure errors are displayed from semi-ajax forms
Yashodha Chaku [Thu, 23 Jul 2015 09:10:28 +0000 (14:40 +0530)]
Merge pull request #6289 from yashodha/CRM-16879
CRM-16879: Tab with table records showing duplicate data with date da…
Kurund Jalmi [Thu, 23 Jul 2015 07:05:09 +0000 (12:35 +0530)]
Merge pull request #6284 from LevityNL/4.6
Fix CRM-16866 for 4.6 branch
Eileen McNaughton [Thu, 23 Jul 2015 04:23:11 +0000 (16:23 +1200)]
Merge pull request #6285 from eileenmcnaughton/CRM-16890
CRM-16890 remove IATS
Eileen McNaughton [Wed, 22 Jul 2015 21:28:43 +0000 (09:28 +1200)]
CRM-16890 remove IATS
Kevin Levie [Wed, 22 Jul 2015 18:24:03 +0000 (20:24 +0200)]
Fix CRM-16866 for 4.6 branch
colemanw [Wed, 22 Jul 2015 17:56:12 +0000 (13:56 -0400)]
Merge pull request #6283 from colemanw/changelog
CRM-16889 - Don't force-refresh the changelog tab to avoid performance overhead
Coleman Watts [Tue, 21 Jul 2015 20:07:13 +0000 (16:07 -0400)]
CRM-16889 - Don't force-refresh the changelog tab to avoid performance overhead
yashodha [Wed, 22 Jul 2015 13:16:04 +0000 (18:46 +0530)]
CRM-16879: Tab with table records showing duplicate data with date data type
----------------------------------------
* CRM-16879: Tab with table records showing duplicate data with date data type
https://issues.civicrm.org/jira/browse/CRM-16879
Monish Deb [Wed, 22 Jul 2015 07:24:22 +0000 (12:54 +0530)]
Merge pull request #6273 from rohankatkar/CRM-16857
CRM-16857: inherited membership through priceset creates multiple line items
Dave Greenberg [Tue, 21 Jul 2015 21:23:39 +0000 (14:23 -0700)]
Merge pull request #6274 from civicrm/revert-6252-CRM-16867
Revert "CRM-16867 fix membership-renew check to get membership types …
Dave Greenberg [Tue, 21 Jul 2015 18:52:47 +0000 (11:52 -0700)]
Merge pull request #6241 from jitendrapurohit/CRM-16776reg
CRM-16776 - additional bug fixes
Dave Greenberg [Tue, 21 Jul 2015 18:45:37 +0000 (11:45 -0700)]
Revert "CRM-16867 fix membership-renew check to get membership types from pri…"
Dave Greenberg [Tue, 21 Jul 2015 18:43:04 +0000 (11:43 -0700)]
Merge pull request #6252 from eileenmcnaughton/CRM-16867
CRM-16867 fix membership-renew check to get membership types from pri…
Dave Greenberg [Tue, 21 Jul 2015 18:41:22 +0000 (11:41 -0700)]
Merge pull request #6271 from monishdeb/4.6
CRM-16868 fix - Incorrect "Pending Refund Status" for Contribution af…
Dave Greenberg [Tue, 21 Jul 2015 17:02:06 +0000 (10:02 -0700)]
Merge pull request #6266 from eileenmcnaughton/CRM-16559
CRM-16559 allow recurring contributions to go against pledges for supporting processors
monishdeb [Tue, 21 Jul 2015 14:41:38 +0000 (20:11 +0530)]
CRM-16868 fix - Incorrect "Pending Refund Status" for Contribution after Change Selections in Participation
https://issues.civicrm.org/jira/browse/CRM-16868
Web Access [Tue, 21 Jul 2015 14:25:36 +0000 (19:55 +0530)]
Fix for CRM-16857
Eileen McNaughton [Tue, 21 Jul 2015 08:25:19 +0000 (20:25 +1200)]
Merge pull request #6263 from eileenmcnaughton/CRM-16867-extra-fn-46
CRM-16867 add function to determin combination of membership types in a priceset
Eileen McNaughton [Tue, 21 Jul 2015 07:29:06 +0000 (19:29 +1200)]
CRM-16559 allow recurring contributions to go against pledges for supporting processors
Eileen McNaughton [Tue, 21 Jul 2015 06:04:35 +0000 (18:04 +1200)]
CRM-16867 add function to determin combination of membership types in a priceset
This function is part of the fix towards CRM-16850 & CRM-16867 & a further commit causes the function it was copied off
to re-use rather than duplicate it, however, various aspects of QA still being undergone - this function addition only PR
allows the work on both those issues to continue without being interrelated
Yashodha Chaku [Tue, 21 Jul 2015 04:32:08 +0000 (10:02 +0530)]
Merge pull request #6257 from yashodha/CRM-16854
CRM-16854:string fix
Eileen McNaughton [Mon, 20 Jul 2015 22:36:49 +0000 (10:36 +1200)]
phpcs
Dave Greenberg [Mon, 20 Jul 2015 17:08:27 +0000 (10:08 -0700)]
Merge pull request #6236 from colemanw/CRM-16836
CRM-16836 - Enforce permissions in group api getoptions
yashodha [Mon, 20 Jul 2015 08:51:37 +0000 (14:21 +0530)]
CRM-16854:string fix
----------------------------------------
* CRM-16854: Can't edit Notes field from Open Case activity
https://issues.civicrm.org/jira/browse/CRM-16854
Yashodha Chaku [Mon, 20 Jul 2015 08:39:22 +0000 (14:09 +0530)]
Merge pull request #6243 from jmcclelland/CRM-16854
CRM-16854 - ensure open case activities can have notes changed.
Monish Deb [Mon, 20 Jul 2015 08:09:11 +0000 (13:39 +0530)]
Merge pull request #6256 from monishdeb/4.6
CRM-16858 custom field fix
monishdeb [Mon, 20 Jul 2015 07:45:33 +0000 (13:15 +0530)]
minor fix
monishdeb [Mon, 20 Jul 2015 07:43:13 +0000 (13:13 +0530)]
fix for custom fields
Eileen McNaughton [Sun, 19 Jul 2015 10:24:25 +0000 (22:24 +1200)]
CRM-16867 saving membership types is blocked when key for a renew type is present - even when the type has just been disabled
Eileen McNaughton [Sun, 19 Jul 2015 09:31:15 +0000 (21:31 +1200)]
CRM-16867 fix membership-renew check to get membership types from price fields
Monish Deb [Sat, 18 Jul 2015 09:57:38 +0000 (15:27 +0530)]
Merge pull request #6239 from eileenmcnaughton/4.6
event search breakage
Kurund Jalmi [Sat, 18 Jul 2015 05:20:59 +0000 (10:50 +0530)]
Merge pull request #6231 from rohankatkar/CRM-16833
CRM-16833: Tax applied to Membership contributions twice with Tax Invoice
Kurund Jalmi [Sat, 18 Jul 2015 05:11:48 +0000 (10:41 +0530)]
Merge pull request #6233 from rohankatkar/NoticeFix
Notice Fix on offline membership
Kurund Jalmi [Sat, 18 Jul 2015 05:10:58 +0000 (10:40 +0530)]
Merge pull request #6238 from monishdeb/4.6
CRM-16858 fix - Participant Status & ID error in adv.search builder
Dave Greenberg [Fri, 17 Jul 2015 20:38:50 +0000 (13:38 -0700)]
Merge pull request #6242 from kurund/set-membership-defaults
CRM-16862: Allow setting of default value for donation amount or membership fee via url for contribution/membership pages
Coleman Watts [Fri, 17 Jul 2015 20:08:22 +0000 (16:08 -0400)]
CRM-16836 - Check permissions in CRM_Core_Form::addSelect
Eileen McNaughton [Fri, 17 Jul 2015 18:01:29 +0000 (06:01 +1200)]
Merge pull request #6226 from eileenmcnaughton/CRM-16856
CRM-16856 put Set title function on extendable class
Jamie McClelland [Fri, 17 Jul 2015 16:21:44 +0000 (12:21 -0400)]
CRM-16854 - ensure open case activities can have notes changed.
Monish Deb [Fri, 17 Jul 2015 13:22:03 +0000 (18:52 +0530)]
Merge pull request #6240 from eileenmcnaughton/CRM-16527
CRM-16527 - Hide credit card section in membership contribution form
Kurund Jalmi [Fri, 17 Jul 2015 11:55:21 +0000 (17:25 +0530)]
code cleanup
Kurund Jalmi [Fri, 17 Jul 2015 11:38:58 +0000 (17:08 +0530)]
fixes to allow overwriting of existing membership defaults via url and code cleanup
Kurund Jalmi [Fri, 17 Jul 2015 10:50:22 +0000 (16:20 +0530)]
allow setting of price set value via url for online membership pages
jitendrapurohit [Fri, 17 Jul 2015 08:28:12 +0000 (13:58 +0530)]
CRM-16776 - additional bug fixes
Eileen McNaughton [Fri, 17 Jul 2015 07:15:44 +0000 (19:15 +1200)]
add enotice on our belt & braces protection fn
Kajan [Wed, 20 May 2015 09:27:26 +0000 (10:27 +0100)]
CRM-16527 - Hide credit card section in membership contribution form
monishdeb [Fri, 17 Jul 2015 07:03:24 +0000 (12:33 +0530)]
CRM-16858 fix - Participant Status & ID error in adv.search builder
https://issues.civicrm.org/jira/browse/CRM-16858
Eileen McNaughton [Fri, 17 Jul 2015 04:53:58 +0000 (16:53 +1200)]
event search breakage
Coleman Watts [Fri, 17 Jul 2015 01:52:24 +0000 (21:52 -0400)]
CRM-16836 - Enforce permissions in group api getoptions
Tim Otten [Fri, 17 Jul 2015 00:49:03 +0000 (17:49 -0700)]
Merge pull request #6216 from colemanw/CRM-16846
CRM-16846 - Fix upgrade sql file skippage
Coleman Watts [Tue, 14 Jul 2015 18:52:16 +0000 (14:52 -0400)]
CRM-16846 - Fix upgrade sql file skippage
Web Access [Thu, 16 Jul 2015 14:03:16 +0000 (19:33 +0530)]
Notice Fix on offline membership
Web Access [Thu, 16 Jul 2015 13:50:51 +0000 (19:20 +0530)]
CRM-16833: Tax applied to Membership contributions twice with Tax Invoice
CiviCRM [Thu, 16 Jul 2015 13:06:57 +0000 (06:06 -0700)]
Update version to 4.6.6
Yashodha Chaku [Thu, 16 Jul 2015 10:08:12 +0000 (15:38 +0530)]
Merge pull request #6228 from jitendrapurohit/release
additional fix for CRM-16776
jitendrapurohit [Thu, 16 Jul 2015 07:35:25 +0000 (13:05 +0530)]
minor fix
jitendrapurohit [Thu, 16 Jul 2015 06:39:44 +0000 (12:09 +0530)]
additional fix for CRM-16776
Eileen McNaughton [Thu, 16 Jul 2015 04:55:19 +0000 (16:55 +1200)]
function visibility for his-highness jenkins
Eileen McNaughton [Thu, 16 Jul 2015 04:30:58 +0000 (16:30 +1200)]
CRM-16856 put Set title function on extendable class
Dave Greenberg [Wed, 15 Jul 2015 18:25:05 +0000 (11:25 -0700)]
Merge pull request #6159 from yashodha/CRM-16735.fix
CRM-16735: PCP notification email should not be sent when contributio…
Monish Deb [Wed, 15 Jul 2015 15:24:30 +0000 (20:54 +0530)]
Merge pull request #6222 from jitendrapurohit/apitestfix
CRM test fix CRM_Group_Page_AjaxTest.testTraditionalACL
colemanw [Wed, 15 Jul 2015 14:01:57 +0000 (10:01 -0400)]
Merge pull request #6220 from monishdeb/CRM-16828
Crm 16828: Backport CRM-16575 changes to 4.6
jitendrapurohit [Wed, 15 Jul 2015 13:14:24 +0000 (18:44 +0530)]
CRM test fix CRM_Group_Page_AjaxTest.testTraditionalACL
monishdeb [Wed, 15 Jul 2015 11:02:59 +0000 (16:32 +0530)]
minor changes
monishdeb [Thu, 18 Jun 2015 10:43:07 +0000 (16:13 +0530)]
improvement for api
monishdeb [Wed, 17 Jun 2015 15:39:40 +0000 (21:09 +0530)]
minor fix
monishdeb [Wed, 17 Jun 2015 15:37:46 +0000 (21:07 +0530)]
CRM-16575 fix - Searching/reporting on similar values in multi select fields breaks
https://issues.civicrm.org/jira/browse/CRM-16575
Conflicts:
CRM/Core/BAO/Mapping.php
unknown [Wed, 27 May 2015 14:42:25 +0000 (15:42 +0100)]
New Warnings - Category ScopeIndent
unknown [Wed, 27 May 2015 13:56:29 +0000 (14:56 +0100)]
CheckStyle Result fixes
unknown [Wed, 27 May 2015 13:39:41 +0000 (14:39 +0100)]
Updating white space
unknown [Wed, 27 May 2015 13:36:06 +0000 (14:36 +0100)]
Proposed fix for searching similar multi select values CRM-16575
Yashodha Chaku [Wed, 15 Jul 2015 09:48:37 +0000 (15:18 +0530)]
Merge pull request #6219 from monishdeb/4.6
CRM-16804 fix - Contribution updated via api wrongfully deletes PCP s…
monishdeb [Wed, 15 Jul 2015 06:31:47 +0000 (12:01 +0530)]
CRM-16804 fix - Contribution updated via api wrongfully deletes PCP soft contribution
https://issues.civicrm.org/jira/browse/CRM-16804
Dave Greenberg [Wed, 15 Jul 2015 00:22:29 +0000 (17:22 -0700)]
Merge pull request #6217 from davecivicrm/CRM-16729
CRM-16729 - Fix inline help to account for payment from a different c…
Dave Greenberg [Wed, 15 Jul 2015 00:21:51 +0000 (17:21 -0700)]
Merge pull request #6218 from davecivicrm/CRM-16812
CRM-16812 - prevent popup for custom search RUN link.
Dave Greenberg [Wed, 15 Jul 2015 00:22:58 +0000 (17:22 -0700)]
CRM-16812 - prevent popup for custom search RUN link.
----------------------------------------
* CRM-16812: CiviCRM » Administer CiviCRM » Option Groups » <custom search> run yields no results
https://issues.civicrm.org/jira/browse/CRM-16812
Dave Greenberg [Tue, 14 Jul 2015 22:09:27 +0000 (15:09 -0700)]
CRM-16729 - Fix inline help to account for payment from a different contact scenario.
----------------------------------------
* CRM-16729: IHM : Wrong email on receipt help text when new membership is paid by a different contact
https://issues.civicrm.org/jira/browse/CRM-16729
Dave Greenberg [Tue, 14 Jul 2015 21:27:27 +0000 (14:27 -0700)]
Merge pull request #6214 from josephlacey/export-related-contacts-bug
CRM-16847 - Fix for addressee and greeting related contact export bug
colemanw [Tue, 14 Jul 2015 19:37:58 +0000 (15:37 -0400)]
Merge pull request #6206 from mlutfy/4.6-crm16839
CRM-16839: Fix CiviCase Activity status messages / ts() usage.
Mathieu Lutfy [Tue, 14 Jul 2015 19:35:42 +0000 (15:35 -0400)]
setStatus to success, instead of info
Mathieu Lutfy [Tue, 14 Jul 2015 19:20:37 +0000 (15:20 -0400)]
Merge pull request #1 from colemanw/patch-1
CRM-16839 - Simpler status msg
colemanw [Tue, 14 Jul 2015 18:58:55 +0000 (14:58 -0400)]
CRM-16839 - Simpler status msg
Joseph Lacey [Tue, 14 Jul 2015 18:14:08 +0000 (14:14 -0400)]
CRM-16847 - Fix for addressee and greeting related contact export bug
----------------------------------------
* CRM-16847: Greeting and Address tokens not properly rendered when exporting related contacts from a contrbution search.
https://issues.civicrm.org/jira/browse/CRM-16847
Tim Otten [Tue, 14 Jul 2015 07:05:53 +0000 (00:05 -0700)]
Merge pull request #5520 from totten/4.6-cxn
CRM-16173 - System for simple, secure API keys
Monish Deb [Tue, 14 Jul 2015 05:24:03 +0000 (10:54 +0530)]
Merge pull request #6202 from jitendrapurohit/CRM-16823
CRM-16823 - Contact Image does not display on contact summary screen …
Yashodha Chaku [Tue, 14 Jul 2015 05:02:17 +0000 (10:32 +0530)]
Merge pull request #6198 from Seb35/4.6
CRM-16824: Unrecognized date format in custom fields during import of…
Tim Otten [Wed, 8 Jul 2015 00:21:20 +0000 (17:21 -0700)]
CRM-16173 - ManageCtrl - Display errors about AppMetas
Tim Otten [Sat, 4 Jul 2015 01:17:03 +0000 (18:17 -0700)]
CRM-16757 - Cache CiviConnect apps and CRLs.
Tim Otten [Sat, 4 Jul 2015 01:15:44 +0000 (18:15 -0700)]
CRM_Utils_Array::rekey()
Tim Otten [Fri, 3 Jul 2015 22:28:30 +0000 (15:28 -0700)]
CRM-16760 - Remove CIVICRM_CXN_APPS_VERIFY constraint
Tim Otten [Tue, 30 Jun 2015 23:21:10 +0000 (16:21 -0700)]
CRM-16757 - Use customized CertificateValidator
Tim Otten [Tue, 30 Jun 2015 23:11:10 +0000 (16:11 -0700)]
CRM-16757 - Split extern/cxn.php into createApiServer() and CRM_Cxn_ApiRouter
projects / civicrm-core.git / log