civicrm-core.git
7 years agoCRM-20768 - install - Accept mysql port
Tim Otten [Fri, 23 Jun 2017 21:41:39 +0000 (14:41 -0700)]
CRM-20768 - install - Accept mysql port

== Background ==

In previous releases, the web-based installation script allowed you to enter
the MySQL "server" with a `host:port` combination (e.g.  `127.0.0.1:3307`).

I believe this regressed during the mysql=>mysqli transition.

== Before ==

If you use the web-based install UI and enter a `host:port` combination, the
error messages indicate a confusing mix of information (e.g.  some
indicating port 3306, some indicating port 3307).

== After ==

If you use the web-based install UI and enter a `host:port` combination, it
uses the specified port.

----------------------------------------
* CRM-20768: Web-based installation should accept non-standard MySQL port
  https://issues.civicrm.org/jira/browse/CRM-20768

7 years agoMerge pull request #10540 from colemanw/CRM-20091
colemanw [Wed, 21 Jun 2017 19:11:03 +0000 (15:11 -0400)]
Merge pull request #10540 from colemanw/CRM-20091

CRM-20091 - Fix return value in api.customValue.gettree

7 years agoCRM-20091 - Fix return value in api.customValue.gettree
Coleman Watts [Wed, 21 Jun 2017 17:34:36 +0000 (13:34 -0400)]
CRM-20091 - Fix return value in api.customValue.gettree

7 years agoMerge pull request #10523 from seamuslee001/animated_image
Eileen McNaughton [Mon, 19 Jun 2017 00:18:56 +0000 (12:18 +1200)]
Merge pull request #10523 from seamuslee001/animated_image

(NFC) re add in animated-overlay.gif is no longer provided by jquery-ui

7 years agoMerge pull request #10525 from seamuslee001/contribution_test_rigger_fix
Eileen McNaughton [Sun, 18 Jun 2017 23:26:36 +0000 (11:26 +1200)]
Merge pull request #10525 from seamuslee001/contribution_test_rigger_fix

(NFC) Fix clearing messages to ensure test accuracy

7 years ago(NFC) Fix clearing messages to ensure test accuracy
Seamus Lee [Sun, 18 Jun 2017 22:07:30 +0000 (08:07 +1000)]
(NFC) Fix clearing messages to ensure test accuracy

7 years ago(NFC) re add in animated-overlay.gif is no longer provided by jquery-ui
Seamus Lee [Sat, 17 Jun 2017 23:31:44 +0000 (09:31 +1000)]
(NFC) re add in animated-overlay.gif is no longer provided by jquery-ui

7 years agoMerge pull request #10085 from totten/master-assets
Tim Otten [Sat, 17 Jun 2017 06:06:27 +0000 (23:06 -0700)]
Merge pull request #10085 from totten/master-assets

CRM-20600 - AngularJS - Allowing hooking and static-caching

7 years agoCRM-20600 - AssetBuiler - Add separate setting, `assetCache`
Tim Otten [Sat, 17 Jun 2017 05:16:15 +0000 (22:16 -0700)]
CRM-20600 - AssetBuiler - Add separate setting, `assetCache`

The default value (`auto`) behaves the same as the current behavior: enable
caching in production mode, disable caching in debug mode.

But it also allows you to enable/disable caching independent of the
prod/debug mode.

7 years agoMerge pull request #9790 from fliespl/patch-3
Mathieu Lu [Sat, 17 Jun 2017 03:42:51 +0000 (23:42 -0400)]
Merge pull request #9790 from fliespl/patch-3

CRM-19896 - customTranslateFunction not mapped

7 years agoMerge pull request #10519 from johanv/attribution_chirojeugd
Mathieu Lu [Sat, 17 Jun 2017 02:18:42 +0000 (22:18 -0400)]
Merge pull request #10519 from johanv/attribution_chirojeugd

(NFC) Attribution Chirojeugd Vlaanderen

7 years agoCRM-20600, CRM-20112 - AngularLoader - Add helper for base-pages and injections
Tim Otten [Thu, 25 May 2017 03:43:07 +0000 (20:43 -0700)]
CRM-20600, CRM-20112 - AngularLoader - Add helper for base-pages and injections

