eileen [Sun, 27 Dec 2015 03:39:34 +0000 (16:39 +1300)]
CRM-17751 add api support for setting the trxn_id for a refund
The civicrm_financial_trxn.trxn_id is set to ['refund_trxn_id'] when it is passed in.
See the tests for detail on expectations
Change-Id: Id24a9af646dde23138ac7888314f7438c4065469
add missing commas
Change-Id: I5ac41d28b17e7149b94742b26e3bc65479e1ce88
eileen [Tue, 29 Dec 2015 04:59:38 +0000 (17:59 +1300)]
Add cleanup for option groups to quick cleanup
Change-Id: Iaa10e26dbbe54f7af228a022d74b48f9107528e8
colemanw [Tue, 29 Dec 2015 22:37:43 +0000 (17:37 -0500)]
Merge pull request #7512 from colemanw/ext
Extension api cleanup
Coleman Watts [Tue, 29 Dec 2015 22:01:04 +0000 (17:01 -0500)]
Extension api cleanup
Eileen McNaughton [Tue, 29 Dec 2015 20:29:55 +0000 (09:29 +1300)]
Merge pull request #7510 from colemanw/ext
Add getfield specs to extension api
Monish Deb [Tue, 29 Dec 2015 18:53:35 +0000 (00:23 +0530)]
Merge pull request #7507 from jitendrapurohit/CRM-17668
CRM-17668 - logging revert: boolean breaks if reverting to null
Coleman Watts [Tue, 29 Dec 2015 15:09:30 +0000 (10:09 -0500)]
Add getfield specs to extension api
Monish Deb [Tue, 29 Dec 2015 15:04:34 +0000 (20:34 +0530)]
Merge pull request #7509 from monishdeb/unitTestFixes
Unit test fixes 4.7beta4
monishdeb [Tue, 29 Dec 2015 14:18:39 +0000 (19:48 +0530)]
unit test fixes 4.7beta4
jitendrapurohit [Tue, 29 Dec 2015 11:32:07 +0000 (17:02 +0530)]
CRM-17668 - logging revert: boolean breaks if reverting to null
Monish Deb [Tue, 29 Dec 2015 10:37:53 +0000 (16:07 +0530)]
Merge pull request #7503 from jitendrapurohit/CRM-17577
CRM-17577 -- Membership Batch Data Entry: Renewal ignores some fields
colemanw [Mon, 28 Dec 2015 19:15:21 +0000 (14:15 -0500)]
Merge pull request #7504 from colemanw/fixes
Custom field fixes
Coleman Watts [Mon, 28 Dec 2015 19:14:36 +0000 (14:14 -0500)]
Avoid calling displayValue for no reason
Coleman Watts [Mon, 28 Dec 2015 17:43:30 +0000 (12:43 -0500)]
Cleanup getOptionListSelector
Coleman Watts [Mon, 28 Dec 2015 17:43:02 +0000 (12:43 -0500)]
Cleanup redundant caching of custom fields
Monish Deb [Mon, 28 Dec 2015 13:20:17 +0000 (18:50 +0530)]
Merge pull request #7502 from yashodha/CRM-17755
CRM-17755: Nesting of operators for event search form
jitendrapurohit [Mon, 28 Dec 2015 13:13:09 +0000 (18:43 +0530)]
CRM-17577 -- Membership Batch Data Entry: Renewal ignores some fields
yashodha [Mon, 28 Dec 2015 10:07:26 +0000 (15:37 +0530)]
CRM-17755: Nesting of operators for event search form
----------------------------------------
* CRM-17755: Nesting of operators for event search form
https://issues.civicrm.org/jira/browse/CRM-17755
Coleman Watts [Sun, 27 Dec 2015 01:18:22 +0000 (20:18 -0500)]
Fix javascript error (cannot join null)
Tim Otten [Sat, 26 Dec 2015 22:46:13 +0000 (16:46 -0600)]
Merge pull request #7500 from totten/master-altermail
CRM_Utils_Hook::alterMailer -- Fix typo
CiviCRM [Sat, 26 Dec 2015 18:33:09 +0000 (12:33 -0600)]
CRM_Utils_Hook::alterMailer -- Fix typo
There was a discrepancy in the naming of this hook:
* The stub function was named `alterMail`. Internal code therefore referred to `alterMail`.
* The hook invocation fires as `alterMailer`. Downstream code therefore referred to `alterMailer`.
This patch standardizes on `alterMailer` to preserve the downstream
interface. It leaves `::alterMail()` as a deprecated alias in case there's
some unexpected external use-case.
colemanw [Sat, 26 Dec 2015 15:24:48 +0000 (10:24 -0500)]
Merge pull request #7453 from colemanw/CRM-17646
CRM-17646 Add hook for modifying field option lists
Coleman Watts [Sat, 26 Dec 2015 03:01:28 +0000 (22:01 -0500)]
CRM-17646 - Mark older hooks deprecated
Coleman Watts [Sat, 26 Dec 2015 02:39:03 +0000 (21:39 -0500)]
Fix participant field labels
Coleman Watts [Sat, 26 Dec 2015 02:36:21 +0000 (21:36 -0500)]
Improve CRM_Core_Form::addField for ChainSelect types
Coleman Watts [Thu, 24 Dec 2015 02:34:41 +0000 (21:34 -0500)]
Use addField for basic search form
Coleman Watts [Thu, 24 Dec 2015 02:34:03 +0000 (21:34 -0500)]
Improve handling of select fields
Coleman Watts [Thu, 24 Dec 2015 01:10:40 +0000 (20:10 -0500)]
CRM_Core_BAO_CustomField - Remove unused param
Coleman Watts [Wed, 23 Dec 2015 04:50:17 +0000 (23:50 -0500)]
CRM_Core_Form - Support html5 field types
Coleman Watts [Wed, 23 Dec 2015 04:31:15 +0000 (23:31 -0500)]
Fix hover button padding
Coleman Watts [Wed, 23 Dec 2015 04:24:27 +0000 (23:24 -0500)]
CRM_Core_Form::addField - Handle custom fields
colemanw [Thu, 24 Dec 2015 17:32:59 +0000 (12:32 -0500)]
Merge pull request #7497 from PalanteJon/CRM-17273
CRM-17273 - Don't show the wrench that pops up the 'Edit Location Typ…
Jon goldberg [Thu, 24 Dec 2015 15:24:46 +0000 (10:24 -0500)]
CRM-17273 - Don't show the wrench that pops up the 'Edit Location Types' screen when editing contact info
Eileen McNaughton [Thu, 24 Dec 2015 02:03:19 +0000 (15:03 +1300)]
Merge pull request #7496 from eileenmcnaughton/CRM-17655
CRM-17655 editing recurring through form causes error
eileen [Thu, 24 Dec 2015 00:16:33 +0000 (13:16 +1300)]
CRM-17655 editing recurring through form causes error
On editing I found previous patches for CRM-17655 had caused a situation where the ID for the recurring contribution
was not always being correctly determined
Change-Id: I74394d6f33b0a68ee73d0cc4be3efb5563bc6406
Coleman Watts [Wed, 23 Dec 2015 03:44:53 +0000 (22:44 -0500)]
CRM_Core_Form::addField - add wysiwyg support
Coleman Watts [Wed, 23 Dec 2015 03:27:17 +0000 (22:27 -0500)]
CRM_Core_Form::addField fixes
Yashodha Chaku [Wed, 23 Dec 2015 13:28:13 +0000 (18:58 +0530)]
Merge pull request #7490 from yashodha/CRM-17398
CRM-17398: Enotice on participant delete
CiviCRM [Wed, 23 Dec 2015 11:43:26 +0000 (03:43 -0800)]
Update version to 4.7.beta5
Yashodha Chaku [Wed, 23 Dec 2015 10:36:35 +0000 (16:06 +0530)]
Merge pull request #7493 from jitendrapurohit/upgradeerror
Avoid insertion of warnings in gencode while creating distmaker
jitendrapurohit [Wed, 23 Dec 2015 09:26:16 +0000 (14:56 +0530)]
Avoid insertion of warnings in gencode while making distmaker
yashodha [Wed, 23 Dec 2015 05:21:03 +0000 (10:51 +0530)]
fix trailing comma
Coleman Watts [Wed, 23 Dec 2015 02:26:57 +0000 (21:26 -0500)]
Icon fix
Coleman Watts [Tue, 22 Dec 2015 21:10:56 +0000 (16:10 -0500)]
Update icons
Coleman Watts [Tue, 22 Dec 2015 20:57:11 +0000 (15:57 -0500)]
CRM-16019 - crmDatepicker improvements
Coleman Watts [Tue, 22 Dec 2015 03:16:52 +0000 (22:16 -0500)]
CRM_Core_Form - remove unused functions
Eileen McNaughton [Wed, 23 Dec 2015 04:28:43 +0000 (17:28 +1300)]
Merge pull request #7467 from eileenmcnaughton/tests
Enhance membership form test
yashodha [Wed, 23 Dec 2015 04:24:17 +0000 (09:54 +0530)]
format fixes
yashodha [Wed, 23 Dec 2015 03:54:13 +0000 (09:24 +0530)]
CRM-17398: Enotice on participant delete
----------------------------------------
* CRM-17398: Enotice on participant delete
https://issues.civicrm.org/jira/browse/CRM-17398
Dave Greenberg [Tue, 22 Dec 2015 18:16:36 +0000 (10:16 -0800)]
Merge pull request #7473 from JMAConsulting/CRM-16259-2
--CRM-16259, added function to record partial payment
yashodha [Tue, 22 Dec 2015 07:14:16 +0000 (12:44 +0530)]
CRM-17398: Enotice on participant delete
----------------------------------------
* CRM-17398: Enotice on participant delete
https://issues.civicrm.org/jira/browse/CRM-17398
Coleman Watts [Mon, 21 Dec 2015 14:26:17 +0000 (09:26 -0500)]
Add support for number fields to CRM_Core_Form
Coleman Watts [Mon, 21 Dec 2015 12:10:54 +0000 (07:10 -0500)]
CRM-16019 - Fix crmDatepicker format handling
Coleman Watts [Mon, 21 Dec 2015 02:35:46 +0000 (21:35 -0500)]
CRM-16019 - Switch custom fields to use crmDatepicker
Tim Otten [Tue, 22 Dec 2015 02:43:39 +0000 (18:43 -0800)]
Merge pull request #7383 from thehereward/tidy-up-remove-unnecessary-imports
TidyUp: Remove unnecessary imports.
Dave Greenberg [Tue, 22 Dec 2015 01:48:33 +0000 (17:48 -0800)]
Merge pull request #7427 from eileenmcnaughton/CRM-17275-import
CRM-17275 fix import class to do a fallback external identifier check
Tim Otten [Tue, 22 Dec 2015 01:21:14 +0000 (17:21 -0800)]
Merge pull request #7489 from totten/master-cxn-check
CRM-16173 - Display alert for local/private sites.
Tim Otten [Tue, 22 Dec 2015 01:20:22 +0000 (17:20 -0800)]
Merge pull request #7488 from totten/master-upgrade-misc
Upgrades/Settings - Fix problems upgrading from older releases
CiviCRM [Mon, 21 Dec 2015 03:05:27 +0000 (19:05 -0800)]
CRM-16173 - Display alert for local/private sites.
CiviCRM [Mon, 21 Dec 2015 23:25:44 +0000 (15:25 -0800)]
SettingsBag - Fix bug upgrading `4.1.0-setupsh.sql.bz2` to 4.7.beta.
CiviCRM [Mon, 21 Dec 2015 23:10:16 +0000 (15:10 -0800)]
CRM_Core_Config::customCSSURL - Don't tample empty values
Ex: The 4.4 upgrader checks `customCSSURL` and sets `disable_core_css`
depending on whether the value is empty. Since the addTrailingSlash was
converting empty to '/', this caused bad upgrades.
Tim Otten [Mon, 21 Dec 2015 23:27:06 +0000 (15:27 -0800)]
Merge pull request #7471 from jitendrapurohit/CRM-17714
CRM-17714 - DB Error after upgradation to 4.7 beta3
Dave Greenberg [Mon, 21 Dec 2015 22:56:56 +0000 (14:56 -0800)]
Merge pull request #7465 from eileenmcnaughton/CRM-17228-payment-processor-form
CRM-17728 enotices on payment processor form
Coleman Watts [Sun, 20 Dec 2015 22:53:15 +0000 (17:53 -0500)]
CRM-16019 - Add crmDatepicker binding to CRM_Core_Form
Coleman Watts [Thu, 17 Dec 2015 02:57:57 +0000 (21:57 -0500)]
CRM-17646 - Fix display of array values
Coleman Watts [Wed, 16 Dec 2015 20:25:08 +0000 (15:25 -0500)]
CRM-17646 - Ensure user-facing case type options go through hook_fieldOptions
Coleman Watts [Wed, 16 Dec 2015 19:31:34 +0000 (14:31 -0500)]
CRM-17646 - Fix array merge
Coleman Watts [Wed, 16 Dec 2015 03:41:51 +0000 (22:41 -0500)]
Code format cleanup
Coleman Watts [Wed, 16 Dec 2015 03:07:20 +0000 (22:07 -0500)]
CRM-17646 - Add unit tests
Coleman Watts [Wed, 16 Dec 2015 01:55:19 +0000 (20:55 -0500)]
CRM-17646 - Consolodate all custom field option lookups
Coleman Watts [Tue, 15 Dec 2015 21:51:40 +0000 (16:51 -0500)]
CRM-17646 - Refactor out CRM_Report_Form::formatCustomValues
Coleman Watts [Tue, 15 Dec 2015 21:29:20 +0000 (16:29 -0500)]
CRM-17646 - Refactor out CRM_Core_BAO_CustomOption::valuesByID
Coleman Watts [Tue, 15 Dec 2015 21:24:15 +0000 (16:24 -0500)]
CRM-17646 - Refactor out CRM_Core_BAO_CustomOption::getOptionLabel
Coleman Watts [Tue, 15 Dec 2015 21:06:23 +0000 (16:06 -0500)]
CRM-17646 - Refactor out CRM_Core_BAO_CustomGroup::formatCustomValues
Coleman Watts [Tue, 15 Dec 2015 19:42:28 +0000 (14:42 -0500)]
CRM-17646 - Refactor out CRM_Core_BAO_CustomField::getDisplayValue
Coleman Watts [Tue, 15 Dec 2015 02:21:01 +0000 (21:21 -0500)]
CRM-17646 - CustomField displayValue refactoring
Coleman Watts [Tue, 15 Dec 2015 02:19:56 +0000 (21:19 -0500)]
CRM-17646 - CustomGroup formatter cleanup
Coleman Watts [Mon, 14 Dec 2015 20:05:49 +0000 (15:05 -0500)]
Test cleanup
Coleman Watts [Mon, 14 Dec 2015 19:56:55 +0000 (14:56 -0500)]
CRM-17646 - Refactor CRM_Report_Form to use standard custom field option retrieval
Coleman Watts [Mon, 14 Dec 2015 19:56:05 +0000 (14:56 -0500)]
CRM-17646 - Add getOptions method to custom field objects
Coleman Watts [Sun, 13 Dec 2015 00:05:43 +0000 (19:05 -0500)]
CRM-17646 -Toward refactoring out hook_customFieldOptions
Coleman Watts [Wed, 2 Dec 2015 02:54:20 +0000 (21:54 -0500)]
CRM-17646 - Add hook_civicrm_fieldOptions + tests
jitendrapurohit [Mon, 21 Dec 2015 05:55:22 +0000 (11:25 +0530)]
additional fixes
Dave Greenberg [Mon, 21 Dec 2015 03:33:42 +0000 (19:33 -0800)]
Merge pull request #7452 from seamuslee001/sl_export_tidy
Some extra tidy up ExportComponents function.
Dave Greenberg [Mon, 21 Dec 2015 03:20:59 +0000 (19:20 -0800)]
Merge pull request #7475 from JMAConsulting/CRM-16259-1
Crm 16259 1
Eileen McNaughton [Mon, 21 Dec 2015 02:45:17 +0000 (15:45 +1300)]
Merge pull request #7396 from eileenmcnaughton/CRM-17627
CRM-17627 minor code simplifications …
Dave Greenberg [Mon, 21 Dec 2015 02:39:46 +0000 (18:39 -0800)]
Merge pull request #7485 from davecivicrm/CRM-15967
CRM-15967 - Fix profile state/province sort.
Dave Greenberg [Mon, 21 Dec 2015 02:36:34 +0000 (18:36 -0800)]
CRM-15967 - Fix profile state/province sort.
----------------------------------------
* CRM-15967: profile: cannot sort state/province
https://issues.civicrm.org/jira/browse/CRM-15967
Tim Otten [Sun, 20 Dec 2015 21:56:49 +0000 (13:56 -0800)]
Merge pull request #7478 from xurizaemon/master
CRM-17733. Update to DOMPDF 0.6.2
Tim Otten [Sun, 20 Dec 2015 21:44:28 +0000 (13:44 -0800)]
Merge pull request #7482 from totten/master-pumpernickle
CRM-16173 - crmCxn - When reconnecting, display the *new* details/permissions.
Tim Otten [Sun, 20 Dec 2015 21:42:09 +0000 (13:42 -0800)]
Merge pull request #7418 from totten/master-nav-dupes
FourSeven Upgrade - Protect against duplicate "navigation" settings
CiviCRM [Sat, 19 Dec 2015 04:08:46 +0000 (20:08 -0800)]
CRM-16173 - crmCxn - When reconnecting, display the *new* details/permissions.
Dave Greenberg [Sat, 19 Dec 2015 01:18:12 +0000 (17:18 -0800)]
Merge pull request #7469 from lcdservices/CRM-17427
CRM-17427 condition receipt sent status msg properly
Dave Greenberg [Sat, 19 Dec 2015 01:04:45 +0000 (17:04 -0800)]
Merge pull request #7480 from davecivicrm/CRM-17716
CRM-17716 - new copy of generated (sample) data.
Dave Greenberg [Sat, 19 Dec 2015 01:03:27 +0000 (17:03 -0800)]
CRM-17716 - new copy of generated (sample) data.
----------------------------------------
* CRM-17716: civicrm_financial_trxn table missing some entries for sample data
https://issues.civicrm.org/jira/browse/CRM-17716
Dave Greenberg [Sat, 19 Dec 2015 01:02:40 +0000 (17:02 -0800)]
Merge pull request #7461 from pradpnayak/CRM-17716
--CRM-17716, fixed code to add missing accounting entries for Members…
Dave Greenberg [Sat, 19 Dec 2015 00:44:20 +0000 (16:44 -0800)]
Merge pull request #7463 from Kajakaran/twitter_link
CRM-17725 - Fix for Twitter link broken contributio email receipt
Seamus Lee [Thu, 17 Dec 2015 19:51:35 +0000 (19:51 +0000)]
Jenkins fix
Seamus Lee [Wed, 16 Dec 2015 07:26:19 +0000 (07:26 +0000)]
Fix issues found by Dave in testing
Seamus Lee [Tue, 15 Dec 2015 20:49:31 +0000 (20:49 +0000)]
Minor fixes
projects / civicrm-core.git / log