civicrm-core.git
8 years agoMerge pull request #7532 from eileenmcnaughton/lybunt
Yashodha Chaku [Tue, 5 Jan 2016 06:57:32 +0000 (12:27 +0530)]
Merge pull request #7532 from eileenmcnaughton/lybunt

CRM-17680 remove custom fields from Lybunt for now since they turn ou…

8 years agoMerge pull request #7529 from rohankatkar/Webtests_Fix_master
Monish Deb [Tue, 5 Jan 2016 05:43:39 +0000 (11:13 +0530)]
Merge pull request #7529 from rohankatkar/Webtests_Fix_master

Webtests Fixes

8 years agoMerge pull request #7533 from eileenmcnaughton/index
Eileen McNaughton [Mon, 4 Jan 2016 22:24:20 +0000 (11:24 +1300)]
Merge pull request #7533 from eileenmcnaughton/index

CRM-17752 add index to civicrm_financial_trxn.trxn_id

8 years agoCRM-17752 add index to civicrm_financial_trxn.trxn_id
eileen [Mon, 4 Jan 2016 21:40:11 +0000 (10:40 +1300)]
CRM-17752 add index to civicrm_financial_trxn.trxn_id

https://issues.civicrm.org/jira/browse/CRM-17752

8 years agoMerge pull request #7522 from colemanw/case_api
colemanw [Mon, 4 Jan 2016 21:09:34 +0000 (16:09 -0500)]
Merge pull request #7522 from colemanw/case_api

CRM-17645 - More consistent return property handling for case api

8 years agoMerge pull request #7531 from JKingsnorth/CRM-17261
colemanw [Mon, 4 Jan 2016 20:55:35 +0000 (15:55 -0500)]
Merge pull request #7531 from JKingsnorth/CRM-17261

CRM-17261: Remove broken IDs from non-location elements on merge screen

8 years agoCRM-17680 remove custom fields from Lybunt for now since they turn out not to work
eileen [Mon, 7 Dec 2015 09:42:56 +0000 (22:42 +1300)]
CRM-17680 remove custom fields from Lybunt for now since they turn out not to work

8 years agoMerge pull request #7530 from JKingsnorth/CRM-17745
colemanw [Mon, 4 Jan 2016 20:27:06 +0000 (15:27 -0500)]
Merge pull request #7530 from JKingsnorth/CRM-17745

CRM-17745: Make maximum additional participants configurable

8 years agoMerge pull request #7470 from eileenmcnaughton/minor-tidy
Eileen McNaughton [Mon, 4 Jan 2016 20:23:23 +0000 (09:23 +1300)]
Merge pull request #7470 from eileenmcnaughton/minor-tidy

Minor tidy up - pass through 'cancel' rather than leave as unintuitiv…

8 years agoMerge pull request #7501 from eileenmcnaughton/CRM-17751
Eileen McNaughton [Mon, 4 Jan 2016 20:17:19 +0000 (09:17 +1300)]
Merge pull request #7501 from eileenmcnaughton/CRM-17751

CRM-17751 add api and form support for setting the trxn_id for a refund payment

8 years agoMerge pull request #7519 from eileenmcnaughton/CRM-17762
Eileen McNaughton [Mon, 4 Jan 2016 20:16:08 +0000 (09:16 +1300)]
Merge pull request #7519 from eileenmcnaughton/CRM-17762

CRM-17762 fix pledge edit for to not needlessly delete schedule data

8 years agoMerge pull request #7523 from lcdservices/CRM-17763
Tim Otten [Mon, 4 Jan 2016 19:46:47 +0000 (11:46 -0800)]
Merge pull request #7523 from lcdservices/CRM-17763

Crm 17763

8 years agoCRM-17261: Remove broken IDs from non-location elements
JKingsnorth [Mon, 4 Jan 2016 15:06:36 +0000 (15:06 +0000)]
CRM-17261: Remove broken IDs from non-location elements

8 years agoFix version number
JKingsnorth [Mon, 4 Jan 2016 14:56:22 +0000 (14:56 +0000)]
Fix version number

8 years agoStyle fixes
JKingsnorth [Mon, 4 Jan 2016 13:43:22 +0000 (13:43 +0000)]
Style fixes

8 years agoCRM-17745 Add SQL updates to 4.7b6
JKingsnorth [Mon, 4 Jan 2016 13:39:00 +0000 (13:39 +0000)]
CRM-17745 Add SQL updates to 4.7b6

8 years agoMerge branch 'master' of https://github.com/civicrm/civicrm-core into CRM-17745
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

8 years agoRemove 4.8 SQL updates
JKingsnorth [Mon, 4 Jan 2016 13:30:28 +0000 (13:30 +0000)]
Remove 4.8 SQL updates

