civicrm-core.git
7 years agoGroups filter hack for smaller groups listings 4.6.29-fsf-mod0
Andrew Engelbrecht [Fri, 15 Sep 2017 20:15:10 +0000 (16:15 -0400)]
Groups filter hack for smaller groups listings

This change is a dirty hack that lets site admins filter the "Contacts
Group(s)" field output in select profiles. This reduces overwhem for
users when they are making a donation or filling out a form with the
Groups signup field. This is preferable to using a custom field with
smart groups because the Groups field provides double opt-in, while
custom fields do not.

The filter is controlled via a json string stored in a drupal variable
that can be set with drush like so:

drush vset --format=string groups_field_filters "{...}"

See the documentation marked with "sudoman hack" in
CRM/Contact/Form/Edit/TagsAndGroups.php for an example.

7 years agoMerge tag '4.6.29' of https://github.com/civicrm/civicrm-core into 4.6.29-fsf 4.6.29-fsf
Andrew Engelbrecht [Mon, 10 Jul 2017 16:08:10 +0000 (12:08 -0400)]
Merge tag '4.6.29' of https://github.com/civicrm/civicrm-core into 4.6.29-fsf

7 years agoMerge pull request #10608 from seamuslee001/CRM-20243-joomla-46
Tim Otten [Wed, 5 Jul 2017 23:32:45 +0000 (16:32 -0700)]
Merge pull request #10608 from seamuslee001/CRM-20243-joomla-46

CRM-20243 - Add check for deleted files and try removing them as part of upgrade

7 years agoMinor updates following testing and update version
Seamus Lee [Wed, 5 Jul 2017 22:19:49 +0000 (08:19 +1000)]
Minor updates following testing and update version

7 years agoMerge pull request #10590 from seamuslee001/CRM-20561-46-unified
Mark Hanna [Wed, 5 Jul 2017 13:35:39 +0000 (08:35 -0500)]
Merge pull request #10590 from seamuslee001/CRM-20561-46-unified

CRM-18408 CRM-20561

7 years agoFix some files
Seamus Lee [Wed, 5 Jul 2017 08:58:19 +0000 (18:58 +1000)]
Fix some files

7 years agoAttempt to fix upgrade fails
Seamus Lee [Wed, 5 Jul 2017 00:10:55 +0000 (10:10 +1000)]
Attempt to fix upgrade fails

7 years agoCRM-20243 - Add check for deleted files
Tim Otten [Tue, 27 Jun 2017 06:35:36 +0000 (23:35 -0700)]
CRM-20243 - Add check for deleted files

CRM-20243 - CRM_Upgrade_Form - Delete orphaned files before upgrade

CRM-20243 - CRM_Utils_Check - Simplify Auth/SASL checks

CRM-20243 Attempt to alter file deletion for use in 4.6

7 years agoCRM-20561 Use composer to provide Auth_SASL
Seamus Lee [Sun, 21 May 2017 10:19:50 +0000 (20:19 +1000)]
CRM-20561 Use composer to provide Auth_SASL

7 years agoCRM-18408 update ca-config and cxn-rpc
Seamus Lee [Fri, 16 Jun 2017 08:53:17 +0000 (18:53 +1000)]
CRM-18408 update ca-config and cxn-rpc

7 years agoMerge pull request #10387 from seamuslee001/CRM-20561-46
Mark Hanna [Tue, 4 Jul 2017 17:38:12 +0000 (12:38 -0500)]
Merge pull request #10387 from seamuslee001/CRM-20561-46

CRM-20561 Use composer for Net_SMTP and Net_Socket and patch for TLS and CiviCRM Custom Error

7 years agoMerge pull request #10475 from JMAConsulting/CRM-19226
Mark Hanna [Sat, 24 Jun 2017 00:39:12 +0000 (19:39 -0500)]
Merge pull request #10475 from JMAConsulting/CRM-19226

CRM-19226: Fix loginUrl token in drupal for CiviCRM 4.6.x

7 years agoCRM-20561 - net-smtp-fix.sh - Cleanup code style
Tim Otten [Fri, 16 Jun 2017 04:03:44 +0000 (21:03 -0700)]
CRM-20561 - net-smtp-fix.sh - Cleanup code style

