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
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.
Samuel Vanhove [Fri, 14 Oct 2016 14:41:00 +0000 (10:41 -0400)]
CRM-19093 adding comments
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
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
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
colemanw [Wed, 12 Oct 2016 22:10:53 +0000 (18:10 -0400)]
Merge pull request #9223 from eileenmcnaughton/dedupe
NFC extract function in dedupe process
colemanw [Wed, 12 Oct 2016 22:09:51 +0000 (18:09 -0400)]
Merge pull request #9230 from totten/master-req2
CRM-17917 - More fixes for D8 installer
Eileen McNaughton [Wed, 12 Oct 2016 21:33:28 +0000 (22:33 +0100)]
Merge pull request #9222 from colemanw/CRM-19479
CRM-19479 - Fix php undefined index notices
Tim Otten [Wed, 12 Oct 2016 21:12:43 +0000 (22:12 +0100)]
CRM-17917 - More fixes for D8 installer
Eileen McNaughton [Wed, 12 Oct 2016 21:12:38 +0000 (22:12 +0100)]
Merge pull request #9225 from colemanw/CRM-19338
CRM-19338 - Update doc url location
eileen [Wed, 12 Oct 2016 14:00:26 +0000 (15:00 +0100)]
NFC extract function in dedupe process
Coleman Watts [Wed, 12 Oct 2016 20:42:14 +0000 (16:42 -0400)]
CRM-17785 - js cleanup on contribution forms
Eileen McNaughton [Wed, 12 Oct 2016 20:38:10 +0000 (21:38 +0100)]
Merge pull request #9213 from francescbassas/patch-8
CRM-19482 Localization for participant status counted and no counted …
Eileen McNaughton [Wed, 12 Oct 2016 20:31:17 +0000 (21:31 +0100)]
Merge pull request #8694 from eileenmcnaughton/unhurt-my-server
CRM-19069 Remove server-hurty OR join
colemanw [Wed, 12 Oct 2016 19:13:50 +0000 (15:13 -0400)]
Merge pull request #9227 from colemanw/CRM-19028
CRM-19028 - Change get(userID) to getLoggedInContactID()
Coleman Watts [Wed, 12 Oct 2016 18:23:23 +0000 (14:23 -0400)]
CRM-19028 - Change get(userID) to getLoggedInContactID()
Coleman Watts [Wed, 12 Oct 2016 17:00:26 +0000 (13:00 -0400)]
CRM-19338 - Add language and version params to doc urls
Eileen McNaughton [Wed, 12 Oct 2016 17:04:05 +0000 (18:04 +0100)]
Merge pull request #8963 from JMAConsulting/CRM-16189-16
CRM-16189, fix for order api for entity table
Eileen McNaughton [Wed, 12 Oct 2016 16:52:30 +0000 (17:52 +0100)]
Merge pull request #9194 from seamuslee001/CRM-17917
CRM-17917 Fix d8 install requirements
Coleman Watts [Mon, 10 Oct 2016 15:27:02 +0000 (11:27 -0400)]
CRM-19448 - Enable api joins across entity_table/entity_id fields
Coleman Watts [Wed, 12 Oct 2016 14:06:22 +0000 (10:06 -0400)]
CRM-19479 - Fix php undefined index notices
Eileen McNaughton [Wed, 12 Oct 2016 13:00:37 +0000 (14:00 +0100)]
Merge pull request #8899 from JKingsnorth/CRM-19179
CRM-19179: Set primary location during manual merge
Monish Deb [Wed, 12 Oct 2016 12:47:43 +0000 (18:17 +0530)]
Merge pull request #9219 from monishdeb/CRM-19486
CRM-19486: breaks saved search absolute date
Monish Deb [Wed, 12 Oct 2016 11:56:22 +0000 (17:26 +0530)]
Merge pull request #9217 from jitendrapurohit/CRM-19460
CRM-19460 - Fix brackets in file uploads
Monish Deb [Wed, 12 Oct 2016 11:04:41 +0000 (16:34 +0530)]
Merge pull request #9218 from jitendrapurohit/CRM-19470
CRM-19470 - Notice Fix upon event registration
Monish Deb [Wed, 12 Oct 2016 11:02:09 +0000 (16:32 +0530)]
Merge pull request #9220 from civicrm/revert-9145
Revert "CRM-19245 - Wrap title and description on manage group page"
Michael McAndrew [Wed, 12 Oct 2016 10:34:07 +0000 (11:34 +0100)]
Revert "CRM-19245 - Wrap title and description on manage group page"
This reverts commit
5b2b04cb0d864c637748be99a0282400d80e0317.
Superceded by https://github.com/civicrm/civicrm-core/pull/9173
Michael McAndrew [Wed, 12 Oct 2016 10:24:54 +0000 (11:24 +0100)]
Merge pull request #9173 from jmcclelland/CRM-19456
CRM-19456 - avoid horizontal scrolling
deb.monish [Wed, 12 Oct 2016 10:22:26 +0000 (15:52 +0530)]
CRM-19486: breaks saved search absolute date
jitendrapurohit [Wed, 12 Oct 2016 09:04:08 +0000 (14:34 +0530)]
CRM-19470 - Notice Fix upon event registration
jitendrapurohit [Wed, 12 Oct 2016 06:54:02 +0000 (12:24 +0530)]
CRM-19460 - Fix brackets in file uploads
Eileen McNaughton [Tue, 11 Oct 2016 22:11:56 +0000 (23:11 +0100)]
Merge pull request #9214 from aydun/master
CRM-19353 - 'Dedupe by email' not working - with test
Eileen McNaughton [Tue, 11 Oct 2016 21:59:58 +0000 (22:59 +0100)]
Merge pull request #8691 from eileenmcnaughton/merge_like
CRM-18694 alternative solution to easier post code searching.
Eileen McNaughton [Tue, 11 Oct 2016 21:57:31 +0000 (22:57 +0100)]
Merge pull request #7725 from colemanw/api4
CRM-17867 - Api4 core patches
Eileen McNaughton [Tue, 11 Oct 2016 21:44:48 +0000 (22:44 +0100)]
Merge pull request #9209 from otetard/CRM-19483
CRM-19483: remove destination URL size in trackable URLs.
Aidan Saunders [Tue, 11 Oct 2016 21:17:57 +0000 (22:17 +0100)]
CRM-19353 unit test for mailing dedupe
gavande [Wed, 14 Sep 2016 06:36:10 +0000 (12:06 +0530)]
CRM-19353 - 'Dedupe by email' not working
Eileen McNaughton [Tue, 11 Oct 2016 21:00:15 +0000 (22:00 +0100)]
Merge pull request #3 from seamuslee001/api4-testfix
Fix contribution tests that failed in last run
Eileen McNaughton [Tue, 11 Oct 2016 20:55:53 +0000 (21:55 +0100)]
Merge pull request #8677 from eileenmcnaughton/logging
CRM-19051 Logging - setting to allow offline triggers not respected i…
Seamus Lee [Tue, 11 Oct 2016 20:54:55 +0000 (07:54 +1100)]
Better test fix
Seamus Lee [Tue, 11 Oct 2016 20:25:30 +0000 (07:25 +1100)]
Fix contribution tests that failed in last run
Eileen McNaughton [Tue, 11 Oct 2016 20:24:00 +0000 (21:24 +0100)]
Merge pull request #9212 from eileenmcnaughton/reports
CRM-19337 fix contact sub_type display on reports
francescbassas [Tue, 11 Oct 2016 17:12:19 +0000 (19:12 +0200)]
CRM-19482 Localization for participant status counted and no counted links
Eileen McNaughton [Tue, 11 Oct 2016 16:40:47 +0000 (17:40 +0100)]
Merge pull request #8942 from francescbassas/patch-6
CRM-19272 Error hiding level 3 child groups
eileen [Tue, 11 Oct 2016 16:19:21 +0000 (17:19 +0100)]
CRM-19337 fix contact sub_type display on reports
Eileen McNaughton [Tue, 11 Oct 2016 14:27:10 +0000 (15:27 +0100)]
Merge pull request #9206 from JMAConsulting/CRM-19481
CRM-19481 Fixed bottom search button functionality
Seamus Lee [Tue, 11 Oct 2016 13:23:29 +0000 (00:23 +1100)]
Fix spelling in new region (#9207)
Eileen McNaughton [Tue, 11 Oct 2016 12:41:04 +0000 (13:41 +0100)]
CRM-15980 Test for API does not permit PHP to permanently delete a contact (#9210)
* CRM-15980 Test for API does not permit PHP to permanently delete a contact
* CRM-15980 fix API does not permit PHP to permanently delete a contact
Change-Id: I4bc50fedf31de60312f3ab1ad0f216fb85962bca
projects / civicrm-core.git / log