civicrm-core.git
7 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

7 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 …

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

7 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

7 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

7 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…

7 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

7 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

7 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…

7 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

7 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

7 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

7 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

7 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

7 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.

7 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

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

7 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

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

7 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

7 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

7 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…

7 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.

7 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.

7 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

7 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

7 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

7 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

7 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

7 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

7 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…

7 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

7 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…

7 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.

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

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

7 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

7 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…

7 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

7 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.

7 years agoMerge pull request #11071 from mukeshcompucorp/HW-380-civicase-settings-page
colemanw [Thu, 5 Oct 2017 15:10:58 +0000 (11:10 -0400)]
Merge pull request #11071 from mukeshcompucorp/HW-380-civicase-settings-page

HW-380: Remove spacer div

7 years agoMerge pull request #10925 from twomice/CRM-21122_dashboard_allow_smart_groups
Monish Deb [Thu, 5 Oct 2017 13:12:37 +0000 (18:42 +0530)]
Merge pull request #10925 from twomice/CRM-21122_dashboard_allow_smart_groups

Fix for CRM-21122: "Support selection of smart groups on Contact Dashboard"

7 years agoHW-380: Remove spacer div
Mukesh Ram [Thu, 5 Oct 2017 10:32:03 +0000 (16:02 +0530)]
HW-380: Remove spacer div

7 years agoMerge pull request #11063 from eileenmcnaughton/display_name
colemanw [Thu, 5 Oct 2017 05:33:00 +0000 (01:33 -0400)]
Merge pull request #11063 from eileenmcnaughton/display_name

CRM-21258 support long display names.