This commit extracts the `Civi\Angular\Page\Main::registerResources()` and
creates a new utility-class, `AngularLoader`.  The `AngularLoader` can be
used in new Angular base-pages, e.g.

```php
class Example extends CRM_Core_Page {
  public function run() {
    $loader = new \Civi\Angular\AngularLoader();
    $loader->setPageName('civicrm/foo/bar');
    $loader->setModules(array('crmApp', '...'));
    $loader->load();
    return parent::run();
  }
}
```

The `AngularLoader` only loads the resources or assets (JS/CSS/HTML files).
To start Angular, you'll need to call `ng-app` or `angular.bootstrap(...)`.
One way to do this is to define a page-template:

```html
<!-- Example.tpl -->
<div ng-app="crmApp">
  <div ng-view></div>
</div>
```

Or you can reuse the existing template:

```php
  public function getTemplateFileName() {
    return 'Civi/Angular/Page/Main.tpl';
  }
```

Note: This is framed as a utility-class which loads the Angular resource
files.  It's not a page-class/base-class.  This approach allows us to call
the utility from other situations -- e.g.  inject AngularJS onto an
pre-existing page via hook.  Doing that may or may not be wise, but the
class-hierarchy shouldn't be the issue.

7 years agoCRM-20600 - Civi\Angular\Manager - Add resolveDependencies(), resolveDefaultModules()
Tim Otten [Thu, 25 May 2017 03:40:04 +0000 (20:40 -0700)]
CRM-20600 - Civi\Angular\Manager - Add resolveDependencies(), resolveDefaultModules()

7 years agoCRM-20600 - CRM_Core_Resources - Add hook for settings data
Tim Otten [Sat, 20 May 2017 00:24:58 +0000 (17:24 -0700)]
CRM-20600 - CRM_Core_Resources - Add hook for settings data

7 years agoCRM-20600 - Civi\Angular\Manager - Add hook for modifying partials and dependencies
Tim Otten [Tue, 16 May 2017 09:46:33 +0000 (02:46 -0700)]
CRM-20600 - Civi\Angular\Manager - Add hook for modifying partials and dependencies

7 years agoCRM-20600 - Civi\Angular\ChangeSet - Implement a utility for modifying HTML snippets...
Tim Otten [Tue, 16 May 2017 06:43:57 +0000 (23:43 -0700)]
CRM-20600 - Civi\Angular\ChangeSet - Implement a utility for modifying HTML snippets via phpQuery

7 years agoCRM-20600 - composer.json - Add phpQuery
Tim Otten [Fri, 31 Mar 2017 19:55:45 +0000 (12:55 -0700)]
CRM-20600 - composer.json - Add phpQuery

7 years agoCRM-20600 - Angular deps - Add missing/implicit dependencies
Tim Otten [Tue, 23 May 2017 04:42:42 +0000 (21:42 -0700)]
CRM-20600 - Angular deps - Add missing/implicit dependencies

Several modules depended on `crmResource` but didn't declare it.

7 years agoCRM-20600 - Angular deps - Move from *.js to *.php
Tim Otten [Fri, 19 May 2017 04:25:58 +0000 (21:25 -0700)]
CRM-20600 - Angular deps - Move from *.js to *.php

If third-parties are allowed to alter the HTML content, then they may
introduce new dependencies.  This means that they'll need to delcare those
dependencies.

This commit actually moves the declarations for any in-house modules to PHP.

7 years agoCRM-20600 - Angular deps - Allow declaration in PHP code
Tim Otten [Fri, 19 May 2017 04:20:28 +0000 (21:20 -0700)]
CRM-20600 - Angular deps - Allow declaration in PHP code

If third-parties are allowed to alter the HTML content, then they may
introduce new dependencies.  This means that they'll need to delcare those
dependencies.

