civicrm-core.git
8 years agoCRM-19290 Fix date creation in Karma test
Seamus Lee [Wed, 31 Aug 2016 23:40:25 +0000 (09:40 +1000)]
CRM-19290 Fix date creation in Karma test

8 years agoMerge pull request #8951 from jitendrapurohit/CRM-19275
Yashodha Chaku [Wed, 31 Aug 2016 09:36:07 +0000 (15:06 +0530)]
Merge pull request #8951 from jitendrapurohit/CRM-19275

CRM-19275 - DB Error on adding priceset when deferred revenue setting…

8 years agoMerge pull request #8943 from seamuslee001/CRM-19261
Tim Otten [Tue, 30 Aug 2016 20:59:06 +0000 (13:59 -0700)]
Merge pull request #8943 from seamuslee001/CRM-19261

CRM-19261 Set uniqueID as well

8 years agoCRM-19275 - DB Error on adding priceset when deferred revenue setting is enabled
jitendrapurohit [Tue, 30 Aug 2016 09:57:34 +0000 (15:27 +0530)]
CRM-19275 - DB Error on adding priceset when deferred revenue setting is enabled

8 years agoMerge pull request #8760 from jitendrapurohit/CRM-19121
Monish Deb [Tue, 30 Aug 2016 04:44:02 +0000 (10:14 +0530)]
Merge pull request #8760 from jitendrapurohit/CRM-19121

CRM-19121 - add DT for soft credit listings

8 years agoSet version to 4.7.12
Tim Otten [Tue, 30 Aug 2016 04:01:15 +0000 (21:01 -0700)]
Set version to 4.7.12

8 years agoMerge pull request #8936 from cividesk/CRM-19261-4.7
Tim Otten [Mon, 29 Aug 2016 22:01:23 +0000 (15:01 -0700)]
Merge pull request #8936 from cividesk/CRM-19261-4.7

CRM-19261: full fix

8 years agoFix escaping
Seamus Lee [Mon, 29 Aug 2016 07:29:12 +0000 (17:29 +1000)]
Fix escaping

8 years agoCRM-19261 Set uniqueID as well
Seamus Lee [Mon, 29 Aug 2016 22:24:44 +0000 (08:24 +1000)]
CRM-19261 Set uniqueID as well

8 years agoMerge pull request #8934 from JMAConsulting/CRM-19260
Yashodha Chaku [Mon, 29 Aug 2016 06:54:23 +0000 (12:24 +0530)]
Merge pull request #8934 from JMAConsulting/CRM-19260

CRM-19260, fixed function name

8 years agoMerge pull request #8939 from colemanw/dashlet
colemanw [Sat, 27 Aug 2016 19:11:04 +0000 (15:11 -0400)]
Merge pull request #8939 from colemanw/dashlet

CRM-18953 - Add events tab to news dashlet

8 years agoMerge pull request #8624 from saurabhbatra96/validate-api
Eileen McNaughton [Sat, 27 Aug 2016 03:34:17 +0000 (15:34 +1200)]
Merge pull request #8624 from saurabhbatra96/validate-api

CRM-18981 Add a 'validate' action to CiviCRM API

8 years agoMerge pull request #8914 from totten/master-soap
Tim Otten [Sat, 27 Aug 2016 01:26:27 +0000 (18:26 -0700)]
Merge pull request #8914 from totten/master-soap

CRM-19154, CRM-18808 - Add E2E tests for web-service end-points. SOAP/REST fixes.

8 years agoMerge pull request #8938 from jcharaoui/fix-array-key-exists-null
Tim Otten [Sat, 27 Aug 2016 00:38:33 +0000 (17:38 -0700)]
Merge pull request #8938 from jcharaoui/fix-array-key-exists-null

Fix array_key_exists() PHP warning in Report Forms

