civicrm-core.git
6 years agoFix formatting
William Mortada [Wed, 11 Oct 2017 21:30:24 +0000 (22:30 +0100)]
Fix formatting

6 years agoMerge pull request #11112 from kcristiano/4.7.26-rc
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

6 years agoMerge pull request #11109 from JKingsnorth/CRM-20903a
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

6 years agoMerge pull request #11111 from civicrm/4.7.26-rc
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

6 years agoGet Drupal database connection settings to prefill form
William Mortada [Wed, 11 Oct 2017 19:18:18 +0000 (20:18 +0100)]
Get Drupal database connection settings to prefill form

6 years agoMove database configuration later in the install process
William Mortada [Wed, 11 Oct 2017 18:26:42 +0000 (19:26 +0100)]
Move database configuration later in the install process

6 years agoMerge pull request #11096 from mukeshcompucorp/HW-381-case-type-settings-screen
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

6 years agoCRM-20903 Order dedupe rules by title not ID - users first!
JKingsnorth [Wed, 11 Oct 2017 08:07:03 +0000 (09:07 +0100)]
CRM-20903 Order dedupe rules by title not ID - users first!

6 years agoMerge pull request #11099 from JKingsnorth/CRM-21282
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

6 years agoMerge pull request #11104 from highfalutin/CRM-21284-mail-setup-doc-link
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

6 years agoMerge pull request #11108 from cividesk/CRM-21281
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

6 years agoMerge pull request #11106 from twomice/CRM-21287_contributions_by_household_add_finan...
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.

6 years agoUpdate wp.frontend and wp.backend to account for cases where CIVICRM_UF_BASEURL may...
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

6 years agoCRM-21281: Fix potential e-notice
Nicolas Ganivet [Tue, 10 Oct 2017 20:27:57 +0000 (14:27 -0600)]
CRM-21281: Fix potential e-notice

6 years agoNavigation - Fix serialization error
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.

6 years agoMerge pull request #11101 from JohnFF/feature/CRM-16243-sprint-b
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

6 years agoMerge pull request #11097 from cividesk/CRM-21281
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

6 years agoMerge pull request #11098 from JKingsnorth/CRM-20903a
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

6 years agoMerge pull request #11105 from kcristiano/4.7.26-rc
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

6 years agoMerge pull request #10355 from eileenmcnaughton/deprecation
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

6 years agoCRM-21287: Add Financial Type column and filter.
Allen Shaw [Tue, 10 Oct 2017 16:35:56 +0000 (11:35 -0500)]
CRM-21287: Add Financial Type column and filter.

6 years agoBuildkit Installs failing for WordPress
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

6 years agoMerge pull request #11089 from seamuslee001/CRM-19346
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

6 years agoCRM-19346 - Move variable setting to preprocess fn
colemanw [Tue, 10 Oct 2017 14:08:46 +0000 (10:08 -0400)]
CRM-19346 - Move variable setting to preprocess fn

6 years agoMerge pull request #11045 from mepps/CRM-20304
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

6 years ago Buildkit Installs are failing.
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

6 years agoMerge pull request #11100 from seamuslee001/CRM-21283
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 …

6 years agoCRM-21284: Update documentation link for setting up default mailbox
Noah Miller [Tue, 10 Oct 2017 12:23:46 +0000 (13:23 +0100)]
CRM-21284: Update documentation link for setting up default mailbox

6 years agoadd upgrade code
deb.monish [Wed, 20 Sep 2017 12:16:50 +0000 (17:46 +0530)]
add upgrade code

6 years agoFix call to deprecated funciton
eileen [Sun, 14 May 2017 23:19:36 +0000 (11:19 +1200)]
Fix call to deprecated funciton

6 years agoCRM-20572 Remove jcalendar from Contrib Sybunt custom Search
eileen [Sun, 14 May 2017 23:19:01 +0000 (11:19 +1200)]
CRM-20572 Remove jcalendar from Contrib Sybunt custom Search