Tangentially, this will also make it easier to construct more optimized
base-pages (e.g.  "make a base-page with module X plus all its
dependencies").

7 years agoCRM-20600 - civicrm/a - Avoid dirty caches for permissioned modules
Tim Otten [Fri, 19 May 2017 01:52:47 +0000 (18:52 -0700)]
CRM-20600 - civicrm/a - Avoid dirty caches for permissioned modules

The default behavior is to include a `bundleUrl` for a bundle of "all
Angular modules".  However, some Angular modules like `crmMailing` are only
displayed if the current user has permission to access them.  This means
that the list of "all Angular modules" can be different (depending on who
you are; albeit in practice there's a small# of permutations).

This patch ensures that two users who access a different list of modules
will see a different `bundleUrl`.

7 years agoCRM-20600 - Civi\Angular\Manager::getStrings() - Scan raw HTML strings instead of...
Tim Otten [Tue, 16 May 2017 05:29:07 +0000 (22:29 -0700)]
CRM-20600 - Civi\Angular\Manager::getStrings() - Scan raw HTML strings instead of *.html files

Rationale: If the raw HTML can be modified via hook, then the HTML files are
not truly representative of the final output.  (e.g.  a hook might add a new
string to some HTML.)

Note: This patch means that we no longer benefit from the cache in
`CRM_Core_Resources_Strings`.  However, the typical user still pulls data
from a cache because we're using `AssetBuilder` to manage
`angular-modules.json`.

Note: `getStrings()` now requires a call to `getPartials()`, which is
expected to become more expensive (firing a hook).  To avoid building the
partials twice, we introduce a private cache.

7 years agoCRM-20600 - PartialSyntaxTest - Ensure that Angular partials are well-formed
Tim Otten [Sat, 1 Apr 2017 05:07:49 +0000 (22:07 -0700)]
CRM-20600 - PartialSyntaxTest - Ensure that Angular partials are well-formed

7 years agoCRM-20600 - Civi\Angular - Generate modules via AssetBuilder
Tim Otten [Fri, 31 Mar 2017 07:36:35 +0000 (00:36 -0700)]
CRM-20600 - Civi\Angular - Generate modules via AssetBuilder

In the typical use-case, AssetBuilder can avoid an extra CMS+Civi bootstrap
along with any build steps.

7 years agoCRM-20600 - Implement AssetBuilder - See extended docblock in AssetBuilder.php
Tim Otten [Fri, 31 Mar 2017 05:55:47 +0000 (22:55 -0700)]
CRM-20600 - Implement AssetBuilder - See extended docblock in AssetBuilder.php

7 years agoCRM-20600 - Move Angular metadata to civix-style files
Tim Otten [Fri, 19 May 2017 03:39:11 +0000 (20:39 -0700)]
CRM-20600 - Move Angular metadata to civix-style files

This PR moves the metadata about Angular modules out of Civi\Angular\Manager
and into standalone files (`ang/*.ang.php`).  This uses the same structure
as `civix`.  Also, this makes it easier to navigate between the
JS/HTML/CSS/PHP content.

To test that these changes were safe, I ran the following command before and
after this commit:

$ cv ev 'var_dump(Civi::service("angular")->getModules());'

The results were substantively identical.

7 years agoMerge pull request #10520 from seamuslee001/CRM-20744
colemanw [Sat, 17 Jun 2017 01:34:51 +0000 (21:34 -0400)]
Merge pull request #10520 from seamuslee001/CRM-20744

CRM-20744 Use images in the bower_components version of datatables plugin rathe…

7 years agoUse images in the bower_components version of datatables plugin rather than packages
Seamus Lee [Sat, 17 Jun 2017 00:14:12 +0000 (10:14 +1000)]
Use images in the bower_components version of datatables plugin rather than packages

7 years agoMerge pull request #10495 from seamuslee001/CRM-20243-phpword
Tim Otten [Fri, 16 Jun 2017 22:35:26 +0000 (15:35 -0700)]
Merge pull request #10495 from seamuslee001/CRM-20243-phpword

CRM-20243 Remove outdated sample jquery.min.js from phpword package

7 years agoRemove all code in the samples folder as per comment from Tim
Seamus Lee [Mon, 12 Jun 2017 09:32:44 +0000 (19:32 +1000)]
Remove all code in the samples folder as per comment from Tim

7 years agoCRM-20243 Remove outdated sample jquery.min.js from phpword package
Seamus Lee [Mon, 12 Jun 2017 03:17:36 +0000 (13:17 +1000)]
CRM-20243 Remove outdated sample jquery.min.js from phpword package

7 years agoMerge pull request #10329 from totten/master-caconfig
Tim Otten [Fri, 16 Jun 2017 21:36:17 +0000 (14:36 -0700)]
Merge pull request #10329 from totten/master-caconfig

CRM-18408 - composer.json - Update ca-config

7 years agoIt seems those lists are sorted alphabetically :-)
Johan Vervloet [Fri, 16 Jun 2017 21:20:42 +0000 (23:20 +0200)]
It seems those lists are sorted alphabetically :-)