8 years agoCRM-18953 - Add events tab to news dashlet
Coleman Watts [Fri, 26 Aug 2016 02:44:22 +0000 (22:44 -0400)]
CRM-18953 - Add events tab to news dashlet

8 years agoCRM_Utils_ICalendar cleanup
Coleman Watts [Thu, 25 Aug 2016 02:36:02 +0000 (22:36 -0400)]
CRM_Utils_ICalendar cleanup

8 years agoFix array_key_exists() PHP warning in Report Forms
Jerome Charaoui [Fri, 26 Aug 2016 18:12:59 +0000 (14:12 -0400)]
Fix array_key_exists() PHP warning in Report Forms

If the query just below returns an empty set, PHP throws a warning about $customFields being undefined (null), so initialize it properly as an empty array.

8 years agoCRM-19261: full fix
Nicolas Ganivet [Fri, 26 Aug 2016 07:27:18 +0000 (01:27 -0600)]
CRM-19261: full fix

8 years agoCRM-19260, fixed function name
Pradeep Nayak [Fri, 26 Aug 2016 05:51:45 +0000 (11:21 +0530)]
CRM-19260, fixed function name

----------------------------------------
* CRM-19260: Fatal Error on View Contribution
  https://issues.civicrm.org/jira/browse/CRM-19260

8 years agoMerge pull request #8933 from ejegg/mergeNotices
Eileen McNaughton [Fri, 26 Aug 2016 02:40:52 +0000 (14:40 +1200)]
Merge pull request #8933 from ejegg/mergeNotices

Fix undefined index notices in merge

8 years agoMerge pull request #8925 from seamuslee001/CRM-15928
Tim Otten [Thu, 25 Aug 2016 21:06:58 +0000 (14:06 -0700)]
Merge pull request #8925 from seamuslee001/CRM-15928

CRM-15928

8 years agoFix undefined index notices in merge
Elliott Eggleston [Thu, 25 Aug 2016 19:17:07 +0000 (15:17 -0400)]
Fix undefined index notices in merge

8 years agoMerge pull request #8927 from yashodha/CRM-19228
Yashodha Chaku [Thu, 25 Aug 2016 10:30:34 +0000 (16:00 +0530)]
Merge pull request #8927 from yashodha/CRM-19228

CRM-19228: $contributionPageId is not populated in Contribution Receipt email

8 years agoMove varible setting for allowRemoteSubmit outsite immediate if
Seamus Lee [Wed, 24 Aug 2016 21:12:01 +0000 (07:12 +1000)]
Move varible setting for allowRemoteSubmit outsite immediate if

8 years agoRemove unrelated template stuff possibly brought in in merge from Pradeep
Seamus Lee [Wed, 24 Aug 2016 21:04:25 +0000 (07:04 +1000)]
Remove unrelated template stuff possibly brought in in merge from Pradeep

8 years agoFix template variable
Seamus Lee [Thu, 25 Aug 2016 06:46:43 +0000 (16:46 +1000)]
Fix template variable

8 years agoRemove stray </tr>
Seamus Lee [Wed, 24 Aug 2016 04:07:56 +0000 (14:07 +1000)]
Remove stray </tr>

8 years agoCRM-15928. Fix missed variable name change (thanks @seamuslee!)
Chris Burgess [Wed, 24 Aug 2016 01:21:06 +0000 (13:21 +1200)]
CRM-15928. Fix missed variable name change (thanks @seamuslee!)

8 years agoCRM-15928. Improve variable name and docs for remote profile embed functionality.
Chris Burgess [Wed, 24 Aug 2016 01:06:45 +0000 (13:06 +1200)]
CRM-15928. Improve variable name and docs for remote profile embed functionality.

8 years agoCRM-15928. Rename variable to be more descriptive, update inline docs.
Chris Burgess [Tue, 23 Aug 2016 23:54:29 +0000 (11:54 +1200)]
CRM-15928. Rename variable to be more descriptive, update inline docs.