8 years agoWebtests Fixes
Web Access [Mon, 4 Jan 2016 13:21:30 +0000 (18:51 +0530)]
Webtests Fixes

8 years agoCRM-17763 postMailing hook -- use mailing ID as only param
Brian Shaughnessy [Mon, 4 Jan 2016 11:27:52 +0000 (06:27 -0500)]
CRM-17763 postMailing hook -- use mailing ID as only param

8 years agoAdd webtest for maximum participants configurable per event
JKingsnorth [Mon, 4 Jan 2016 10:59:24 +0000 (10:59 +0000)]
Add webtest for maximum participants configurable per event

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

8 years agoMerge pull request #7526 from totten/master-system-get
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

8 years agoSystem.get API - Return whitelisted settings
CiviCRM [Mon, 4 Jan 2016 01:42:45 +0000 (17:42 -0800)]
System.get API - Return whitelisted settings

8 years agoSystem.get API - Report on OS, httpd, multilanguage, multidomain, sapi
CiviCRM [Sun, 3 Jan 2016 23:46:13 +0000 (15:46 -0800)]
System.get API - Report on OS, httpd, multilanguage, multidomain, sapi

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

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

8 years agoFree dao memory during api basic get
Coleman Watts [Sat, 2 Jan 2016 02:32:36 +0000 (21:32 -0500)]
Free dao memory during api basic get

8 years agoCase api test fixes
Coleman Watts [Fri, 1 Jan 2016 23:02:36 +0000 (18:02 -0500)]
Case api test fixes

8 years agoInclude test (failing) to ensure api filters by status id.
Saurabh Batra [Wed, 2 Dec 2015 09:59:33 +0000 (15:29 +0530)]
Include test (failing) to ensure api filters by status id.

Conflicts:
api/v3/Case.php

8 years agoCRM-17645 - More consistent return property handling for case api
Coleman Watts [Fri, 1 Jan 2016 03:52:07 +0000 (22:52 -0500)]
CRM-17645 - More consistent return property handling for case api

8 years agoMerge pull request #7524 from totten/master-datetest-jan
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

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 agocrmMailingRadioDateSpec.js - Fix handling of January dates
CiviCRM [Fri, 1 Jan 2016 22:25:52 +0000 (14:25 -0800)]
crmMailingRadioDateSpec.js - Fix handling of January dates

8 years agoCRM-17763 restore postEmailSend hook and create new postMailing hook
Brian Shaughnessy [Fri, 1 Jan 2016 16:29:15 +0000 (11:29 -0500)]
CRM-17763 restore postEmailSend hook and create new postMailing hook

8 years agoNo, this is not a "simple function"
Coleman Watts [Fri, 1 Jan 2016 03:51:03 +0000 (22:51 -0500)]
No, this is not a "simple function"

8 years agoFix api basic get return properties
Coleman Watts [Fri, 1 Jan 2016 03:45:47 +0000 (22:45 -0500)]
Fix api basic get return properties

Api basic get was crashing when a non-existant field was in the return properties.
But there are legitimate reasons for this e.g. apis with the ability to return extra info when requested via magic return params.

Also fixes handling of field aliases in the return properties.

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 agoCRM-17763 trigger postEmailSend hook in civimail
Brian Shaughnessy [Thu, 31 Dec 2015 19:33:42 +0000 (14:33 -0500)]
CRM-17763 trigger postEmailSend hook in civimail

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

8 years agofurther fixes for webtest
jitendrapurohit [Thu, 31 Dec 2015 10:44:49 +0000 (16:14 +0530)]
further fixes for webtest

8 years agoCRM-17762 fix pledge edit for to not needlessly delete schedule data
eileenmcnaugton [Thu, 31 Dec 2015 08:56:29 +0000 (21:56 +1300)]
CRM-17762 fix pledge edit for to not needlessly delete schedule data

This prevents edited schedule data being deleted when unrelated data is edited (e.g campaign, email receipt)

8 years agoadded doc
jitendrapurohit [Thu, 31 Dec 2015 08:37:02 +0000 (14:07 +0530)]
added doc

8 years agoCRM-17723 -- Inherited Membership not created from Online Contribution Page
jitendrapurohit [Thu, 31 Dec 2015 07:29:43 +0000 (12:59 +0530)]
CRM-17723 -- Inherited Membership not created from Online Contribution Page

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 agoCRM-17751 add refund trxn to forms
eileen [Sun, 27 Dec 2015 09:18:37 +0000 (22:18 +1300)]
CRM-17751 add refund trxn to forms

Change-Id: I8f4ad17cb2d7f9e33d853bbfc13d36fe5bacd572

Enotice fix

Change-Id: Ibea8a93291ad1963f108f5b80d7d55902ab61f66

8 years agoCRM-17751 add api support for setting the trxn_id for a refund
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

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 #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