7 years agoAdded Chirojeugd Vlaanderen to CONTRIBUTORS.txt.
Johan Vervloet [Fri, 16 Jun 2017 21:17:50 +0000 (23:17 +0200)]
Added Chirojeugd Vlaanderen to CONTRIBUTORS.txt.

Almost all contributions I did for CiviCRM, were sponsored by my
former employer Chirojeugd Vlaanderen.

7 years agoCRM-18408 - composer.lock - Update ca-config
Tim Otten [Fri, 16 Jun 2017 20:45:18 +0000 (13:45 -0700)]
CRM-18408 - composer.lock - Update ca-config

7 years agoCRM-18408 - composer.json - Update ca-config
Tim Otten [Wed, 10 May 2017 20:10:43 +0000 (15:10 -0500)]
CRM-18408 - composer.json - Update ca-config

This loads a more recent build of `cacert.pem` for use on hosts which lack
one.  It does not directly solve CRM-18408, but it complements the solution.

7 years agoMerge pull request #10384 from seamuslee001/CRM-20561
Tim Otten [Fri, 16 Jun 2017 19:05:53 +0000 (12:05 -0700)]
Merge pull request #10384 from seamuslee001/CRM-20561

CRM-20561 Use composer for Net_SMTP and Net_Socket and patch for TLS and CiviCR…

7 years agoMerge pull request #10477 from twomice/CRM-20692_support_jquery_tabs_options
colemanw [Fri, 16 Jun 2017 13:41:13 +0000 (09:41 -0400)]
Merge pull request #10477 from twomice/CRM-20692_support_jquery_tabs_options

CRM-20692: pass through options.

7 years agoMerge pull request #10512 from johanv/CRM-20740-custom_field_not_null
colemanw [Fri, 16 Jun 2017 13:27:31 +0000 (09:27 -0400)]
Merge pull request #10512 from johanv/CRM-20740-custom_field_not_null

CRM-20740 - Fix issue with check for custom_nn => ['IS NULL' => 1].

7 years agoMerge pull request #4 from totten/seamuslee001-CRM-20561
Seamus Lee [Fri, 16 Jun 2017 04:08:49 +0000 (14:08 +1000)]
Merge pull request #4 from totten/seamuslee001-CRM-20561

CRM-20561 - Remove example files. Cleanup code style.

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 agoMerge pull request #10511 from totten/master-19303
Tim Otten [Fri, 16 Jun 2017 03:39:09 +0000 (20:39 -0700)]
Merge pull request #10511 from totten/master-19303

CRM-19303 - Drupal - Fix computation of `civicrm.files` on multisite

7 years agoMerge pull request #3 from totten/seamuslee001-CRM-20561
Seamus Lee [Fri, 16 Jun 2017 03:16:54 +0000 (13:16 +1000)]
Merge pull request #3 from totten/seamuslee001-CRM-20561

CRM-8597, CRM-20561 - Restore fix for `&`

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 #10390 from JMAConsulting/CRM-20611
colemanw [Fri, 16 Jun 2017 02:59:01 +0000 (22:59 -0400)]
Merge pull request #10390 from JMAConsulting/CRM-20611