7 years agoCRM-20561 - Net_SMTP - Remove example files
Tim Otten [Fri, 16 Jun 2017 04:03:18 +0000 (21:03 -0700)]
CRM-20561 - Net_SMTP - Remove example files

7 years agoCRM-8597, CRM-20561 - Restore fix for `&`
Tim Otten [Fri, 16 Jun 2017 03:13:22 +0000 (20:13 -0700)]
CRM-8597, CRM-20561 - Restore fix for `&`

7 years agoMerge pull request #10015 from seanmadsen/CRM-20300
Mark Hanna [Mon, 12 Jun 2017 17:08:59 +0000 (12:08 -0500)]
Merge pull request #10015 from seanmadsen/CRM-20300

CRM-20300 - Fix in-app documentation links

7 years agoMerge pull request #10308 from davejenx/CRM-17331
Mark Hanna [Mon, 12 Jun 2017 04:18:16 +0000 (23:18 -0500)]
Merge pull request #10308 from davejenx/CRM-17331

CRM-17331 - Mass SMSes are not being sent - fix for 4.6

7 years agoMerge pull request #9811 from yashodha/CRM-19950-4.6
Mark Hanna [Mon, 12 Jun 2017 04:14:19 +0000 (23:14 -0500)]
Merge pull request #9811 from yashodha/CRM-19950-4.6

CRM-19950 : Wrong param passed to checkPermission function

7 years agoMerge pull request #10422 from davejenx/access-mailing-reports-46
Mark Hanna [Mon, 12 Jun 2017 02:24:53 +0000 (21:24 -0500)]
Merge pull request #10422 from davejenx/access-mailing-reports-46

Improve user checking for mailing reports

7 years agoMerge pull request #9855 from adixon/CRM-20040-4-6
Mark Hanna [Mon, 12 Jun 2017 02:15:28 +0000 (21:15 -0500)]
Merge pull request #9855 from adixon/CRM-20040-4-6

(WIP) CRM-20040 Handle apostrophes and double double quotes in on behalf of Org fields

7 years agoMerge pull request #10408 from jackrabbithanna/CRM-20487
Mark Hanna [Mon, 12 Jun 2017 01:32:33 +0000 (20:32 -0500)]
Merge pull request #10408 from jackrabbithanna/CRM-20487

CRM-20847 updating PINGBACK_URL to https in CRM_Utils_VersionCheck

7 years agoMerge pull request #10410 from jackrabbithanna/CRM-20301
Mark Hanna [Mon, 12 Jun 2017 01:31:22 +0000 (20:31 -0500)]
Merge pull request #10410 from jackrabbithanna/CRM-20301

CRM-20301 backport for 4.6

7 years agoMerge pull request #10409 from jackrabbithanna/CRM-20046
Mark Hanna [Mon, 12 Jun 2017 01:30:12 +0000 (20:30 -0500)]
Merge pull request #10409 from jackrabbithanna/CRM-20046

CRM-20046 escaping item titles in recently viewed block

7 years agoMerge pull request #10411 from jackrabbithanna/CRM-20159
Mark Hanna [Mon, 12 Jun 2017 01:29:10 +0000 (20:29 -0500)]
Merge pull request #10411 from jackrabbithanna/CRM-20159

CRM-20159 backport for 4.6

7 years agoCRM-19226: Fix loginUrl token in drupal for CiviCRM 4.6.x
Pradeep Nayak [Tue, 6 Jun 2017 17:32:15 +0000 (23:02 +0530)]
CRM-19226: Fix loginUrl token in drupal for CiviCRM 4.6.x

----------------------------------------
* CRM-19226: $loginUrl token not populating in Drupal 7
  https://issues.civicrm.org/jira/browse/CRM-19226

7 years agoImprove user checking for mailing reports
Dave Jenkins [Fri, 26 May 2017 17:34:51 +0000 (18:34 +0100)]
Improve user checking for mailing reports

7 years agoCRM-20159 backport for 4.6
Mark Hanna [Wed, 24 May 2017 02:58:47 +0000 (21:58 -0500)]
CRM-20159 backport for 4.6

7 years agoCRM-20301 backport for 4.6
Mark Hanna [Wed, 24 May 2017 02:30:59 +0000 (21:30 -0500)]
CRM-20301 backport for 4.6