8 years agoCRM-15928, Added code to create qfkey for profile on the basis of global settings
Pradeep Nayak [Fri, 10 Jun 2016 12:16:47 +0000 (17:46 +0530)]
CRM-15928, Added code to create qfkey for profile on the basis of global settings

8 years agoMerge pull request #8514 from fuzionnz/CRM-13640
Tim Otten [Wed, 24 Aug 2016 21:49:17 +0000 (14:49 -0700)]
Merge pull request #8514 from fuzionnz/CRM-13640

CRM-13640: Improve hash generator for logfile.

8 years agoFix amount display
jitendrapurohit [Wed, 24 Aug 2016 12:40:11 +0000 (18:10 +0530)]
Fix amount display

8 years agoCRM-19121 - add DT for soft credit listings
jitendrapurohit [Tue, 26 Jul 2016 10:51:34 +0000 (16:21 +0530)]
CRM-19121 - add DT for soft credit listings

8 years agoMerge pull request #8926 from jitendrapurohit/CRM-19242
Monish Deb [Wed, 24 Aug 2016 11:43:28 +0000 (17:13 +0530)]
Merge pull request #8926 from jitendrapurohit/CRM-19242

CRM-19242 - fix create report task

8 years agoCRM-19228: is not populated in Contribution Receipt email
yashodha [Wed, 24 Aug 2016 09:12:07 +0000 (14:42 +0530)]
CRM-19228:  is not populated in Contribution Receipt email

----------------------------------------
* CRM-19228: $contributionPageId is not populated in Contribution Receipt email
  https://issues.civicrm.org/jira/browse/CRM-19228

8 years agoCRM-19242 - fix create report task
jitendrapurohit [Wed, 24 Aug 2016 05:25:52 +0000 (10:55 +0530)]
CRM-19242 - fix create report task

8 years agoMerge pull request #8919 from PalanteJon/CRM-19257
Tim Otten [Wed, 24 Aug 2016 05:12:35 +0000 (22:12 -0700)]
Merge pull request #8919 from PalanteJon/CRM-19257

CRM-19257 - Fix PHP warning when browsing custom field multiple choic…

8 years agoCRM-13640. Public generateLogFileHash.
Chris Burgess [Wed, 24 Aug 2016 03:16:30 +0000 (15:16 +1200)]
CRM-13640. Public generateLogFileHash.

8 years agoMerge pull request #8922 from totten/master-sql-import
Eileen McNaughton [Wed, 24 Aug 2016 01:06:51 +0000 (13:06 +1200)]
Merge pull request #8922 from totten/master-sql-import

CRM-15925 - Define extra import permission

8 years agoUpdate test to account for CRM-13640.
Chris Burgess [Tue, 23 Aug 2016 23:08:16 +0000 (11:08 +1200)]
Update test to account for CRM-13640.

8 years agoCRM-15925 - CRM_Contact_Import_Form_DataSource - Enforce permissions
Tim Otten [Tue, 23 Aug 2016 22:56:10 +0000 (15:56 -0700)]
CRM-15925 - CRM_Contact_Import_Form_DataSource - Enforce permissions

8 years agoCRM-15925 - CRM_Import_DataSource_SQL - Declare required permission
Tim Otten [Tue, 23 Aug 2016 22:55:29 +0000 (15:55 -0700)]
CRM-15925 - CRM_Import_DataSource_SQL - Declare required permission

8 years agoCRM-15925 - CRM_Core_Permissions - Declare "import SQL datasource"
Tim Otten [Tue, 23 Aug 2016 22:53:22 +0000 (15:53 -0700)]
CRM-15925 - CRM_Core_Permissions - Declare "import SQL datasource"

8 years agoCRM-13640. Correct whitespace.
Chris Burgess [Tue, 23 Aug 2016 21:33:37 +0000 (09:33 +1200)]
CRM-13640. Correct whitespace.