CRM-20611: fix financial records of cancelled line_items on event fee  change selection

7 years agoMerge pull request #10397 from JMAConsulting/CRM-20620
colemanw [Fri, 16 Jun 2017 02:53:45 +0000 (22:53 -0400)]
Merge pull request #10397 from JMAConsulting/CRM-20620

CRM-20620, optimized code to use Batch api

7 years agoMerge pull request #10443 from twomice/CRM-20660_total_vs_unique_opens
colemanw [Fri, 16 Jun 2017 01:52:44 +0000 (21:52 -0400)]
Merge pull request #10443 from twomice/CRM-20660_total_vs_unique_opens

Fix CRM-20660: Total Opens should count without DISTINCT keyword.

7 years agoPHP 5.3.
Johan Vervloet [Thu, 15 Jun 2017 21:21:06 +0000 (23:21 +0200)]
PHP 5.3.

7 years agoTried to write a test.
Johan Vervloet [Thu, 15 Jun 2017 20:17:11 +0000 (22:17 +0200)]
Tried to write a test.

But since I have no working dev environment for the moment, I cannot
run it myself. I will push it, and see if it passes.

(If someone can check whether the tests fails on master, that would
be very nice.)

7 years agoStyle fix.
Johan Vervloet [Thu, 15 Jun 2017 20:02:36 +0000 (22:02 +0200)]
Style fix.

7 years agoCRM-20740 - Fix issue with check for custom_nn => ['IS NULL' => 1].
Johan Vervloet [Thu, 15 Jun 2017 19:51:04 +0000 (21:51 +0200)]
CRM-20740 - Fix issue with check for custom_nn => ['IS NULL' => 1].

7 years agoMerge pull request #10503 from jitendrapurohit/CRM-20556
colemanw [Thu, 15 Jun 2017 19:08:59 +0000 (15:08 -0400)]
Merge pull request #10503 from jitendrapurohit/CRM-20556

CRM-20556: Fix datatable warning on merge screen

7 years agoCRM-19303 - Paths - Allow sysadmin to explicitly `[civicrm.*]` variables
Tim Otten [Thu, 15 Jun 2017 07:06:03 +0000 (00:06 -0700)]
CRM-19303 - Paths - Allow sysadmin to explicitly `[civicrm.*]` variables

7 years agoCRM-19303 - Drupal - Fix various path computations for multisite
Tim Otten [Thu, 15 Jun 2017 06:42:59 +0000 (23:42 -0700)]
CRM-19303 - Drupal - Fix various path computations for multisite

A few changes:
 * Move logic out of `CRM_Utils_System_Base` to `CRM_Utils_System_DrupalBase`
   so that it's easier to read.
 * Update `[civicrm.files]`:  First, try to use `sites/{$name}/files/civicrm`.
   Otherwise, use `sites/default/files/civicrm`.
    * Note: The `$name` is parsed/validated the same way as `civicrm.config.php`.
      It takes the full HTTP_HOST and then tries various substrings.
 * Update `[civicrm.root]`:  Compare `$civicrm_root` and `cmsRootPath()`
   to determine the relative path.  Then, combine `CIVICRM_UF_BASEURL` with
   relpath.  (This is the same as WordPress.)

7 years agoMerge pull request #10499 from agileware/CRM-20718
Eileen McNaughton [Thu, 15 Jun 2017 07:56:15 +0000 (19:56 +1200)]
Merge pull request #10499 from agileware/CRM-20718

CRM-20718 CIVICRM-125 Use the "On behalf of" profile title...

7 years agoMerge pull request #10510 from seamuslee001/api_duplicate_location_types
Eileen McNaughton [Thu, 15 Jun 2017 05:38:30 +0000 (17:38 +1200)]
Merge pull request #10510 from seamuslee001/api_duplicate_location_types

API allows creating multiple addresses same location type

7 years agoMerge pull request #10456 from elisseck/CRM-20672
Eileen McNaughton [Thu, 15 Jun 2017 05:12:58 +0000 (17:12 +1200)]
Merge pull request #10456 from elisseck/CRM-20672