7 years agoCRM-20046 escaping item titles in recently viewed block
Mark Hanna [Wed, 24 May 2017 02:17:52 +0000 (21:17 -0500)]
CRM-20046 escaping item titles in recently viewed block

7 years agoupdating PINGBACK_URL to https in CRM_Utils_VersionCheck
Mark Hanna [Wed, 24 May 2017 01:44:49 +0000 (20:44 -0500)]
updating PINGBACK_URL to https in CRM_Utils_VersionCheck

7 years agoAdd patch to Net_SMTP for php7 compatability
Seamus Lee [Sat, 20 May 2017 02:42:47 +0000 (12:42 +1000)]
Add patch to Net_SMTP for php7 compatability

7 years agoUse composer for Net_SMTP and Net_Socket and patch for TLS and CiviCRM Custom Error
Seamus Lee [Fri, 19 May 2017 23:33:28 +0000 (09:33 +1000)]
Use composer for Net_SMTP and Net_Socket and patch for TLS and CiviCRM Custom Error

Roll back Net_Socket for php compatabilty

7 years agoMerge pull request #9520 from davejenx/CRM-19735
colemanw [Tue, 9 May 2017 20:00:18 +0000 (16:00 -0400)]
Merge pull request #9520 from davejenx/CRM-19735

CRM-19735 - allow contact's second membership to inherit.

7 years agoCRM-17331 - Mass SMSes are not being sent - fix for 4.6
Dave Jenkins [Fri, 5 May 2017 16:19:07 +0000 (17:19 +0100)]
CRM-17331 - Mass SMSes are not being sent - fix for 4.6

7 years agoSet version to 4.6.29
CiviCRM [Thu, 4 May 2017 07:26:41 +0000 (07:26 +0000)]
Set version to 4.6.29

7 years agoMerge pull request #10299 from totten/4.6-distmaker
Tim Otten [Thu, 4 May 2017 06:40:30 +0000 (01:40 -0500)]
Merge pull request #10299 from totten/4.6-distmaker

Backport distmaker changes to 4.6

7 years agodistmaker/utils/repo-report.php - Pass civilint
Tim Otten [Thu, 4 May 2017 06:34:30 +0000 (01:34 -0500)]
distmaker/utils/repo-report.php - Pass civilint

7 years agodistmaker/utils/repo-report.php - Add missing Joomla element
Tim Otten [Thu, 4 May 2017 06:21:00 +0000 (01:21 -0500)]
distmaker/utils/repo-report.php - Add missing Joomla element

7 years agoCRM-19417 - repo-report for 4.6 shouldn't mention backdrop
Tim Otten [Thu, 4 May 2017 06:03:00 +0000 (01:03 -0500)]
CRM-19417 - repo-report for 4.6 shouldn't mention backdrop

7 years agoCRM-19417 - distmaker - Rename report file. Tweak edge-case for missing repos.
Tim Otten [Wed, 28 Sep 2016 19:21:08 +0000 (15:21 -0400)]
CRM-19417 - distmaker - Rename report file. Tweak edge-case for missing repos.

7 years agoCRM-19417 - distmaker JSON report - Tighten ordering, fix typo
Tim Otten [Wed, 28 Sep 2016 03:53:20 +0000 (23:53 -0400)]
CRM-19417 - distmaker JSON report - Tighten ordering, fix typo

7 years agoCRM-19417 - distmaker - JSON format should better match upgrade checker
Tim Otten [Wed, 28 Sep 2016 02:53:50 +0000 (22:53 -0400)]
CRM-19417 - distmaker - JSON format should better match upgrade checker

7 years agoCRM-19417 - distmaker - Change report to JSON
Tim Otten [Wed, 28 Sep 2016 02:16:53 +0000 (22:16 -0400)]
CRM-19417 - distmaker - Change report to JSON

7 years agoCRM-19417 - distmaker - Change report to key-value format. Add version.
Tim Otten [Wed, 28 Sep 2016 01:33:33 +0000 (21:33 -0400)]
CRM-19417 - distmaker - Change report to key-value format. Add version.

7 years agoCRM-19417 - distmaker - Generate report about git revisions
Tim Otten [Wed, 28 Sep 2016 00:42:59 +0000 (20:42 -0400)]
CRM-19417 - distmaker - Generate report about git revisions