8 years agoMerge remote-tracking branch 'origin/master' into CRM-13640
Chris Burgess [Tue, 23 Aug 2016 21:29:00 +0000 (09:29 +1200)]
Merge remote-tracking branch 'origin/master' into CRM-13640

8 years agoMerge pull request #8552 from adixon/CRM-12132
Tim Otten [Tue, 23 Aug 2016 21:13:17 +0000 (14:13 -0700)]
Merge pull request #8552 from adixon/CRM-12132

CRM-12132 - Allow custom TTL for forms

8 years agoCiviEndToEndTestcase - Ensure users match when testing on clean environment
Tim Otten [Tue, 23 Aug 2016 11:30:39 +0000 (04:30 -0700)]
CiviEndToEndTestcase - Ensure users match when testing on clean environment

8 years agoCRM-18808, CRM-19154 - Add E2E_Extern_SoapTest
Tim Otten [Tue, 23 Aug 2016 07:26:46 +0000 (00:26 -0700)]
CRM-18808, CRM-19154 - Add E2E_Extern_SoapTest

8 years agoConvert WebTest_Utils_RestTest to E2E_Extern_RestTest
Tim Otten [Tue, 23 Aug 2016 07:23:22 +0000 (00:23 -0700)]
Convert WebTest_Utils_RestTest to E2E_Extern_RestTest

8 years agoCiviEndToEndTestcase - Base class
Tim Otten [Tue, 23 Aug 2016 07:20:26 +0000 (00:20 -0700)]
CiviEndToEndTestcase - Base class

8 years agoCRM_Utils_REST - Always boot CMS, even in error conditions
Tim Otten [Tue, 23 Aug 2016 07:00:10 +0000 (00:00 -0700)]
CRM_Utils_REST - Always boot CMS, even in error conditions

Now-a-days, HTTP headers are outputted using CMS functions, which means
that the CMS must always boot -- even if you're only displaying an error
message. This caused regressions in the REST error handling.  Why?
The boot sequence is really quirky with the REST calls... and the
required CMS functions were not always available.

This revision ensures that (one way or another) the CMS does get booted.
Notably, though, in the error scenarios, it boots *without* loading or
authenticating a user.

8 years ago`tests/README` - Rewrite
Tim Otten [Tue, 23 Aug 2016 04:59:42 +0000 (21:59 -0700)]
`tests/README` - Rewrite

8 years agoE2E_AllTests - Add suite for non-selenium end-to-end testing
Tim Otten [Tue, 23 Aug 2016 04:59:17 +0000 (21:59 -0700)]
E2E_AllTests - Add suite for non-selenium end-to-end testing

8 years agoCRM-18808, CRM-19154 - CRM_Utils_SoapServer - Fix call to authenticate()
Tim Otten [Tue, 23 Aug 2016 03:24:14 +0000 (20:24 -0700)]
CRM-18808, CRM-19154 - CRM_Utils_SoapServer - Fix call to authenticate()

This function call bombs (on Drupal) because the method is not really
static. Need this to work so we can have a test...

8 years agoCRM-19257 - Fix PHP warning when browsing custom field multiple choice options
Jon goldberg [Tue, 23 Aug 2016 20:39:39 +0000 (16:39 -0400)]
CRM-19257 - Fix PHP warning when browsing custom field multiple choice options

8 years agoMerge pull request #8912 from eileenmcnaughton/membership
Eileen McNaughton [Mon, 22 Aug 2016 17:33:28 +0000 (05:33 +1200)]
Merge pull request #8912 from eileenmcnaughton/membership

Fix contribution page test to create & check line-items

8 years agoFix contribution page test to create & check line-items
eileen [Mon, 22 Aug 2016 08:22:55 +0000 (20:22 +1200)]
Fix contribution page test to create & check line-items

8 years agoMerge pull request #8908 from seamuslee001/CRM-16876-2
Eileen McNaughton [Sat, 20 Aug 2016 01:45:38 +0000 (13:45 +1200)]
Merge pull request #8908 from seamuslee001/CRM-16876-2