7 years ago4.7.25 release notes (#11043)
Andrew Hunt [Wed, 4 Oct 2017 22:55:48 +0000 (18:55 -0400)]
4.7.25 release notes (#11043)

7 years agoRevert "CRM-21055, Changed label of cancel button"
Andrew Hunt [Wed, 4 Oct 2017 15:04:02 +0000 (11:04 -0400)]
Revert "CRM-21055, Changed label of cancel button"

This reverts commit 35c930c1921ad45ae3da24b2e0bdad7470ed7b49.

The change was done in isolation, leading to inconsistency with other forms
that have the Save / Save and New / Cancel pattern.

7 years agoCRM-20769 Rebuild multilingual structure based on DAOs after adding columns to table
Seamus Lee [Mon, 2 Oct 2017 00:49:02 +0000 (11:49 +1100)]
CRM-20769 Rebuild multilingual structure based on DAOs after adding columns to table

7 years agoMerge pull request #11064 from agh1/revert-close-button
Tim Otten [Thu, 5 Oct 2017 00:04:15 +0000 (20:04 -0400)]
Merge pull request #11064 from agh1/revert-close-button

CRM-21055 Revert change of "cancel" to "close" on backend contribution form

7 years ago4.7.25 release notes (#11043)
Andrew Hunt [Wed, 4 Oct 2017 22:55:48 +0000 (18:55 -0400)]
4.7.25 release notes (#11043)

7 years agoTraditional phpcs errors.
Johan Vervloet [Wed, 4 Oct 2017 21:02:21 +0000 (23:02 +0200)]
Traditional phpcs errors.

7 years agoFix for double chaining problem.
Johan Vervloet [Wed, 4 Oct 2017 20:54:47 +0000 (22:54 +0200)]
Fix for double chaining problem.

7 years agoA unit test to illustrate CRM-21246.
Johan Vervloet [Mon, 2 Oct 2017 20:24:36 +0000 (22:24 +0200)]
A unit test to illustrate CRM-21246.

Chaining Contact.get - Relationship.get - Contact.get does not work.
Added a test that passes as well.

7 years agoRevert "CRM-21055, Changed label of cancel button"
Andrew Hunt [Wed, 4 Oct 2017 15:04:02 +0000 (11:04 -0400)]
Revert "CRM-21055, Changed label of cancel button"

This reverts commit 35c930c1921ad45ae3da24b2e0bdad7470ed7b49.

The change was done in isolation, leading to inconsistency with other forms
that have the Save / Save and New / Cancel pattern.

7 years agoSet version to 4.7.27
CiviCRM [Wed, 4 Oct 2017 14:29:04 +0000 (14:29 +0000)]
Set version to 4.7.27

7 years agoCRM-21249 - Geocode warns hitting Google limit - small change
Daniël [Wed, 4 Oct 2017 07:25:06 +0000 (09:25 +0200)]
CRM-21249 - Geocode warns hitting Google limit - small change

Instead of throwing an error

7 years agoCRM-21249 - Geocode warns hitting Google limit
Daniël [Tue, 3 Oct 2017 09:22:56 +0000 (11:22 +0200)]
CRM-21249 - Geocode warns hitting Google limit

Instead of throwing an error

7 years agoMerge pull request #10412 from jitendrapurohit/notice-fix
Yashodha Chaku [Wed, 4 Oct 2017 06:35:13 +0000 (12:05 +0530)]
Merge pull request #10412 from jitendrapurohit/notice-fix

CRM-20636: Notice fix while updating membership without payment

7 years agoMerge pull request #10987 from eileenmcnaughton/report_remove
Monish Deb [Wed, 4 Oct 2017 05:11:22 +0000 (10:41 +0530)]
Merge pull request #10987 from eileenmcnaughton/report_remove

CRM-18367 Remove long-broken contribution logging reports

7 years agoCRM-21258 support long display names.
eileen [Wed, 4 Oct 2017 02:49:49 +0000 (15:49 +1300)]
CRM-21258 support long display names.

Gracefully truncate rather than hard-error if calculated field exceeds DB chars

7 years agoCRM-18367 Remove long-broken contribution logging reports
eileen [Sun, 17 Sep 2017 22:47:19 +0000 (10:47 +1200)]
CRM-18367 Remove long-broken contribution logging reports

7 years agoMerge pull request #11036 from elisseck/CRM-20460-4.7
Eileen McNaughton [Tue, 3 Oct 2017 01:27:39 +0000 (14:27 +1300)]
Merge pull request #11036 from elisseck/CRM-20460-4.7

CRM-20460 addition to Fix Grant Report Where clause

7 years agoMerge pull request #11057 from colemanw/CRM-21247
colemanw [Tue, 3 Oct 2017 00:59:24 +0000 (20:59 -0400)]
Merge pull request #11057 from colemanw/CRM-21247

CRM-21247 - Fix user link

7 years agoCRM-21247 - Fix user link
Coleman Watts [Mon, 2 Oct 2017 22:58:40 +0000 (18:58 -0400)]
CRM-21247 - Fix user link

7 years agoMerge pull request #11031 from kcristiano/17633
Eileen McNaughton [Mon, 2 Oct 2017 19:15:45 +0000 (08:15 +1300)]
Merge pull request #11031 from kcristiano/17633

CRM-17633: Changes to support WP in it's own directory.

7 years agoMerge pull request #11046 from agh1/logo-improvements
colemanw [Mon, 2 Oct 2017 18:59:24 +0000 (14:59 -0400)]
Merge pull request #11046 from agh1/logo-improvements

CRM-21241 Logo improvements

7 years agoMerge pull request #11051 from seamuslee001/CRM-20769-multilingual
Eileen McNaughton [Mon, 2 Oct 2017 02:12:43 +0000 (15:12 +1300)]
Merge pull request #11051 from seamuslee001/CRM-20769-multilingual

CRM-20769 Rebuild multilingual structure based on DAOs after adding c…

7 years agoCRM-20769 Rebuild multilingual structure based on DAOs after adding columns to table
Seamus Lee [Mon, 2 Oct 2017 00:49:02 +0000 (11:49 +1100)]
CRM-20769 Rebuild multilingual structure based on DAOs after adding columns to table

7 years agoMerge pull request #11033 from jmcclelland/CRM-21229
Eileen McNaughton [Mon, 2 Oct 2017 00:47:47 +0000 (13:47 +1300)]
Merge pull request #11033 from jmcclelland/CRM-21229

CRM-21229 - don't regenerate smart groups on manage groups

7 years agoMerge pull request #11026 from JMAConsulting/CRM-21201-fix
Eileen McNaughton [Sun, 1 Oct 2017 21:34:54 +0000 (10:34 +1300)]
Merge pull request #11026 from JMAConsulting/CRM-21201-fix

CRM-21201: Tax recalculated when pay later contribution is completed using Pay Now

7 years agoMerge pull request #11042 from davejenx/CRM-21236
Eileen McNaughton [Sun, 1 Oct 2017 21:16:11 +0000 (10:16 +1300)]
Merge pull request #11042 from davejenx/CRM-21236

CRM-21236 - Make contact custom fields available in Membership Detail report

7 years agoMerge pull request #11049 from eileenmcnaughton/revert
Eileen McNaughton [Sun, 1 Oct 2017 20:54:41 +0000 (09:54 +1300)]
Merge pull request #11049 from eileenmcnaughton/revert

CRM-21238 Revert "CRM-20653: Allow non-truthy defaults for retrieval …

7 years agoCRM-21238 Revert "CRM-20653: Allow non-truthy defaults for retrieval of request param...
Frank J. Gómez [Mon, 29 May 2017 15:45:56 +0000 (11:45 -0400)]
CRM-21238 Revert "CRM-20653: Allow non-truthy defaults for retrieval of request parameters."

This reverts commit f73ad9b6ec94e5ffcf61dcbec941c43a2a8da924.

7 years agoMerge pull request #11009 from seamuslee001/CRM-21110-2
Monish Deb [Sat, 30 Sep 2017 15:48:36 +0000 (21:18 +0530)]
Merge pull request #11009 from seamuslee001/CRM-21110-2

CRM-21110 Get Total relationships without need for extra table

7 years agoMerge pull request #10640 from mattwire/CRM-20772_showtaxterm
Monish Deb [Sat, 30 Sep 2017 15:27:05 +0000 (20:57 +0530)]
Merge pull request #10640 from mattwire/CRM-20772_showtaxterm

CRM-20852 Show Tax term on UI

7 years agoMerge pull request #11041 from nowszy/CRM-21234
Monish Deb [Sat, 30 Sep 2017 14:45:46 +0000 (20:15 +0530)]
Merge pull request #11041 from nowszy/CRM-21234

Refs CRM-21234 Missing subdivisions of Tajikistan.

7 years agoCRM-21241 Modal loading: spinning logo is smoother, slower, and full-color
Andrew Hunt [Sat, 30 Sep 2017 03:27:58 +0000 (23:27 -0400)]
CRM-21241 Modal loading: spinning logo is smoother, slower, and full-color

----------------------------------------
* CRM-21241: Spinning logo is too jumpy
  https://issues.civicrm.org/jira/browse/CRM-21241

7 years agoCRM-21243 remove unused logo image
Andrew Hunt [Sat, 30 Sep 2017 00:26:43 +0000 (20:26 -0400)]
CRM-21243 remove unused logo image

----------------------------------------
* CRM-21243: Logo in WP menu doesn't follow standard
  https://issues.civicrm.org/jira/browse/CRM-21243y

7 years agoCRM-21241 nav menu: spinning logo should be centered and spin smoothly
Andrew Hunt [Fri, 29 Sep 2017 21:40:12 +0000 (17:40 -0400)]
CRM-21241 nav menu: spinning logo should be centered and spin smoothly

----------------------------------------
* CRM-21241: Spinning logo is too jumpy
  https://issues.civicrm.org/jira/browse/CRM-21241

7 years agoCRM-21110 Get Total relationships without need for extra table
Seamus Lee [Thu, 21 Sep 2017 00:42:36 +0000 (10:42 +1000)]
CRM-21110 Get Total relationships without need for extra table

7 years agoCRM-21214 - Fix address sharing - small change
Daniël [Fri, 29 Sep 2017 17:07:26 +0000 (19:07 +0200)]
CRM-21214 - Fix address sharing - small change

NULL is easier to check than 'null'

7 years agoCRM-21214 - Fix address sharing - rewrite
Daniël [Fri, 29 Sep 2017 17:06:57 +0000 (19:06 +0200)]
CRM-21214 - Fix address sharing - rewrite

Rewrite `processSharedAddress()` a littlebit and add clear comments.
'null' is not needed here, breaks my code.

7 years agoCRM-21236 - Make contact custom fields available in Membership Detail report
Dave Jenkins [Fri, 29 Sep 2017 16:41:06 +0000 (17:41 +0100)]
CRM-21236 - Make contact custom fields available in Membership Detail report

7 years agoCRM-21229 - avoid invalid fails due to static variable.
Jamie McClelland [Fri, 29 Sep 2017 16:40:49 +0000 (12:40 -0400)]
CRM-21229 - avoid invalid fails due to static variable.

7 years agoSQL moved yo 4.7.26.mysql.tpl
BlaVeN [Fri, 29 Sep 2017 12:51:55 +0000 (14:51 +0200)]
SQL moved yo 4.7.26.mysql.tpl

7 years agoMerge pull request #10887 from eileenmcnaughton/member
Monish Deb [Fri, 29 Sep 2017 10:43:59 +0000 (16:13 +0530)]
Merge pull request #10887 from eileenmcnaughton/member

Towards CRM-15861 consolidate default function on shared class

7 years agoCRM-21214 - Fix address sharing - undo
Daniël [Fri, 29 Sep 2017 09:11:56 +0000 (11:11 +0200)]
CRM-21214 - Fix address sharing - undo

7 years agoCRM-21214 - Fix address sharing - tests - small change
Daniël [Fri, 29 Sep 2017 09:09:39 +0000 (11:09 +0200)]
CRM-21214 - Fix address sharing - tests - small change

7 years agoRefs CRM-21234 Missing subdivisions of Tajikistan.
BlaVeN [Fri, 29 Sep 2017 07:51:24 +0000 (09:51 +0200)]
Refs CRM-21234 Missing subdivisions of Tajikistan.

7 years agoCRM-21214 - Fix address sharing - small change
Daniël [Fri, 29 Sep 2017 07:38:52 +0000 (09:38 +0200)]
CRM-21214 - Fix address sharing - small change

7 years agoCRM-21214 - Fix address sharing - tests - small change
Daniël [Fri, 29 Sep 2017 07:29:05 +0000 (09:29 +0200)]
CRM-21214 - Fix address sharing - tests - small change

7 years agoMerge pull request #11040 from civicrm/4.7.25-rc
Eileen McNaughton [Fri, 29 Sep 2017 07:19:16 +0000 (20:19 +1300)]
Merge pull request #11040 from civicrm/4.7.25-rc

4.7.25 rc

7 years agoMerge pull request #11039 from eileenmcnaughton/4.7.25-rc
Monish Deb [Fri, 29 Sep 2017 07:10:59 +0000 (12:40 +0530)]
Merge pull request #11039 from eileenmcnaughton/4.7.25-rc

CRM-21230 fix fatal error on multi-data imports

7 years agoMerge pull request #11037 from totten/master-daotest
Eileen McNaughton [Fri, 29 Sep 2017 06:16:46 +0000 (19:16 +1300)]
Merge pull request #11037 from totten/master-daotest

(NFC) CRM-21223 - DAOTest - Add null-ish test-cases for composeQuery

7 years agoMerge pull request #10943 from eileenmcnaughton/deltest
Monish Deb [Fri, 29 Sep 2017 05:34:04 +0000 (11:04 +0530)]
Merge pull request #10943 from eileenmcnaughton/deltest

CRM-21109 Add test & consolidate code controlling cache clearing, specific improvement on cli imports

7 years agoCRM-21230 fix fatal error on multi-data imports
eileen [Fri, 29 Sep 2017 02:14:36 +0000 (15:14 +1300)]
CRM-21230 fix fatal error on multi-data imports

7 years ago(NFC) CRM-21223 - DAOTest - Add null-ish test-cases for composeQuery
Tim Otten [Thu, 28 Sep 2017 21:21:08 +0000 (17:21 -0400)]
(NFC) CRM-21223 - DAOTest - Add null-ish test-cases for composeQuery

The behavior of `CRM_Core_DAO::executeQuery()` and `::composeQuery()` is
inconsistent with respect to handling NULL values.  This revision adds a
unit-test covering the quirky behaviors.

7 years agoMerge pull request #11032 from seamuslee001/CRM-21227
Eileen McNaughton [Thu, 28 Sep 2017 20:26:16 +0000 (09:26 +1300)]
Merge pull request #11032 from seamuslee001/CRM-21227

CRM-21227 Fix test following merge of PR #10435

7 years agoCRM-20460 addition to @sunilpawar Fix Grant Report Where clause
Eli Lisseck [Thu, 28 Sep 2017 17:06:02 +0000 (13:06 -0400)]
CRM-20460 addition to @sunilpawar Fix Grant Report Where clause

7 years agoMerge branch 'CRM-20460' into CRM-20460-4.7
Eli Lisseck [Thu, 28 Sep 2017 17:01:41 +0000 (13:01 -0400)]
Merge branch 'CRM-20460' into CRM-20460-4.7

merge commit by @sunilpawar

7 years agoCRM-21214 - Fix address sharing - rewrite
Daniël [Thu, 28 Sep 2017 15:11:07 +0000 (17:11 +0200)]
CRM-21214 - Fix address sharing - rewrite