7 years agotools/bin/scripts/set-version.php - Add helper script
Tim Otten [Mon, 25 Apr 2016 22:14:00 +0000 (15:14 -0700)]
tools/bin/scripts/set-version.php - Add helper script

This is similar to the function `do_update` in `releaser`, except that :
 * It it doesn't care if you use the `$workdir/$version/export` directory structure or something else
 * It it doesn't care if you push directly to the canonical repo or use a pull-request

7 years agoCONTRIBUTING.md - Backport
Tim Otten [Fri, 21 Apr 2017 02:51:31 +0000 (19:51 -0700)]
CONTRIBUTING.md - Backport

7 years agoMerge pull request #10146 from KarinG/CRM-20393
Mark Hanna [Wed, 12 Apr 2017 14:48:55 +0000 (09:48 -0500)]
Merge pull request #10146 from KarinG/CRM-20393

CRM-20393 - fix for check if the user already submitted transaction

7 years agoNo need to truncate x_invoice_num.
KarinG [Wed, 12 Apr 2017 00:54:43 +0000 (18:54 -0600)]
No need to truncate x_invoice_num.

7 years agoCRM-20300 - Fix in-app documentation links
Sean Madsen [Sat, 18 Mar 2017 03:46:35 +0000 (21:46 -0600)]
CRM-20300 - Fix in-app documentation links

7 years agoMerge pull request #9741 from yashodha/4.6-CRM-19686
Yashodha Chaku [Fri, 17 Mar 2017 07:15:38 +0000 (12:45 +0530)]
Merge pull request #9741 from yashodha/4.6-CRM-19686

CRM-19686 - Dedupe Exceptions Should Link to Contacts(4.6 backport)

7 years agoCRM-19950 - clean up
yashodha [Tue, 14 Feb 2017 12:31:05 +0000 (18:01 +0530)]
CRM-19950 -  clean up

7 years agoCRM-19950 : Wrong param passed to checkPermission function
yashodha [Thu, 9 Feb 2017 04:03:15 +0000 (09:33 +0530)]
CRM-19950 : Wrong param passed to checkPermission function

7 years agoRevert "fix display of contacts' recurring con..."
Andrew Engelbrecht [Wed, 15 Mar 2017 18:49:06 +0000 (14:49 -0400)]
Revert "fix display of contacts' recurring con..."

This reverts the following commits:

3245bcdae93977d210d82020ec43badb79b20d4e
b8d15d544ccc74365328ce59876071c43d848443
fdfd9aefd293c1afe1759d534e862841fd552286

This is apparently fixed elsewhere upstream.

7 years agoMerge tag '4.6.27' of civicrm-core into 4.6.27-fsf
Andrew Engelbrecht [Wed, 15 Mar 2017 18:38:53 +0000 (14:38 -0400)]
Merge tag '4.6.27' of civicrm-core into 4.6.27-fsf

from https://github.com/civicrm/civicrm-core

7 years agoUpdate version to 4.6.28
CiviCRM [Thu, 9 Mar 2017 00:45:27 +0000 (16:45 -0800)]
Update version to 4.6.28

7 years agoCRM-20040 Handle apostrophes and double double quotes in on behalf of Org fields...
adixon [Fri, 17 Feb 2017 15:38:44 +0000 (10:38 -0500)]
CRM-20040 Handle apostrophes and double double quotes in on behalf of Org fields (4.6 version)

7 years agoMerge pull request #9817 from yashodha/CRM-19989
Guanhuan [Fri, 10 Feb 2017 11:26:17 +0000 (11:26 +0000)]
Merge pull request #9817 from yashodha/CRM-19989

CRM-19989 - Constituent Detail Report gives only one result for multi…

7 years agoCRM-19989 - Constituent Detail Report gives only one result for multi-value custom...
yashodha [Thu, 9 Feb 2017 10:14:49 +0000 (15:44 +0530)]
CRM-19989 - Constituent Detail Report gives only one result for multi-value custom data

7 years agoUpdate version to 4.6.27
CiviCRM [Fri, 3 Feb 2017 06:50:22 +0000 (22:50 -0800)]
Update version to 4.6.27

7 years agoBy default send cancel req. to payment processor crm-dev-1d
Andrew Engelbrecht [Wed, 1 Feb 2017 23:21:28 +0000 (18:21 -0500)]
By default send cancel req. to payment processor

