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
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 [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
Michael McAndrew [Tue, 11 Oct 2016 12:39:00 +0000 (13:39 +0100)]
CRM 19474 - additional test (#9208)
* adding test for CRM-19474
* removing unecessary if clause
* removing empty line after function description
* test that only two contacts are returned
Seamus Lee [Tue, 11 Oct 2016 12:32:47 +0000 (23:32 +1100)]
Fix Syntax Conformance Tests (#2)
Tim Otten [Tue, 11 Oct 2016 10:13:59 +0000 (11:13 +0100)]
AllCoreTables - Fix checksum
Olivier Tétard [Tue, 11 Oct 2016 09:38:18 +0000 (11:38 +0200)]
CRM-19483: remove destination URL size in trackable URLs.
This revert
d78d31a1.
See also: CRM-14730 and CRM-15740.
Edsel [Tue, 11 Oct 2016 07:41:18 +0000 (13:11 +0530)]
CRM-19481 Fixed bottom search button functionality
----------------------------------------
* CRM-19481: Filtering transactions according to search criteria for batches don't work when bottom search button is clicked
https://issues.civicrm.org/jira/browse/CRM-19481
Eileen McNaughton [Tue, 11 Oct 2016 07:29:29 +0000 (08:29 +0100)]
Merge pull request #9196 from eileenmcnaughton/paypal
CRM-18483: Paypal Std transaction failure fix
Eileen McNaughton [Tue, 11 Oct 2016 06:41:58 +0000 (07:41 +0100)]
Merge pull request #8599 from PalanteJon/CRM-18980
CRM-18980 Make payment processor selection on event pages multi-site aware again
colemanw [Tue, 11 Oct 2016 01:59:29 +0000 (21:59 -0400)]
Merge pull request #9205 from twomice/CRM-16838
Fix for CRM-16838.
Allen Shaw [Tue, 11 Oct 2016 00:40:30 +0000 (19:40 -0500)]
CRM-16838: civilint fix.
Allen Shaw [Mon, 10 Oct 2016 23:43:33 +0000 (18:43 -0500)]
CRM-16838: Sort task contacts again after merging households.
colemanw [Mon, 10 Oct 2016 23:33:13 +0000 (19:33 -0400)]
Merge pull request #9128 from colemanw/CRM-19065
CRM-19065 - Fix custom data import validation
colemanw [Mon, 10 Oct 2016 23:32:02 +0000 (19:32 -0400)]
Merge pull request #9165 from colemanw/CRM-19441
CRM-19441 - Fix display and saving of case tags
Michael McAndrew [Mon, 10 Oct 2016 22:26:50 +0000 (23:26 +0100)]
Merge pull request #8344 from darrick/CRM-18515
CRM-18515 - Allow Payment Processor with same name when using multi-d…
colemanw [Mon, 10 Oct 2016 21:28:48 +0000 (17:28 -0400)]
Merge pull request #9199 from fuzionnz/CRM-19476
Add "details" input to IDS exceptions.
colemanw [Mon, 10 Oct 2016 21:27:07 +0000 (17:27 -0400)]
Merge pull request #9125 from colemanw/CRM-19363
CRM-19363 - Add price_set api permission checks
Coleman Watts [Tue, 29 Mar 2016 02:01:10 +0000 (22:01 -0400)]
Test fix
The unconditional translation of financial_type to contribution_type
was messing up a few tests. This seems more sensible anyway.
Coleman Watts [Tue, 15 Mar 2016 05:50:23 +0000 (01:50 -0400)]
Test fix
Coleman Watts [Thu, 10 Mar 2016 19:03:19 +0000 (14:03 -0500)]
CRM-17867 - Set checkPermission before running getAclClause
Coleman Watts [Tue, 9 Feb 2016 18:55:13 +0000 (13:55 -0500)]
CRM-17867 - Api test fixes
Coleman Watts [Mon, 8 Feb 2016 21:22:23 +0000 (16:22 -0500)]
CRM-17867 - Api kernel refactoring
Coleman Watts [Mon, 25 Jan 2016 02:24:20 +0000 (21:24 -0500)]
CRM-17867 - Api4 core patches
Most of api4 is in an extension - these are the changes needed to core.
colemanw [Mon, 10 Oct 2016 14:54:18 +0000 (10:54 -0400)]
Merge pull request #9198 from colemanw/CRM-19448-fix
CRM-19448 - Test fixes
colemanw [Mon, 10 Oct 2016 14:51:01 +0000 (10:51 -0400)]
Merge pull request #1 from seamuslee001/CRM-19448
Further test fixes
eileen [Sun, 9 Oct 2016 11:50:12 +0000 (12:50 +0100)]
CRM-18483 remove custom field checking from BaseIPN, moved to paypal std
eileen [Sun, 9 Oct 2016 11:22:54 +0000 (12:22 +0100)]
CRM-18483 Paypal Std: Also move recur params into the custom data
eileen [Tue, 4 Oct 2016 09:08:14 +0000 (22:08 +1300)]
CRM-18483 further Joomla! fix
Chris Burgess [Sun, 9 Oct 2016 23:33:02 +0000 (12:33 +1300)]
Add "details" input to IDS exceptions.
Matches CRM_Utils_API_HTMLInputCoder::$skipfields list, refs CRM-19476.
Seamus Lee [Sun, 9 Oct 2016 23:19:29 +0000 (10:19 +1100)]
Further test fixes
colemanw [Sun, 9 Oct 2016 21:25:29 +0000 (17:25 -0400)]
Merge pull request #9197 from seamuslee001/4.7.12-rc
4.7.12 rc
Coleman Watts [Sun, 9 Oct 2016 21:16:40 +0000 (17:16 -0400)]
CRM-19441 - Simplify api call
Can do this as one call instead of two thanks to CRM-19448
Coleman Watts [Sun, 9 Oct 2016 21:09:56 +0000 (17:09 -0400)]
CRM-19448 - Test fixes
Coleman Watts [Mon, 3 Oct 2016 19:47:53 +0000 (15:47 -0400)]
CRM-19441 - Fix display and saving of case tags
colemanw [Sun, 9 Oct 2016 20:41:00 +0000 (16:41 -0400)]
Merge pull request #9186 from colemanw/CRM-18953
CRM-18953 - Update dashboard widget to use aggregated news feed
deb.monish [Thu, 29 Sep 2016 19:22:57 +0000 (00:52 +0530)]
minor change
deb.monish [Thu, 29 Sep 2016 12:23:25 +0000 (17:53 +0530)]
Additional fix for Joomla
deb.monish [Mon, 26 Sep 2016 21:46:29 +0000 (03:16 +0530)]
CRM-18483: Paypal Std transaction failure fix
deb.monish [Tue, 27 Sep 2016 13:07:06 +0000 (18:37 +0530)]
Revert CRM-18159 fix [4.7.8 REGRESSION]
colemanw [Sun, 9 Oct 2016 20:25:40 +0000 (16:25 -0400)]
Merge pull request #9174 from colemanw/CRM-19448
CRM-19448 - Extend api permissions to cover entity_table/entity_id
Seamus Lee [Sat, 8 Oct 2016 20:47:57 +0000 (07:47 +1100)]
CRM-17917 Fix d8 install requirements
Coleman Watts [Fri, 7 Oct 2016 15:53:36 +0000 (11:53 -0400)]
CRM-18953 - Update dashboard widget to use aggregated news feed
Yashodha Chaku [Fri, 7 Oct 2016 10:05:18 +0000 (15:35 +0530)]
Merge pull request #9160 from monishdeb/CRM-19294
CRM-19294: Unable to upload files via a contribution page
Yashodha Chaku [Fri, 7 Oct 2016 10:03:32 +0000 (15:33 +0530)]
Merge pull request #9185 from jitendrapurohit/CRM-19352-notice-fix
CRM-19352-notice fix
jitendrapurohit [Fri, 7 Oct 2016 05:51:11 +0000 (11:21 +0530)]
CRM-19352-notice fix
Yashodha Chaku [Fri, 7 Oct 2016 04:42:44 +0000 (10:12 +0530)]
Merge pull request #9164 from jitendrapurohit/CRM-19352
CRM-19352 - Improve performance of multi-valued custom records
Monish Deb [Thu, 6 Oct 2016 20:58:00 +0000 (02:28 +0530)]
Merge pull request #9182 from frederickgzmn/patch-2
CRM-19465 - Capitalization displaying contries when in mailing mode
Frederic Guzman [Thu, 6 Oct 2016 20:05:19 +0000 (16:05 -0400)]
Spaces incorrect
Frederic Guzman [Thu, 6 Oct 2016 19:59:30 +0000 (15:59 -0400)]
Applying similar corrections in file and checkstyle result
Monish Deb [Thu, 6 Oct 2016 17:02:13 +0000 (22:32 +0530)]
Merge pull request #9152 from samuelsov/47-crm16352
CRM-16352 - add language filter support for mass mailing
Monish Deb [Thu, 6 Oct 2016 16:55:29 +0000 (22:25 +0530)]
Merge pull request #8972 from liedekef/customfields
CRM-19300 : allow external id for custom fields import
Franky Van Liedekerke [Thu, 6 Oct 2016 15:07:09 +0000 (17:07 +0200)]
small code optimization
Samuel Vanhove [Thu, 6 Oct 2016 14:36:50 +0000 (10:36 -0400)]
CRM-16352 missing ts + placeholder
Samuel Vanhove [Fri, 30 Sep 2016 17:28:22 +0000 (13:28 -0400)]
CRM-16352 - civilint errors
Samuel Vanhove [Fri, 30 Sep 2016 17:04:24 +0000 (13:04 -0400)]
CRM-16352 - genCode to reflect the add of column language in mailing table
Samuel Vanhove [Fri, 30 Sep 2016 17:03:03 +0000 (13:03 -0400)]
CRM-16352 - improve browsing by language
Mathieu Lutfy [Sat, 25 Jul 2015 15:14:26 +0000 (11:14 -0400)]
CRM-16352: Mailing language in Browse.tpl
Mathieu Lutfy [Sat, 25 Jul 2015 15:07:01 +0000 (11:07 -0400)]
CRM-16352: Allow to define the language of Mailings (for tokens).
Frederic Guzman [Thu, 6 Oct 2016 14:29:38 +0000 (10:29 -0400)]
UTF "-" 8
Frederic Guzman [Thu, 6 Oct 2016 14:16:14 +0000 (10:16 -0400)]
CRM-19465 - Capitalization displaying contries when in mailing mode
Avoiding possible issues with special characters.
Yashodha Chaku [Thu, 6 Oct 2016 14:00:59 +0000 (19:30 +0530)]
Merge pull request #9170 from tschuettler/CRM-19454
CRM-19454 - Fix unset of localised columns in custom searches