CRM-16876 2nd attempt at capitalising country names, Also add a setting allowin…

8 years agoMerge pull request #8909 from tschuettler/patch-4
Eileen McNaughton [Fri, 19 Aug 2016 22:16:38 +0000 (10:16 +1200)]
Merge pull request #8909 from tschuettler/patch-4

CRM-19248

8 years agoFix class name following testing locally
Seamus Lee [Fri, 19 Aug 2016 21:28:43 +0000 (07:28 +1000)]
Fix class name following testing locally

8 years agoAdd in test from previous PR
Seamus Lee [Fri, 19 Aug 2016 21:08:10 +0000 (07:08 +1000)]
Add in test from previous PR

8 years agoCRM-19248
tschuettler [Fri, 19 Aug 2016 12:46:40 +0000 (14:46 +0200)]
CRM-19248

Restoring pagingType from 4.5.4

8 years ago2nd attempt at capitalising country names, Also add a setting allowing users to hide...
Seamus Lee [Fri, 19 Aug 2016 09:38:19 +0000 (19:38 +1000)]
2nd attempt at capitalising country names, Also add a setting allowing users to hide country if country matches that of domain country

8 years agoMerge pull request #1 from totten/adixon-CRM-12132
Alan Dixon [Thu, 18 Aug 2016 22:27:44 +0000 (18:27 -0400)]
Merge pull request #1 from totten/adixon-CRM-12132

CRM-12132 - Declare `secure_cache_timeout_minutes` setting

8 years agoMerge pull request #8843 from eileenmcnaughton/merge_fixes
Eileen McNaughton [Thu, 18 Aug 2016 21:56:01 +0000 (09:56 +1200)]
Merge pull request #8843 from eileenmcnaughton/merge_fixes

CRM-19197 merge links fix and CRM-19198 Add form merge hook call

8 years agoCRM-12132 - Make special timeout for event/contrib conditional
Tim Otten [Thu, 18 Aug 2016 21:45:29 +0000 (14:45 -0700)]
CRM-12132 - Make special timeout for event/contrib conditional

The conditional `if ($session)` was previously applied to this code;
restoring.

8 years agoCRM-12132 - Declare `secure_cache_timeout_minutes` setting
Tim Otten [Thu, 18 Aug 2016 21:40:48 +0000 (14:40 -0700)]
CRM-12132 - Declare `secure_cache_timeout_minutes` setting

8 years agoMerge pull request #8886 from eileenmcnaughton/paypal
Eileen McNaughton [Thu, 18 Aug 2016 21:29:31 +0000 (09:29 +1200)]
Merge pull request #8886 from eileenmcnaughton/paypal

CRM-18483 Update paypal standard to use processor specific url

8 years agoMerge pull request #8808 from totten/master-cxn-welcome
Tim Otten [Thu, 18 Aug 2016 19:48:10 +0000 (12:48 -0700)]
Merge pull request #8808 from totten/master-cxn-welcome

CRM-19169 - ang/crmCxn - If `welcome` link defined, open it

8 years agoconvert hard-coded 20 minute secure cache timeout to const with settings override
adixon [Thu, 18 Aug 2016 17:13:27 +0000 (13:13 -0400)]
convert hard-coded 20 minute secure cache timeout to const with settings override

8 years agoAlways cleanup stale contribution-related page caches
adixon [Mon, 13 Jun 2016 16:27:21 +0000 (12:27 -0400)]
Always cleanup stale contribution-related page caches

8 years agoMerge pull request #8905 from jitendrapurohit/CRM-19238
Monish Deb [Thu, 18 Aug 2016 12:27:37 +0000 (17:57 +0530)]
Merge pull request #8905 from jitendrapurohit/CRM-19238

CRM-19238 - Print/Merge Document not creating Activity after download