When cancelling a payment through the Civi interface, the cancellation
request should be sent to the payment processor by default. To that end,
I've set the "Yes" option to be selected by default on the recurring
contribution cancellation form.

When using a payment processor such as TrustCommerce, they need to know
about the cancellation in order to stop future payments.

7 years agoMerge pull request #9710 from KarinG/TaxMath
colemanw [Tue, 31 Jan 2017 15:25:30 +0000 (10:25 -0500)]
Merge pull request #9710 from KarinG/TaxMath

CRM-19908 - Fundamental Fixes for TaxMath Calculations 4.6

7 years agoCRM-19686 - Dedupe Exceptions Should Link to Contacts(4.6 backport)
yashodha [Fri, 27 Jan 2017 07:44:14 +0000 (13:14 +0530)]
CRM-19686 - Dedupe Exceptions Should Link to Contacts(4.6 backport)

7 years agoMerge pull request #9440 from omarabuhussein/backporting-#5913
Eileen McNaughton [Tue, 24 Jan 2017 10:49:35 +0000 (23:49 +1300)]
Merge pull request #9440 from omarabuhussein/backporting-#5913

CRM-16575: Backporting #5913

7 years agoFundamental Fixes for TaxMath Calculations.
KarinG [Sun, 22 Jan 2017 21:33:28 +0000 (14:33 -0700)]
Fundamental Fixes for TaxMath Calculations.

7 years agoMerge pull request #9645 from totten/4.6-mailing-tmpl
Tim Otten [Wed, 18 Jan 2017 10:08:19 +0000 (02:08 -0800)]
Merge pull request #9645 from totten/4.6-mailing-tmpl

(Backport) CRM-19690 - Declare Mailing.template_type, Mailing.template_options, Hook::mailingTemplateTypes

7 years agoMerge pull request #9688 from yashodha/CRM-19883.4.6
Yashodha Chaku [Tue, 17 Jan 2017 10:56:21 +0000 (16:26 +0530)]
Merge pull request #9688 from yashodha/CRM-19883.4.6

CRM-19883 - Activity Priority Field is Not Included in Advanced Searc…

7 years agominor fix
yashodha [Tue, 17 Jan 2017 07:13:47 +0000 (12:43 +0530)]
minor fix

7 years agoCRM-19883 - Activity Priority Field is Not Included in Advanced Search or Activity...
yashodha [Tue, 17 Jan 2017 07:02:22 +0000 (12:32 +0530)]
CRM-19883 - Activity Priority Field is Not Included in Advanced Search or Activity Reports

7 years agoMerge pull request #9644 from omarabuhussein/CRM-19832-backport-#9637
colemanw [Wed, 11 Jan 2017 19:53:21 +0000 (14:53 -0500)]
Merge pull request #9644 from omarabuhussein/CRM-19832-backport-#9637

CRM-19832: Backporting #9637 to 4.6

7 years agoMerge pull request #9663 from agileware/4.6-CRM-19535
colemanw [Wed, 11 Jan 2017 16:39:18 +0000 (11:39 -0500)]
Merge pull request #9663 from agileware/4.6-CRM-19535

CRM-19535 - Conditionally add is_active param to entityRef

7 years agoCRM-19535 - Conditionally add is_active param to entityRef
Francis Whittle [Wed, 11 Jan 2017 02:55:42 +0000 (13:55 +1100)]
CRM-19535 - Conditionally add is_active param to entityRef

Backport of #9291 by colemanw

7 years agouse old hackish fix for viewing recurring contribs
Andrew Engelbrecht [Fri, 6 Jan 2017 21:42:21 +0000 (16:42 -0500)]
use old hackish fix for viewing recurring contribs

the method suggested by ruben did not succeed. the method i was using
prior does work for now, but it is not ideal. i've included that change
in this commit.

7 years ago(NFC) CRM-19690 - Improve code-style and docblocks
Tim Otten [Tue, 20 Dec 2016 03:00:40 +0000 (19:00 -0800)]
(NFC) CRM-19690 - Improve code-style and docblocks

