civicrm-core.git
8 years agoMerge pull request #7505 from konadave/flexiblejobs
colemanw [Fri, 1 Jan 2016 22:29:28 +0000 (17:29 -0500)]
Merge pull request #7505 from konadave/flexiblejobs

CRM-17669 and CRM-17686, flexible scheduled jobs

8 years agoMerge pull request #7517 from colemanw/caseApi
colemanw [Fri, 1 Jan 2016 00:46:15 +0000 (19:46 -0500)]
Merge pull request #7517 from colemanw/caseApi

CRM-17645 - Standardize all case api select operations

8 years agoCRM-17686 move from beta5 to beta6
David Reedy Jr [Thu, 31 Dec 2015 23:27:15 +0000 (17:27 -0600)]
CRM-17686 move from beta5 to beta6

8 years agoCRM-17686 fix next_shceduled_run xml
David Reedy Jr [Thu, 31 Dec 2015 15:50:30 +0000 (09:50 -0600)]
CRM-17686 fix next_shceduled_run xml

8 years agoCRM-17686 extension disable fix, tpl improvement
David Reedy Jr [Tue, 29 Dec 2015 23:44:53 +0000 (17:44 -0600)]
CRM-17686 extension disable fix, tpl improvement

8 years agoCRM-17686 switch to datepicker
David Reedy Jr [Tue, 29 Dec 2015 22:42:07 +0000 (16:42 -0600)]
CRM-17686 switch to datepicker

8 years agoCRM-17686 fix disabling of extension on upgrade
David Reedy Jr [Tue, 29 Dec 2015 14:03:43 +0000 (08:03 -0600)]
CRM-17686 fix disabling of extension on upgrade

8 years agoCRM-17686 disable flexible jobs extension...
David Reedy Jr [Mon, 28 Dec 2015 23:50:39 +0000 (17:50 -0600)]
CRM-17686 disable flexible jobs extension...

...when upgrading.

8 years agoCRM-17686 change database column name
David Reedy Jr [Mon, 28 Dec 2015 23:49:10 +0000 (17:49 -0600)]
CRM-17686 change database column name

8 years agoCRM-17669 Add new run frequencies to scheduled...
David Reedy Jr [Mon, 28 Dec 2015 18:22:20 +0000 (12:22 -0600)]
CRM-17669 Add new run frequencies to scheduled...

jobs. Also removes run frequencies added in CRM-16500 as they are no longer needed.

8 years agoCRM-17686 Add field to scheduled job form...
David Reedy Jr [Mon, 28 Dec 2015 18:20:09 +0000 (12:20 -0600)]
CRM-17686 Add field to scheduled job form...

...to specify first/next run

8 years agoMerge pull request #7520 from rohankatkar/Tests4.7fixes
Kurund Jalmi [Thu, 31 Dec 2015 20:50:33 +0000 (02:20 +0530)]
Merge pull request #7520 from rohankatkar/Tests4.7fixes

Webtets Fixes

8 years agoWebtets Fixes
Web Access [Thu, 31 Dec 2015 13:13:18 +0000 (18:43 +0530)]
Webtets Fixes

8 years agoCRM-17645 - Standardize all case api select operations
Coleman Watts [Thu, 31 Dec 2015 04:40:11 +0000 (23:40 -0500)]
CRM-17645 - Standardize all case api select operations

8 years agoAPI Explorer fix
Coleman Watts [Wed, 30 Dec 2015 22:03:19 +0000 (17:03 -0500)]
API Explorer fix

8 years agoMerge pull request #7516 from colemanw/Better
colemanw [Wed, 30 Dec 2015 20:34:40 +0000 (15:34 -0500)]
Merge pull request #7516 from colemanw/Better

Better errors for core form actions

8 years agoBetter errors for core form actions
Coleman Watts [Wed, 30 Dec 2015 18:54:58 +0000 (13:54 -0500)]
Better errors for core form actions

8 years agoMerge pull request #7515 from rohankatkar/TestFixes
Kurund Jalmi [Wed, 30 Dec 2015 14:50:33 +0000 (20:20 +0530)]
Merge pull request #7515 from rohankatkar/TestFixes

Tests Fixes

8 years agoTests Fixes
Web Access [Wed, 30 Dec 2015 13:02:13 +0000 (18:32 +0530)]
Tests Fixes

8 years agoUpdate version to 4.7.beta6
CiviCRM [Wed, 30 Dec 2015 10:32:43 +0000 (02:32 -0800)]
Update version to 4.7.beta6