6 years agominor fix
Monish Deb [Tue, 10 Oct 2017 11:46:41 +0000 (17:16 +0530)]
minor fix

6 years agoMerge pull request #11058 from DanielvV/CRM-21249
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

6 years agoCRM-21231: On CiviMail screen make 'Review and Schedule' tab active if required field...
deb.monish [Thu, 28 Sep 2017 11:45:17 +0000 (17:15 +0530)]
CRM-21231: On CiviMail screen make 'Review and Schedule' tab active if required fields are filled

6 years agoHW:381/HW-382: Removed extra buttons from UI
Mukesh Ram [Tue, 10 Oct 2017 10:53:05 +0000 (16:23 +0530)]
HW:381/HW-382: Removed extra buttons from UI

6 years agoCRM-21283 Incorporate Barbados and Antigua and Barbuda parishes into list of states...
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

6 years agoMerge pull request #11093 from seamuslee001/CRM-20397-tollerance
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…

6 years agoCRM-21282 Improve ordering of click reporting
JKingsnorth [Tue, 10 Oct 2017 08:21:05 +0000 (09:21 +0100)]
CRM-21282 Improve ordering of click reporting

6 years agoCRM-20903 Improve ordering of dedupe rules
JKingsnorth [Tue, 10 Oct 2017 08:18:47 +0000 (09:18 +0100)]
CRM-20903 Improve ordering of dedupe rules

6 years agoRoll back unneeded composer.lock changes
Seamus Lee [Tue, 10 Oct 2017 07:47:35 +0000 (18:47 +1100)]
Roll back unneeded composer.lock changes

6 years agoCRM-19346 Patch API also to ensure that same value cannot be used as well
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

6 years agoCRM-19346 Add in form rule to ensure that option values can't use the same value
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

6 years agoCRM-21281: Restore entity reference in case the post hook needs it
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

6 years agoHW-381: Added container block to wrap elements
Mukesh Ram [Tue, 10 Oct 2017 05:36:44 +0000 (11:06 +0530)]
HW-381: Added container block to wrap elements

6 years agoCRM-21262 - Don't run a resource URL check during unit tests
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

6 years agoMerge pull request #11019 from DanielvV/CRM-21214
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

6 years agoUpdated getKeys to match core.
John Kirk [Mon, 9 Oct 2017 21:20:52 +0000 (21:20 +0000)]
Updated getKeys to match core.

6 years agoUpdated composer to include topsort library.
John Kirk [Mon, 9 Oct 2017 19:31:15 +0000 (19:31 +0000)]
Updated composer to include topsort library.

6 years agoMerge pull request #11073 from totten/master-pfv
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

6 years agoMerge pull request #11092 from seamuslee001/CRM-20397-popup
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…

6 years agoReverted change to place info requires in an array.
John Kirk [Thu, 24 Aug 2017 23:42:31 +0000 (23:42 +0000)]
Reverted change to place info requires in an array.

6 years agoChanged formatting of Require display.
John Kirk [Sat, 22 Oct 2016 23:28:55 +0000 (23:28 +0000)]
Changed formatting of Require display.

6 years agoCRM-16243 - ExtensionDetails.tpl - Display both title+key for dependencies
Tim Otten [Sat, 15 Oct 2016 11:33:31 +0000 (12:33 +0100)]
CRM-16243 - ExtensionDetails.tpl - Display both title+key for dependencies

6 years agoFurther work to pull request 9257 CRM-16243 - Extension API - Automatically enable...
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.

6 years agoMade sure that array_merge accepts two arrays as expected.
John Kirk [Sun, 20 Nov 2016 03:23:02 +0000 (03:23 +0000)]
Made sure that array_merge accepts two arrays as expected.

6 years agoChanged formatting of Require display.
John Kirk [Sat, 22 Oct 2016 23:28:55 +0000 (23:28 +0000)]
Changed formatting of Require display.