7 years agoCRM-19690 - Mailing API - Encode and decode `template_options`
Tim Otten [Fri, 2 Dec 2016 18:24:02 +0000 (10:24 -0800)]
CRM-19690 - Mailing API - Encode and decode `template_options`

Present API consumers with a consistent, array-based interface for reading
and writing properties in a Mailing.

Suppose you're submitting a REST request to create a mailing.  The REST
request as a whole is encoded with JSON.  With the default API behavior, you
would need to double-encode the `template_options`, e.g. roughly

```
POST rest.php
  json_encode([
    entity => Mailing
    action => create
    params => [
      template_options => json_encode([...])
    ]
  ])
```

With this patch, you only need to encode the request once.

This parallels the approach used in CaseType API (for the XML `definition`
field).

7 years agoCRM-19690 - Declare Mailing.template_type, Mailing.template_options, Hook::mailingTem...
Tim Otten [Mon, 28 Nov 2016 22:09:20 +0000 (14:09 -0800)]
CRM-19690 - Declare Mailing.template_type, Mailing.template_options, Hook::mailingTemplateTypes.

This adds two new fields to the schema.

Template types can be declared (along with preferred editor) using
hook_civicrm_mailingTemplateTypes, e.g.

```
function mymod_civicrm_mailingTemplateTypes(&$types) {
  $types[] = array(
   'name' => 'moasico',
   'editorUrl' => '~/crmMosaico/EditMailingCtrl/mosaico.html',
  );
}
```

Note: This only stores data.  Other commits will make use of that data in
more meaningful ways.

7 years agoCRM-19832: Backporting #9637 to 4.6
omar abu hussein [Thu, 5 Jan 2017 10:03:03 +0000 (10:03 +0000)]
CRM-19832: Backporting #9637 to 4.6

7 years agoUpdate version to 4.6.26
CiviCRM [Wed, 4 Jan 2017 22:43:26 +0000 (14:43 -0800)]
Update version to 4.6.26

7 years agoadded comment for fix of ambiguous column ref.
Andrew Engelbrecht [Wed, 4 Jan 2017 21:54:58 +0000 (16:54 -0500)]
added comment for fix of ambiguous column ref.

this commit adds a comment section near the changes made in the relevant
file changed in commit b8d15d544ccc74365328ce59876071c43d848443

7 years agofix display of contacts' recurring contributions
Andrew Engelbrecht [Wed, 4 Jan 2017 21:45:12 +0000 (16:45 -0500)]
fix display of contacts' recurring contributions

https://rt.gnu.org/Ticket/Display.html?id=1176733

if you look at a contact, click contributions, then click on "view" next
to a recurring payment (not all users have these), then the server would
crash and give a backtrace. this patch fixes that issue.

the issue was due to a sort-by-id failing because multiple tables are
queried, more than one of which has an id column. therefore the "id"
column name was redundant and threw an SQL error. this patch specifies
the desired table with the specified id column.

i worked a bit on this patch and received help from ruben, who corrected
my less than perfect original patch.

7 years agoMerge pull request #9611 from JMAConsulting/CRM-19817-4.6
Yashodha Chaku [Wed, 4 Jan 2017 05:48:09 +0000 (11:18 +0530)]
Merge pull request #9611 from JMAConsulting/CRM-19817-4.6

CRM-19817, fixed warnings and export for wordpress cms

7 years agoMerge pull request #9615 from seamuslee001/https_test_fix
Tim Otten [Tue, 3 Jan 2017 07:40:53 +0000 (23:40 -0800)]
Merge pull request #9615 from seamuslee001/https_test_fix

(Port from master) CRM_Utils_HttpClientTest - Use special purpose hostnames

7 years agoCRM_Utils_HttpClientTest - Use special purpose hostnames
Tim Otten [Fri, 2 Dec 2016 02:56:14 +0000 (18:56 -0800)]
CRM_Utils_HttpClientTest - Use special purpose hostnames

This test issues a few real HTTP requests which are supposed to succeed or
fail in a prescribed way.  However, the examples were chosen for expedience
and leached off other/unrelated sites...  but this tends to break from
time-to-time (when the example system goes to HTTPS-only or changes their
content).

With this patch, all the examples point to dedicated sites which are
purpose-built for supporting integration tests.

7 years agoCRM-19817, fixed warnings and export for wordpress cms
Pradeep Nayak [Mon, 2 Jan 2017 11:15:41 +0000 (16:45 +0530)]
CRM-19817, fixed warnings and export for wordpress cms

