Yashodha Chaku [Tue, 24 Nov 2015 07:51:49 +0000 (13:21 +0530)]
Merge pull request #7281 from mlutfy/4.7-crm13934
CRM-13934: Fix for saving dedupe rules in non-English.
Eileen McNaughton [Tue, 24 Nov 2015 03:59:58 +0000 (16:59 +1300)]
Merge pull request #7284 from eileenmcnaughton/master
code comments
eileen [Tue, 24 Nov 2015 03:58:56 +0000 (16:58 +1300)]
code comments
Eileen McNaughton [Tue, 24 Nov 2015 03:03:48 +0000 (16:03 +1300)]
Merge pull request #7280 from eileenmcnaughton/master
Remove defunct reference to cdType from case form
Mathieu Lutfy [Tue, 24 Nov 2015 02:27:59 +0000 (21:27 -0500)]
CRM-13934: Fix for saving dedupe rules in non-English.
eileen [Tue, 24 Nov 2015 02:06:17 +0000 (15:06 +1300)]
Remove defunct reference to cdType from case form
colemanw [Tue, 24 Nov 2015 00:46:34 +0000 (19:46 -0500)]
Merge pull request #7268 from colemanw/userSystem
Add userSystem to Civi facade... or don't
Dave Greenberg [Mon, 23 Nov 2015 20:05:03 +0000 (12:05 -0800)]
Merge pull request #7228 from mollux/CRM-17582
CRM-17582 - Allow filtering on deleted participants.
Dave Greenberg [Mon, 23 Nov 2015 18:25:26 +0000 (10:25 -0800)]
Merge pull request #7249 from davecivicrm/CRM-16761a
CRM-16761 - Forms, templates and message template changes.
Kurund Jalmi [Mon, 23 Nov 2015 17:31:42 +0000 (23:01 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-11-23-22-46-27
colemanw [Mon, 23 Nov 2015 16:03:51 +0000 (11:03 -0500)]
Merge pull request #7266 from jmcclelland/CRM-17586-master
Crm 17586 master
colemanw [Mon, 23 Nov 2015 15:41:20 +0000 (10:41 -0500)]
Merge pull request #7109 from jitendrapurohit/CRM-9428
CRM-9428 - Using custom field data specified with hook_civicrm_custom…
colemanw [Mon, 23 Nov 2015 15:41:03 +0000 (10:41 -0500)]
Merge pull request #7215 from totten/master-sql-log
CRM-17394 - Initialize DB slightly later. Fix query-log and redundant SET NAMES.
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.
Jamie McClelland [Mon, 23 Nov 2015 15:26:14 +0000 (10:26 -0500)]
CRM-17586 - fixed last coding style problem.
Monish Deb [Mon, 23 Nov 2015 15:11:20 +0000 (20:41 +0530)]
Merge pull request #7274 from monishdeb/testFailures
4.7beta1 w/o skip Webtest fixes
Monish Deb [Mon, 23 Nov 2015 15:09:23 +0000 (20:39 +0530)]
Merge pull request #7273 from sudhabisht/webtestfix
Webtest Fix
Monish Deb [Mon, 23 Nov 2015 15:08:51 +0000 (20:38 +0530)]
Merge pull request #7272 from rohankatkar/master_webtests
Webtests Fix
monishdeb [Mon, 23 Nov 2015 15:04:53 +0000 (20:34 +0530)]
4.7beta1 w/o skip Webtest fixes
Sudha Bisht [Mon, 23 Nov 2015 14:17:06 +0000 (19:47 +0530)]
Fix
Sudha Bisht [Mon, 23 Nov 2015 14:11:16 +0000 (19:41 +0530)]
Minor fix
Web Access [Mon, 23 Nov 2015 13:25:33 +0000 (18:55 +0530)]
Webtests Fix
Sudha Bisht [Mon, 23 Nov 2015 13:07:18 +0000 (18:37 +0530)]
Webtest Fix
jitendrapurohit [Mon, 23 Nov 2015 05:26:15 +0000 (10:56 +0530)]
remove changes
Tim Otten [Mon, 16 Nov 2015 00:07:36 +0000 (16:07 -0800)]
CRM-17394 - Initialize DB slightly later. Fix query-log and redundant SET NAMES.
Strictly speaking, this patch does two different things:
* Initialize DB slightly later. This fixes a race among settings-manager, DB init, and query logging.
* Call `SET NAMES utf8` once during connection init. Before, it was called once for every DAO object.
Based on quick spot-check, it still seems to store UTF-8 data. To be safe,
I've added an extra error-check to ensure that the `SET NAMES utf8` is still
called before we actually use the DAO.
Coleman Watts [Sun, 22 Nov 2015 01:58:33 +0000 (20:58 -0500)]
Add userSystem to Civi facade
Coleman Watts [Sun, 22 Nov 2015 01:43:03 +0000 (20:43 -0500)]
synchronizeUsers minor fixups
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
colemanw [Sun, 22 Nov 2015 01:22:28 +0000 (20:22 -0500)]
Merge pull request #6732 from pradpnayak/CRM-17209
--CRM-17209, fixed notice error when contribution status is changed f…
Coleman Watts [Sun, 22 Nov 2015 00:17:01 +0000 (19:17 -0500)]
CRM-17609 - Refactor synchronize contacts function into appropriate cms classes
Coleman Watts [Sat, 21 Nov 2015 20:38:09 +0000 (15:38 -0500)]
Remove unused functions
Coleman Watts [Sat, 21 Nov 2015 20:30:31 +0000 (15:30 -0500)]
CRM-17609 - Sycnronize contacts form cleanup
Mattias Michaux [Sat, 21 Nov 2015 19:15:44 +0000 (20:15 +0100)]
Replaced deprecated CRM_Core_BAO_Setting call (see CRM-17507).
Mattias Michaux [Wed, 18 Nov 2015 07:52:04 +0000 (08:52 +0100)]
Made the field label the same as in Advanced Search.
Mattias Michaux [Tue, 17 Nov 2015 21:22:51 +0000 (22:22 +0100)]
Changed label to be more clear what the checking the checkbox does.
Mattias Michaux [Tue, 17 Nov 2015 13:22:15 +0000 (14:22 +0100)]
Fixed incorrect nesting.
Mattias Michaux [Tue, 17 Nov 2015 09:35:33 +0000 (10:35 +0100)]
Allow filtering on deleted participants.
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
colemanw [Sat, 21 Nov 2015 13:33:55 +0000 (08:33 -0500)]
Merge pull request #7264 from jaapjansma/CRM-17601
Fixed #CRM-17601 show custom fields on case reports
Jaap Jansma [Sat, 21 Nov 2015 08:55:31 +0000 (09:55 +0100)]
fixed #CRM-17601 commit was incomplete last time
Coleman Watts [Sat, 21 Nov 2015 02:13:13 +0000 (21:13 -0500)]
Remove reference to old wysiwyg template
Jamie McClelland [Fri, 20 Nov 2015 22:09:24 +0000 (17:09 -0500)]
CRM-17586 - fix for coding standards.
Jamie McClelland [Tue, 17 Nov 2015 20:30:08 +0000 (15:30 -0500)]
CRM-17586 - ensure total goal is accurate.
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
Dave Greenberg [Fri, 20 Nov 2015 18:52:06 +0000 (10:52 -0800)]
Merge pull request #7262 from jaapjansma/CRM-17382
fixed #CRM-17382
Monish Deb [Fri, 20 Nov 2015 18:20:00 +0000 (23:50 +0530)]
Merge pull request #7263 from rohankatkar/master-test
Webtests Fixes
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
monishdeb [Fri, 20 Nov 2015 15:10:27 +0000 (20:40 +0530)]
format fix
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
Jaap Jansma [Fri, 20 Nov 2015 13:03:02 +0000 (14:03 +0100)]
Fixed #CRM-17601 show custom fields on case reports
Web Access [Fri, 20 Nov 2015 12:55:45 +0000 (18:25 +0530)]
Webtests Fixes
Jaap Jansma [Fri, 20 Nov 2015 12:48:15 +0000 (13:48 +0100)]
fixed #CRM-17382
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
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
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
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
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
monishdeb [Fri, 20 Nov 2015 06:30:21 +0000 (12:00 +0530)]
4.7beta1 Upgrade failure fix
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
Monish Deb [Fri, 20 Nov 2015 05:38:06 +0000 (11:08 +0530)]
Merge pull request #7257 from monishdeb/testFailures
CRM-17520 webtest fix
monishdeb [Fri, 20 Nov 2015 05:33:44 +0000 (11:03 +0530)]
CRM-17520 webtest fix
----------------------------------------
* CRM-17520: Wrong Non-deductable amount after doing back-office contribution with is_deductible = TRUE and no premium
https://issues.civicrm.org/jira/browse/CRM-17520
Marty Wright [Fri, 20 Nov 2015 04:57:01 +0000 (21:57 -0700)]
Update Main.tpl
Combined CRM.$(function($) {...}) blocks.
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
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
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
Coleman Watts [Fri, 20 Nov 2015 00:40:57 +0000 (19:40 -0500)]
Merge branch 'aydun-CRM-16203' into 4.6
Conflicts:
CRM/Report/Form.php
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
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(),…
colemanw [Thu, 19 Nov 2015 23:34:03 +0000 (18:34 -0500)]
Merge pull request #7176 from christianwach/crm-17543
CRM-17543 Bootstrapping WordPress triggers multiple PHP warnings and plugin load failures
colemanw [Thu, 19 Nov 2015 23:32:37 +0000 (18:32 -0500)]
Merge pull request #7254 from monishdeb/CRM-17417
CRM-17417 and CRM-17418 fixes
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
monishdeb [Thu, 19 Nov 2015 17:30:34 +0000 (23:00 +0530)]
format fix
colemanw [Thu, 19 Nov 2015 16:01:06 +0000 (11:01 -0500)]
Merge pull request #7255 from colemanw/checkStatusPreference
checkStatusPreference improvements
Coleman Watts [Thu, 19 Nov 2015 15:14:26 +0000 (10:14 -0500)]
checkStatusPreference improvements
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
Monish Deb [Thu, 19 Nov 2015 14:06:03 +0000 (19:36 +0530)]
Merge pull request #7246 from agileware/4.6-CRM-17417
CRM-17417: Tax is reapplied when editing a contribution associated with a membership or participant
monishdeb [Thu, 19 Nov 2015 14:03:38 +0000 (19:33 +0530)]
CRM-17417 and CRM-17418 fixes
----------------------------------------
* CRM-17417: Tax is reapplied when editing a contribution associated with a membership or participant entity unless the status is changed.
https://issues.civicrm.org/jira/browse/CRM-17417
* CRM-17418: Cancelling a taxable contribution writes incorrect values to the database
https://issues.civicrm.org/jira/browse/CRM-17418
jitendrapurohit [Thu, 19 Nov 2015 13:23:32 +0000 (18:53 +0530)]
style fix
jitendrapurohit [Thu, 19 Nov 2015 13:11:13 +0000 (18:41 +0530)]
fix for CRM-17520 - webtest
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
jitendrapurohit [Thu, 19 Nov 2015 11:04:22 +0000 (16:34 +0530)]
minor fix
jitendrapurohit [Wed, 18 Nov 2015 13:03:17 +0000 (18:33 +0530)]
Cleanup deprecated CRM_Core_BAO_Settings calls CRM-17507
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
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
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
colemanw [Thu, 19 Nov 2015 01:54:17 +0000 (20:54 -0500)]
Merge pull request #7237 from colemanw/status
Extension & version check fixes
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
Dave Greenberg [Thu, 19 Nov 2015 01:08:00 +0000 (17:08 -0800)]
CRM-16761 - Forms, templates and message template changes.
----------------------------------------
* CRM-16761: Self service view, update and cancel for CiviEvent
https://issues.civicrm.org/jira/browse/CRM-16761
Coleman Watts [Wed, 18 Nov 2015 22:58:05 +0000 (17:58 -0500)]
Api explorer - fix getfields action list
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…
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
Coleman Watts [Wed, 18 Nov 2015 23:17:53 +0000 (18:17 -0500)]
SyntaxConformance fix
Vaibhav Sagar [Wed, 18 Nov 2015 22:45:45 +0000 (09:45 +1100)]
CRM-17417: Modify conditional so that tax is not reapplied on edit.
----------------------------------------
* CRM-17417: Tax is reapplied when editing a contribution associated with a membership or participant entity unless the status is changed.
https://issues.civicrm.org/jira/browse/CRM-17417
Pradeep Nayak [Thu, 12 Nov 2015 05:02:07 +0000 (10:32 +0530)]
--CRM-17418, fixed amount during cancelling completed contribution when tax is enabled
Coleman Watts [Wed, 18 Nov 2015 22:29:58 +0000 (17:29 -0500)]
Indentation fix
Coleman Watts [Wed, 18 Nov 2015 22:24:24 +0000 (17:24 -0500)]
CRM-13823 - Extract setLevel method from CRM_Utils_Check_Message constructor
Coleman Watts [Wed, 18 Nov 2015 21:52:31 +0000 (16:52 -0500)]
CRM-13823 - Extension status msg tweak
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.
Coleman Watts [Wed, 18 Nov 2015 19:40:41 +0000 (14:40 -0500)]
CRM-13823 - Split extension status into multiple messages
Monish Deb [Wed, 18 Nov 2015 18:29:43 +0000 (23:59 +0530)]
Merge pull request #7245 from monishdeb/testFailures
CRM-17534 improvement
projects / civicrm-core.git / log