CRM 20672 - Fix access to fields for relationship with target type all contacts in export mapping

7 years agoAdd comments around 'wrongness' and link to chat discussion
Seamus Lee [Thu, 15 Jun 2017 03:54:59 +0000 (13:54 +1000)]
Add comments around 'wrongness' and link to chat discussion

7 years agoAPI allows creating multiple addresses same location type
Seamus Lee [Thu, 15 Jun 2017 03:32:00 +0000 (13:32 +1000)]
API allows creating multiple addresses same location type

7 years agoMerge pull request #10502 from agileware/CRM-20253
Eileen McNaughton [Thu, 15 Jun 2017 03:22:32 +0000 (15:22 +1200)]
Merge pull request #10502 from agileware/CRM-20253

CRM-20253: CIVICRM-135: Don' send extra receipt email.

7 years agoMerge pull request #10509 from seamuslee001/CRM-20253-test2
Eileen McNaughton [Thu, 15 Jun 2017 02:33:05 +0000 (14:33 +1200)]
Merge pull request #10509 from seamuslee001/CRM-20253-test2

CRM-20253 Fix some environmental issues in tests

7 years agoCRM-20253 Fix some environmental issues in tests
Seamus Lee [Thu, 15 Jun 2017 02:24:17 +0000 (12:24 +1000)]
CRM-20253 Fix some environmental issues in tests

7 years agoMerge pull request #10508 from seamuslee001/CRM-20253-test2
Eileen McNaughton [Thu, 15 Jun 2017 01:54:26 +0000 (13:54 +1200)]
Merge pull request #10508 from seamuslee001/CRM-20253-test2

CRM-20253 Add another test using dummy processor and switch noReceipt…

7 years agoCRM-20253 Add another test using dummy processor and switch noReceipt test to dummy...
Seamus Lee [Thu, 15 Jun 2017 00:53:43 +0000 (10:53 +1000)]
CRM-20253 Add another test using dummy processor and switch noReceipt test to dummy processor

7 years agoMerge pull request #10506 from seamuslee001/CRM-20253-test
Eileen McNaughton [Thu, 15 Jun 2017 00:17:20 +0000 (12:17 +1200)]
Merge pull request #10506 from seamuslee001/CRM-20253-test

CRM-20253 Add test to ensure that email receipts aren't sent when not…

7 years agoMerge pull request #10479 from tschuettler/CRM-20694
Eileen McNaughton [Wed, 14 Jun 2017 23:56:41 +0000 (11:56 +1200)]
Merge pull request #10479 from tschuettler/CRM-20694

CRM-20694 - CiviMail - Add Resubscribe Message to CiviMail Report

7 years agoMerge pull request #10476 from chrisfromredfin/CRM-20690
Eileen McNaughton [Wed, 14 Jun 2017 23:54:08 +0000 (11:54 +1200)]
Merge pull request #10476 from chrisfromredfin/CRM-20690

CRM-20690: fix priceset option limits

7 years agoMerge pull request #10465 from kryptothesuperdog/CRM-20680
colemanw [Wed, 14 Jun 2017 22:47:50 +0000 (18:47 -0400)]
Merge pull request #10465 from kryptothesuperdog/CRM-20680

CRM-20680 Spin the Civi logo when navigating between pages

7 years agoCRM-20253 Add checking on number of receipts issued when credit card submitted
Seamus Lee [Wed, 14 Jun 2017 22:28:55 +0000 (08:28 +1000)]
CRM-20253 Add checking on number of receipts issued when credit card submitted

7 years agoCRM-20253 Add test to ensure that email receipts aren't sent when not requested on...
Seamus Lee [Wed, 14 Jun 2017 22:09:11 +0000 (08:09 +1000)]
CRM-20253 Add test to ensure that email receipts aren't sent when not requested on backend form

7 years agoMerge pull request #10333 from francescbassas/patch-10
colemanw [Wed, 14 Jun 2017 14:16:24 +0000 (10:16 -0400)]
Merge pull request #10333 from francescbassas/patch-10

CRM-18081 Allow search of active relationships during a custom range of dates