8 years agoMerge pull request #8904 from jitendrapurohit/CRM-19236-test
Monish Deb [Thu, 18 Aug 2016 12:11:26 +0000 (17:41 +0530)]
Merge pull request #8904 from jitendrapurohit/CRM-19236-test

Test to check CRM-19236

8 years agoCRM-19238 - Print/Merge Document not creating Activity after download
jitendrapurohit [Thu, 18 Aug 2016 11:44:49 +0000 (17:14 +0530)]
CRM-19238 - Print/Merge Document not creating Activity after download

8 years agoTest to check CRM-19236
jitendrapurohit [Thu, 18 Aug 2016 11:16:13 +0000 (16:46 +0530)]
Test to check CRM-19236

8 years agoMerge pull request #8900 from scardinius/crm-19236
Yashodha Chaku [Thu, 18 Aug 2016 10:12:32 +0000 (15:42 +0530)]
Merge pull request #8900 from scardinius/crm-19236

CRM-19236: URL with unicode signs breaks down trackable urls

8 years agoMerge pull request #8863 from fuzionnz/CRM-19215
Monish Deb [Thu, 18 Aug 2016 10:09:53 +0000 (15:39 +0530)]
Merge pull request #8863 from fuzionnz/CRM-19215

CRM-19215. Handle peculiar format of From header.

8 years agoavoid fetching processor ID from IPN reponse and added unit test
deb.monish [Thu, 18 Aug 2016 09:21:04 +0000 (14:51 +0530)]
avoid fetching processor ID from IPN reponse and added unit test

8 years agoMerge pull request #8793 from eileenmcnaughton/pledge
Monish Deb [Thu, 18 Aug 2016 08:46:45 +0000 (14:16 +0530)]
Merge pull request #8793 from eileenmcnaughton/pledge

CRM-18259 call pledge & pledgePayment specific functions for geting status

8 years agoMerge pull request #8903 from eileenmcnaughton/report_filters
Yashodha Chaku [Thu, 18 Aug 2016 06:13:13 +0000 (11:43 +0530)]
Merge pull request #8903 from eileenmcnaughton/report_filters

CRM-19241 Add communication filters to reports

8 years agoCRM-19241 Add communication filters to reports
eileen [Thu, 18 Aug 2016 02:40:04 +0000 (14:40 +1200)]
CRM-19241 Add communication filters to reports

8 years agoCRM_Contact_Page_AJAX - Style fix
Tim Otten [Thu, 18 Aug 2016 00:16:19 +0000 (17:16 -0700)]
CRM_Contact_Page_AJAX - Style fix

8 years agoMerge branch 'civiExit' of https://github.com/colemanw/civicrm-core into colemanw...
Tim Otten [Thu, 18 Aug 2016 00:17:43 +0000 (17:17 -0700)]
Merge branch 'civiExit' of https://github.com/colemanw/civicrm-core into colemanw-civiExit

8 years agoMerge pull request #8901 from GinkgoFJG/CRM-19068
Eileen McNaughton [Wed, 17 Aug 2016 21:29:02 +0000 (09:29 +1200)]
Merge pull request #8901 from GinkgoFJG/CRM-19068

CRM-19068: Code style change.

8 years agoCRM-18744 - Fix quotes in smarty tag
Coleman Watts [Wed, 17 Aug 2016 18:45:53 +0000 (14:45 -0400)]
CRM-18744 - Fix quotes in smarty tag

8 years agoCRM-19068: Code style change. Reduced verbosity and removed the dreaded $dc
Frank J. Gómez [Wed, 17 Aug 2016 15:29:18 +0000 (11:29 -0400)]
CRM-19068: Code style change. Reduced verbosity and removed the dreaded $dc
(or $dont_care) variable.

8 years agoCRM-19236: URL with unicode signs breaks down trackable urls
scardinius [Wed, 17 Aug 2016 14:18:10 +0000 (16:18 +0200)]
CRM-19236: URL with unicode signs breaks down trackable urls

