civicrm-core.git
10 years agoInitial refactor of CRM_Utils_System to use magic method.
Coleman Watts [Mon, 23 Nov 2015 15:35:00 +0000 (10:35 -0500)]
Initial refactor of CRM_Utils_System to use magic method.

Instead of creating one static function for every CMS function we can access them via magic method.

10 years agoAdd userSystem to Civi facade
Coleman Watts [Sun, 22 Nov 2015 01:58:33 +0000 (20:58 -0500)]
Add userSystem to Civi facade

10 years agosynchronizeUsers minor fixups
Coleman Watts [Sun, 22 Nov 2015 01:43:03 +0000 (20:43 -0500)]
synchronizeUsers minor fixups

10 years agoMerge pull request #7267 from colemanw/cmsUser
colemanw [Sun, 22 Nov 2015 01:25:40 +0000 (20:25 -0500)]
Merge pull request #7267 from colemanw/cmsUser

CRM-17609 - Refactor synchronize contacts function into appropriate cms classes

10 years agoCRM-17609 - Refactor synchronize contacts function into appropriate cms classes
Coleman Watts [Sun, 22 Nov 2015 00:17:01 +0000 (19:17 -0500)]
CRM-17609 - Refactor synchronize contacts function into appropriate cms classes

10 years agoRemove unused functions
Coleman Watts [Sat, 21 Nov 2015 20:38:09 +0000 (15:38 -0500)]
Remove unused functions

10 years agoCRM-17609 - Sycnronize contacts form cleanup
Coleman Watts [Sat, 21 Nov 2015 20:30:31 +0000 (15:30 -0500)]
CRM-17609 - Sycnronize contacts form cleanup

10 years agoMerge pull request #7252 from jitendrapurohit/CRM-17507
Kurund Jalmi [Sat, 21 Nov 2015 17:56:42 +0000 (23:26 +0530)]
Merge pull request #7252 from jitendrapurohit/CRM-17507

Cleanup deprecated CRM_Core_BAO_Settings calls CRM-17507

10 years agoRemove reference to old wysiwyg template
Coleman Watts [Sat, 21 Nov 2015 02:13:13 +0000 (21:13 -0500)]
Remove reference to old wysiwyg template

10 years agoMerge pull request #7265 from monishdeb/testFailures
colemanw [Fri, 20 Nov 2015 19:05:53 +0000 (14:05 -0500)]
Merge pull request #7265 from monishdeb/testFailures

CRM-17599 fix - CiviCase case details table is broken

10 years agoMerge pull request #7263 from rohankatkar/master-test
Monish Deb [Fri, 20 Nov 2015 18:20:00 +0000 (23:50 +0530)]
Merge pull request #7263 from rohankatkar/master-test

Webtests Fixes

10 years agoMerge pull request #7260 from futurefirst/master-rest-cid
colemanw [Fri, 20 Nov 2015 16:18:23 +0000 (11:18 -0500)]
Merge pull request #7260 from futurefirst/master-rest-cid

CRM-17413: Set ufID and userID in the session when bootstrapping for a REST call

10 years agoformat fix
monishdeb [Fri, 20 Nov 2015 15:10:27 +0000 (20:40 +0530)]
format fix

10 years agoCRM-17599 fix - CiviCase case details table is broken
monishdeb [Fri, 20 Nov 2015 14:51:32 +0000 (20:21 +0530)]
CRM-17599 fix - CiviCase case details table is broken

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

10 years agoWebtests Fixes
Web Access [Fri, 20 Nov 2015 12:55:45 +0000 (18:25 +0530)]
Webtests Fixes

10 years agoMerge pull request #7261 from yashodha/CRM-17469
Monish Deb [Fri, 20 Nov 2015 11:53:03 +0000 (17:23 +0530)]
Merge pull request #7261 from yashodha/CRM-17469

CRM-17469: fix pledge id for online payment

10 years agoCRM-17469: fix pledge id for online payment
yashodha [Fri, 20 Nov 2015 11:38:01 +0000 (17:08 +0530)]
CRM-17469: fix pledge id for online payment