8 years agoMerge pull request #7514 from colemanw/CRM-17758
Yashodha Chaku [Wed, 30 Dec 2015 05:04:16 +0000 (10:34 +0530)]
Merge pull request #7514 from colemanw/CRM-17758

CRM-17758 - Fix fatal error when rendering case tab

8 years agoImprove open case form
Coleman Watts [Wed, 30 Dec 2015 03:27:16 +0000 (22:27 -0500)]
Improve open case form

8 years agoMore accurate message for addField error
Coleman Watts [Wed, 30 Dec 2015 03:27:00 +0000 (22:27 -0500)]
More accurate message for addField error

8 years agoCRM-17758 - Fix fatal error when rendering case tab
Coleman Watts [Wed, 30 Dec 2015 03:26:26 +0000 (22:26 -0500)]
CRM-17758 - Fix fatal error when rendering case tab

8 years agoMerge pull request #7513 from colemanw/CRM-17757
colemanw [Wed, 30 Dec 2015 02:36:40 +0000 (21:36 -0500)]
Merge pull request #7513 from colemanw/CRM-17757

CRM-17757 - Fix metadata for CRM_Core_Form::addField

8 years agoMerge pull request #7511 from eileenmcnaughton/tests
Eileen McNaughton [Tue, 29 Dec 2015 23:48:07 +0000 (12:48 +1300)]
Merge pull request #7511 from eileenmcnaughton/tests

Add cleanup for option groups to quick cleanup

8 years agoCRM-17757 - Fix metadata for CRM_Core_Form::addField
Coleman Watts [Tue, 29 Dec 2015 23:09:24 +0000 (18:09 -0500)]
CRM-17757 - Fix metadata for CRM_Core_Form::addField

8 years agoMerge pull request #7512 from colemanw/ext
colemanw [Tue, 29 Dec 2015 22:37:43 +0000 (17:37 -0500)]
Merge pull request #7512 from colemanw/ext

Extension api cleanup

8 years agoExtension api cleanup
Coleman Watts [Tue, 29 Dec 2015 22:01:04 +0000 (17:01 -0500)]
Extension api cleanup

8 years agoAdd cleanup for option groups to quick cleanup
eileen [Tue, 29 Dec 2015 04:59:38 +0000 (17:59 +1300)]
Add cleanup for option groups to quick cleanup

Change-Id: Iaa10e26dbbe54f7af228a022d74b48f9107528e8

8 years agoMerge pull request #7510 from colemanw/ext
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

8 years agoMerge pull request #7507 from jitendrapurohit/CRM-17668
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

8 years agoAdd getfield specs to extension api
Coleman Watts [Tue, 29 Dec 2015 15:09:30 +0000 (10:09 -0500)]
Add getfield specs to extension api

8 years agoMerge pull request #7509 from monishdeb/unitTestFixes
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

8 years agounit test fixes 4.7beta4
monishdeb [Tue, 29 Dec 2015 14:18:39 +0000 (19:48 +0530)]
unit test fixes 4.7beta4

8 years agoCRM-17668 - logging revert: boolean breaks if reverting to null
jitendrapurohit [Tue, 29 Dec 2015 11:32:07 +0000 (17:02 +0530)]
CRM-17668 - logging revert: boolean breaks if reverting to null

8 years agoMerge pull request #7503 from jitendrapurohit/CRM-17577
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

8 years agoMerge pull request #7504 from colemanw/fixes
colemanw [Mon, 28 Dec 2015 19:15:21 +0000 (14:15 -0500)]
Merge pull request #7504 from colemanw/fixes

Custom field fixes

8 years agoAvoid calling displayValue for no reason
Coleman Watts [Mon, 28 Dec 2015 19:14:36 +0000 (14:14 -0500)]
Avoid calling displayValue for no reason

8 years agoCleanup getOptionListSelector
Coleman Watts [Mon, 28 Dec 2015 17:43:30 +0000 (12:43 -0500)]
Cleanup getOptionListSelector

8 years agoCleanup redundant caching of custom fields
Coleman Watts [Mon, 28 Dec 2015 17:43:02 +0000 (12:43 -0500)]
Cleanup redundant caching of custom fields

8 years agoMerge pull request #7502 from yashodha/CRM-17755
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

8 years agoCRM-17577 -- Membership Batch Data Entry: Renewal ignores some fields
jitendrapurohit [Mon, 28 Dec 2015 13:13:09 +0000 (18:43 +0530)]
CRM-17577 -- Membership Batch Data Entry: Renewal ignores some fields

8 years agoCRM-17755: Nesting of operators for event search form
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

