civicrm-core.git
8 years agoMerge pull request #8330 from mlutfy/master-crm18518-3
Yashodha Chaku [Tue, 10 May 2016 05:05:48 +0000 (10:35 +0530)]
Merge pull request #8330 from mlutfy/master-crm18518-3

CRM-18518: More ts() fixes.

8 years agoCRM-18518: More ts() fixes.
Mathieu Lutfy [Mon, 9 May 2016 21:37:29 +0000 (17:37 -0400)]
CRM-18518: More ts() fixes.

8 years agoMerge pull request #8324 from jitendrapurohit/CRM-18520
Monish Deb [Mon, 9 May 2016 13:14:16 +0000 (18:44 +0530)]
Merge pull request #8324 from jitendrapurohit/CRM-18520

CRM-18520 - Wrong message after "unhold email" task on Contact Search.

8 years agoMerge pull request #8306 from monishdeb/CRM-18490
Monish Deb [Mon, 9 May 2016 13:12:49 +0000 (18:42 +0530)]
Merge pull request #8306 from monishdeb/CRM-18490

CRM-18490: API does not return Address ID via API

8 years agoMerge pull request #8305 from jitendrapurohit/CRM-18239
Monish Deb [Mon, 9 May 2016 12:42:50 +0000 (18:12 +0530)]
Merge pull request #8305 from jitendrapurohit/CRM-18239

CRM-18239 - 'CiviCRM: view my contact' permission results in user bei…

8 years agoCRM-18520 - replace row_count() with affectedRows()
jitendrapurohit [Mon, 9 May 2016 09:14:32 +0000 (14:44 +0530)]
CRM-18520 - replace row_count() with affectedRows()

minor fix

8 years agoCRM-18490: API does not return Address ID via API
deb.monish [Fri, 6 May 2016 14:39:29 +0000 (20:09 +0530)]
CRM-18490: API does not return Address ID via API

8 years agoMerge pull request #8304 from jitendrapurohit/CRM-18474
Monish Deb [Mon, 9 May 2016 10:03:33 +0000 (15:33 +0530)]
Merge pull request #8304 from jitendrapurohit/CRM-18474

CRM-18474 - Escape unicode characters to avoid json syntax errors

8 years agoCRM-18474 - Escape unicode characters to avoid json syntax errors
jitendrapurohit [Fri, 6 May 2016 10:52:58 +0000 (16:22 +0530)]
CRM-18474 - Escape unicode characters to avoid json syntax errors

replace by line break

8 years agoMerge pull request #8320 from mlutfy/master-crm18518
colemanw [Mon, 9 May 2016 00:36:58 +0000 (20:36 -0400)]
Merge pull request #8320 from mlutfy/master-crm18518

CRM-18518: ts() string fixes.

8 years agoCRM-18518: ts() string fixes.
Mathieu Lutfy [Sun, 8 May 2016 22:07:36 +0000 (18:07 -0400)]
CRM-18518: ts() string fixes.

8 years agoCRM-18518: ts() string fixes.
Mathieu Lutfy [Sun, 8 May 2016 22:03:56 +0000 (18:03 -0400)]
CRM-18518: ts() string fixes.

8 years agoCRM-18518: ts() string fixes.
Mathieu Lutfy [Sun, 8 May 2016 21:30:35 +0000 (17:30 -0400)]
CRM-18518: ts() string fixes.

8 years agoMerge pull request #8308 from laryn/patch-8
Monish Deb [Fri, 6 May 2016 19:03:32 +0000 (00:33 +0530)]
Merge pull request #8308 from laryn/patch-8

Simple spelling fix

8 years agoSimple spelling fix
Laryn - CEDC.org [Fri, 6 May 2016 18:27:17 +0000 (13:27 -0500)]
Simple spelling fix

8 years agoCRM-18239 - 'CiviCRM: view my contact' permission results in user being able to edit...
jitendrapurohit [Fri, 6 May 2016 11:15:36 +0000 (16:45 +0530)]
CRM-18239 - 'CiviCRM: view my contact' permission results in user being able to edit themselves in CiviCRM

8 years agoMerge pull request #8166 from otetard/CRM-18432
Yashodha Chaku [Fri, 6 May 2016 10:58:21 +0000 (16:28 +0530)]
Merge pull request #8166 from otetard/CRM-18432

CRM-18432: In CiviMail’s updateEmailResetDate(), exec the main query.

