eileen [Tue, 27 Jun 2017 02:23:50 +0000 (14:23 +1200)]
CRM-20759 enable Primary as an import location type.
This goes to the default location type if the contact has no primary, or overwrites primary,
in keeping with profile behaviour
Eileen McNaughton [Tue, 4 Jul 2017 21:20:30 +0000 (09:20 +1200)]
Merge pull request #10603 from JMAConsulting/CRM-20640
CRM-20640: Added unit test for the fix
Monish Deb [Tue, 4 Jul 2017 13:08:34 +0000 (18:38 +0530)]
Merge pull request #10594 from eileenmcnaughton/extract2
[NFC] Add unit test towards CRM-20759
deb.monish [Tue, 4 Jul 2017 08:28:53 +0000 (13:58 +0530)]
CRM-20640: Added unit test for the fix
Eileen McNaughton [Tue, 4 Jul 2017 04:43:20 +0000 (16:43 +1200)]
Merge pull request #10600 from civicrm/4.7.21-rc
4.7.21 rc
Eileen McNaughton [Tue, 4 Jul 2017 03:17:09 +0000 (15:17 +1200)]
Merge pull request #10596 from JMAConsulting/CRM-20640
CRM-20640: contribution summary report: duplicates values with group filter
Eileen McNaughton [Tue, 4 Jul 2017 03:07:12 +0000 (15:07 +1200)]
Merge pull request #10598 from totten/4.7.21-rc-20675
(Backport) CRM-20675 - Fix incorrect renewal activity created when membership updated via API
Monish Deb [Mon, 19 Jun 2017 17:29:04 +0000 (22:59 +0530)]
Minor fix at unit test
Jitendra Purohit [Fri, 2 Jun 2017 15:13:58 +0000 (20:43 +0530)]
CRM-20675: Fix incorrect renewal activity created when membership updated via api
deb.monish [Mon, 3 Jul 2017 08:01:17 +0000 (13:31 +0530)]
CRM-20640: contribution summary report: duplicates values with group filter
eileen [Mon, 3 Jul 2017 00:04:31 +0000 (12:04 +1200)]
Towards CRM-20759, minor tidy up
eileen [Wed, 28 Jun 2017 00:32:16 +0000 (12:32 +1200)]
CRM-20759 add e-notice fix and unit tests for saving mappings
eileen [Tue, 27 Jun 2017 01:31:46 +0000 (13:31 +1200)]
Add unit test towards CRM-20759
Eileen McNaughton [Sun, 2 Jul 2017 20:41:10 +0000 (08:41 +1200)]
Merge pull request #10593 from civicrm/4.7.21-rc
4.7.21 rc
Eileen McNaughton [Sun, 2 Jul 2017 20:40:13 +0000 (08:40 +1200)]
Merge pull request #10583 from seamuslee001/CRM-20789
CRM-20789 Fix unsubscribing when link comes from an AB Test
Eileen McNaughton [Sun, 2 Jul 2017 20:39:26 +0000 (08:39 +1200)]
Merge pull request #10579 from eileenmcnaughton/deprecated2
CRM-20786 Move deprecated utils functions to the import classes
colemanw [Sat, 1 Jul 2017 20:14:18 +0000 (16:14 -0400)]
Merge pull request #10591 from totten/master-casetype-flush
CRM-20802 - CaseType - Flush any in-memory caches that might reference case-type
Tim Otten [Sat, 1 Jul 2017 19:22:08 +0000 (12:22 -0700)]
CRM-20802 - CaseType - Flush any in-memory caches that might reference case-type
Coleman Watts [Fri, 23 Jun 2017 16:20:18 +0000 (12:20 -0400)]
Fix bug in open case status selector
Coleman Watts [Sat, 1 Jul 2017 18:23:02 +0000 (14:23 -0400)]
Merge branch '4.7.21-rc' into master
Monish Deb [Sat, 1 Jul 2017 11:25:12 +0000 (16:55 +0530)]
Merge pull request #10575 from JMAConsulting/CRM-20747-rc
CRM-20747: {contribution.campaign} token not working on Contribution
Monish Deb [Sat, 1 Jul 2017 11:23:23 +0000 (16:53 +0530)]
Merge pull request #10533 from JMAConsulting/CRM-20747
CRM-20747: {contribution.campaign} token not working on Contribution ThankYou letter
Tim Otten [Fri, 30 Jun 2017 23:54:59 +0000 (16:54 -0700)]
Merge pull request #10574 from eileenmcnaughton/cms
CRM-20780 Add drupal option to define CMS_ROOT
Eileen McNaughton [Fri, 30 Jun 2017 22:55:59 +0000 (10:55 +1200)]
Merge pull request #6 from totten/eileenmcnaughton-cms
CRM-20780 - System::cmsRootPath() - Use the same override on all CMS's
Tim Otten [Fri, 30 Jun 2017 21:49:57 +0000 (14:49 -0700)]
CRM-20780 - System::cmsRootPath() - Use the same override on all CMS's
eileen [Wed, 28 Jun 2017 08:29:54 +0000 (20:29 +1200)]
CRM-20780 Add drupal option to define CMS_ROOT
Seamus Lee [Thu, 29 Jun 2017 21:54:01 +0000 (21:54 +0000)]
CRM-20789 Add check based on mailing_type following chat with Tim to ensure only deailing with AB tests
Monish Deb [Thu, 29 Jun 2017 14:15:19 +0000 (19:45 +0530)]
Merge pull request #10527 from eileenmcnaughton/act
Replace a couple of calls to deprecated function
Monish Deb [Thu, 29 Jun 2017 12:21:06 +0000 (17:51 +0530)]
Merge pull request #10581 from eileenmcnaughton/deprecated4
CRM-20786 consolidate calls to deprecated function
Seamus Lee [Thu, 29 Jun 2017 05:20:38 +0000 (05:20 +0000)]
CRM-20789 Fix unsubscribing when link comes from an AB Test
CRM-20789 Fix retrieving entity when in AB test context
eileen [Wed, 28 Jun 2017 21:26:37 +0000 (09:26 +1200)]
CRM-20786 consolidate calls to deprecated function
Tim Otten [Wed, 28 Jun 2017 22:11:01 +0000 (15:11 -0700)]
Merge pull request #10577 from totten/4.7.21-rc-src
CRM-19303 - Drupal - Restore getCiviSourceStorage()
eileen [Wed, 28 Jun 2017 21:03:33 +0000 (09:03 +1200)]
CRM-20786 copy deprecated utils function 'inids' to import class.
Will work separately to fully remove it
eileen [Wed, 28 Jun 2017 20:59:35 +0000 (08:59 +1200)]
CRM-20786 Move deprecated utils functions to the import classes
Eileen McNaughton [Wed, 28 Jun 2017 20:53:18 +0000 (08:53 +1200)]
Merge pull request #10576 from JMAConsulting/CRM-20781
CRM-20781: Truncate long text in mail listing
eileen [Wed, 28 Jun 2017 20:47:51 +0000 (08:47 +1200)]
CRM-20786 combine functions in order to move to class
Eileen McNaughton [Wed, 28 Jun 2017 19:48:39 +0000 (07:48 +1200)]
Merge pull request #10558 from JMAConsulting/CRM-20412
CRM-20412: mailing report: unique opens detail view inaccurate
deb.monish [Wed, 28 Jun 2017 18:46:35 +0000 (00:16 +0530)]
CRM-20781: Truncate long text in mail listing
Tim Otten [Wed, 28 Jun 2017 18:57:54 +0000 (11:57 -0700)]
CRM-19303 - Drupal - Restore getCiviSourceStorage()
This partially reverts changes made under CRM-19303:
* The changes to `getDefaultFileStorage()` are preserved
* The changes to `getCiviSourceStorage()` are reverted
* To avoid conflicts, `parseDrupalSiteName()` has been split into the older `parseDrupalSiteNameFromRoot()` and the newer `parseDrupalSiteNameFromRequest()`.
(IMHO, `parseDrupalSiteNameFromRequest()` is more correct, but `parseDrupalSiteNameFromRoot()` is more compatible with existing deployments).
As discussed in [PR #10513](https://github.com/civicrm/civicrm-core/pull/10513#issuecomment-
310506829),
we should stop trying so hard to autodetect these things. We'll treat the
auto-detection stuff as legacy, and should shift toward a simpler/flatter arrangement
which encourages paths/URLs to be stored in `civicrm.settings.php`.
colemanw [Wed, 28 Jun 2017 12:28:32 +0000 (08:28 -0400)]
Merge pull request #10571 from totten/master-joomla-hook
CRM-19914 - CRM_Utils_Hook - Fix `civicrmHooks.php` on Joomla
colemanw [Wed, 28 Jun 2017 12:09:48 +0000 (08:09 -0400)]
Merge pull request #10573 from totten/master-nav-hash
CRM-20776 - Navigation - Fix menu items with mix of #, ?, &
deb.monish [Wed, 28 Jun 2017 09:15:24 +0000 (14:45 +0530)]
CRM-20747: {contribution.campaign} token not working on Contribution
deb.monish [Tue, 20 Jun 2017 11:24:59 +0000 (16:54 +0530)]
CRM-20747: {contribution.campaign} token not working on Contribution ThankYou letter
Tim Otten [Wed, 28 Jun 2017 07:54:30 +0000 (00:54 -0700)]
Merge pull request #10572 from seamuslee001/CRM-20774-words
CRM-20774 Add in additional words on contacting system administrator …
Seamus Lee [Wed, 28 Jun 2017 06:57:35 +0000 (16:57 +1000)]
CRM-20774 Add in additional words on contacting system administrator for assistance
Tim Otten [Wed, 28 Jun 2017 06:47:19 +0000 (23:47 -0700)]
CRM-20776 - Navigation - Fix menu items with mix of #, ?, &
== Use case
* Use an extension to implement `hook_civicrm_navigationMenu`.
* Add or edit the URL of a menu item to use a mix of URL control chars -- eg `civicrm/case/a/#/case?dtab=0&dme=0`
* Look in the CiviCRM navigation bar and see the final URL of the link.
== Before
* The URL is munged (eg `http://dcase.l/civicrm/case/a/?dtab=0&dme=0#/case`)
== After
* The URL appears consistent (eg `http://dcase.l/civicrm/case/a/#/case?dtab=0&dme=0`)
== Testing
* On Drupal 7, I activated all components (CiviContribute, CiviMail, etal) to build a large pool of menu items.
Then I grabbed the menu content (eg `http://dcase.l/civicrm/ajax/menujs/202/en_US/1/
abcd1234`) -- both with and
without the patch. The content was the same, except for the intended items.
* Repeated above on WordPress (which does not use clean URLs).
Eileen McNaughton [Wed, 28 Jun 2017 06:32:08 +0000 (18:32 +1200)]
Merge pull request #10566 from jitendrapurohit/indexfix
CRM-20774 - Add check for existing key index in table
Tim Otten [Wed, 28 Jun 2017 03:46:59 +0000 (20:46 -0700)]
CRM-19914 - CRM_Utils_Hook - Fix `civicrmHooks.php` on Joomla
colemanw [Wed, 28 Jun 2017 02:19:33 +0000 (22:19 -0400)]
Merge pull request #10552 from colemanw/CRM-19778
CRM-19778 - Api.getoptions - Filter status id by case type id
Eileen McNaughton [Wed, 28 Jun 2017 02:09:16 +0000 (14:09 +1200)]
Merge pull request #10569 from eileenmcnaughton/perm
CRM-20778 - Use civicontribute permission for contribution recur.cancel
Tim Otten [Tue, 27 Jun 2017 22:49:16 +0000 (15:49 -0700)]
Merge pull request #10570 from civicrm/4.7.21-rc
Update `master` with latest `4.7.21-rc`
Tim Otten [Tue, 27 Jun 2017 21:56:39 +0000 (14:56 -0700)]
Merge pull request #10567 from totten/4.7.21-rc-rm
CRM-20243 - Actively remove old files
eileen [Tue, 27 Jun 2017 20:57:37 +0000 (08:57 +1200)]
CRM-20778 - Use civicontribute permission for contribution recur.cancel
Tim Otten [Tue, 27 Jun 2017 20:44:11 +0000 (13:44 -0700)]
CRM-20243 - CRM_Utils_Check - Simplify Auth/SASL checks
Coleman Watts [Tue, 27 Jun 2017 20:10:32 +0000 (16:10 -0400)]
Mark failing test incomplete
Coleman Watts [Fri, 23 Jun 2017 16:21:27 +0000 (12:21 -0400)]
CRM-19778 - Api.getoptions - Filter status id by case type id
Jitendra Purohit [Tue, 27 Jun 2017 14:18:01 +0000 (19:48 +0530)]
add test
colemanw [Tue, 27 Jun 2017 13:40:57 +0000 (09:40 -0400)]
Merge pull request #10568 from francescbassas/patch-10
CRM-20775 Wrong is full results for API event get
francescbassas [Tue, 27 Jun 2017 11:02:43 +0000 (13:02 +0200)]
Code style
francescbassas [Tue, 27 Jun 2017 10:52:52 +0000 (12:52 +0200)]
CRM-20775 Wrong is full results for API event get
Tim Otten [Tue, 27 Jun 2017 07:27:09 +0000 (00:27 -0700)]
CRM-20243 - CRM_Upgrade_Form - Delete orphaned files before upgrade
Tim Otten [Tue, 27 Jun 2017 06:35:36 +0000 (23:35 -0700)]
CRM-20243 - Add check for deleted files
Tim Otten [Tue, 27 Jun 2017 06:54:26 +0000 (23:54 -0700)]
CRM-20243 - Civi\Core\Paths - Define 'civicrm.packages' variable (etal)
In the long run, the file location of the `packages`, `vendor`, and
`bower_components` should be adjustable (depending on how the codebase is
built).
This patch begins loosening the coupling between the `$civicrm_root` and
those folders.
Jitendra Purohit [Tue, 27 Jun 2017 04:24:15 +0000 (09:54 +0530)]
existing test fixes
Jitendra Purohit [Mon, 26 Jun 2017 11:25:19 +0000 (16:55 +0530)]
Add check for existing key index in table
Eileen McNaughton [Tue, 27 Jun 2017 01:11:57 +0000 (13:11 +1200)]
Merge pull request #10554 from eileenmcnaughton/crazy_vars
[NFC] Cleanup towards CRM-20759, define variables more legibly & consistently.
colemanw [Mon, 26 Jun 2017 21:13:58 +0000 (17:13 -0400)]
Merge pull request #9886 from JMAConsulting/CRM-20169
CRM-20169 WIP (possibly wanting refactor of whole report) Added alterReportVar hook support to activity report
colemanw [Mon, 26 Jun 2017 21:02:42 +0000 (17:02 -0400)]
Merge pull request #10452 from JMAConsulting/CRM-20668
CRM-20668, Fixed Notice error
colemanw [Mon, 26 Jun 2017 20:57:17 +0000 (16:57 -0400)]
Merge pull request #10346 from JMAConsulting/CRM-20567
CRM-20567: backoffice membership via price set errors with non-aggregated column
colemanw [Mon, 26 Jun 2017 20:50:28 +0000 (16:50 -0400)]
Merge pull request #10497 from JMAConsulting/CRM-20721
CRM-20721: Add parameter to dateQueryBuilder fn to change date value to desired format
colemanw [Mon, 26 Jun 2017 20:29:43 +0000 (16:29 -0400)]
Merge pull request #10562 from JMAConsulting/CRM-20411
CRM-20411: mailing tab listing: MySQL 5.7 group by error
Coleman Watts [Fri, 23 Jun 2017 16:20:18 +0000 (12:20 -0400)]
Fix bug in open case status selector
colemanw [Mon, 26 Jun 2017 19:50:28 +0000 (15:50 -0400)]
Merge pull request #10507 from lcdservices/CRM-20739
CRM-20739 process groups for import using fill
Eileen McNaughton [Mon, 26 Jun 2017 19:49:23 +0000 (07:49 +1200)]
Merge pull request #10561 from seamuslee001/CRM-20771
CRM-20771 Ensure that addColumn can handle translatable columns
deb.monish [Mon, 26 Jun 2017 12:48:03 +0000 (18:18 +0530)]
CRM-20411: mailing tab listing: MySQL 5.7 group by error
deb.monish [Sun, 25 Jun 2017 16:19:34 +0000 (21:49 +0530)]
CRM-20412: mailing report: unique opens detail view inaccurate
Seamus Lee [Mon, 26 Jun 2017 11:15:04 +0000 (21:15 +1000)]
CRM-20771 Ensure that addColumn can handle translatable columns
eileen [Fri, 23 Jun 2017 22:09:17 +0000 (10:09 +1200)]
Cleanup towards CRM-20759, define variables more legibly & consistently.
I really want the 2 copy & paste variants of this code loop to be combinable but I think it takes a numebr
of small changes to get there in a readable way
Eileen McNaughton [Mon, 26 Jun 2017 05:35:39 +0000 (17:35 +1200)]
Merge pull request #10492 from seamuslee001/CRM-20716
CRM-20716 Fix Array to string error because subject is an array not string
Yashodha Chaku [Mon, 26 Jun 2017 04:12:38 +0000 (09:42 +0530)]
Merge pull request #10550 from yashodha/CRM-20765
CRM-20765 - Missing id for 'onBehalfOfOrg' section
Eileen McNaughton [Sun, 25 Jun 2017 23:08:19 +0000 (11:08 +1200)]
Merge pull request #10560 from civicrm/4.7.21-rc
4.7.21 rc
Eileen McNaughton [Sun, 25 Jun 2017 22:33:15 +0000 (10:33 +1200)]
Merge pull request #10555 from totten/4.7.21-install-port
CRM-20768 - Installer UI - Accept mysql port
Eileen McNaughton [Sun, 25 Jun 2017 22:30:19 +0000 (10:30 +1200)]
Merge pull request #10559 from civicrm/4.7.21-rc
4.7.21 rc
Eileen McNaughton [Sun, 25 Jun 2017 22:28:42 +0000 (10:28 +1200)]
Merge pull request #10556 from devarun/4.7.21-rc
CRM-20644: Column names on Advanced search results displayed on contacts are out of order.
Eileen McNaughton [Sun, 25 Jun 2017 06:32:50 +0000 (18:32 +1200)]
Merge pull request #10536 from yashodha/CRM-20753
CRM-20753 - Net amount doesn't respect localization
devarun [Sat, 24 Jun 2017 14:22:23 +0000 (19:52 +0530)]
CRM-20644: Column names on Advanced search results displayed on contacts are out of order.
Tim Otten [Sat, 24 Jun 2017 00:31:14 +0000 (17:31 -0700)]
CRM-20768 - install - Improve docblock
Tim Otten [Sat, 24 Jun 2017 00:24:33 +0000 (17:24 -0700)]
CRM-20768 - Install UI - Distinguish host/port in IPv6
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
Tim Otten [Fri, 23 Jun 2017 21:23:43 +0000 (14:23 -0700)]
Merge pull request #10545 from totten/master-ui-bootstrap
CRM-20756 - Add Angular `ui.bootstrap` library
deb.monish [Fri, 23 Jun 2017 19:31:39 +0000 (01:01 +0530)]
added unit test
deb.monish [Fri, 12 May 2017 20:16:36 +0000 (01:46 +0530)]
CRM-20567: backoffice membership via price set errors with non-aggregated column
colemanw [Fri, 23 Jun 2017 15:22:00 +0000 (11:22 -0400)]
Merge pull request #10541 from JMAConsulting/CRM-20411
CRM-20411: mailing tab listing: MySQL 5.7 group by error
colemanw [Fri, 23 Jun 2017 15:19:50 +0000 (11:19 -0400)]
Merge pull request #10498 from JMAConsulting/CRM-20722
CRM-20722: 'Lock wait timeout exceeded' error triggered on smart group cache rebuild
colemanw [Fri, 23 Jun 2017 14:03:54 +0000 (10:03 -0400)]
Merge pull request #10407 from JMAConsulting/CRM-19653
CRM-19653: Custom field checkboxes migrated incorrectly on merge (part deux)
colemanw [Fri, 23 Jun 2017 13:59:16 +0000 (09:59 -0400)]
Merge pull request #10298 from colemanw/CRM-20387
CRM-20387 - Add invoice_number field for human readable contribution invoice
Monish Deb [Fri, 23 Jun 2017 13:10:45 +0000 (18:40 +0530)]
Merge pull request #10549 from jitendrapurohit/CRM-20761
CRM-20761 : Formrule error when priceset is selected on contribution page
Coleman Watts [Wed, 3 May 2017 21:15:28 +0000 (17:15 -0400)]
CRM-20387 - Add invoice_number field for human readable contribution invoice
yashodha [Fri, 23 Jun 2017 03:56:31 +0000 (09:26 +0530)]
CRM-20765 - Missing id for 'onBehalfOfOrg' section
Eileen McNaughton [Fri, 23 Jun 2017 03:05:08 +0000 (15:05 +1200)]
Merge pull request #10547 from eileenmcnaughton/extract
[NFC] Extract submit in mapFields to start adding unit testing (towards CRM-20759)