8 years agoFix javascript error (cannot join null)
Coleman Watts [Sun, 27 Dec 2015 01:18:22 +0000 (20:18 -0500)]
Fix javascript error (cannot join null)

8 years agoMerge pull request #7500 from totten/master-altermail
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

8 years agoCRM_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.

8 years agoMerge pull request #7453 from colemanw/CRM-17646
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

8 years agoCRM-17646 - Mark older hooks deprecated
Coleman Watts [Sat, 26 Dec 2015 03:01:28 +0000 (22:01 -0500)]
CRM-17646 - Mark older hooks deprecated

8 years agoFix participant field labels
Coleman Watts [Sat, 26 Dec 2015 02:39:03 +0000 (21:39 -0500)]
Fix participant field labels

8 years agoImprove CRM_Core_Form::addField for ChainSelect types
Coleman Watts [Sat, 26 Dec 2015 02:36:21 +0000 (21:36 -0500)]
Improve CRM_Core_Form::addField for ChainSelect types

8 years agoUse addField for basic search form
Coleman Watts [Thu, 24 Dec 2015 02:34:41 +0000 (21:34 -0500)]
Use addField for basic search form

8 years agoImprove handling of select fields
Coleman Watts [Thu, 24 Dec 2015 02:34:03 +0000 (21:34 -0500)]
Improve handling of select fields

8 years agoCRM_Core_BAO_CustomField - Remove unused param
Coleman Watts [Thu, 24 Dec 2015 01:10:40 +0000 (20:10 -0500)]
CRM_Core_BAO_CustomField - Remove unused param

8 years agoCRM_Core_Form - Support html5 field types
Coleman Watts [Wed, 23 Dec 2015 04:50:17 +0000 (23:50 -0500)]
CRM_Core_Form - Support html5 field types

8 years agoFix hover button padding
Coleman Watts [Wed, 23 Dec 2015 04:31:15 +0000 (23:31 -0500)]
Fix hover button padding

8 years agoCRM_Core_Form::addField - Handle custom fields
Coleman Watts [Wed, 23 Dec 2015 04:24:27 +0000 (23:24 -0500)]
CRM_Core_Form::addField - Handle custom fields

8 years agoMerge pull request #7497 from PalanteJon/CRM-17273
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…

8 years agoCRM-17273 - Don't show the wrench that pops up the 'Edit Location Types' screen when...
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

8 years agoMerge pull request #7496 from eileenmcnaughton/CRM-17655
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

8 years agoCRM-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

8 years agoCRM_Core_Form::addField - add wysiwyg support
Coleman Watts [Wed, 23 Dec 2015 03:44:53 +0000 (22:44 -0500)]
CRM_Core_Form::addField - add wysiwyg support

8 years agoCRM_Core_Form::addField fixes
Coleman Watts [Wed, 23 Dec 2015 03:27:17 +0000 (22:27 -0500)]
CRM_Core_Form::addField fixes

8 years agoMerge pull request #7490 from yashodha/CRM-17398
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

8 years agoUpdate version to 4.7.beta5
CiviCRM [Wed, 23 Dec 2015 11:43:26 +0000 (03:43 -0800)]
Update version to 4.7.beta5

8 years agoMerge pull request #7493 from jitendrapurohit/upgradeerror
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

8 years agoAvoid insertion of warnings in gencode while making distmaker
jitendrapurohit [Wed, 23 Dec 2015 09:26:16 +0000 (14:56 +0530)]
Avoid insertion of warnings in gencode while making distmaker

8 years agofix trailing comma
yashodha [Wed, 23 Dec 2015 05:21:03 +0000 (10:51 +0530)]
fix trailing comma

8 years agoIcon fix
Coleman Watts [Wed, 23 Dec 2015 02:26:57 +0000 (21:26 -0500)]
Icon fix

8 years agoUpdate icons
Coleman Watts [Tue, 22 Dec 2015 21:10:56 +0000 (16:10 -0500)]
Update icons

8 years agoCRM-16019 - crmDatepicker improvements
Coleman Watts [Tue, 22 Dec 2015 20:57:11 +0000 (15:57 -0500)]
CRM-16019 - crmDatepicker improvements

8 years agoCRM_Core_Form - remove unused functions
Coleman Watts [Tue, 22 Dec 2015 03:16:52 +0000 (22:16 -0500)]
CRM_Core_Form - remove unused functions

8 years agoMerge pull request #7467 from eileenmcnaughton/tests
Eileen McNaughton [Wed, 23 Dec 2015 04:28:43 +0000 (17:28 +1300)]
Merge pull request #7467 from eileenmcnaughton/tests

Enhance membership form test