----------------------------------------
* CRM-17469: Online pledge payment credits scheduled amount, not actual amount
  https://issues.civicrm.org/jira/browse/CRM-17469

10 years agoMerge pull request #7095 from mjwright/online-pledge-payment-fix
Yashodha Chaku [Fri, 20 Nov 2015 11:21:25 +0000 (16:51 +0530)]
Merge pull request #7095 from mjwright/online-pledge-payment-fix

CRM-17469 - Online pledge payment fix

10 years agoMerge pull request #7258 from yashodha/CRM-15306
Yashodha Chaku [Fri, 20 Nov 2015 08:52:30 +0000 (14:22 +0530)]
Merge pull request #7258 from yashodha/CRM-15306

CRM-15306: Adding hook to alter mail templates

10 years agoMerge pull request #7259 from monishdeb/testFailures
Monish Deb [Fri, 20 Nov 2015 07:20:25 +0000 (12:50 +0530)]
Merge pull request #7259 from monishdeb/testFailures

4.7beta1 Upgrade failure fix

10 years ago4.7beta1 Upgrade failure fix
monishdeb [Fri, 20 Nov 2015 06:30:21 +0000 (12:00 +0530)]
4.7beta1 Upgrade failure fix

10 years agoCRM-15306: Adding hook to alter mail templates
yashodha [Fri, 20 Nov 2015 06:02:34 +0000 (11:32 +0530)]
CRM-15306: Adding hook to alter mail templates

----------------------------------------
* CRM-15306: Adding hook to alter mail templates
  https://issues.civicrm.org/jira/browse/CRM-15306

10 years agoUpdate Main.tpl
Marty Wright [Fri, 20 Nov 2015 04:57:01 +0000 (21:57 -0700)]
Update Main.tpl

Combined CRM.$(function($) {...}) blocks.

10 years agoMerge pull request #7256 from esantanche/esantanche-patch-regex
colemanw [Fri, 20 Nov 2015 00:55:44 +0000 (19:55 -0500)]
Merge pull request #7256 from esantanche/esantanche-patch-regex

Improve EmailProcessor bounce catching

10 years agoMerge pull request #7090 from mollux/CRM-17476
colemanw [Fri, 20 Nov 2015 00:50:44 +0000 (19:50 -0500)]
Merge pull request #7090 from mollux/CRM-17476

CRM-17476 - Fixes result structure of api.customvalue.get

10 years agoMerge pull request #7121 from mollux/CRM-17494
colemanw [Fri, 20 Nov 2015 00:45:53 +0000 (19:45 -0500)]
Merge pull request #7121 from mollux/CRM-17494

CRM-17494 - Fixed participant role filtering for non numeric participant role values

10 years agoMerge pull request #6987 from xurizaemon/CRM-17212
colemanw [Fri, 20 Nov 2015 00:21:41 +0000 (19:21 -0500)]
Merge pull request #6987 from xurizaemon/CRM-17212