6 years agoPrevented warning for array index if extension files deleted.
John Kirk [Sat, 22 Oct 2016 23:30:27 +0000 (23:30 +0000)]
Prevented warning for array index if extension files deleted.

6 years agoCRM-16243 - ExtensionDetails.tpl - Display both title+key for dependencies
Tim Otten [Sat, 15 Oct 2016 11:33:31 +0000 (12:33 +0100)]
CRM-16243 - ExtensionDetails.tpl - Display both title+key for dependencies

6 years agoCRM-16243 - CRM_Admin_Form_Extensions - Expose list of extensions for naming requirements
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

6 years agoCRM_Admin_Page_Extensions - Extract functions format(Local,Remote)ExtensionRows
Tim Otten [Sat, 15 Oct 2016 11:26:25 +0000 (12:26 +0100)]
CRM_Admin_Page_Extensions - Extract functions format(Local,Remote)ExtensionRows

6 years agoFurther work to pull request 9257 CRM-16243 - Extension API - Automatically enable...
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.

6 years agoCRM-16243 - Extension API - Manage extensions by path
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`)

6 years agoCRM-16243 - CRM_Extension_Manager::install() - Refresh class-loader incrementally
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.

6 years agoCRM-16243 - Extension API - Automatically enable dependencies
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.

6 years agoCRM-16243 - CRM_Extension_Manager - Add helper functions to resolve installation...
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

6 years agoCRM-16243 - CRM_Extension_Info - Parse `<requires>` tag
Tim Otten [Fri, 25 Mar 2016 03:44:08 +0000 (20:44 -0700)]
CRM-16243 - CRM_Extension_Info - Parse `<requires>` tag

6 years agoupdated composer file
John Kirk [Thu, 24 Aug 2017 17:19:19 +0000 (17:19 +0000)]
updated composer file

6 years agoCRM-16243 - composer.json - Include `marcj/topsort`
Tim Otten [Fri, 25 Mar 2016 03:38:32 +0000 (20:38 -0700)]
CRM-16243 - composer.json - Include `marcj/topsort`

6 years agoMerge pull request #11056 from johanv/CRM-21246-chaining_contact_relationship_contact
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

6 years agoMerge pull request #11005 from totten/master-visual-bundle
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

6 years agoCRM-20397 Allow for up to 4 hours tollarence in setting the date as valid or not...
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

6 years agoCRM-20397 - crmMailingRadioDate - Make the UI less spammy and close it when a good...
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

6 years agoMerge pull request #11082 from colemanw/CRM-20779
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

6 years agoCRM-20304 Tweak open-inline classes
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.

6 years agoCRM-20304 Add no-open class so modal stays open but doesn't open on page
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

6 years agoCRM-20304 Clarify comment
Margaret Epps [Fri, 29 Sep 2017 19:17:33 +0000 (15:17 -0400)]
CRM-20304 Clarify comment

6 years agoCRM-20304 Make clear that browse is called regardless of other action
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

6 years agominor fix
yashodha [Mon, 20 Mar 2017 04:15:15 +0000 (09:45 +0530)]
minor fix

6 years agoCRM-20304 - Add option to alphabetize option values
yashodha [Mon, 20 Mar 2017 04:09:13 +0000 (09:39 +0530)]
CRM-20304 - Add option to alphabetize option values

6 years agoMerge pull request #11084 from mlutfy/crm21275
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

6 years agoMerge pull request #10942 from agileware/CIVICRM-441
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…

6 years agoMerge pull request #11076 from nowszy/CRM-21268
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.

6 years agoCRM-21275: Fatal error without message should recommend bug-reporting page, instead...
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.

6 years agoMerge pull request #10876 from mlutfy/master-crm20468
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

6 years agoMerge pull request #11083 from civicrm/4.7.26-rc
Eileen McNaughton [Sun, 8 Oct 2017 00:50:47 +0000 (13:50 +1300)]
Merge pull request #11083 from civicrm/4.7.26-rc

4.7.26 rc

6 years agoMerge pull request #11081 from seamuslee001/master
Eileen McNaughton [Sun, 8 Oct 2017 00:49:11 +0000 (13:49 +1300)]
Merge pull request #11081 from seamuslee001/master

(NFC) Add in test of current practice in updating multiselect custom data

6 years agoMerge pull request #11075 from mukeshcompucorp/HW-390-fixed-iframe-popup
colemanw [Sat, 7 Oct 2017 22:08:51 +0000 (18:08 -0400)]
Merge pull request #11075 from mukeshcompucorp/HW-390-fixed-iframe-popup

Hw 390 fixed iframe popup

6 years agoCRM-20779 - Fix image display in custom field tab
Coleman Watts [Sat, 7 Oct 2017 17:32:44 +0000 (13:32 -0400)]
CRM-20779 - Fix image display in custom field tab

6 years agoAdd in test of current practice in updating multiselect custom data
Seamus Lee [Sat, 7 Oct 2017 17:30:54 +0000 (04:30 +1100)]
Add in test of current practice in updating multiselect custom data

6 years agoUpdate getBasePath to use something a bit more sane
Matthew Wire [Sat, 7 Oct 2017 16:44:15 +0000 (17:44 +0100)]
Update getBasePath to use something a bit more sane

6 years agoMerge pull request #11079 from eileenmcnaughton/cms_clean
colemanw [Sat, 7 Oct 2017 16:40:20 +0000 (12:40 -0400)]
Merge pull request #11079 from eileenmcnaughton/cms_clean

CRM-21272 move definition of isUserRegistration…

6 years agoCRM-21272 (preliminary tidy up) move definition of isUserRegistrationPermitted to...
eileen [Fri, 6 Oct 2017 22:57:02 +0000 (11:57 +1300)]
CRM-21272 (preliminary tidy up) move definition of isUserRegistrationPermitted to CMS classes

6 years agoMerge pull request #8837 from seamuslee001/CRM-19060
Eileen McNaughton [Fri, 6 Oct 2017 22:44:54 +0000 (11:44 +1300)]
Merge pull request #8837 from seamuslee001/CRM-19060

CRM-19060 fix Payment table join in membership Detail report to ensur…

6 years agoRefs CRM-21268 Missing French overseas departments.
BlaVeN [Fri, 6 Oct 2017 10:59:58 +0000 (12:59 +0200)]
Refs CRM-21268 Missing French overseas departments.

6 years agoHW-390: Remove extra changes
Mukesh Ram [Fri, 6 Oct 2017 07:42:04 +0000 (13:12 +0530)]
HW-390: Remove extra changes

6 years agoHW-390: Remove unwanted changes
Mukesh Ram [Fri, 6 Oct 2017 07:40:01 +0000 (13:10 +0530)]
HW-390: Remove unwanted changes

6 years agoHW-390: Fixed iframe resizing issue
Mukesh Ram [Fri, 6 Oct 2017 07:36:24 +0000 (13:06 +0530)]
HW-390: Fixed iframe resizing issue

6 years agoMerge pull request #10965 from seamuslee001/CRM-20892-lock
Tim Otten [Thu, 5 Oct 2017 20:38:48 +0000 (21:38 +0100)]
Merge pull request #10965 from seamuslee001/CRM-20892-lock

CRM-20892 Create Opportunistic locking mechanism in the CiviMail API…

6 years agoMerge pull request #11070 from civicrm/4.7.25-rc
Eileen McNaughton [Thu, 5 Oct 2017 20:18:19 +0000 (09:18 +1300)]
Merge pull request #11070 from civicrm/4.7.25-rc

4.7.25 rc

6 years ago(NFC) Regenerate CRM_Price_DAO_PriceFieldValue
Tim Otten [Thu, 5 Oct 2017 19:43:01 +0000 (20:43 +0100)]
(NFC) Regenerate CRM_Price_DAO_PriceFieldValue

Following 2db35bf6e, the definition of this entity changed.  However,
2db35bf6e left the checksum alone. This commit updates it to match.