----------------------------------------
* CRM-19817: Notice error fails membership export
  https://issues.civicrm.org/jira/browse/CRM-19817

7 years agoMerge pull request #9527 from seamuslee001/CRM-19743
Eileen McNaughton [Wed, 14 Dec 2016 07:23:11 +0000 (20:23 +1300)]
Merge pull request #9527 from seamuslee001/CRM-19743

CRM-19743 Ensure that checking for id in sort column works in arrays …

7 years agoMerge pull request #9519 from monishdeb/CRM-19294-46
Monish Deb [Mon, 12 Dec 2016 10:06:26 +0000 (15:36 +0530)]
Merge pull request #9519 from monishdeb/CRM-19294-46

CRM-19294: Unable to continue on required file field

7 years agoExpand test coverage to include specified ordering
Seamus Lee [Mon, 12 Dec 2016 05:16:28 +0000 (16:16 +1100)]
Expand test coverage to include specified ordering

7 years agoCRM-19743 Ensure that checking for id in sort column works in arrays as well as strings
Seamus Lee [Fri, 9 Dec 2016 21:35:26 +0000 (08:35 +1100)]
CRM-19743 Ensure that checking for id in sort column works in arrays as well as strings

7 years agoMerge tag '4.6.24' of https://github.com/civicrm/civicrm-core into 4.6.24-fsf
Ruben Rodriguez [Fri, 9 Dec 2016 16:22:15 +0000 (11:22 -0500)]
Merge tag '4.6.24' of https://github.com/civicrm/civicrm-core into 4.6.24-fsf

7 years agoCRM-19735 - allow contact's second membership to inherit.
Dave Jenkins [Thu, 8 Dec 2016 16:43:45 +0000 (16:43 +0000)]
CRM-19735 - allow contact's second membership to inherit.

7 years agoCRM-19294: Unable to continue on required file field
deb.monish [Thu, 8 Dec 2016 11:57:20 +0000 (17:27 +0530)]
CRM-19294: Unable to continue on required file field

7 years agoUpdate version to 4.6.25
CiviCRM [Wed, 7 Dec 2016 22:05:17 +0000 (14:05 -0800)]
Update version to 4.6.25

7 years agoMerge pull request #9483 from colemanw/CRM-19709-lts
Eileen McNaughton [Fri, 2 Dec 2016 00:49:45 +0000 (13:49 +1300)]
Merge pull request #9483 from colemanw/CRM-19709-lts

CRM-19709 fix html output (LTS)

7 years agoCRM-19709 - Fix html output in Common.js
Coleman Watts [Thu, 1 Dec 2016 22:07:01 +0000 (17:07 -0500)]
CRM-19709 - Fix html output in Common.js

Conflicts:
js/Common.js

7 years agoCRM-19709 - Fix double-escaped quicksearch results
Coleman Watts [Thu, 1 Dec 2016 22:06:39 +0000 (17:06 -0500)]
CRM-19709 - Fix double-escaped quicksearch results

7 years agoComment cleanup
Ruben Rodriguez [Thu, 1 Dec 2016 21:59:27 +0000 (16:59 -0500)]
Comment cleanup

7 years agoUpdated the LaTeX header for letters
Ruben Rodriguez [Thu, 1 Dec 2016 21:28:53 +0000 (16:28 -0500)]
Updated the LaTeX header for letters

7 years agoMerge pull request #9462 from seamuslee001/CRM-19079
Eileen McNaughton [Tue, 29 Nov 2016 10:28:56 +0000 (23:28 +1300)]
Merge pull request #9462 from seamuslee001/CRM-19079

CRM-19079 condition profile edit permission check

8 years agoCRM-19079 condition profile edit permission check
Brian Shaughnessy [Thu, 14 Jul 2016 12:40:39 +0000 (08:40 -0400)]
CRM-19079 condition profile edit permission check

8 years agoMerge pull request #9439 from seamuslee001/CRM-19641-b-46
Eileen McNaughton [Wed, 23 Nov 2016 21:34:55 +0000 (10:34 +1300)]
Merge pull request #9439 from seamuslee001/CRM-19641-b-46

CRM-19641 Further Fix