CRM-17212: Set session handler to "files" in extern/*php

10 years agoMerge pull request #7032 from mlutfy/4.7-crm17432
colemanw [Fri, 20 Nov 2015 00:18:36 +0000 (19:18 -0500)]
Merge pull request #7032 from mlutfy/4.7-crm17432

CRM-17432 Attachment API create: use copy/unlink instead of rename(),…

10 years agoMerge pull request #7253 from jitendrapurohit/CRM-17520
Dave Greenberg [Thu, 19 Nov 2015 23:31:23 +0000 (15:31 -0800)]
Merge pull request #7253 from jitendrapurohit/CRM-17520

Fix for CRM-17520 - webtest

10 years agoMerge pull request #7255 from colemanw/checkStatusPreference
colemanw [Thu, 19 Nov 2015 16:01:06 +0000 (11:01 -0500)]
Merge pull request #7255 from colemanw/checkStatusPreference

checkStatusPreference improvements

10 years agocheckStatusPreference improvements
Coleman Watts [Thu, 19 Nov 2015 15:14:26 +0000 (10:14 -0500)]
checkStatusPreference improvements

10 years agoMerge pull request #7250 from systopia/CRM-17588-2
colemanw [Thu, 19 Nov 2015 14:41:33 +0000 (09:41 -0500)]
Merge pull request #7250 from systopia/CRM-17588-2

CRM-17588 - fix for single value for multi-select-fields passed by the api-explorer

10 years agostyle fix
jitendrapurohit [Thu, 19 Nov 2015 13:23:32 +0000 (18:53 +0530)]
style fix

10 years agofix for CRM-17520 - webtest
jitendrapurohit [Thu, 19 Nov 2015 13:11:13 +0000 (18:41 +0530)]
fix for CRM-17520 - webtest

10 years agoMerge pull request #7251 from yashodha/CRM-15306
Yashodha Chaku [Thu, 19 Nov 2015 12:35:00 +0000 (18:05 +0530)]
Merge pull request #7251 from yashodha/CRM-15306

CRM-15306: Adding hook to alter mail templates

10 years agominor fix
jitendrapurohit [Thu, 19 Nov 2015 11:04:22 +0000 (16:34 +0530)]
minor fix

10 years agoCleanup deprecated CRM_Core_BAO_Settings calls CRM-17507
jitendrapurohit [Wed, 18 Nov 2015 13:03:17 +0000 (18:33 +0530)]
Cleanup deprecated CRM_Core_BAO_Settings calls CRM-17507

10 years agoCRM-15306: Adding hook to alter mail templates
yashodha [Thu, 19 Nov 2015 10:44:02 +0000 (16:14 +0530)]
CRM-15306: Adding hook to alter mail templates

----------------------------------------
* CRM-15306: Adding hook to alter mail templates
  https://issues.civicrm.org/jira/browse/CRM-15306

10 years agofix for single value for multi-select-fields passed by the api-explorer
Thomas Leichtuss [Thu, 19 Nov 2015 09:18:42 +0000 (10:18 +0100)]
fix for single value for multi-select-fields passed by the api-explorer

10 years agoMerge branch '4.6' into master
Coleman Watts [Thu, 19 Nov 2015 02:12:30 +0000 (21:12 -0500)]
Merge branch '4.6' into master

Conflicts:
CRM/Case/Form/Search.php
tests/phpunit/WebTest/Contribute/PCPAddTest.php
tests/phpunit/WebTest/Member/InheritedMembershipTest.php
tests/phpunit/WebTest/Member/OnlineMembershipRenewTest.php

10 years agoMerge pull request #7237 from colemanw/status
colemanw [Thu, 19 Nov 2015 01:54:17 +0000 (20:54 -0500)]
Merge pull request #7237 from colemanw/status

Extension & version check fixes

10 years agoMerge pull request #7247 from colemanw/explorer
colemanw [Thu, 19 Nov 2015 01:53:31 +0000 (20:53 -0500)]
Merge pull request #7247 from colemanw/explorer

Api explorer - fix getfields action list

10 years agoApi explorer - fix getfields action list
Coleman Watts [Wed, 18 Nov 2015 22:58:05 +0000 (17:58 -0500)]
Api explorer - fix getfields action list

10 years agoMerge pull request #7248 from davecivicrm/CRM-16761
Dave Greenberg [Thu, 19 Nov 2015 00:34:45 +0000 (16:34 -0800)]
Merge pull request #7248 from davecivicrm/CRM-16761

CRM-16761 - Schema changes, DB upgrade, new copy of civicrm_generated…

10 years agoCRM-16761 - Schema changes, DB upgrade, new copy of civicrm_generated.mysql.
Dave Greenberg [Wed, 18 Nov 2015 23:37:00 +0000 (15:37 -0800)]
CRM-16761 - Schema changes, DB upgrade, new copy of civicrm_generated.mysql.

----------------------------------------
* CRM-16761: Self service view, update and cancel for CiviEvent
  https://issues.civicrm.org/jira/browse/CRM-16761

10 years agoSyntaxConformance fix
Coleman Watts [Wed, 18 Nov 2015 23:17:53 +0000 (18:17 -0500)]
SyntaxConformance fix

10 years agoIndentation fix
Coleman Watts [Wed, 18 Nov 2015 22:29:58 +0000 (17:29 -0500)]
Indentation fix

10 years agoCRM-13823 - Extract setLevel method from CRM_Utils_Check_Message constructor
Coleman Watts [Wed, 18 Nov 2015 22:24:24 +0000 (17:24 -0500)]
CRM-13823 - Extract setLevel method from CRM_Utils_Check_Message constructor

10 years agoCRM-13823 - Extension status msg tweak
Coleman Watts [Wed, 18 Nov 2015 21:52:31 +0000 (16:52 -0500)]
CRM-13823 - Extension status msg tweak

10 years agoCRM-13823 - Remove unncessary settings
Coleman Watts [Wed, 18 Nov 2015 21:45:00 +0000 (16:45 -0500)]
CRM-13823 - Remove unncessary settings

Now that status messages can be snoozed and disabled there is no need for settings specific to version checks.

10 years agoCRM-13823 - Split extension status into multiple messages
Coleman Watts [Wed, 18 Nov 2015 19:40:41 +0000 (14:40 -0500)]
CRM-13823 - Split extension status into multiple messages

10 years agoMerge pull request #7245 from monishdeb/testFailures
Monish Deb [Wed, 18 Nov 2015 18:29:43 +0000 (23:59 +0530)]
Merge pull request #7245 from monishdeb/testFailures

CRM-17534 improvement

10 years agoCRM-13823 - Tweak popup status alerts
Coleman Watts [Wed, 18 Nov 2015 17:54:58 +0000 (12:54 -0500)]
CRM-13823 - Tweak popup status alerts

10 years agoCRM-13823 - Fix caching of system status
Coleman Watts [Wed, 18 Nov 2015 16:21:00 +0000 (11:21 -0500)]
CRM-13823 - Fix caching of system status

10 years agoFix missing comma
Coleman Watts [Wed, 18 Nov 2015 16:17:46 +0000 (11:17 -0500)]
Fix missing comma

10 years agoCRM-17534 improvement - 'Preferred Communication Methods' don't get saved on Inline...
monishdeb [Wed, 18 Nov 2015 16:16:12 +0000 (21:46 +0530)]
CRM-17534 improvement - 'Preferred Communication Methods' don't get saved on Inline Edit

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

10 years agoMerge pull request #7240 from sudhabisht/WebtestFix46
Monish Deb [Wed, 18 Nov 2015 15:54:11 +0000 (21:24 +0530)]
Merge pull request #7240 from sudhabisht/WebtestFix46

Webtest Fix

10 years agoMerge pull request #7241 from sudhabisht/WebtestMaster
Monish Deb [Wed, 18 Nov 2015 15:53:37 +0000 (21:23 +0530)]
Merge pull request #7241 from sudhabisht/WebtestMaster

Webtest Fix

10 years agoMerge pull request #7243 from monishdeb/testFailures
Monish Deb [Wed, 18 Nov 2015 15:53:22 +0000 (21:23 +0530)]
Merge pull request #7243 from monishdeb/testFailures

Test failures

10 years agoformat fix
monishdeb [Wed, 18 Nov 2015 14:01:52 +0000 (19:31 +0530)]
format fix

10 years agowebtest fixes
monishdeb [Wed, 18 Nov 2015 13:54:20 +0000 (19:24 +0530)]
webtest fixes

10 years agoWebtest Fix
Sudha Bisht [Wed, 18 Nov 2015 13:38:30 +0000 (19:08 +0530)]
Webtest Fix

10 years agoWebtest Fix
Sudha Bisht [Wed, 18 Nov 2015 10:51:43 +0000 (16:21 +0530)]
Webtest Fix

10 years agoMerge pull request #7239 from monishdeb/CRM-17534
Monish Deb [Wed, 18 Nov 2015 09:58:43 +0000 (15:28 +0530)]
Merge pull request #7239 from monishdeb/CRM-17534

CRM-17534 fix - 'Preferred Communication Methods' don't get saved on …

10 years agoMerge pull request #6733 from pradpnayak/CRM-16801
Yashodha Chaku [Wed, 18 Nov 2015 08:40:19 +0000 (14:10 +0530)]
Merge pull request #6733 from pradpnayak/CRM-16801

--CRM-16801, Replaced $_REQUEST with $_POST

10 years agoMerge pull request #7229 from yashodha/CRM-17564
Monish Deb [Wed, 18 Nov 2015 07:26:34 +0000 (12:56 +0530)]
Merge pull request #7229 from yashodha/CRM-17564

CRM-17564: Dedupe rule doesnt appear to be working correctly

10 years agoMerge pull request #7091 from mollux/CRM-17477
Yashodha Chaku [Wed, 18 Nov 2015 07:17:36 +0000 (12:47 +0530)]
Merge pull request #7091 from mollux/CRM-17477

CRM-17477 - Allow overriding the replyto mail header

10 years agoMerge pull request #7238 from jitendrapurohit/CRM-17532
Monish Deb [Wed, 18 Nov 2015 07:10:31 +0000 (12:40 +0530)]
Merge pull request #7238 from jitendrapurohit/CRM-17532

Webtest Fix for CRM-17532

10 years agoformat fix
monishdeb [Wed, 18 Nov 2015 06:46:20 +0000 (12:16 +0530)]
format fix

10 years agoCRM-17534 fix - 'Preferred Communication Methods' don't get saved on Inline Edit
monishdeb [Wed, 18 Nov 2015 06:38:19 +0000 (12:08 +0530)]
CRM-17534 fix - 'Preferred Communication Methods' don't get saved on Inline Edit

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

10 years agoWebtest Fix for CRM-17532
jitendrapurohit [Wed, 18 Nov 2015 06:31:09 +0000 (12:01 +0530)]
Webtest Fix for CRM-17532

10 years ago4.7beta1 webtest failure
monishdeb [Wed, 18 Nov 2015 04:59:44 +0000 (10:29 +0530)]
4.7beta1 webtest failure

10 years agoCRM-13823 - Fix converting null to date
Coleman Watts [Wed, 18 Nov 2015 04:20:09 +0000 (23:20 -0500)]
CRM-13823 - Fix converting null to date

10 years agoBetter markup and icons for extension version check
Coleman Watts [Wed, 18 Nov 2015 04:09:23 +0000 (23:09 -0500)]
Better markup and icons for extension version check

10 years agoBetter format for extension upgrade msg
Coleman Watts [Tue, 17 Nov 2015 22:56:59 +0000 (17:56 -0500)]
Better format for extension upgrade msg

10 years agoMerge pull request #7225 from colemanw/check
colemanw [Tue, 17 Nov 2015 22:15:45 +0000 (17:15 -0500)]
Merge pull request #7225 from colemanw/check

System status check improvements

10 years agoCRM-13823 - Allow string and numeric output of severity level
Coleman Watts [Tue, 17 Nov 2015 21:27:32 +0000 (16:27 -0500)]
CRM-13823 - Allow string and numeric output of severity level

10 years agoCRM-13823 - Better validation of PSR level
Coleman Watts [Tue, 17 Nov 2015 21:11:37 +0000 (16:11 -0500)]
CRM-13823 - Better validation of PSR level

10 years agoMerge pull request #7235 from colemanw/djs
colemanw [Tue, 17 Nov 2015 21:08:53 +0000 (16:08 -0500)]
Merge pull request #7235 from colemanw/djs

Remove deprecated js code

10 years agoAvoid duplicate statusPreference checks
Coleman Watts [Tue, 17 Nov 2015 20:25:10 +0000 (15:25 -0500)]
Avoid duplicate statusPreference checks

10 years agoRemove deprecated js code
Coleman Watts [Tue, 17 Nov 2015 20:11:29 +0000 (15:11 -0500)]
Remove deprecated js code

10 years agoAdd pseudoconstant to StatusPreference
Coleman Watts [Tue, 17 Nov 2015 19:53:36 +0000 (14:53 -0500)]
Add pseudoconstant to StatusPreference

Fix for failing StatusPreferenceTest - pseudoconstant is needed by api to validate input.

10 years agoMerge pull request #7233 from sudhabisht/WebtestFix46
Monish Deb [Tue, 17 Nov 2015 19:00:21 +0000 (00:30 +0530)]
Merge pull request #7233 from sudhabisht/WebtestFix46

Webtest Fix

10 years agoMerge pull request #7234 from monishdeb/testFailures
Monish Deb [Tue, 17 Nov 2015 19:00:03 +0000 (00:30 +0530)]
Merge pull request #7234 from monishdeb/testFailures

4.7beta1 Webtest failures

10 years agoMerge pull request #7222 from davecivicrm/CRM-17580
Dave Greenberg [Tue, 17 Nov 2015 17:01:33 +0000 (09:01 -0800)]
Merge pull request #7222 from davecivicrm/CRM-17580

CRM-17580 - Include contributionTokens in contribution PDFLetter (Tha…

10 years agoAdd CRM.utils.makeDate function
Coleman Watts [Tue, 17 Nov 2015 16:10:47 +0000 (11:10 -0500)]
Add CRM.utils.makeDate function

10 years agoAdd api doc link
Coleman Watts [Tue, 17 Nov 2015 15:46:15 +0000 (10:46 -0500)]
Add api doc link

10 years agoMerge pull request #7227 from yashodha/CRM-17563
Monish Deb [Tue, 17 Nov 2015 15:03:11 +0000 (20:33 +0530)]
Merge pull request #7227 from yashodha/CRM-17563

CRM-17563

10 years ago4.7beta1 Webtest failures
monishdeb [Tue, 17 Nov 2015 15:01:03 +0000 (20:31 +0530)]
4.7beta1 Webtest failures

10 years agoFix
Sudha Bisht [Tue, 17 Nov 2015 13:53:47 +0000 (19:23 +0530)]
Fix

10 years agoMinor fix
Sudha Bisht [Tue, 17 Nov 2015 13:45:27 +0000 (19:15 +0530)]
Minor fix

10 years agoWebtestFix
Sudha Bisht [Tue, 17 Nov 2015 13:27:46 +0000 (18:57 +0530)]
WebtestFix

10 years agoCRM-17564: minor fix
yashodha [Tue, 17 Nov 2015 10:33:13 +0000 (16:03 +0530)]
CRM-17564: minor fix

----------------------------------------
* CRM-17564: Dedupe rule doesnt appear to be working correctly...
  https://issues.civicrm.org/jira/browse/CRM-17564

10 years agoCRM-17564: Dedupe rule doesnt appear to be working correctly
yashodha [Tue, 17 Nov 2015 09:54:03 +0000 (15:24 +0530)]
CRM-17564: Dedupe rule doesnt appear to be working correctly

----------------------------------------
* CRM-17564: Dedupe rule doesnt appear to be working correctly...
  https://issues.civicrm.org/jira/browse/CRM-17564

10 years agominor format fix
yashodha [Tue, 17 Nov 2015 07:47:59 +0000 (13:17 +0530)]
minor format fix

10 years agoCRM-17563: Dedupe rules - changes not saved when editing existing rule
yashodha [Tue, 17 Nov 2015 06:35:09 +0000 (12:05 +0530)]
CRM-17563: Dedupe rules - changes not saved when editing existing rule

----------------------------------------
* CRM-17563: Dedupe rules - changes not saved when editing existing rule
  https://issues.civicrm.org/jira/browse/CRM-17563

10 years agoMerge pull request #7224 from eileenmcnaughton/master
Eileen McNaughton [Tue, 17 Nov 2015 03:24:54 +0000 (16:24 +1300)]
Merge pull request #7224 from eileenmcnaughton/master

comment fixes

10 years agoCode style fix
Coleman Watts [Tue, 17 Nov 2015 02:55:57 +0000 (21:55 -0500)]
Code style fix

10 years agoCRM-13823 - Show/hide button css fix
Coleman Watts [Tue, 17 Nov 2015 02:31:12 +0000 (21:31 -0500)]
CRM-13823 - Show/hide button css fix

10 years agoAdd CRM.utils.formatDate
Coleman Watts [Tue, 17 Nov 2015 02:24:25 +0000 (21:24 -0500)]
Add CRM.utils.formatDate