colemanw [Wed, 19 Oct 2016 17:49:51 +0000 (13:49 -0400)]
Merge pull request #9291 from colemanw/CRM-19535
CRM-19535 - Conditionally add is_active param to entityRef
Monish Deb [Wed, 19 Oct 2016 11:52:20 +0000 (17:22 +0530)]
Merge pull request #9284 from monishdeb/CRM-19513
CRM-19513: Saved search is incorrectly using IN rather than BETWEEN f…
Monish Deb [Wed, 19 Oct 2016 09:06:12 +0000 (14:36 +0530)]
Merge pull request #9288 from jmcclelland/CRM-19536
CRM-19536 - ensure type is defined for campaign_id
Monish Deb [Wed, 19 Oct 2016 04:51:33 +0000 (10:21 +0530)]
Merge pull request #9292 from jitendrapurohit/removedebug
remove accidental debug stmt
jitendrapurohit [Wed, 19 Oct 2016 04:49:22 +0000 (10:19 +0530)]
remove accidental debug stmt
colemanw [Wed, 19 Oct 2016 04:19:18 +0000 (00:19 -0400)]
Merge pull request #9289 from colemanw/CRM-18953
CRM-18953 - Better cleanup of news widget markup
colemanw [Wed, 19 Oct 2016 00:53:16 +0000 (20:53 -0400)]
Merge pull request #9285 from agh1/CRM-19533
CRM-19533 System check: check for writable directories
colemanw [Wed, 19 Oct 2016 00:47:35 +0000 (20:47 -0400)]
Merge pull request #9283 from jitendrapurohit/CRM-19529
CRM-19529 - PHP7-Upcoming/Recent Case Activities results into 'Networ…
Coleman Watts [Wed, 19 Oct 2016 00:19:51 +0000 (20:19 -0400)]
CRM-19535 - Conditionally add is_active param to entityRef
Coleman Watts [Wed, 19 Oct 2016 00:13:55 +0000 (20:13 -0400)]
CRM-18953 - Better cleanup of news widget markup
colemanw [Tue, 18 Oct 2016 23:39:48 +0000 (19:39 -0400)]
Merge pull request #9287 from francescbassas/patch-9
CRM-19313 - Can't assign custom group to relationships with two conta…
Jamie McClelland [Tue, 18 Oct 2016 20:41:50 +0000 (16:41 -0400)]
CRM-19536 - ensure type is defined for campaign_id
colemanw [Tue, 18 Oct 2016 19:51:31 +0000 (15:51 -0400)]
Merge pull request #9282 from francescbassas/patch-8
CRM-19528 Internationalise "Select Code" on contributions page widget…
francescbassas [Tue, 18 Oct 2016 19:16:22 +0000 (21:16 +0200)]
CRM-19313 - Can't assign custom group to relationships with two contact subtypes involved
Andrew Hunt [Tue, 18 Oct 2016 18:43:00 +0000 (14:43 -0400)]
CRM-19533 System check: check for writable directories
deb.monish [Tue, 18 Oct 2016 13:31:56 +0000 (19:01 +0530)]
CRM-19513: Saved search is incorrectly using IN rather than BETWEEN for custom fields for civicrm group cache
jitendrapurohit [Tue, 18 Oct 2016 09:46:11 +0000 (15:16 +0530)]
CRM-19529 - PHP7-Upcoming/Recent Case Activities results into 'Network Error'
francescbassas [Tue, 18 Oct 2016 08:44:28 +0000 (10:44 +0200)]
CRM-19528 Internationalise "Select Code" on contributions page widget tab
Monish Deb [Tue, 18 Oct 2016 07:13:27 +0000 (12:43 +0530)]
Merge pull request #9011 from jernic/jernic-patch-1
Select correct activity if more than one in upcoming or recent period
colemanw [Tue, 18 Oct 2016 00:30:18 +0000 (20:30 -0400)]
Merge pull request #9280 from colemanw/CRM-19512
CRM-19512 - Return en_US by default from getLocale
Coleman Watts [Mon, 17 Oct 2016 23:40:01 +0000 (19:40 -0400)]
CRM-19512 - Return en_US by default from getLocale
Yashodha Chaku [Mon, 17 Oct 2016 10:00:38 +0000 (15:30 +0530)]
Merge pull request #9274 from yashodha/CRM-19511
CRM-19511: Disabled fields still visible in Import Multi-value Custom…
Yashodha Chaku [Mon, 17 Oct 2016 08:43:47 +0000 (14:13 +0530)]
Merge pull request #9269 from fuzionnz/trivia-
20161017a
Comment clarification.
Yashodha Chaku [Mon, 17 Oct 2016 07:39:33 +0000 (13:09 +0530)]
CRM-19511: Disabled fields still visible in Import Multi-value Custom Data
Chris Burgess [Sun, 16 Oct 2016 20:28:24 +0000 (09:28 +1300)]
Comment clarification.
"call a task" => "add a task", since we do not directly call runSQL method.
Eileen McNaughton [Fri, 14 Oct 2016 22:37:51 +0000 (23:37 +0100)]
Merge pull request #9266 from JohnFF/CRM-17616
Crm 17616
Eileen McNaughton [Fri, 14 Oct 2016 21:59:07 +0000 (22:59 +0100)]
Merge pull request #9253 from seamuslee001/CRM-19490
CRM-19490 Add in a shortdate format setting and ensure that date fiel…
John Kirk [Fri, 14 Oct 2016 21:42:41 +0000 (22:42 +0100)]
Removed the magic number 500.
Eileen McNaughton [Fri, 14 Oct 2016 21:20:39 +0000 (22:20 +0100)]
Merge pull request #8707 from lcdservices/CRM-19079
CRM-19079 condition profile edit permission check
Samuel Vanhove [Thu, 16 Jun 2016 21:30:55 +0000 (17:30 -0400)]
CRM-17616 - Moving to an arbitrary search page result could lead to incomplete results
Eileen McNaughton [Fri, 14 Oct 2016 20:56:36 +0000 (21:56 +0100)]
Merge pull request #9259 from sqweets/customRelationshipsExport
CRM-19471 - Custom relationships for custom contact types not availab…
Eileen McNaughton [Fri, 14 Oct 2016 20:55:07 +0000 (21:55 +0100)]
Merge pull request #8751 from eileenmcnaughton/groupOrg
CRM-19122 Group Organization & parent default code should be the same
Monish Deb [Fri, 14 Oct 2016 20:30:14 +0000 (02:00 +0530)]
Merge pull request #9066 from seamuslee001/CRM-19380
CRM-19380 allow for multiple from email addresses but only one per do…
Eileen McNaughton [Fri, 14 Oct 2016 17:55:56 +0000 (18:55 +0100)]
Merge pull request #9187 from sqweets/ExportHeadersRelationships
CRM-19472 - Export headers for relationships are in machine name format
Eileen McNaughton [Fri, 14 Oct 2016 17:46:40 +0000 (18:46 +0100)]
Merge pull request #8466 from totten/master-path-warning
CRM_Utils_Check - Suggest using `[cms.root]`, etal
Eileen McNaughton [Fri, 14 Oct 2016 17:39:15 +0000 (18:39 +0100)]
Merge pull request #9262 from colemanw/caseApi
Remove phony fk info from case api
Tim Otten [Fri, 14 Oct 2016 17:21:20 +0000 (18:21 +0100)]
Set version to 4.7.14
Tim Otten [Fri, 14 Oct 2016 17:12:22 +0000 (18:12 +0100)]
CRM_UpgradeIncremental_php_FourSeven - Typo
Tim Otten [Fri, 14 Oct 2016 17:09:41 +0000 (18:09 +0100)]
Merge pull request #9260 from totten/master-error-mysql
CRM-19505 - CRM_Core_Error::handle() - Fix detection of mysql driver
Tim Otten [Fri, 14 Oct 2016 16:47:52 +0000 (17:47 +0100)]
Merge pull request #9261 from totten/master-flaky-crm19133
CRM_Contact_BAO_ContactType_ContactTest.testCRM19133 - Fix flaky test
Tim Otten [Fri, 14 Oct 2016 16:28:26 +0000 (17:28 +0100)]
Merge pull request #9258 from eileenmcnaughton/group_fix
CRM-19311 limit hidden groups to those passed in if is set
Eileen McNaughton [Fri, 14 Oct 2016 16:22:32 +0000 (17:22 +0100)]
Merge pull request #9249 from samuelsov/CRM-19093
CRM-19093 - i18n executeQuery regex pb
Coleman Watts [Fri, 14 Oct 2016 15:30:16 +0000 (11:30 -0400)]
Remove phony fk info from case api
Tim Otten [Fri, 14 Oct 2016 15:12:45 +0000 (16:12 +0100)]
CRM_Contact_BAO_ContactType_ContactTest.testCRM19133 - Fix flaky test
This test seems to involve creation of a custom-data group with a randomly
generated name. The random name sometimes begins with a number, which leads
to awkward SQL queries like:
```
INSERT INTO civicrm_value_15e5f1d45a5896753463467e8c380144_1 ( 15e5f1d45a5896753463467e8c380144_1,entity_id ) VALUES (...)
```
This patch updates `CRM_Core_BAO_CustomValueTable` to perform proper escaping on the column name.
Ellen Hendricks [Fri, 14 Oct 2016 14:51:41 +0000 (09:51 -0500)]
CRM-19471 - Custom relationships for custom contact types not available during export
----------------------------------------
* CRM-19471: Custom relationships for custom contact types not available during export
https://issues.civicrm.org/jira/browse/CRM-19471
Samuel Vanhove [Fri, 14 Oct 2016 14:41:00 +0000 (10:41 -0400)]
CRM-19093 adding comments
Ellen Hendricks [Fri, 14 Oct 2016 14:40:33 +0000 (09:40 -0500)]
CRM-19472 Moved call to manipulateHeadeRows to right after the are built
----------------------------------------
* CRM-19472: Export headers for relationships are in "machine name" format
https://issues.civicrm.org/jira/browse/CRM-19472
Tim Otten [Fri, 14 Oct 2016 14:17:20 +0000 (15:17 +0100)]
CRM-19505 - CRM_Core_Error::handle() - Fix detection of mysql driver
The check `preg_match('/^mysql:/', $_DB_DATAOBJECT['CONFIG']['database'])`
assumes that the admin is manually changing `CIVICRM_DSN` to indicate
preferred driver. Since we determine the driver automatically in 4.7.12+,
this check doesn't work.
This new check determines what driver is actually in use.
eileen [Fri, 14 Oct 2016 14:05:51 +0000 (15:05 +0100)]
CRM-19311 limit hidden groups to those passed in if is set
Monish Deb [Fri, 14 Oct 2016 12:55:01 +0000 (18:25 +0530)]
Merge pull request #9239 from jitendrapurohit/CRM-19443
CRM-19443 - Fix date tokens in Print/Merge Task
Tim Otten [Fri, 14 Oct 2016 12:18:25 +0000 (13:18 +0100)]
Merge pull request #9013 from ggargani/CRM-18199
CRM-18199 CRM_Utils_File::sourceSQLFile too greedy
Monish Deb [Fri, 14 Oct 2016 12:08:54 +0000 (17:38 +0530)]
Merge pull request #9256 from eileenmcnaughton/CRM-19311
CRM-19311 extend group permission to include own hidden groups
eileen [Fri, 14 Oct 2016 11:09:45 +0000 (12:09 +0100)]
CRM-19311 extend group permission to include own hidden groups
Eileen McNaughton [Fri, 14 Oct 2016 11:02:27 +0000 (12:02 +0100)]
Merge pull request #9048 from JMAConsulting/CRM-19310
CRM-19310: removed upgrade code that inserts the financial accounts f…
Eileen McNaughton [Fri, 14 Oct 2016 09:34:17 +0000 (10:34 +0100)]
Merge pull request #9203 from colemanw/CRM-19448
CRM-19448 - Enable api joins across entity_table/entity_id fields
Eileen McNaughton [Fri, 14 Oct 2016 09:26:19 +0000 (10:26 +0100)]
Merge pull request #9254 from eileenmcnaughton/stoob
CRM-19478 handle wierd contribution page id
Eileen McNaughton [Fri, 14 Oct 2016 08:47:20 +0000 (09:47 +0100)]
Merge pull request #9228 from colemanw/CRM-17785
CRM-17785 - js cleanup on contribution forms
Eileen McNaughton [Fri, 14 Oct 2016 08:41:03 +0000 (09:41 +0100)]
Merge pull request #9244 from davejenx/CRM-19148-merge-on-hold-test
CRM-19148 - added test testBatchMergeEmailOnHold.
Eileen McNaughton [Fri, 14 Oct 2016 08:40:29 +0000 (09:40 +0100)]
Merge pull request #9252 from monishdeb/CRM-19502
CRM-19502: Export of contacts generating asort/foreach warnings
eileen [Fri, 14 Oct 2016 08:19:08 +0000 (09:19 +0100)]
CRM-19478 handle wierd contribution page id
Seamus Lee [Fri, 14 Oct 2016 07:43:40 +0000 (18:43 +1100)]
CRM-19490 Add in a shortdate format setting and ensure that date fields are localised appropriately on confirmation page
Eileen McNaughton [Fri, 14 Oct 2016 07:42:24 +0000 (08:42 +0100)]
Merge pull request #9250 from f2boot/move_tags_management_from_admin_to_tag
CRM-15371 - add tags management permission and move tag management out…
Eileen McNaughton [Fri, 14 Oct 2016 07:27:33 +0000 (08:27 +0100)]
Merge pull request #8780 from eileenmcnaughton/on_hold_data_fix
CRM-19148 Fix for on hold data being lost
deb.monish [Fri, 14 Oct 2016 07:07:46 +0000 (12:37 +0530)]
CRM-19502: Export of contacts generating asort/foreach warnings
Monish Deb [Fri, 14 Oct 2016 06:21:51 +0000 (11:51 +0530)]
Merge pull request #9247 from sleewok/patch-3
Display error if large batches will exceed the php.ini max_input_vars
jitendrapurohit [Thu, 13 Oct 2016 13:29:22 +0000 (18:59 +0530)]
CRM-19443 - Fix date tokens in Print/Merge Task
colemanw [Fri, 14 Oct 2016 04:59:56 +0000 (00:59 -0400)]
Merge pull request #9241 from monishdeb/CRM-19501
CRM-19501: Improve Contact's Image Url handling
colemanw [Fri, 14 Oct 2016 04:58:33 +0000 (00:58 -0400)]
Merge pull request #9251 from JohnFF/settings_deprecated_group
Deprecated settings group name param
John Kirk [Fri, 14 Oct 2016 00:13:50 +0000 (00:13 +0000)]
1. Flagged the group name param as deprecated. 2. Removed an if (TRUE) condition.
Inforgetics [Thu, 13 Oct 2016 21:34:41 +0000 (23:34 +0200)]
CRM-15371 - add tag management permission and move tag management out of admin path and folders
----------------------------------------
* CRM-15371: Allow non-administrative users to see and manage tags without Administer CiviCRM permission
https://issues.civicrm.org/jira/browse/CRM-15371
Samuel Vanhove [Thu, 13 Oct 2016 21:01:44 +0000 (17:01 -0400)]
CRM-19093 - i18n executeQuery regex pb
colemanw [Thu, 13 Oct 2016 20:58:29 +0000 (16:58 -0400)]
Merge pull request #9248 from seamuslee001/CRM-19496
CRM-19496 Fix removing and re-adding contacts from the groups tab on …
Seamus Lee [Thu, 13 Oct 2016 20:08:02 +0000 (07:08 +1100)]
CRM-19496 Fix removing and re-adding contacts from the groups tab on contact record
sleewok [Thu, 13 Oct 2016 19:00:45 +0000 (15:00 -0400)]
Update Entry.php
More style fixes
eileenmcnaugton [Mon, 25 Jul 2016 06:00:46 +0000 (18:00 +1200)]
CRM-19122 Group Organization & parent default code should be the same
Eileen McNaughton [Thu, 13 Oct 2016 18:06:53 +0000 (19:06 +0100)]
Merge pull request #9245 from wmortada/CRM-19497-rebased
CRM-19497 Fix PHP notice on Activity Summary Report
sleewok [Thu, 13 Oct 2016 18:04:58 +0000 (14:04 -0400)]
Update Entry.php
Changed formatting.
eileen [Thu, 13 Oct 2016 17:50:01 +0000 (18:50 +0100)]
CRM-19148 Fix for on hold data being lost
Tim Otten [Thu, 13 Oct 2016 17:38:39 +0000 (18:38 +0100)]
Merge pull request #9242 from mollux/CRM-18549
CRM-18549 - Don't store empty array value of a setting as NULL.
sleewok [Thu, 13 Oct 2016 17:38:23 +0000 (13:38 -0400)]
Display error if large batches will exceed the php.ini max_input_vars
The default value for max_input_vars in PHP is 1000. Batch entries that are >65 will silently error and break the batch data entry. This change will throw a fatal error if the batch size will fail.
Eileen McNaughton [Thu, 13 Oct 2016 17:01:21 +0000 (18:01 +0100)]
Merge pull request #9231 from wmortada/master
CRM-19487 Tidy up contact reports to fix contact subtype not displaying correctly
William Mortada [Thu, 13 Oct 2016 15:51:10 +0000 (16:51 +0100)]
CRM-19497 Fix PHP notice on Activity Summary Report
Eileen McNaughton [Thu, 13 Oct 2016 16:31:27 +0000 (17:31 +0100)]
Merge pull request #9240 from colemanw/CRM-19500
CRM-19500 - Fix api runAuthorize
deb.monish [Thu, 13 Oct 2016 14:48:57 +0000 (20:18 +0530)]
CRM-19501: Improve Contact's Image Url handling
Mattias Michaux [Thu, 13 Oct 2016 14:54:26 +0000 (16:54 +0200)]
Don't store empty array value of a setting as NULL.
Coleman Watts [Thu, 13 Oct 2016 14:18:05 +0000 (10:18 -0400)]
CRM-19500 - Fix api runAuthorize
Dave Jenkins [Thu, 13 Oct 2016 14:01:46 +0000 (15:01 +0100)]
CRM-19148 - added test testBatchMergeEmailOnHold.
William Mortada [Thu, 13 Oct 2016 13:04:56 +0000 (14:04 +0100)]
Remove link from gender field
Eileen McNaughton [Thu, 13 Oct 2016 12:30:43 +0000 (13:30 +0100)]
Merge pull request #9238 from eileenmcnaughton/dupetests
Remove duplicate test
eileen [Thu, 13 Oct 2016 12:08:48 +0000 (13:08 +0100)]
Remove duplicate test
Dave pointed out this is a less complete copy of another test.
William Mortada [Thu, 13 Oct 2016 09:49:54 +0000 (10:49 +0100)]
Reinstate deleted code
Eileen McNaughton [Thu, 13 Oct 2016 08:56:24 +0000 (09:56 +0100)]
Merge pull request #9234 from jitendrapurohit/CRM-19489
CRM-19489 - Fix notices on Constituent Detail Report
jitendrapurohit [Thu, 13 Oct 2016 07:04:01 +0000 (12:34 +0530)]
CRM-19489 - Fix notices on Constituent Detail Report
Monish Deb [Thu, 13 Oct 2016 05:18:12 +0000 (10:48 +0530)]
Merge pull request #9233 from monishdeb/CRM-19435
CRM-19435: NFC changes
deb.monish [Thu, 13 Oct 2016 05:14:48 +0000 (10:44 +0530)]
CRM-19435: NFC changes
Monish Deb [Thu, 13 Oct 2016 05:09:11 +0000 (10:39 +0530)]
Merge pull request #9156 from jainabhishek14/CRM-19435
CRM-19435: IncludeSmartGroups Option added
Seamus Lee [Thu, 13 Oct 2016 03:48:42 +0000 (14:48 +1100)]
CRM-19495 Ensure that no dots appear at the bottom of menu links in d8 (#9232)
* CRM-19495 Ensure that no dots appear at the bottom of menu links in d8
* Switch to borer: 0 as per suggestion from coleman
William Mortada [Wed, 12 Oct 2016 15:27:17 +0000 (16:27 +0100)]
CRM-19487 Tidy up contact reports to fix contact subtype not displaying
correctly
Seamus Lee [Sun, 18 Sep 2016 04:25:22 +0000 (14:25 +1000)]
Fix doc bloc entry
Seamus Lee [Sun, 18 Sep 2016 02:24:05 +0000 (12:24 +1000)]
Flesh out docblock
projects / civicrm-core.git / log