8 years agoMerge pull request #8105 from herbdool/master
Tim Otten [Thu, 5 May 2016 23:42:23 +0000 (16:42 -0700)]
Merge pull request #8105 from herbdool/master

Added getUFLocale, setUFLocale methods to Backdrop class

8 years agoMerge pull request #8294 from yashodha/CRM-18154
Yashodha Chaku [Thu, 5 May 2016 09:09:17 +0000 (14:39 +0530)]
Merge pull request #8294 from yashodha/CRM-18154

CRM-18154: Profile custom field option: 'Include in multi-record list…

8 years agoCRM-18154: change checkbox to advcheckbox to ensure unsetting works fine
yashodha [Thu, 5 May 2016 07:44:35 +0000 (13:14 +0530)]
CRM-18154: change checkbox to advcheckbox to ensure unsetting works fine

----------------------------------------
* CRM-18154: Profile custom field option: "Include in multi-record listing" un-ticked, but still persists
  https://issues.civicrm.org/jira/browse/CRM-18154

8 years agoMerge pull request #8230 from KarinG/CRM-18110-test
Yashodha Chaku [Thu, 5 May 2016 05:16:44 +0000 (10:46 +0530)]
Merge pull request #8230 from KarinG/CRM-18110-test

CRM-18110-test added test --amend

8 years agoMerge remote-tracking branch 'origin/4.7.7-rc' into 4.7.7-rc-master-2016-05-04-14...
Tim Otten [Wed, 4 May 2016 21:21:22 +0000 (14:21 -0700)]
Merge remote-tracking branch 'origin/4.7.7-rc' into 4.7.7-rc-master-2016-05-04-14-21-20

8 years agoMerge pull request #8265 from mollux/CRM-17983-v2
Tim Otten [Wed, 4 May 2016 18:30:37 +0000 (11:30 -0700)]
Merge pull request #8265 from mollux/CRM-17983-v2

CRM-17983

8 years agoMerge pull request #8296 from rohankatkar/CRM-18151
Monish Deb [Wed, 4 May 2016 17:18:03 +0000 (22:48 +0530)]
Merge pull request #8296 from rohankatkar/CRM-18151

CRM-18151: npm test failing locally

8 years agoMerge pull request #8295 from rohankatkar/master-webtest-fix
Monish Deb [Wed, 4 May 2016 13:33:54 +0000 (19:03 +0530)]
Merge pull request #8295 from rohankatkar/master-webtest-fix

Webtests fix

8 years agoCRM-18151
Web Access [Wed, 4 May 2016 13:24:00 +0000 (18:54 +0530)]
CRM-18151

8 years agoWebtests fix
Web Access [Wed, 4 May 2016 13:20:34 +0000 (18:50 +0530)]
Webtests fix

8 years agoCRM-18154: Profile custom field option: 'Include in multi-record listing' un-ticked...
yashodha [Wed, 4 May 2016 09:38:04 +0000 (15:08 +0530)]
CRM-18154: Profile custom field option: 'Include in multi-record listing' un-ticked, but still persists

----------------------------------------
* CRM-18154: Profile custom field option: "Include in multi-record listing" un-ticked, but still persists
  https://issues.civicrm.org/jira/browse/CRM-18154

8 years agoMerge pull request #8281 from colemanw/CRM-18154
Yashodha Chaku [Wed, 4 May 2016 09:34:41 +0000 (15:04 +0530)]
Merge pull request #8281 from colemanw/CRM-18154

CRM-18154 - Fix checkboxes on profile field form

8 years agoMerge pull request #8278 from jitendrapurohit/CRM-18472
Monish Deb [Wed, 4 May 2016 06:53:52 +0000 (12:23 +0530)]
Merge pull request #8278 from jitendrapurohit/CRM-18472

CRM-18472 - Notice Fixes

8 years agoMerge pull request #8044 from JKingsnorth/CRM-18320
Monish Deb [Wed, 4 May 2016 06:44:55 +0000 (12:14 +0530)]
Merge pull request #8044 from JKingsnorth/CRM-18320

CRM-18320: Fix URLs with ampersands in CiviMail

8 years agoFixed issue with ajax calls on custom field table tab on contact.
Mattias Michaux [Wed, 4 May 2016 05:41:13 +0000 (07:41 +0200)]
Fixed issue with ajax calls on custom field table tab on contact.