7 years agoCRM-20556: Fix datatable warning on merge screen
Jitendra Purohit [Wed, 14 Jun 2017 11:12:42 +0000 (16:42 +0530)]
CRM-20556: Fix datatable warning on merge screen

7 years agoCRM-20253: CIVICRM-135: Don' send extra receipt email.
Francis Whittle [Wed, 14 Jun 2017 00:15:54 +0000 (10:15 +1000)]
CRM-20253: CIVICRM-135: Don' send extra receipt email.

----------------------------------------
* CRM-20253: backend contribution receipt sent when option not selected
  https://issues.civicrm.org/jira/browse/CRM-20253

7 years agoMerge pull request #10500 from fuzionnz/rephrase_poormans
Eileen McNaughton [Tue, 13 Jun 2017 22:42:20 +0000 (10:42 +1200)]
Merge pull request #10500 from fuzionnz/rephrase_poormans

There's a better way to say it than "poor man's".

7 years agoAdd ts() to getTitle
Agileware [Tue, 13 Jun 2017 21:18:52 +0000 (07:18 +1000)]
Add ts() to getTitle

7 years agoCRM-20672 restrict field search to basic contact types re @seanmadsen 's review
Eli Lisseck [Tue, 13 Jun 2017 19:30:16 +0000 (15:30 -0400)]
CRM-20672 restrict field search to basic contact types re @seanmadsen 's review

7 years agoCRM-20660: minor code cleanup.
Allen Shaw [Tue, 13 Jun 2017 16:19:18 +0000 (11:19 -0500)]
CRM-20660: minor code cleanup.

7 years agoMerge pull request #10481 from seanmadsen/CRM-20698
colemanw [Tue, 13 Jun 2017 15:12:28 +0000 (11:12 -0400)]
Merge pull request #10481 from seanmadsen/CRM-20698

CRM-20698 - better CSS for disabled table rows

7 years agoMerge pull request #10484 from JMAConsulting/CRM-20706
Monish Deb [Tue, 13 Jun 2017 08:14:39 +0000 (13:44 +0530)]
Merge pull request #10484 from JMAConsulting/CRM-20706

CRM-20706: Notice error on using Contribution.Getfield API

7 years agoThere's a better way to say it than "poor man's".
Chris Burgess [Tue, 13 Jun 2017 02:38:37 +0000 (14:38 +1200)]
There's a better way to say it than "poor man's".

"Makeshift", "simplistic" or "inferior" are effective ways to describe a solution you think is less than ideal.

The phrase "poor man's" suggests poor people get/deserve inferior things, which IMO is incongruous with CiviCRM's aims.

Avoiding that terminology won't just be inclusive, it will better express what you really meant!

This PR contains comment changes only.

7 years agoCIVICRM-125 CRM-20718 Use the "On behalf of" profile title as fieldset title on Contr...
Justin Freeman [Mon, 12 Jun 2017 02:10:53 +0000 (12:10 +1000)]
CIVICRM-125 CRM-20718 Use the "On behalf of" profile title as fieldset title on Contribution pages instead of hardcoded title "Organization Details"

7 years agoMerge pull request #10433 from JMAConsulting/CRM-20651
Eileen McNaughton [Mon, 12 Jun 2017 22:05:13 +0000 (10:05 +1200)]
Merge pull request #10433 from JMAConsulting/CRM-20651

CRM-20651: Change partial_amount_pay to partial_amount_to_pay for Partial Payment workflow

7 years agoMerge pull request #10473 from mickadoo/CRM-20687-remove-issue-number-variables
Eileen McNaughton [Mon, 12 Jun 2017 20:08:26 +0000 (08:08 +1200)]
Merge pull request #10473 from mickadoo/CRM-20687-remove-issue-number-variables

CRM-20687: Invert logic and rename variable to remove issue reference

7 years agoMerge pull request #10494 from seamuslee001/CRM-20243-jquery
colemanw [Mon, 12 Jun 2017 14:40:15 +0000 (10:40 -0400)]
Merge pull request #10494 from seamuslee001/CRM-20243-jquery