8 years agoformat fixes
yashodha [Wed, 23 Dec 2015 04:24:17 +0000 (09:54 +0530)]
format fixes

8 years agoCRM-17398: Enotice on participant delete
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

8 years agoMerge pull request #7473 from JMAConsulting/CRM-16259-2
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

8 years agoCRM-17398: Enotice on participant delete
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

8 years agoAdd support for number fields to CRM_Core_Form
Coleman Watts [Mon, 21 Dec 2015 14:26:17 +0000 (09:26 -0500)]
Add support for number fields to CRM_Core_Form

8 years agoCRM-16019 - Fix crmDatepicker format handling
Coleman Watts [Mon, 21 Dec 2015 12:10:54 +0000 (07:10 -0500)]
CRM-16019 - Fix crmDatepicker format handling

8 years agoCRM-16019 - Switch custom fields to use crmDatepicker
Coleman Watts [Mon, 21 Dec 2015 02:35:46 +0000 (21:35 -0500)]
CRM-16019 - Switch custom fields to use crmDatepicker

8 years agoMerge pull request #7383 from thehereward/tidy-up-remove-unnecessary-imports
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.

8 years agoMerge pull request #7427 from eileenmcnaughton/CRM-17275-import
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

8 years agoMerge pull request #7489 from totten/master-cxn-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.

8 years agoMerge pull request #7488 from totten/master-upgrade-misc
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

8 years agoCRM-16173 - Display alert for local/private sites.
CiviCRM [Mon, 21 Dec 2015 03:05:27 +0000 (19:05 -0800)]
CRM-16173 - Display alert for local/private sites.

8 years agoSettingsBag - Fix bug upgrading `4.1.0-setupsh.sql.bz2` to 4.7.beta.
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.

8 years agoCRM_Core_Config::customCSSURL - Don't tample empty values
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.

8 years agoMerge pull request #7471 from jitendrapurohit/CRM-17714
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

8 years agoMerge pull request #7465 from eileenmcnaughton/CRM-17228-payment-processor-form
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

8 years agoCRM-16019 - Add crmDatepicker binding to CRM_Core_Form
Coleman Watts [Sun, 20 Dec 2015 22:53:15 +0000 (17:53 -0500)]
CRM-16019 - Add crmDatepicker binding to CRM_Core_Form

8 years agoCRM-17646 - Fix display of array values
Coleman Watts [Thu, 17 Dec 2015 02:57:57 +0000 (21:57 -0500)]
CRM-17646 - Fix display of array values

8 years agoCRM-17646 - Ensure user-facing case type options go through hook_fieldOptions
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

8 years agoCRM-17646 - Fix array merge
Coleman Watts [Wed, 16 Dec 2015 19:31:34 +0000 (14:31 -0500)]
CRM-17646 - Fix array merge

8 years agoCode format cleanup
Coleman Watts [Wed, 16 Dec 2015 03:41:51 +0000 (22:41 -0500)]
Code format cleanup

8 years agoCRM-17646 - Add unit tests
Coleman Watts [Wed, 16 Dec 2015 03:07:20 +0000 (22:07 -0500)]
CRM-17646 - Add unit tests

8 years agoCRM-17646 - Consolodate all custom field option lookups
Coleman Watts [Wed, 16 Dec 2015 01:55:19 +0000 (20:55 -0500)]
CRM-17646 - Consolodate all custom field option lookups

8 years agoCRM-17646 - Refactor out CRM_Report_Form::formatCustomValues
Coleman Watts [Tue, 15 Dec 2015 21:51:40 +0000 (16:51 -0500)]
CRM-17646 - Refactor out CRM_Report_Form::formatCustomValues

8 years agoCRM-17646 - Refactor out CRM_Core_BAO_CustomOption::valuesByID
Coleman Watts [Tue, 15 Dec 2015 21:29:20 +0000 (16:29 -0500)]
CRM-17646 - Refactor out CRM_Core_BAO_CustomOption::valuesByID

8 years agoCRM-17646 - Refactor out CRM_Core_BAO_CustomOption::getOptionLabel
Coleman Watts [Tue, 15 Dec 2015 21:24:15 +0000 (16:24 -0500)]
CRM-17646 - Refactor out CRM_Core_BAO_CustomOption::getOptionLabel

8 years agoCRM-17646 - Refactor out CRM_Core_BAO_CustomGroup::formatCustomValues
Coleman Watts [Tue, 15 Dec 2015 21:06:23 +0000 (16:06 -0500)]
CRM-17646 - Refactor out CRM_Core_BAO_CustomGroup::formatCustomValues