8 years agoPHP warning fix.
Mattias Michaux [Tue, 3 May 2016 19:19:08 +0000 (21:19 +0200)]
PHP warning fix.

8 years agoParially revert 19b8532d55bb35d3d471bbe859e5ca080e85324f to ensure queries are not...
Mattias Michaux [Tue, 3 May 2016 14:37:30 +0000 (16:37 +0200)]
Parially revert 19b8532d55bb35d3d471bbe859e5ca080e85324f to ensure queries are not broken.

8 years agoFixed forgotten rename.
Mattias Michaux [Tue, 3 May 2016 14:34:03 +0000 (16:34 +0200)]
Fixed forgotten rename.

8 years agoMerge pull request #8287 from monishdeb/CRM-18476
Monish Deb [Tue, 3 May 2016 13:29:11 +0000 (18:59 +0530)]
Merge pull request #8287 from monishdeb/CRM-18476

CRM-18476: Invalid argument supplied for foreach() in CRM_Extension_Browser->_discoverRemote()

8 years agoMerge pull request #8285 from eileenmcnaughton/remove_fn
Yashodha Chaku [Tue, 3 May 2016 10:01:53 +0000 (15:31 +0530)]
Merge pull request #8285 from eileenmcnaughton/remove_fn

CRM-18491 Remove unused function CRM_Core_Report::dateDisplay

8 years agoCRM-18476: Invalid argument supplied for foreach() in CRM_Extension_Browser->_discove...
deb.monish [Tue, 3 May 2016 09:15:52 +0000 (14:45 +0530)]
CRM-18476: Invalid argument supplied for foreach() in CRM_Extension_Browser->_discoverRemote()

8 years agoMerge pull request #8276 from jitendrapurohit/CRM-18487
Monish Deb [Tue, 3 May 2016 05:39:22 +0000 (11:09 +0530)]
Merge pull request #8276 from jitendrapurohit/CRM-18487

CRM-18487 - max date should be the last date of the year

8 years agoCRM-18491 Remove unused function CRM_Core_Report::dateDisplay
eileen [Tue, 3 May 2016 05:22:30 +0000 (17:22 +1200)]
CRM-18491 Remove unused function CRM_Core_Report::dateDisplay

8 years agoMerge pull request #8274 from jitendrapurohit/webtestfixes
Monish Deb [Tue, 3 May 2016 05:11:51 +0000 (10:41 +0530)]
Merge pull request #8274 from jitendrapurohit/webtestfixes

CRM-18454 - pass proper id for datepicker of core and custom field

8 years agoMerge pull request #8279 from rohankatkar/CRM-18484-webtest
Monish Deb [Tue, 3 May 2016 05:04:58 +0000 (10:34 +0530)]
Merge pull request #8279 from rohankatkar/CRM-18484-webtest

CRM-18484: Webtest

8 years agoMerge pull request #8280 from lcdservices/CRM-18489
colemanw [Tue, 3 May 2016 03:28:30 +0000 (23:28 -0400)]
Merge pull request #8280 from lcdservices/CRM-18489

CRM-18489 suppress billing block if waitlist

8 years agoCRM-18154 - Fix checkboxes on profile field form
Coleman Watts [Mon, 2 May 2016 23:24:12 +0000 (19:24 -0400)]
CRM-18154 - Fix checkboxes on profile field form

8 years agoCRM-18489 suppress billing block if waitlist
Brian Shaughnessy [Mon, 2 May 2016 15:11:11 +0000 (11:11 -0400)]
CRM-18489 suppress billing block if waitlist

8 years agoWebtest-CRM-18484
Web Access [Mon, 2 May 2016 13:18:14 +0000 (18:48 +0530)]
Webtest-CRM-18484

8 years agoCRM-18472 - Notice Fixes
jitendrapurohit [Mon, 2 May 2016 12:06:54 +0000 (17:36 +0530)]
CRM-18472 - Notice Fixes

8 years agoMerge pull request #8267 from yashodha/CRM-18484
Yashodha Chaku [Mon, 2 May 2016 09:50:20 +0000 (15:20 +0530)]
Merge pull request #8267 from yashodha/CRM-18484

CRM-18484 : Error thrown in Reports if one of the params for in betwe…

8 years agoCRM-18454 - pass proper id for datepicker of core and custom field
jitendrapurohit [Mon, 2 May 2016 06:19:03 +0000 (11:49 +0530)]
CRM-18454 - pass proper id for datepicker of core and custom field

