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
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
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
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
Tim Otten [Mon, 29 Jun 2015 07:23:39 +0000 (00:23 -0700)]
crmCxnManageCtrl - Show links for settings, docs, support, logs
Tim Otten [Mon, 29 Jun 2015 07:22:59 +0000 (00:22 -0700)]
CrmCxnLinkDialogCtrl - Add ctrl to show an external link in a dialog
Tim Otten [Mon, 29 Jun 2015 05:44:37 +0000 (22:44 -0700)]
Cxn.getlink API
Tim Otten [Fri, 19 Jun 2015 03:24:54 +0000 (20:24 -0700)]
api/v3/Cxn - Tweak error
Tim Otten [Sat, 11 Apr 2015 22:58:58 +0000 (15:58 -0700)]
CRM-16173 - extern/cxn.php - Respect the "Force SSL" option
Tim Otten [Sat, 11 Apr 2015 03:40:10 +0000 (20:40 -0700)]
JobLog.get API
Tim Otten [Fri, 10 Apr 2015 06:03:18 +0000 (23:03 -0700)]
CRM-16173 - Cxn.get API - Hide 'secret'
Tim Otten [Fri, 27 Mar 2015 11:08:04 +0000 (04:08 -0700)]
CRM-16173 - crmCxn - Add UI for connecting and disconnecting
* Split available and actual connections
* Display alert if sysadmin disables Cxn security
* Display permissions when confirming
Tim Otten [Mon, 30 Mar 2015 06:46:18 +0000 (23:46 -0700)]
CRM-16173 - CRM_Core_Permission_Temp, extern/cxn.php - Allow temporary permission escalation
Tim Otten [Sat, 28 Mar 2015 03:27:05 +0000 (20:27 -0700)]
CRM-16173 - WhitelistSubscriber - Filtering for API requests (entity/action/params)
Tim Otten [Fri, 27 Mar 2015 08:10:21 +0000 (01:10 -0700)]
CRM-16173 - Fix for SyntaxConformanceTest
Tim Otten [Sat, 28 Mar 2015 23:48:08 +0000 (16:48 -0700)]
CRM-16173 - Allow define()s for CIVICRM_CXN_APPS_VERIFY and CIVICRM_CXN_APPS_URL
Tim Otten [Tue, 31 Mar 2015 07:32:56 +0000 (00:32 -0700)]
Cxn.register - Fix for multiple CxnApp
Tim Otten [Fri, 27 Mar 2015 08:10:11 +0000 (01:10 -0700)]
CRM-16173 - Cxn API - Add "get". Fix GUID fields and API metadata.
APIv3 overloads fields like "cxn_id" as aliases for numeric "id". Therefore,
it's problematic to use "cxn_id" and "app_id" as GUID fields. This commit
renames them to "cxn_guid" and "app_guid".
Tim Otten [Fri, 27 Mar 2015 07:32:17 +0000 (00:32 -0700)]
CRM_Cxn_BAO_Cxn - Comments
Tim Otten [Fri, 27 Mar 2015 07:30:25 +0000 (00:30 -0700)]
CRM-16173 - CxnApp.get API
Tim Otten [Fri, 27 Mar 2015 03:05:58 +0000 (20:05 -0700)]
CRM-16173 - Rename createCACert() to getCACert().
Tim Otten [Fri, 27 Mar 2015 02:52:56 +0000 (19:52 -0700)]
composer.json - Update civicrm/civicrm-cxn-rpc. Fix handleAndRespond().
Tim Otten [Thu, 26 Mar 2015 23:50:41 +0000 (16:50 -0700)]
CRM-16173 - CIVICRM_CXN_VERIFY => CIVICRM_CXN_CA, CIVICRM_CXN_VERIFY_APPMETA
The CA may take one of three values - CiviRootCA, CiviTestRootCA, or none.
In the future, this may help with staging and private-beta apps.
Tim Otten [Wed, 25 Mar 2015 11:27:52 +0000 (04:27 -0700)]
CRM-16173 - Cxn.unregister API
Tim Otten [Wed, 25 Mar 2015 05:46:56 +0000 (22:46 -0700)]
CRM-16173 - Move construction of RegistrationClient to container
Tim Otten [Tue, 24 Mar 2015 23:49:54 +0000 (16:49 -0700)]
CRM-16173 - Add Cxn.register API. Add extern/cxn.php endpoint.
Tim Otten [Sun, 22 Mar 2015 05:55:21 +0000 (22:55 -0700)]
CRM-16173 - xml/schema/Cxn - Schema + upgrade for storing connections
Tim Otten [Sat, 21 Mar 2015 03:44:10 +0000 (20:44 -0700)]
composer.json - Add civicrm-cxn-rpc
Tim Otten [Fri, 10 Apr 2015 02:22:47 +0000 (19:22 -0700)]
Add angular-sanitize
Tim Otten [Sat, 11 Apr 2015 22:59:51 +0000 (15:59 -0700)]
Core.setting.php - Expose enableSSL
Tim Otten [Fri, 10 Apr 2015 02:51:00 +0000 (19:51 -0700)]
Extension.get API - Add support for API filters/options
Tim Otten [Fri, 10 Apr 2015 03:54:52 +0000 (20:54 -0700)]
System.get API - Return system details (PHP+MySQL version, ad nauseum)
Includes:
* Civi+PHP+MySQL versions
* Active components/extensions/modules
* Redacted PHP INI settings
Tim Otten [Fri, 27 Mar 2015 07:00:11 +0000 (00:00 -0700)]
_civicrm_api3_basic_array_get - Helper for simple array-backed APIs
Suppose you have a small/mid-sized list of records (from JSON, XML, YAML,
etc) and want to expose an API for filtering them. You could make a new
table and new DAO/BAO and then call _civicrm_api3_basic_get, but
_civicrm_api3_basic_array_get would be so much simpler.
Tim Otten [Sat, 28 Mar 2015 03:47:20 +0000 (20:47 -0700)]
Civi\API\Request - Make normalize*() less manic-side-effect-y.
Tim Otten [Sat, 28 Mar 2015 03:25:24 +0000 (20:25 -0700)]
Civi\API\Subscriber\ChainSubscriber - Reuse the inputted kernel, not the global kernel.
Tim Otten [Sat, 28 Mar 2015 01:22:59 +0000 (18:22 -0700)]
Civi\API\Event - Pass through the $apiKernel
projects / civicrm-core.git / log