CRM-20243 Upgrade jquery to 1.12

7 years agoMerge pull request #10453 from PalanteJon/CRM-19610-test
Eileen McNaughton [Mon, 12 Jun 2017 08:01:04 +0000 (20:01 +1200)]
Merge pull request #10453 from PalanteJon/CRM-19610-test

Test for CRM-19610

7 years agoMerge pull request #10491 from seamuslee001/CRM-19610
Eileen McNaughton [Mon, 12 Jun 2017 07:53:52 +0000 (19:53 +1200)]
Merge pull request #10491 from seamuslee001/CRM-19610

CRM-19610 : Search preferences changes are not updated

7 years agoMerge pull request #10490 from seamuslee001/CRM-20678
Eileen McNaughton [Mon, 12 Jun 2017 05:05:17 +0000 (17:05 +1200)]
Merge pull request #10490 from seamuslee001/CRM-20678

CRM-20678 Fix issue where repeattransaction was creating transactions…

7 years agoMerge pull request #10489 from seamuslee001/CRM-20715
Eileen McNaughton [Mon, 12 Jun 2017 04:59:52 +0000 (16:59 +1200)]
Merge pull request #10489 from seamuslee001/CRM-20715

CRM-20715 Add Index on is_deceased column

7 years agoCRM-20243 Upgrade jquery to 1.12
Seamus Lee [Mon, 12 Jun 2017 03:01:42 +0000 (13:01 +1000)]
CRM-20243 Upgrade jquery to 1.12

7 years agoAllow for value to be a string '0'
Seamus Lee [Sun, 11 Jun 2017 22:08:21 +0000 (08:08 +1000)]
Allow for value to be a string '0'

7 years agoOnly ensure that we check if the value passed is 0 and the db value is 0 or NULL
Seamus Lee [Sun, 11 Jun 2017 04:23:49 +0000 (14:23 +1000)]
Only ensure that we check if the value passed is 0 and the db value is 0 or NULL

7 years agoCRM-19610 : Search preferences changes are not updated
Jitendra Purohit [Tue, 30 May 2017 11:36:55 +0000 (17:06 +0530)]
CRM-19610 : Search preferences changes are not updated

7 years agoMerge pull request #9779 from WeMoveEU/CRM-19963
Tim Otten [Sun, 11 Jun 2017 14:34:58 +0000 (16:34 +0200)]
Merge pull request #9779 from WeMoveEU/CRM-19963

CRM-19963 - Use translated processor name for Paypal in all comparisons

7 years agoMerge pull request #10227 from WeMoveEU/CRM-20309
Tim Otten [Sun, 11 Jun 2017 14:15:12 +0000 (16:15 +0200)]
Merge pull request #10227 from WeMoveEU/CRM-20309

CRM-20309 Schedule mailing jobs at increasing times

7 years agoCRM-20678 Fix issue where repeattransaction was creating transactions in incorrect...
Seamus Lee [Sun, 11 Jun 2017 04:12:09 +0000 (14:12 +1000)]
CRM-20678 Fix issue where repeattransaction was creating transactions in incorrect currency

7 years agoMerge pull request #10488 from civicrm/4.7.20-rc
Eileen McNaughton [Sun, 11 Jun 2017 02:38:16 +0000 (14:38 +1200)]
Merge pull request #10488 from civicrm/4.7.20-rc

4.7.20 rc

7 years agoAdd Index on id_deceased column
Seamus Lee [Sun, 11 Jun 2017 01:38:00 +0000 (11:38 +1000)]
Add Index on id_deceased column

7 years agoMerge pull request #10398 from agh1/4.7.20-releasenotes
Tim Otten [Fri, 9 Jun 2017 20:31:31 +0000 (22:31 +0200)]
Merge pull request #10398 from agh1/4.7.20-releasenotes

4.7.20 release notes

7 years agoCRM-20706: Notice error on using Contribution.getfield API
deb.monish [Fri, 9 Jun 2017 08:57:43 +0000 (14:27 +0530)]
CRM-20706: Notice error on using Contribution.getfield API