Fix id of custom date field

8 years agoCRM-18487 - max date should be the last date of the year
jitendrapurohit [Mon, 2 May 2016 09:02:33 +0000 (14:32 +0530)]
CRM-18487 - max date should be the last date of the year

8 years agoFixed incorrect parameter.
Mattias Michaux [Fri, 29 Apr 2016 19:04:31 +0000 (21:04 +0200)]
Fixed incorrect parameter.

8 years agoAdded forgotten changes.
Mattias Michaux [Fri, 29 Apr 2016 19:01:30 +0000 (21:01 +0200)]
Added forgotten changes.

8 years agoMerge pull request #8271 from rohankatkar/Webtests
Monish Deb [Fri, 29 Apr 2016 17:53:38 +0000 (23:23 +0530)]
Merge pull request #8271 from rohankatkar/Webtests

CRM-18454: WebTest fixes

8 years agoMerge pull request #8272 from jitendrapurohit/webtestfixes
Monish Deb [Fri, 29 Apr 2016 17:52:30 +0000 (23:22 +0530)]
Merge pull request #8272 from jitendrapurohit/webtestfixes

CRM-18454 - webtest fixes

8 years agoCRM-18454 - webtest fixes
jitendrapurohit [Fri, 29 Apr 2016 13:30:59 +0000 (19:00 +0530)]
CRM-18454 - webtest fixes

8 years agoTest fixes
Web Access [Fri, 29 Apr 2016 13:16:03 +0000 (18:46 +0530)]
Test fixes

Webtests fixes

8 years agoMerge pull request #8268 from jitendrapurohit/CRM-18289
Yashodha Chaku [Fri, 29 Apr 2016 12:51:19 +0000 (18:21 +0530)]
Merge pull request #8268 from jitendrapurohit/CRM-18289

 CRM-18289 - Generated data

8 years agoCRM-18289 - Generated data
jitendrapurohit [Fri, 29 Apr 2016 10:34:09 +0000 (16:04 +0530)]
CRM-18289 - Generated data

8 years agoCRM-18484 : Error thrown in Reports if one of the params for in between filter is...
yashodha [Fri, 29 Apr 2016 08:55:41 +0000 (14:25 +0530)]
CRM-18484 : Error thrown in Reports if one of the params for in between filter is NULL

----------------------------------------
* CRM-18484: Error thrown in Reports if one of the params for in between filter is NULL
  https://issues.civicrm.org/jira/browse/CRM-18484

8 years agoMerge pull request #8211 from KarinG/CRM-18463
Yashodha Chaku [Fri, 29 Apr 2016 08:33:31 +0000 (14:03 +0530)]
Merge pull request #8211 from KarinG/CRM-18463

CRM-18463 - Not in between filter - not working properly.

8 years agoMerge pull request #8255 from jitendrapurohit/CRM-18472
Monish Deb [Fri, 29 Apr 2016 07:16:36 +0000 (12:46 +0530)]
Merge pull request #8255 from jitendrapurohit/CRM-18472

CRM-18472: Warning fix on search builder and notice fix

8 years agoStyle fixes.
Mattias Michaux [Fri, 29 Apr 2016 06:00:42 +0000 (08:00 +0200)]
Style fixes.

8 years agoAdded tests for <table>.<column> 64 character limit.
Mattias Michaux [Fri, 29 Apr 2016 05:50:35 +0000 (07:50 +0200)]
Added tests for <table>.<column> 64 character limit.

8 years agoRemoved obsolete MysqlColumnNameLoose validate and escape check.
Mattias Michaux [Fri, 29 Apr 2016 05:45:10 +0000 (07:45 +0200)]
Removed obsolete MysqlColumnNameLoose validate and escape check.

8 years agoFixed incorrect regexes for <table>.<column> names + added warning in mysqlColumnName...
Mattias Michaux [Wed, 27 Apr 2016 16:22:12 +0000 (18:22 +0200)]
Fixed incorrect regexes for <table>.<column> names + added warning in mysqlColumnNameLoose method.

8 years agoRemoved unnecessary parts of the Mysql regexes.
Mattias Michaux [Wed, 27 Apr 2016 12:26:50 +0000 (14:26 +0200)]
Removed unnecessary parts of the Mysql regexes.

8 years agoTypo fix in tests.
Mattias Michaux [Tue, 26 Apr 2016 12:32:55 +0000 (14:32 +0200)]
Typo fix in tests.