8 years agoMerge pull request #8895 from totten/master-bin-adm
Eileen McNaughton [Wed, 17 Aug 2016 07:35:57 +0000 (19:35 +1200)]
Merge pull request #8895 from totten/master-bin-adm

CRM-19223 - Tighter permissions for migration scripts

8 years agoFix DedupeFind cache set call
Elliott Eggleston [Wed, 10 Aug 2016 20:55:33 +0000 (16:55 -0400)]
Fix DedupeFind cache set call

set, not get.

8 years agoCRM-19197 fix some more merge links
eileen [Wed, 10 Aug 2016 00:39:53 +0000 (12:39 +1200)]
CRM-19197 fix some more merge links

8 years agoCRM-19223 - bin/encryptDB.php - Completely disable by default
Tim Otten [Wed, 17 Aug 2016 02:04:42 +0000 (19:04 -0700)]
CRM-19223 - bin/encryptDB.php - Completely disable by default

Arguably, it's sufficient to check for administrative privileges...  since
an administrator can do this kind of damage anyway...  but this use-case is
so broad, dangerous, and uncommon that it really shouldn't be available
unless you take extraordinary measures.

It's tempting to remove the file entirely, but some upgrade workflows don't
properly handle deleted files, and some users may still want access to this
code so that they can run it themselves.

8 years agomigrate/(export,import)JSON.php - Syntax cleanup
Tim Otten [Wed, 17 Aug 2016 01:57:07 +0000 (18:57 -0700)]
migrate/(export,import)JSON.php - Syntax cleanup

8 years agoCRM-19198 Add form merge hook call to dedupe form
eileen [Tue, 9 Aug 2016 07:05:47 +0000 (19:05 +1200)]
CRM-19198 Add form merge hook call to dedupe form

8 years agoCRM-19197 Stop Merge links from dropping the limit parameter
eileen [Tue, 9 Aug 2016 06:53:30 +0000 (18:53 +1200)]
CRM-19197 Stop Merge links from dropping the limit parameter

Note that I decided that we did not need to avoid adding parameters to the url if they were empty.

The code is simpler with &reset=1&rgid=&gid=9 and I think that is equally valid. I had to change
one place in the code to make that work - but it was a change that should have been made.

8 years agoMerge pull request #8764 from colemanw/CRM-18744
Eileen McNaughton [Wed, 17 Aug 2016 01:10:28 +0000 (13:10 +1200)]
Merge pull request #8764 from colemanw/CRM-18744

CRM-18744 - Add prompt text when search term not found

8 years agoMerge pull request #8869 from seamuslee001/CRM-19218
Eileen McNaughton [Tue, 16 Aug 2016 22:58:42 +0000 (10:58 +1200)]
Merge pull request #8869 from seamuslee001/CRM-19218

CRM-19218 Fix unindexed join by getting option values using api

8 years agoMerge pull request #8066 from totten/master-alter-menu-rb
Eileen McNaughton [Tue, 16 Aug 2016 21:58:52 +0000 (09:58 +1200)]
Merge pull request #8066 from totten/master-alter-menu-rb

CRM-17570 - CRM_Core_Menu - Fire `alterMenu` hook

8 years agoMerge pull request #8887 from seamuslee001/CRM-19229
Tim Otten [Tue, 16 Aug 2016 21:01:33 +0000 (14:01 -0700)]
Merge pull request #8887 from seamuslee001/CRM-19229

CRM-19229 empty the bower_components folder if it already exists when…

8 years agoMerge pull request #8787 from agh1/soap-wp-4.7
Eileen McNaughton [Tue, 16 Aug 2016 08:47:19 +0000 (20:47 +1200)]
Merge pull request #8787 from agh1/soap-wp-4.7

SOAP Authentication Fails on WP (4.7)