Jamie McClelland [Tue, 8 Nov 2016 19:45:45 +0000 (14:45 -0500)]
CRM-19620 - Restore matching contacts in trash prior to import along with Unit Test.
This avoids duplicate key errors. If we don't restore and return the
deleted contact when we have a match on external_identifier, then
we end up with a key error.
Monish Deb [Fri, 13 Oct 2017 20:48:57 +0000 (02:18 +0530)]
Merge pull request #11124 from agileware/CRM-21267
CRM-21267: Fixed call to undefined formatCustomDate method in Parser.
colemanw [Fri, 13 Oct 2017 02:34:00 +0000 (22:34 -0400)]
Merge pull request #10486 from mickadoo/CRM-20710_get-valid-types-function
CRM-20710: Add function to return valid types
colemanw [Fri, 13 Oct 2017 01:31:31 +0000 (21:31 -0400)]
Merge pull request #11067 from MegaphoneJon/resource-url-check
CRM-21262 - Add a system check for the resource URL
colemanw [Fri, 13 Oct 2017 01:25:41 +0000 (21:25 -0400)]
Merge pull request #11116 from eileenmcnaughton/dedupe_obs_code
CRM-21291 remove obsolete code from dedupe.
Eileen McNaughton [Thu, 12 Oct 2017 23:55:51 +0000 (12:55 +1300)]
Merge pull request #11107 from totten/master-nav-ser
Navigation - Fix serialization error
Mathieu Lu [Thu, 12 Oct 2017 16:06:52 +0000 (12:06 -0400)]
Merge pull request #10707 from eileenmcnaughton/civimail
CRM-20919 adjust mailing.create to allow adding completed mailings.
Tim Otten [Thu, 12 Oct 2017 14:31:22 +0000 (15:31 +0100)]
CRM/Upgrade - Move 4.7.26 steps to 4.7.27
Tim Otten [Thu, 12 Oct 2017 14:31:21 +0000 (15:31 +0100)]
Merge branch 'new-4.7.27-rc' into new-master
Tim Otten [Thu, 12 Oct 2017 14:31:21 +0000 (15:31 +0100)]
Set version to 4.7.28
Tim Otten [Thu, 12 Oct 2017 14:31:21 +0000 (15:31 +0100)]
CRM/Upgrade - Move 4.7.26 steps to 4.7.27
Tim Otten [Thu, 12 Oct 2017 14:31:21 +0000 (15:31 +0100)]
CRM/Upgrade - Make the Tajikistan change replayable
Tim Otten [Thu, 12 Oct 2017 14:31:19 +0000 (15:31 +0100)]
Merge branch 'new-4.7.27-rc' into new-master
Tim Otten [Thu, 12 Oct 2017 14:31:19 +0000 (15:31 +0100)]
Set version to 4.7.27
Tim Otten [Thu, 12 Oct 2017 14:31:19 +0000 (15:31 +0100)]
CRM/Upgrade - Move 4.7.27 steps to 4.7.28
Alok Patel [Thu, 12 Oct 2017 11:34:04 +0000 (17:04 +0530)]
CRM-21267: Cleaning up lint errors
Alok Patel [Thu, 12 Oct 2017 05:43:47 +0000 (11:13 +0530)]
CRM-21267: Fixed call to undefined formatCustomDate method in Parser. Agileware Ref: CIVICRM-542
Eileen McNaughton [Thu, 12 Oct 2017 04:41:54 +0000 (17:41 +1300)]
Merge pull request #11119 from eileenmcnaughton/phpcs
[nfc] Fix missing comma for phpcs
eileen [Thu, 12 Oct 2017 04:41:07 +0000 (17:41 +1300)]
Fix missing comma for phpcs
eileen [Thu, 12 Oct 2017 02:26:19 +0000 (15:26 +1300)]
CRM-21291 remove obsolete code from dedupe.
As confirmed by Jamie this code is no longer in use
Eileen McNaughton [Wed, 11 Oct 2017 19:50:42 +0000 (08:50 +1300)]
Merge pull request #11112 from kcristiano/4.7.26-rc
CRM-21285 Buildkit Installs failing for WordPress
Eileen McNaughton [Wed, 11 Oct 2017 19:49:33 +0000 (08:49 +1300)]
Merge pull request #11109 from JKingsnorth/CRM-20903a
CRM-20903 Order dedupe rules by title not ID
Eileen McNaughton [Wed, 11 Oct 2017 19:45:56 +0000 (08:45 +1300)]
Merge pull request #11111 from civicrm/4.7.26-rc
4.7.26 rc
colemanw [Wed, 11 Oct 2017 12:46:08 +0000 (08:46 -0400)]
Merge pull request #11096 from mukeshcompucorp/HW-381-case-type-settings-screen
HW-381: Added container block to wrap elements
JKingsnorth [Wed, 11 Oct 2017 08:07:03 +0000 (09:07 +0100)]
CRM-20903 Order dedupe rules by title not ID - users first!
Eileen McNaughton [Wed, 11 Oct 2017 00:34:32 +0000 (13:34 +1300)]
Merge pull request #11099 from JKingsnorth/CRM-21282
CRM-21282 Improve ordering of click reporting
Eileen McNaughton [Tue, 10 Oct 2017 21:22:40 +0000 (10:22 +1300)]
Merge pull request #11104 from highfalutin/CRM-21284-mail-setup-doc-link
CRM-21284: Update documentation link for setting up default mailbox
Eileen McNaughton [Tue, 10 Oct 2017 21:21:05 +0000 (10:21 +1300)]
Merge pull request #11108 from cividesk/CRM-21281
CRM-21281: Fix potential e-notice
Eileen McNaughton [Tue, 10 Oct 2017 21:16:01 +0000 (10:16 +1300)]
Merge pull request #11106 from twomice/CRM-21287_contributions_by_household_add_financial_type
CRM-21287: Add Financial Type column and filter.
Kevin Cristiano [Tue, 10 Oct 2017 20:57:55 +0000 (16:57 -0400)]
Update wp.frontend and wp.backend to account for cases where CIVICRM_UF_BASEURL may or may not have a trailing slash
Nicolas Ganivet [Tue, 10 Oct 2017 20:27:57 +0000 (14:27 -0600)]
CRM-21281: Fix potential e-notice
Tim Otten [Tue, 10 Oct 2017 20:25:20 +0000 (21:25 +0100)]
Navigation - Fix serialization error
Overview
--------
The navigation subsystem stores per-user data in the table
`civicrm_setting`. Most access to this table goes through
`CRM_Core_BAO_Setting` or `Civi\Core\SettingsBag`. However, certain
edge-cases produce a warning about a serialization error because
`CRM_Core_BAO_Navigation` does not participate.
Before
------
`CRM_Core_BAO_Navigation::resetNavigation()` generates malformed
records which cannot be read via `CRM_Core_BAO_Setting` or
`Civi\Core\SettingsBag`.
After
-----
`CRM_Core_BAO_Navigation::resetNavigation()` generates better records.
Tim Otten [Tue, 10 Oct 2017 19:30:57 +0000 (20:30 +0100)]
Merge pull request #11101 from JohnFF/feature/CRM-16243-sprint-b
CRM-16243 - Activate extension dependencies
Eileen McNaughton [Tue, 10 Oct 2017 18:55:39 +0000 (07:55 +1300)]
Merge pull request #11097 from cividesk/CRM-21281
CRM-21281: Restore entity reference in case the post hook needs it
Eileen McNaughton [Tue, 10 Oct 2017 18:49:08 +0000 (07:49 +1300)]
Merge pull request #11098 from JKingsnorth/CRM-20903a
CRM-20903 Improve ordering of dedupe rules
Eileen McNaughton [Tue, 10 Oct 2017 18:47:41 +0000 (07:47 +1300)]
Merge pull request #11105 from kcristiano/4.7.26-rc
CRM-21285 Buildkit Installs failing for WordPress 4.7.26-rc PR
colemanw [Tue, 10 Oct 2017 18:45:01 +0000 (14:45 -0400)]
Merge pull request #10355 from eileenmcnaughton/deprecation
Deprecation: CRM-20572 Remove jcalendar from Contrib Sybunt custom Search
Allen Shaw [Tue, 10 Oct 2017 16:35:56 +0000 (11:35 -0500)]
CRM-21287: Add Financial Type column and filter.
Kevin Cristiano [Tue, 10 Oct 2017 15:50:33 +0000 (11:50 -0400)]
Buildkit Installs failing for WordPress
Front end paths missing trailing slash on CIVICRM_UF_BASEURL
colemanw [Tue, 10 Oct 2017 14:57:50 +0000 (10:57 -0400)]
Merge pull request #11089 from seamuslee001/CRM-19346
CRM-19346 Ensure Option Values do not share same value
colemanw [Tue, 10 Oct 2017 14:08:46 +0000 (10:08 -0400)]
CRM-19346 - Move variable setting to preprocess fn
colemanw [Tue, 10 Oct 2017 13:46:11 +0000 (09:46 -0400)]
Merge pull request #11045 from mepps/CRM-20304
CRM-20304 Bug fixes to Alphabetize options
Kevin Cristiano [Tue, 10 Oct 2017 13:13:57 +0000 (09:13 -0400)]
Buildkit Installs are failing.
update wp.backend.base to ensure admin_url is correct
Monish Deb [Tue, 10 Oct 2017 13:01:28 +0000 (18:31 +0530)]
Merge pull request #11100 from seamuslee001/CRM-21283
CRM-21283 Incorporate Barbados and Antigua and Barbuda parishes into …
Noah Miller [Tue, 10 Oct 2017 12:23:46 +0000 (13:23 +0100)]
CRM-21284: Update documentation link for setting up default mailbox
deb.monish [Wed, 20 Sep 2017 12:16:50 +0000 (17:46 +0530)]
add upgrade code
eileen [Sun, 14 May 2017 23:19:36 +0000 (11:19 +1200)]
Fix call to deprecated funciton
eileen [Sun, 14 May 2017 23:19:01 +0000 (11:19 +1200)]
CRM-20572 Remove jcalendar from Contrib Sybunt custom Search
Monish Deb [Tue, 10 Oct 2017 11:46:41 +0000 (17:16 +0530)]
minor fix
Monish Deb [Tue, 10 Oct 2017 11:34:49 +0000 (17:04 +0530)]
Merge pull request #11058 from DanielvV/CRM-21249
CRM-21249 - GeocodeTest should warn hitting the Google limit
Mukesh Ram [Tue, 10 Oct 2017 10:53:05 +0000 (16:23 +0530)]
HW:381/HW-382: Removed extra buttons from UI
Seamus Lee [Tue, 10 Oct 2017 10:39:18 +0000 (21:39 +1100)]
CRM-21283 Incorporate Barbados and Antigua and Barbuda parishes into list of states as per ISO documentation https://en.wikipedia.org/wiki/ISO_3166-2:BB https://en.wikipedia.org/wiki/ISO_3166-2:AG
Monish Deb [Tue, 10 Oct 2017 09:17:59 +0000 (14:47 +0530)]
Merge pull request #11093 from seamuslee001/CRM-20397-tollerance
CRM-20397 Allow for up to 4 hours tollarence in setting the date as v…
JKingsnorth [Tue, 10 Oct 2017 08:21:05 +0000 (09:21 +0100)]
CRM-21282 Improve ordering of click reporting
JKingsnorth [Tue, 10 Oct 2017 08:18:47 +0000 (09:18 +0100)]
CRM-20903 Improve ordering of dedupe rules
Seamus Lee [Tue, 10 Oct 2017 07:47:35 +0000 (18:47 +1100)]
Roll back unneeded composer.lock changes
Seamus Lee [Mon, 9 Oct 2017 09:11:25 +0000 (20:11 +1100)]
CRM-19346 Patch API also to ensure that same value cannot be used as well
Add in fixes to unit tests
Switch to using CRM_Core_OptionGroup:: rather than hard codeded array
Seamus Lee [Mon, 9 Oct 2017 08:39:58 +0000 (19:39 +1100)]
CRM-19346 Add in form rule to ensure that option values can't use the same value
Nicolas Ganivet [Tue, 10 Oct 2017 06:26:37 +0000 (00:26 -0600)]
CRM-21281: Restore entity reference in case the post hook needs it
Mukesh Ram [Tue, 10 Oct 2017 05:36:44 +0000 (11:06 +0530)]
HW-381: Added container block to wrap elements
Jon goldberg [Tue, 10 Oct 2017 04:03:04 +0000 (00:03 -0400)]
CRM-21262 - Don't run a resource URL check during unit tests
colemanw [Tue, 10 Oct 2017 01:44:52 +0000 (21:44 -0400)]
Merge pull request #11019 from DanielvV/CRM-21214
CRM-21214 - Fix address sharing
John Kirk [Mon, 9 Oct 2017 21:20:52 +0000 (21:20 +0000)]
Updated getKeys to match core.
John Kirk [Mon, 9 Oct 2017 19:31:15 +0000 (19:31 +0000)]
Updated composer to include topsort library.
Tim Otten [Mon, 9 Oct 2017 19:28:57 +0000 (20:28 +0100)]
Merge pull request #11073 from totten/master-pfv
(NFC) CRM-12167 - Regenerate CRM_Price_DAO_PriceFieldValue
Tim Otten [Mon, 9 Oct 2017 19:05:18 +0000 (20:05 +0100)]
Merge pull request #11092 from seamuslee001/CRM-20397-popup
CRM-20397 - crmMailingRadioDate - Make the UI less spammy and close i…
John Kirk [Thu, 24 Aug 2017 23:42:31 +0000 (23:42 +0000)]
Reverted change to place info requires in an array.
John Kirk [Sat, 22 Oct 2016 23:28:55 +0000 (23:28 +0000)]
Changed formatting of Require display.
Tim Otten [Sat, 15 Oct 2016 11:33:31 +0000 (12:33 +0100)]
CRM-16243 - ExtensionDetails.tpl - Display both title+key for dependencies
John Kirk [Fri, 14 Oct 2016 17:45:25 +0000 (18:45 +0100)]
Further work to pull request 9257 CRM-16243 - Extension API - Automatically enable dependencies
Also adjusted interface to show the needed dependencies.
John Kirk [Sun, 20 Nov 2016 03:23:02 +0000 (03:23 +0000)]
Made sure that array_merge accepts two arrays as expected.
John Kirk [Sat, 22 Oct 2016 23:28:55 +0000 (23:28 +0000)]
Changed formatting of Require display.
John Kirk [Sat, 22 Oct 2016 23:30:27 +0000 (23:30 +0000)]
Prevented warning for array index if extension files deleted.
Tim Otten [Sat, 15 Oct 2016 11:33:31 +0000 (12:33 +0100)]
CRM-16243 - ExtensionDetails.tpl - Display both title+key for dependencies
Tim Otten [Sat, 15 Oct 2016 11:26:55 +0000 (12:26 +0100)]
CRM-16243 - CRM_Admin_Form_Extensions - Expose list of extensions for naming requirements
Tim Otten [Sat, 15 Oct 2016 11:26:25 +0000 (12:26 +0100)]
CRM_Admin_Page_Extensions - Extract functions format(Local,Remote)ExtensionRows
John Kirk [Fri, 14 Oct 2016 17:45:25 +0000 (18:45 +0100)]
Further work to pull request 9257 CRM-16243 - Extension API - Automatically enable dependencies
Also adjusted interface to show the needed dependencies.
Tim Otten [Sat, 26 Mar 2016 21:14:11 +0000 (14:14 -0700)]
CRM-16243 - Extension API - Manage extensions by path
This allows one to enable or disable a series of extensions by path.
This should be useful, for example, when integrating with `composer` or
`drush make`. Without any knowledge of the specific extensions
involved, one might:
* If you download a bunch of extensions to a common dir (e.g.
composer's `vendor/`) and need to enable them all, then run
`cv api extension.install path=$PWD/vendor/*` (circa `post-install-cmd`)
* If you're deleting a specific directory (e.g. via composer's
`uninstall`), then remove it gracefully from the DB by running
`cv api extension.disable path=$PKGDIR` (circa `pre-package-uninstall`)
Tim Otten [Fri, 25 Mar 2016 20:58:02 +0000 (13:58 -0700)]
CRM-16243 - CRM_Extension_Manager::install() - Refresh class-loader incrementally
This allows an extension's installation logic to use a class defined by one
of the (upstream) requirements.
Tim Otten [Fri, 25 Mar 2016 03:46:00 +0000 (20:46 -0700)]
CRM-16243 - Extension API - Automatically enable dependencies
This applies to the `install` and `enable` actions.
Handling `download` is a different task.
Tim Otten [Fri, 25 Mar 2016 03:45:28 +0000 (20:45 -0700)]
CRM-16243 - CRM_Extension_Manager - Add helper functions to resolve installation and removal deps
Tim Otten [Fri, 25 Mar 2016 03:44:08 +0000 (20:44 -0700)]
CRM-16243 - CRM_Extension_Info - Parse `<requires>` tag
John Kirk [Thu, 24 Aug 2017 17:19:19 +0000 (17:19 +0000)]
updated composer file
Tim Otten [Fri, 25 Mar 2016 03:38:32 +0000 (20:38 -0700)]
CRM-16243 - composer.json - Include `marcj/topsort`
colemanw [Mon, 9 Oct 2017 16:51:22 +0000 (12:51 -0400)]
Merge pull request #11056 from johanv/CRM-21246-chaining_contact_relationship_contact
CRM-21246 - Double chaining problem
colemanw [Mon, 9 Oct 2017 16:45:53 +0000 (12:45 -0400)]
Merge pull request #11005 from totten/master-visual-bundle
CRM-21179 - Provide copies of `dc.js`, etal, for use by extensions
Seamus Lee [Mon, 9 Oct 2017 14:41:11 +0000 (01:41 +1100)]
CRM-20397 Allow for up to 4 hours tollarence in setting the date as valid or not so that end user timezone issues aren't a factor
Seamus Lee [Mon, 9 Oct 2017 14:33:12 +0000 (01:33 +1100)]
CRM-20397 - crmMailingRadioDate - Make the UI less spammy and close it when a good time is set
colemanw [Mon, 9 Oct 2017 14:02:23 +0000 (10:02 -0400)]
Merge pull request #11082 from colemanw/CRM-20779
CRM-20779 - Fix image display in custom field tab
Coleman Watts [Mon, 9 Oct 2017 03:42:15 +0000 (23:42 -0400)]
CRM-20304 Tweak open-inline classes
open-inline implies that it will not pop up, so this explicitly excludes them.
This allows us to fix the problem where clicking the sort button would add to the history of the popup and take you "back" when clicking done instead of simply closing the dialog.
Margaret Epps [Fri, 29 Sep 2017 20:11:22 +0000 (16:11 -0400)]
CRM-20304 Add no-open class so modal stays open but doesn't open on page
Margaret Epps [Fri, 29 Sep 2017 19:17:33 +0000 (15:17 -0400)]
CRM-20304 Clarify comment
Margaret Epps [Fri, 29 Sep 2017 19:13:11 +0000 (15:13 -0400)]
CRM-20304 Make clear that browse is called regardless of other action
yashodha [Mon, 20 Mar 2017 04:15:15 +0000 (09:45 +0530)]
minor fix
yashodha [Mon, 20 Mar 2017 04:09:13 +0000 (09:39 +0530)]
CRM-20304 - Add option to alphabetize option values
Eileen McNaughton [Sun, 8 Oct 2017 21:02:41 +0000 (10:02 +1300)]
Merge pull request #11084 from mlutfy/crm21275
CRM-21275: Fatal error without message should recommend bug-reporting page, instead of the deprecated forum
Mathieu Lu [Sun, 8 Oct 2017 17:49:04 +0000 (13:49 -0400)]
Merge pull request #10942 from agileware/CIVICRM-441
CIVICRM-441 CRM-21149 Update translatable string changing "including…
Mathieu Lu [Sun, 8 Oct 2017 17:12:39 +0000 (13:12 -0400)]
Merge pull request #11076 from nowszy/CRM-21268
Refs CRM-21268 Missing French overseas departments.
Mathieu Lutfy [Sun, 8 Oct 2017 16:15:49 +0000 (12:15 -0400)]
CRM-21275: Fatal error without message should recommend bug-reporting page, instead of the deprecated forum.
Tim Otten [Sun, 8 Oct 2017 13:57:20 +0000 (14:57 +0100)]
Merge pull request #10876 from mlutfy/master-crm20468
CRM-20468: HTMLInputCoder: do not escape the content field, breaks attachments