8 years agoAdapted CRM_Utils_Sort code to use the validation and escaping.
Mattias Michaux [Tue, 26 Apr 2016 12:11:55 +0000 (14:11 +0200)]
Adapted CRM_Utils_Sort code to use the validation and escaping.

8 years agoAdded tests + validate and escape checks for mysql order by.
Mattias Michaux [Tue, 26 Apr 2016 12:10:49 +0000 (14:10 +0200)]
Added tests + validate and escape checks for mysql order by.

8 years agoJust discovered CRM_Utils_Type::escapeAll
Mattias Michaux [Tue, 26 Apr 2016 05:51:22 +0000 (07:51 +0200)]
Just discovered CRM_Utils_Type::escapeAll

8 years agoMade correct distinction between validate and escape.
Mattias Michaux [Tue, 26 Apr 2016 05:50:23 +0000 (07:50 +0200)]
Made correct distinction between validate and escape.

8 years agoExtra ajax fixes.
Mattias Michaux [Mon, 25 Apr 2016 21:44:24 +0000 (23:44 +0200)]
Extra ajax fixes.

8 years agoFirst WIP for AJAX cleanup.
Mattias Michaux [Mon, 25 Apr 2016 15:16:49 +0000 (17:16 +0200)]
First WIP for AJAX cleanup.

8 years agoMerge pull request #8237 from monishdeb/CRM-18457
Monish Deb [Thu, 28 Apr 2016 16:39:15 +0000 (22:09 +0530)]
Merge pull request #8237 from monishdeb/CRM-18457

CRM-18457: Error on report form strlen() expects parameter 1 to be string

8 years agoMerge pull request #8224 from yashodha/CRM-18450
Yashodha Chaku [Thu, 28 Apr 2016 12:24:20 +0000 (17:54 +0530)]
Merge pull request #8224 from yashodha/CRM-18450

CRM-18450 : dmaster notice error

8 years agoMerge pull request #8253 from yashodha/CRM-18472
Yashodha Chaku [Thu, 28 Apr 2016 12:21:27 +0000 (17:51 +0530)]
Merge pull request #8253 from yashodha/CRM-18472

CRM-18472 : Notice fixes

8 years agoMerge pull request #8202 from agileware/master-crm-18356
Yashodha Chaku [Thu, 28 Apr 2016 12:17:52 +0000 (17:47 +0530)]
Merge pull request #8202 from agileware/master-crm-18356

CRM-18356: Fix incorrect logic Activity Report has when excluding NUL…

8 years agoMerge pull request #8206 from yashodha/fix.CRM-17893
Yashodha Chaku [Thu, 28 Apr 2016 08:47:54 +0000 (14:17 +0530)]
Merge pull request #8206 from yashodha/fix.CRM-17893

CRM-17893: Cannot import custom field type Country

8 years agoMerge pull request #8254 from eileenmcnaughton/4.7.7-rc
Tim Otten [Wed, 27 Apr 2016 20:38:12 +0000 (13:38 -0700)]
Merge pull request #8254 from eileenmcnaughton/4.7.7-rc

CRM-17984 getTree regression

8 years agoCRM-17984 - CustomGroupTest - Fix style errors
Tim Otten [Wed, 27 Apr 2016 18:52:47 +0000 (11:52 -0700)]
CRM-17984 - CustomGroupTest - Fix style errors

There were problems in this line:
 * The missing comma (required by Drupal style)
 * The use of literal CtrlA causes phpcs to produce invalid output

8 years agoMerge pull request #8256 from jitendrapurohit/webtest
Monish Deb [Wed, 27 Apr 2016 17:23:24 +0000 (22:53 +0530)]
Merge pull request #8256 from jitendrapurohit/webtest

CRM-18454: webtest fixes

8 years agoMerge pull request #8257 from rohankatkar/tests-fix-master
Monish Deb [Wed, 27 Apr 2016 17:23:11 +0000 (22:53 +0530)]
Merge pull request #8257 from rohankatkar/tests-fix-master

Webtests fixes: CRM-18454

8 years agoCRM-18454: webtest fixes
jitendrapurohit [Wed, 27 Apr 2016 13:17:39 +0000 (18:47 +0530)]
CRM-18454: webtest fixes

CRM-18454: webtest fixes

8 years agoWebtests fixes - CRM:18454
Web Access [Wed, 27 Apr 2016 13:20:55 +0000 (18:50 +0530)]
Webtests fixes - CRM:18454

