Frank J. Gómez [Wed, 22 Jul 2015 15:16:45 +0000 (11:16 -0400)]
Attempt to fix bug where a tab's link property is ignored.
Tobias Lounsbury [Wed, 22 Jul 2015 18:33:55 +0000 (11:33 -0700)]
Migrated from manual includes to using civi helpers, Cleanup
Tobias Lounsbury [Tue, 21 Jul 2015 01:03:58 +0000 (18:03 -0700)]
Added ability for angular to be loaded as a snippet
Coleman Watts [Mon, 20 Jul 2015 14:29:39 +0000 (10:29 -0400)]
CRM-16354 - Remove old wysiwyg reference
Coleman Watts [Mon, 20 Jul 2015 14:20:33 +0000 (10:20 -0400)]
Merge branch '4.6' into master
Eileen McNaughton [Mon, 20 Jul 2015 09:47:24 +0000 (21:47 +1200)]
Merge pull request #6248 from eileenmcnaughton/CRM-16808
CRM-16808 fix to preApproval processor_name
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
Kurund Jalmi [Sun, 19 Jul 2015 13:09:39 +0000 (18:39 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-19-17-34-09
Conflicts:
CRM/Contribute/Form/Contribution.php
CRM/Contribute/Form/Contribution/Confirm.php
CRM/Core/BAO/CustomQuery.php
CRM/Core/BAO/Mapping.php
CRM/Member/Form/Membership.php
bower.json
sql/civicrm_generated.mysql
templates/CRM/Contribute/Form/Contribution/Main.tpl
xml/version.xml
Monish Deb [Sat, 18 Jul 2015 09:57:38 +0000 (15:27 +0530)]
Merge pull request #6239 from eileenmcnaughton/4.6
event search breakage
Eileen McNaughton [Sat, 18 Jul 2015 09:39:25 +0000 (21:39 +1200)]
CRM-16808 fix to preApproval processor_name
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
Eileen McNaughton [Fri, 17 Jul 2015 23:49:48 +0000 (11:49 +1200)]
Merge pull request #6246 from eileenmcnaughton/tests
test fix - another instance of old processor instantiation
Eileen McNaughton [Fri, 17 Jul 2015 23:48:30 +0000 (11:48 +1200)]
test fix - another instance of old processor instantiation
Eileen McNaughton [Fri, 17 Jul 2015 23:05:06 +0000 (11:05 +1200)]
Merge pull request #6245 from eileenmcnaughton/CRM-16813
CRM-16813 alter test to reflect true desired behaviour
Eileen McNaughton [Fri, 17 Jul 2015 23:04:41 +0000 (11:04 +1200)]
CRM-16813 alter test to reflect true desired behaviour
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
Eileen McNaughton [Fri, 17 Jul 2015 18:07:16 +0000 (06:07 +1200)]
Merge pull request #6234 from eileenmcnaughton/CRM-16808
CRM-16808 remove refs to paypal & genericise processor code
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
Eileen McNaughton [Fri, 17 Jul 2015 17:59:45 +0000 (05:59 +1200)]
test fixes
Dave Greenberg [Fri, 17 Jul 2015 17:57:07 +0000 (10:57 -0700)]
Merge pull request #6205 from Edzelopez/CRM-16835
CRM-16835 Added fix to allow contributions with Partially paid status…
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
Eileen McNaughton [Fri, 17 Jul 2015 12:33:49 +0000 (00:33 +1200)]
phpcs fix
Kurund Jalmi [Fri, 17 Jul 2015 11:55:21 +0000 (17:25 +0530)]
code cleanup
Eileen McNaughton [Fri, 17 Jul 2015 11:53:29 +0000 (23:53 +1200)]
CRM-16808 follow up fixes
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
Eileen McNaughton [Fri, 17 Jul 2015 03:23:30 +0000 (15:23 +1200)]
phpcs fixes
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
Eileen McNaughton [Thu, 16 Jul 2015 22:07:59 +0000 (10:07 +1200)]
CRM-16808 follow up - finally remove all references to calling doTransferPayment & doDirectPayment & only call doPayment
Eileen McNaughton [Thu, 16 Jul 2015 21:42:15 +0000 (09:42 +1200)]
Merge pull request #6230 from eileenmcnaughton/tests
test fix - instantiate processor in live mode
Eileen McNaughton [Thu, 16 Jul 2015 21:37:45 +0000 (09:37 +1200)]
CRM-16808 remove refs to paypal & genericise processor code
(This was in response to discovering e-notices on no $ but was always 'part-of-the-plan'
the form only calls doPayment now. We only have one concession left to it knowing about contributeMode - whether to call PostProcess hook
colemanw [Thu, 16 Jul 2015 18:20:12 +0000 (14:20 -0400)]
Remove stray merge msg
Coleman Watts [Tue, 14 Jul 2015 18:52:16 +0000 (14:52 -0400)]
CRM-16846 - Fix upgrade sql file skippage
colemanw [Thu, 16 Jul 2015 14:06:02 +0000 (10:06 -0400)]
Merge pull request #6232 from sudhabisht/WebtestFix1
Import and CKEditor webtest failure fix
Web Access [Thu, 16 Jul 2015 14:03:16 +0000 (19:33 +0530)]
Notice Fix on offline membership
Sudha Bisht [Thu, 16 Jul 2015 14:00:48 +0000 (19:30 +0530)]
Ckeditor and Import webtest related fix
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
Eileen McNaughton [Thu, 16 Jul 2015 09:42:22 +0000 (21:42 +1200)]
test fix - instantiate processor in live mode
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 05:16:18 +0000 (17:16 +1200)]
Merge pull request #6223 from eileenmcnaughton/CRM-16851
CRM-16851 fix product options in api
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
Eileen McNaughton [Thu, 16 Jul 2015 03:50:57 +0000 (15:50 +1200)]
Merge pull request #6225 from davecivicrm/CRM-16841
CRM-16841 - allow use of Dummy processor in LIVE mode.
Eileen McNaughton [Thu, 16 Jul 2015 02:14:44 +0000 (14:14 +1200)]
CRM-16851 enforce array type
Dave Greenberg [Wed, 15 Jul 2015 23:21:37 +0000 (16:21 -0700)]
Merge pull request #6186 from JKingsnorth/CRM-16826
CRM-16826: Fix updating addresses via Profiles
Dave Greenberg [Wed, 15 Jul 2015 23:06:31 +0000 (16:06 -0700)]
CRM-16841 - allow use of Dummy processor in LIVE mode.
----------------------------------------
* CRM-16841: Dummy processor can be used for 'live' transaction mode
https://issues.civicrm.org/jira/browse/CRM-16841
Dave Greenberg [Wed, 15 Jul 2015 19:25:00 +0000 (12:25 -0700)]
Merge pull request #6224 from davecivicrm/updateGenerated.mysql
New copy of civicrm_generated.mysql.
Dave Greenberg [Wed, 15 Jul 2015 19:26:04 +0000 (12:26 -0700)]
New copy of civicrm_generated.mysql.
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…
Dave Greenberg [Wed, 15 Jul 2015 16:32:42 +0000 (09:32 -0700)]
Merge pull request #6221 from jitendrapurohit/CRM-16715
minor fix for median calculation CRM-16714 & CRM-16715
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
Eileen McNaughton [Wed, 15 Jul 2015 14:38:04 +0000 (02:38 +1200)]
Merge pull request #6204 from eileenmcnaughton/tests
test fix membership form completion
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
jitendrapurohit [Wed, 15 Jul 2015 10:02:15 +0000 (15:32 +0530)]
minor fix for median calculation CRM-16714 & CRM-16715
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 20:04:33 +0000 (16:04 -0400)]
Merge pull request #6212 from colemanw/CRM-16354
WYSIWYG upgrades
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
Coleman Watts [Mon, 13 Jul 2015 16:16:02 +0000 (12:16 -0400)]
CRM-16354 - Improve wysiwyg upgrade & add message to user
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
projects / civicrm-core.git / log