JKingsnorth [Mon, 4 Jan 2016 13:43:22 +0000 (13:43 +0000)]
Style fixes
JKingsnorth [Mon, 4 Jan 2016 13:39:00 +0000 (13:39 +0000)]
CRM-17745 Add SQL updates to 4.7b6
JKingsnorth [Mon, 4 Jan 2016 13:34:59 +0000 (13:34 +0000)]
Merge branch 'master' of https://github.com/civicrm/civicrm-core into CRM-17745
JKingsnorth [Mon, 4 Jan 2016 13:30:28 +0000 (13:30 +0000)]
Remove 4.8 SQL updates
JKingsnorth [Mon, 4 Jan 2016 10:59:24 +0000 (10:59 +0000)]
Add webtest for maximum participants configurable per event
Monish Deb [Mon, 4 Jan 2016 06:34:22 +0000 (12:04 +0530)]
Merge pull request #7518 from jitendrapurohit/CRM-17723
CRM-17723 -- Inherited Membership not created from Online Contribution Page
Tim Otten [Mon, 4 Jan 2016 02:37:56 +0000 (18:37 -0800)]
Merge pull request #7526 from totten/master-system-get
System.get API - Report on OS, httpd, multilanguage, multidomain, sapi
CiviCRM [Mon, 4 Jan 2016 01:42:45 +0000 (17:42 -0800)]
System.get API - Return whitelisted settings
CiviCRM [Sun, 3 Jan 2016 23:46:13 +0000 (15:46 -0800)]
System.get API - Report on OS, httpd, multilanguage, multidomain, sapi
colemanw [Sat, 2 Jan 2016 15:27:01 +0000 (10:27 -0500)]
Merge pull request #7525 from eileenmcnaughton/CRM-17764
CRM-17764 add pledge block region to main contribution page
eileenmcnaugton [Sat, 2 Jan 2016 07:03:54 +0000 (20:03 +1300)]
CRM-17764 add pledge block region to main contribution page
Tim Otten [Fri, 1 Jan 2016 22:58:25 +0000 (14:58 -0800)]
Merge pull request #7524 from totten/master-datetest-jan
crmMailingRadioDateSpec.js - Fix handling of January dates
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
CiviCRM [Fri, 1 Jan 2016 22:25:52 +0000 (14:25 -0800)]
crmMailingRadioDateSpec.js - Fix handling of January dates
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
David Reedy Jr [Thu, 31 Dec 2015 23:27:15 +0000 (17:27 -0600)]
CRM-17686 move from beta5 to beta6
David Reedy Jr [Thu, 31 Dec 2015 15:50:30 +0000 (09:50 -0600)]
CRM-17686 fix next_shceduled_run xml
David Reedy Jr [Tue, 29 Dec 2015 23:44:53 +0000 (17:44 -0600)]
CRM-17686 extension disable fix, tpl improvement
David Reedy Jr [Tue, 29 Dec 2015 22:42:07 +0000 (16:42 -0600)]
CRM-17686 switch to datepicker
David Reedy Jr [Tue, 29 Dec 2015 14:03:43 +0000 (08:03 -0600)]
CRM-17686 fix disabling of extension on upgrade
David Reedy Jr [Mon, 28 Dec 2015 23:50:39 +0000 (17:50 -0600)]
CRM-17686 disable flexible jobs extension...
...when upgrading.
David Reedy Jr [Mon, 28 Dec 2015 23:49:10 +0000 (17:49 -0600)]
CRM-17686 change database column name
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.
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
Kurund Jalmi [Thu, 31 Dec 2015 20:50:33 +0000 (02:20 +0530)]
Merge pull request #7520 from rohankatkar/Tests4.7fixes
Webtets Fixes
Web Access [Thu, 31 Dec 2015 13:13:18 +0000 (18:43 +0530)]
Webtets Fixes
jitendrapurohit [Thu, 31 Dec 2015 10:44:49 +0000 (16:14 +0530)]
further fixes for webtest
jitendrapurohit [Thu, 31 Dec 2015 08:37:02 +0000 (14:07 +0530)]
added doc
jitendrapurohit [Thu, 31 Dec 2015 07:29:43 +0000 (12:59 +0530)]
CRM-17723 -- Inherited Membership not created from Online Contribution Page
Coleman Watts [Thu, 31 Dec 2015 04:40:11 +0000 (23:40 -0500)]
CRM-17645 - Standardize all case api select operations
Coleman Watts [Wed, 30 Dec 2015 22:03:19 +0000 (17:03 -0500)]
API Explorer fix
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
Coleman Watts [Wed, 30 Dec 2015 18:54:58 +0000 (13:54 -0500)]
Better errors for core form actions
Kurund Jalmi [Wed, 30 Dec 2015 14:50:33 +0000 (20:20 +0530)]
Merge pull request #7515 from rohankatkar/TestFixes
Tests Fixes
Web Access [Wed, 30 Dec 2015 13:02:13 +0000 (18:32 +0530)]
Tests Fixes
CiviCRM [Wed, 30 Dec 2015 10:32:43 +0000 (02:32 -0800)]
Update version to 4.7.beta6
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
Coleman Watts [Wed, 30 Dec 2015 03:27:16 +0000 (22:27 -0500)]
Improve open case form
Coleman Watts [Wed, 30 Dec 2015 03:27:00 +0000 (22:27 -0500)]
More accurate message for addField error
Coleman Watts [Wed, 30 Dec 2015 03:26:26 +0000 (22:26 -0500)]
CRM-17758 - Fix fatal error when rendering case tab
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
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
Coleman Watts [Tue, 29 Dec 2015 23:09:24 +0000 (18:09 -0500)]
CRM-17757 - Fix metadata for CRM_Core_Form::addField
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 [Tue, 29 Dec 2015 04:59:38 +0000 (17:59 +1300)]
Add cleanup for option groups to quick cleanup
Change-Id: Iaa10e26dbbe54f7af228a022d74b48f9107528e8
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
JKingsnorth [Wed, 23 Dec 2015 13:51:13 +0000 (13:51 +0000)]
CRM-17745 Make maximum additional participants configurable
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.