8 years agoCRM-18472: Warning fix on search builder and notice fix
jitendrapurohit [Wed, 27 Apr 2016 09:59:27 +0000 (15:29 +0530)]
CRM-18472: Warning fix on search builder and notice fix

8 years agoMerge pull request #8239 from jitendrapurohit/CRM-18471
Monish Deb [Wed, 27 Apr 2016 09:11:12 +0000 (14:41 +0530)]
Merge pull request #8239 from jitendrapurohit/CRM-18471

CRM-18471: format money custom field

8 years agoFurther custom tree regression fix, where the label does not match the name the name...
eileenmcnaugton [Wed, 27 Apr 2016 08:13:41 +0000 (20:13 +1200)]
Further custom tree regression fix, where the label does not match the name the name is the key to use

8 years agoCRM-18469, CRM-17984 - getTree regression on multiple integers separated by the cnrtl...
eileenmcnaugton [Wed, 27 Apr 2016 07:37:02 +0000 (19:37 +1200)]
CRM-18469, CRM-17984 - getTree regression on multiple integers separated by the cnrtl char

8 years agoCRM-18472 : Notice fixes
yashodha [Wed, 27 Apr 2016 07:55:48 +0000 (13:25 +0530)]
CRM-18472 : Notice fixes

----------------------------------------
* CRM-18472: Notice fixes
  https://issues.civicrm.org/jira/browse/CRM-18472

8 years agoCRM-18471: format money custom field
jitendrapurohit [Tue, 26 Apr 2016 13:13:01 +0000 (18:43 +0530)]
CRM-18471: format money custom field

additional fixes

minor fixes

minor fix

8 years agoCRM-18457: Error on report form strlen() expects parameter 1 to be string
deb.monish [Tue, 26 Apr 2016 11:53:58 +0000 (17:23 +0530)]
CRM-18457: Error on report form strlen() expects parameter 1 to be string

8 years agoMerge pull request #8245 from colemanw/CRM-18006-b
Tim Otten [Wed, 27 Apr 2016 01:15:22 +0000 (18:15 -0700)]
Merge pull request #8245 from colemanw/CRM-18006-b

Last-minute upgrade fixes

8 years agoMerge pull request #8246 from PalanteJon/contributor-fix
Tim Otten [Tue, 26 Apr 2016 22:47:22 +0000 (15:47 -0700)]
Merge pull request #8246 from PalanteJon/contributor-fix

[NFC] CONTRIBUTORS.txt fix

8 years agoMerge pull request #8243 from totten/477rc-gettree-a
Eileen McNaughton [Tue, 26 Apr 2016 22:35:12 +0000 (10:35 +1200)]
Merge pull request #8243 from totten/477rc-gettree-a

CRM-18469, CRM-17984 - getTree - No more pass by reference

8 years agoMerge pull request #8244 from civicrm/totten-patch-1
Tim Otten [Tue, 26 Apr 2016 21:56:34 +0000 (14:56 -0700)]
Merge pull request #8244 from civicrm/totten-patch-1

(NFC) Update CONTRIBUTING.md

8 years agoCONTRIBUTORS.txt fix
Jon goldberg [Tue, 26 Apr 2016 21:34:02 +0000 (17:34 -0400)]
CONTRIBUTORS.txt fix

8 years agoCRM-16846 - Fix missing upgrade steps
Coleman Watts [Tue, 26 Apr 2016 20:58:21 +0000 (16:58 -0400)]
CRM-16846 - Fix missing upgrade steps

8 years agoMerge pull request #8232 from eileenmcnaughton/4.7.7-rc
Tim Otten [Tue, 26 Apr 2016 20:29:28 +0000 (13:29 -0700)]
Merge pull request #8232 from eileenmcnaughton/4.7.7-rc

CRM-18193 logging schema: fix mismatch between comment & code convention

8 years agoUpdate CONTRIBUTING.md
Tim Otten [Tue, 26 Apr 2016 20:12:38 +0000 (13:12 -0700)]
Update CONTRIBUTING.md

8 years agoCRM-18006 - civicrm_install_canary - Ensure ENGINE is InnoDB
Tim Otten [Mon, 25 Apr 2016 23:13:07 +0000 (16:13 -0700)]
CRM-18006 - civicrm_install_canary - Ensure ENGINE is InnoDB

This should resolve warnings on systems where MyISAM was default engine.