civicrm-core.git
8 years agoCRM-18435 handling for membership type etc fields
Eileen [Mon, 20 Jun 2016 06:16:21 +0000 (06:16 +0000)]
CRM-18435 handling for membership type etc fields

8 years agoMerge pull request #8596 from jitendrapurohit/CRM-18656
Monish Deb [Mon, 20 Jun 2016 11:14:23 +0000 (16:44 +0530)]
Merge pull request #8596 from jitendrapurohit/CRM-18656

CRM-18656 - Advanced search fails to show tagset criteria when editing saved search

8 years agoCRM-18656 - minor optimisation
jitendrapurohit [Mon, 20 Jun 2016 10:09:12 +0000 (15:39 +0530)]
CRM-18656 - minor optimisation

8 years agoChanged comment to comply with style checker
kenwest [Sun, 29 May 2016 06:50:27 +0000 (16:50 +1000)]
Changed comment to comply with style checker

8 years agoCRM-18656 Advanced search fails to show tagset criteria when editing saved search
kenwest [Mon, 23 May 2016 12:43:03 +0000 (22:43 +1000)]
CRM-18656 Advanced search fails to show tagset criteria when editing saved search

8 years agoMerge pull request #8471 from johanv/CRM-18697-export_batches
Monish Deb [Mon, 20 Jun 2016 08:49:34 +0000 (14:19 +0530)]
Merge pull request #8471 from johanv/CRM-18697-export_batches

Make it possible to create new batch ExportFormats in an extension

8 years agoMerge pull request #8595 from civicrm/eileenmcnaughton-patch-1
Yashodha Chaku [Mon, 20 Jun 2016 08:33:02 +0000 (14:03 +0530)]
Merge pull request #8595 from civicrm/eileenmcnaughton-patch-1

Remove unnecessary deprected require_once

8 years agoMerge pull request #8593 from yashodha/CRM-18960
Monish Deb [Mon, 20 Jun 2016 05:10:55 +0000 (10:40 +0530)]
Merge pull request #8593 from yashodha/CRM-18960

CRM-18960: Change title in Getting Started widget

8 years agoRemove unnecessary deprected require_once
Eileen McNaughton [Mon, 20 Jun 2016 05:03:06 +0000 (17:03 +1200)]
Remove unnecessary deprected require_once

8 years agoMerge pull request #8100 from cividesk/CRM-18362-4.7
Eileen McNaughton [Fri, 17 Jun 2016 23:39:16 +0000 (11:39 +1200)]
Merge pull request #8100 from cividesk/CRM-18362-4.7

CRM-18362 get current local for navigation menu

8 years agoMerge pull request #8590 from adixon/CRM-18973
Monish Deb [Fri, 17 Jun 2016 19:45:13 +0000 (01:15 +0530)]
Merge pull request #8590 from adixon/CRM-18973

CRM-18973

8 years agoMerge pull request #8551 from scardinius/crm-18815
Yashodha Chaku [Fri, 17 Jun 2016 14:14:53 +0000 (19:44 +0530)]
Merge pull request #8551 from scardinius/crm-18815

CRM-18815: getTrackerURL() returns invalid url_id for CiviMail A/B Test

8 years agoMerge pull request #8575 from monishdeb/CRM-18071
Monish Deb [Fri, 17 Jun 2016 10:17:13 +0000 (15:47 +0530)]
Merge pull request #8575 from monishdeb/CRM-18071

CRM-18071: free membership doesn't depend on is_monetary

8 years agoCRM-18973
adixon [Thu, 16 Jun 2016 19:23:49 +0000 (15:23 -0400)]
CRM-18973

8 years agoCRM-18071: free membership doesn't depend on is_monetary
deb.monish [Wed, 15 Jun 2016 18:45:27 +0000 (00:15 +0530)]
CRM-18071: free membership doesn't depend on is_monetary

8 years agoCRM-18960: Change title in Getting Started widget
yashodha [Thu, 16 Jun 2016 10:21:23 +0000 (15:51 +0530)]
CRM-18960: Change title in Getting Started widget

----------------------------------------
* CRM-18960: Change title in Getting Started widget
  https://issues.civicrm.org/jira/browse/CRM-18960

8 years agoCRM-18960: Change title in Getting Started widget
yashodha [Thu, 16 Jun 2016 08:25:38 +0000 (13:55 +0530)]
CRM-18960: Change title in Getting Started widget

----------------------------------------
* CRM-18960: Change title in Getting Started widget
  https://issues.civicrm.org/jira/browse/CRM-18960

8 years agoMerge pull request #8557 from yashodha/fix-CRM-18472
Yashodha Chaku [Thu, 16 Jun 2016 06:43:36 +0000 (12:13 +0530)]
Merge pull request #8557 from yashodha/fix-CRM-18472

CRM-18472: notice fixes

8 years agoMerge pull request #8567 from yashodha/CRM-18954
Yashodha Chaku [Thu, 16 Jun 2016 06:14:19 +0000 (11:44 +0530)]
Merge pull request #8567 from yashodha/CRM-18954

CRM-18954: Error on adding a field to a profile used by a contributio…

8 years agoCRM-18954: Error on adding a field to a profile used by a contribution page
yashodha [Wed, 15 Jun 2016 10:31:39 +0000 (16:01 +0530)]
CRM-18954: Error on adding a field to a profile used by a contribution page

----------------------------------------
* CRM-18954: Error on adding a field to a profile used by a contribution page
  https://issues.civicrm.org/jira/browse/CRM-18954

8 years agoMerge pull request #8554 from stevekessler/patch-2
Yashodha Chaku [Tue, 14 Jun 2016 13:08:30 +0000 (18:38 +0530)]
Merge pull request #8554 from stevekessler/patch-2

CRM-18836 -Update Address.tpl

8 years agoMerge pull request #8550 from jitendrapurohit/CRM-17815test
Yashodha Chaku [Tue, 14 Jun 2016 09:27:52 +0000 (14:57 +0530)]
Merge pull request #8550 from jitendrapurohit/CRM-17815test

CRM-17815 - Unit Test to check due date in invoices

8 years agoCRM-18472: notice fixes
yashodha [Tue, 14 Jun 2016 06:43:12 +0000 (12:13 +0530)]
CRM-18472: notice fixes

----------------------------------------
* CRM-18472: Notice fixes
  https://issues.civicrm.org/jira/browse/CRM-18472

8 years agoUpdate Address.tpl
Steve Kessler [Mon, 13 Jun 2016 20:56:28 +0000 (14:56 -0600)]
Update Address.tpl

Corrected URL for USPS in 4.7 (master).

8 years agoCRM-18815: Fix concatenation spacing
scardinius [Mon, 13 Jun 2016 14:45:17 +0000 (16:45 +0200)]
CRM-18815: Fix concatenation spacing

8 years agoCRM-18815: getTrackerURL() returns invalid url_id for CiviMail A/B Test
scardinius [Mon, 13 Jun 2016 14:13:35 +0000 (16:13 +0200)]
CRM-18815: getTrackerURL() returns invalid url_id for CiviMail A/B Test

8 years agoCRM-17815 - Unit Test to check due date in invoices
jitendrapurohit [Mon, 13 Jun 2016 13:07:42 +0000 (18:37 +0530)]
CRM-17815 - Unit Test to check due date in invoices

8 years agoMerge pull request #8549 from yashodha/CRM-17684
Yashodha Chaku [Mon, 13 Jun 2016 12:45:55 +0000 (18:15 +0530)]
Merge pull request #8549 from yashodha/CRM-17684

CRM-17684: check where end date is past to determine auto-renew subsc…

8 years agominor fixes
yashodha [Mon, 13 Jun 2016 11:25:44 +0000 (16:55 +0530)]
minor fixes

8 years agominor fixes
yashodha [Mon, 13 Jun 2016 11:15:21 +0000 (16:45 +0530)]
minor fixes

8 years agoCRM-17684: check where end date is past to determine auto-renew subscription has...
yashodha [Mon, 13 Jun 2016 09:59:06 +0000 (15:29 +0530)]
CRM-17684: check where end date is past to determine auto-renew subscription has ended

----------------------------------------
* CRM-17684: Find Memberships with no auto-renew
  https://issues.civicrm.org/jira/browse/CRM-17684

8 years agoMerge pull request #8346 from sqweets/auto-renew-filter-changes
Yashodha Chaku [Mon, 13 Jun 2016 09:45:23 +0000 (15:15 +0530)]
Merge pull request #8346 from sqweets/auto-renew-filter-changes

CRM-17684 Find Memberships with no auto-renew

8 years agoMerge pull request #8543 from monishdeb/CRM-18399
Monish Deb [Mon, 13 Jun 2016 08:48:41 +0000 (14:18 +0530)]
Merge pull request #8543 from monishdeb/CRM-18399

CRM-18399: 'My billing address is the same as above' option goes away when selecting other payment options

8 years agoMerge pull request #8533 from eileenmcnaughton/membership_form
colemanw [Sun, 12 Jun 2016 21:27:44 +0000 (15:27 -0600)]
Merge pull request #8533 from eileenmcnaughton/membership_form

CRM-18701 fix setting of membership amount set on the fly for backoff…

8 years agoadditional fix for event and optimisation
deb.monish [Fri, 10 Jun 2016 14:44:05 +0000 (20:14 +0530)]
additional fix for event and optimisation

8 years agoMerge pull request #8498 from eileenmcnaughton/ajax
Eileen McNaughton [Sat, 11 Jun 2016 23:06:17 +0000 (16:06 -0700)]
Merge pull request #8498 from eileenmcnaughton/ajax

Initial test to prepare to refactor dupe ajax function

8 years agoMerge pull request #8546 from JMAConsulting/CRM-18807
Eileen McNaughton [Fri, 10 Jun 2016 15:54:01 +0000 (08:54 -0700)]
Merge pull request #8546 from JMAConsulting/CRM-18807

CRM-18807, fixed fatal error when saving participant

8 years agoCRM-18807, fixed fatal error when saving participant
Pradeep Nayak [Fri, 10 Jun 2016 15:18:18 +0000 (20:48 +0530)]
CRM-18807, fixed fatal error when saving participant

----------------------------------------
* CRM-18807: Fatal error when trying to register participant offline
  https://issues.civicrm.org/jira/browse/CRM-18807

8 years agoCRM-18399: 'My billing address is the same as above' option goes away when selecting...
deb.monish [Fri, 10 Jun 2016 11:29:50 +0000 (16:59 +0530)]
CRM-18399: 'My billing address is the same as above' option goes away when selecting other payment options

8 years agoMerge pull request #8526 from jitendrapurohit/CRM-18706
Monish Deb [Fri, 10 Jun 2016 05:34:40 +0000 (11:04 +0530)]
Merge pull request #8526 from jitendrapurohit/CRM-18706

CRM-18706 - Activity type filter on user activities is not working

8 years agoMerge pull request #8541 from jitendrapurohit/CRM-18779
Yashodha Chaku [Thu, 9 Jun 2016 12:11:23 +0000 (17:41 +0530)]
Merge pull request #8541 from jitendrapurohit/CRM-18779

CRM-18779 - generated data changes

8 years agogenerated data changes
jitendrapurohit [Thu, 9 Jun 2016 04:54:40 +0000 (10:24 +0530)]
generated data changes

8 years agoMerge pull request #8420 from ineffyble/fix-membership-id-in-search-builder
Eileen McNaughton [Wed, 8 Jun 2016 16:43:40 +0000 (10:43 -0600)]
Merge pull request #8420 from ineffyble/fix-membership-id-in-search-builder

CRM-18523 - Search Builder - Fix searching on Membership ID

8 years agoMerge pull request #8470 from ankitjain28may/master
Eileen McNaughton [Wed, 8 Jun 2016 16:42:03 +0000 (10:42 -0600)]
Merge pull request #8470 from ankitjain28may/master

error in input tag

8 years agoMerge pull request #8368 from mlutfy/master-crm18555
Eileen McNaughton [Wed, 8 Jun 2016 15:25:17 +0000 (09:25 -0600)]
Merge pull request #8368 from mlutfy/master-crm18555

CRM-18555: API utils: avoid unset() on empty array.

8 years agoMerge pull request #8534 from agh1/CRM-18778-2
Yashodha Chaku [Wed, 8 Jun 2016 06:03:43 +0000 (11:33 +0530)]
Merge pull request #8534 from agh1/CRM-18778-2

CRM-18778 i18n petition: thank-you page title translation to wrong table

8 years agoMerge pull request #8524 from yashodha/CRM-18554
Yashodha Chaku [Wed, 8 Jun 2016 05:14:33 +0000 (10:44 +0530)]
Merge pull request #8524 from yashodha/CRM-18554

CRM-18554: Using IS EMPTY operator for some date fields crashes 4.7.7

8 years agoCRM-18701 fix setting of membership amount set on the fly for backoffice membership...
eileen [Wed, 8 Jun 2016 01:19:07 +0000 (19:19 -0600)]
CRM-18701 fix setting of membership amount set on the fly for backoffice membership form

8 years agoCRM-18778 i18n petition: thank-you page title translation to wrong table
Andrew Hunt [Wed, 8 Jun 2016 03:36:33 +0000 (23:36 -0400)]
CRM-18778 i18n petition: thank-you page title translation to wrong table

----------------------------------------
* CRM-18778: Petition thank-you fields translatable to wrong table
  https://issues.civicrm.org/jira/browse/CRM-18778

8 years agoMerge pull request #8347 from eileenmcnaughton/tidy-up
colemanw [Wed, 8 Jun 2016 01:33:29 +0000 (19:33 -0600)]
Merge pull request #8347 from eileenmcnaughton/tidy-up

CRM-17335 reduce use of nullArray

8 years agoMerge pull request #8528 from eileenmcnaughton/membership_form
Eileen McNaughton [Wed, 8 Jun 2016 00:32:28 +0000 (18:32 -0600)]
Merge pull request #8528 from eileenmcnaughton/membership_form

CRM-18701 remove inappropriate actions from processAmount

8 years agoMerge pull request #8531 from PalanteJon/CRM-16888
Eileen McNaughton [Wed, 8 Jun 2016 00:26:50 +0000 (18:26 -0600)]
Merge pull request #8531 from PalanteJon/CRM-16888

CRM-16888 - CiviSMS - fix templates not working with CiviSMS

8 years agoMerge pull request #8532 from xurizaemon/patch-1
Eileen McNaughton [Wed, 8 Jun 2016 00:09:17 +0000 (18:09 -0600)]
Merge pull request #8532 from xurizaemon/patch-1

Correct typo

8 years agoCRM-18701 first round refactor towards removing amount_priceset_level_radio from...
eileen [Mon, 6 Jun 2016 23:57:37 +0000 (17:57 -0600)]
CRM-18701 first round refactor towards removing amount_priceset_level_radio from processPriceSet

Looking to determine the values in a more approprite place & also removing the select one that is NOT used

Change-Id: I0e2087ebbc2f0d8e6b06cec00415c77b9ef44da9

8 years agoCorrect typo
Chris Burgess [Tue, 7 Jun 2016 23:27:06 +0000 (17:27 -0600)]
Correct typo

Random period placed outside XML tags, removing.

8 years agoMerge pull request #8506 from eileenmcnaughton/eileenmcnaughton-my_reports
Eileen McNaughton [Tue, 7 Jun 2016 19:29:38 +0000 (13:29 -0600)]
Merge pull request #8506 from eileenmcnaughton/eileenmcnaughton-my_reports

Eileenmcnaughton my reports

8 years agoMerge pull request #8520 from hkillam/patch-4
Eileen McNaughton [Tue, 7 Jun 2016 19:29:08 +0000 (13:29 -0600)]
Merge pull request #8520 from hkillam/patch-4

CRM-17619 add space before numeric suffix

8 years agoCRM-18701 minor, tangental tidy up
eileen [Mon, 6 Jun 2016 21:55:44 +0000 (15:55 -0600)]
CRM-18701 minor, tangental tidy up

8 years agoCRM-17310 add reports to menu when rebuilding nav from civicrm/admin/menu?reset=1
eileen [Mon, 6 Jun 2016 19:48:42 +0000 (13:48 -0600)]
CRM-17310 add reports to menu when rebuilding nav from civicrm/admin/menu?reset=1

CRM-17310 add reports to menu when rebuilding nav from civicrm/admin/menu?reset=1

8 years ago This is a combination of 2 commits.
eileen [Tue, 6 Oct 2015 02:48:23 +0000 (15:48 +1300)]
 This is a combination of 2 commits.

CRM-17310 add My Reports to initial navigation

typo fx

8 years agoReport test fix
eileen [Mon, 6 Jun 2016 14:45:05 +0000 (08:45 -0600)]
Report test fix

8 years agoCRM-17310 - simplification
Samuel Vanhove [Mon, 6 Jun 2016 00:07:38 +0000 (20:07 -0400)]
CRM-17310 - simplification

8 years agoCRM-17310 Add my reports functionality
eileenmcnaugton [Wed, 30 Sep 2015 07:11:19 +0000 (20:11 +1300)]
CRM-17310 Add my reports functionality

This includes a new my reports menu & the ability to save reports as 'my report' to show on there

8 years agoCRM-18706 - Activity type filter on user activities is not working
jitendrapurohit [Tue, 7 Jun 2016 11:17:53 +0000 (16:47 +0530)]
CRM-18706 - Activity type filter on user activities is not working

8 years agoMerge pull request #8522 from seamuslee001/CRM-18772
Yashodha Chaku [Tue, 7 Jun 2016 10:46:56 +0000 (16:16 +0530)]
Merge pull request #8522 from seamuslee001/CRM-18772

CRM-18772 Create function to check if column already exists in the da…

8 years agoCRM-18554: Using IS EMPTY operator for some date fields crashes 4.7.7
yashodha [Tue, 7 Jun 2016 09:56:48 +0000 (15:26 +0530)]
CRM-18554: Using IS EMPTY operator for some date fields crashes 4.7.7

----------------------------------------
* CRM-18554: Using IS EMPTY operator for some date fields crashes 4.7.7
  https://issues.civicrm.org/jira/browse/CRM-18554

8 years agoCRM-18554: Using IS EMPTY operator for some date fields crashes 4.7.7
yashodha [Tue, 7 Jun 2016 06:56:20 +0000 (12:26 +0530)]
CRM-18554: Using IS EMPTY operator for some date fields crashes 4.7.7

----------------------------------------
* CRM-18554: Using IS EMPTY operator for some date fields crashes 4.7.7
  https://issues.civicrm.org/jira/browse/CRM-18554

8 years agoMerge pull request #8422 from colemanw/CRM-18586
colemanw [Tue, 7 Jun 2016 05:14:31 +0000 (23:14 -0600)]
Merge pull request #8422 from colemanw/CRM-18586

CRM-18586 - Fix race condition when loading custom data forms

8 years agoMerge pull request #8450 from jitendrapurohit/CRM-18586-additional
colemanw [Tue, 7 Jun 2016 05:14:20 +0000 (23:14 -0600)]
Merge pull request #8450 from jitendrapurohit/CRM-18586-additional

CRM-18586 - add delete link and fix add more button

8 years agoMerge pull request #8507 from josephlacey/CRM-18116
Yashodha Chaku [Tue, 7 Jun 2016 05:07:45 +0000 (10:37 +0530)]
Merge pull request #8507 from josephlacey/CRM-18116

CRM-18116 Fixing bug with editing assigned activities within case.

8 years agoMerge pull request #8518 from twomice/CRM-18770
colemanw [Tue, 7 Jun 2016 05:06:21 +0000 (23:06 -0600)]
Merge pull request #8518 from twomice/CRM-18770

Fix for CRM-18770.

8 years agoUpdate Address.php
Heather Killam [Tue, 7 Jun 2016 02:24:28 +0000 (20:24 -0600)]
Update Address.php

8 years agoUpdate Address.php
Heather Killam [Tue, 7 Jun 2016 02:12:09 +0000 (20:12 -0600)]
Update Address.php

8 years agoMerge pull request #2 from hkillam/patch-3
Heather Killam [Mon, 6 Jun 2016 22:50:31 +0000 (18:50 -0400)]
Merge pull request #2 from hkillam/patch-3

Merge two patches into single patch.

8 years agoMerge pull request #8519 from eileenmcnaughton/membership_form
Eileen McNaughton [Mon, 6 Jun 2016 21:45:45 +0000 (15:45 -0600)]
Merge pull request #8519 from eileenmcnaughton/membership_form

Membership form

8 years agoCRM-18701 remove unused variables
eileen [Mon, 6 Jun 2016 21:08:13 +0000 (15:08 -0600)]
CRM-18701 remove unused variables

8 years agoCRM-18701 tidy up, do not pass variables around as a reference when they are not...
eileen [Mon, 6 Jun 2016 20:37:09 +0000 (14:37 -0600)]
CRM-18701 tidy up, do not pass variables around as a reference when they are not being altered

8 years agoCRM-18701 tidy up, stop setting an array key & use a variable.
eileen [Mon, 6 Jun 2016 20:20:50 +0000 (14:20 -0600)]
CRM-18701 tidy up, stop setting an array key & use a variable.

The array key is returned to the calling function but grepping did not find any more instances of it so we should limit it's scope to the function that uses it.

Really we want to pass in  as a non-reference or else it's too unpredictable but this is just a small step

8 years agoFix for CRM-18770.
Allen Shaw [Mon, 6 Jun 2016 19:39:06 +0000 (14:39 -0500)]
Fix for CRM-18770.

8 years agoMerge pull request #8513 from eileenmcnaughton/dash
Eileen McNaughton [Mon, 6 Jun 2016 19:37:45 +0000 (13:37 -0600)]
Merge pull request #8513 from eileenmcnaughton/dash

CRM-18675 do extra check before trying to create dashlets to avoid un…

8 years agoMerge pull request #8497 from colemanw/CRM-18652
colemanw [Mon, 6 Jun 2016 19:30:28 +0000 (13:30 -0600)]
Merge pull request #8497 from colemanw/CRM-18652

CRM-18652 - Improve style of no-results item

8 years agoIncluding all users for case permission check
Joseph Lacey [Mon, 6 Jun 2016 17:00:49 +0000 (11:00 -0600)]
Including all users for case permission check

8 years agoCRM-18675 do extra check before trying to create dashlets to avoid unexpected message
eileen [Mon, 6 Jun 2016 14:45:51 +0000 (08:45 -0600)]
CRM-18675 do extra check before trying to create dashlets to avoid unexpected message

8 years agoUpdate Contact.php
Heather Killam [Mon, 6 Jun 2016 14:33:06 +0000 (08:33 -0600)]
Update Contact.php

8 years agoMerge pull request #8426 from Anjali2906/crm_18560_validation
Yashodha Chaku [Mon, 6 Jun 2016 08:49:39 +0000 (14:19 +0530)]
Merge pull request #8426 from Anjali2906/crm_18560_validation

CRM-18560 - Validate either body text or body html

8 years agoMerge pull request #8490 from eileenmcnaughton/trans
Eileen McNaughton [Mon, 6 Jun 2016 03:27:18 +0000 (21:27 -0600)]
Merge pull request #8490 from eileenmcnaughton/trans

CRM-18661 Fix & add test for financial rows created by repeattransaction

8 years agoMerge pull request #8504 from rollox/patch-2
colemanw [Mon, 6 Jun 2016 02:57:10 +0000 (20:57 -0600)]
Merge pull request #8504 from rollox/patch-2

CRM-18743 - Undefined variable $order

8 years agoCRM-18116 Fixing bug with editing assigned activities within case.
Joseph Lacey [Mon, 6 Jun 2016 02:34:52 +0000 (20:34 -0600)]
CRM-18116 Fixing bug with editing assigned activities within case.

----------------------------------------
* CRM-18116: CiviCase Users Unable to Edit & Add Activities on Cases They've Been Assigned
  https://issues.civicrm.org/jira/browse/CRM-18116

8 years agoInitial test to prepare to refactor dupe ajax function
eileen [Sun, 5 Jun 2016 22:26:01 +0000 (16:26 -0600)]
Initial test to prepare to refactor dupe ajax function

8 years agoremove whitespace
Heather Killam [Mon, 6 Jun 2016 01:39:13 +0000 (19:39 -0600)]
remove whitespace

8 years agoCheck for null value
Heather Killam [Mon, 6 Jun 2016 01:17:37 +0000 (19:17 -0600)]
Check for null value

8 years agoCRM-18661 further fix to ensure payment processor account is used
eileen [Mon, 6 Jun 2016 00:53:03 +0000 (18:53 -0600)]
CRM-18661 further fix to ensure payment processor account is used

8 years agoMerge pull request #8312 from colemanw/CRM-18344
colemanw [Mon, 6 Jun 2016 00:41:07 +0000 (18:41 -0600)]
Merge pull request #8312 from colemanw/CRM-18344

CRM-18344 - Show attachments on CiviMail review panel

8 years agoMerge pull request #8342 from rohankatkar/CRM18472NoticeFix
Eileen McNaughton [Mon, 6 Jun 2016 00:33:42 +0000 (18:33 -0600)]
Merge pull request #8342 from rohankatkar/CRM18472NoticeFix

CRM-18472: Notice fix

8 years agoFix syntax and tests
Seamus Lee [Mon, 6 Jun 2016 00:26:30 +0000 (10:26 +1000)]
Fix syntax and tests

8 years agoCRM-18743 - Undefined variable $order
rollox [Mon, 6 Jun 2016 00:18:09 +0000 (01:18 +0100)]
CRM-18743 - Undefined variable $order

Fixes 3 notice/errors stating "Undefined variable: order in CRM_Contact_BAO_Query->prepareOrderBy()" on Drupal user page when the user record is linked to a Civi contact record. eg at path: user/1

8 years agoMerge pull request #8499 from eileenmcnaughton/strings
Eileen McNaughton [Mon, 6 Jun 2016 00:15:08 +0000 (18:15 -0600)]
Merge pull request #8499 from eileenmcnaughton/strings

CRM-10210 add test for international strings

8 years agoFix validation
Seamus Lee [Mon, 6 Jun 2016 00:12:36 +0000 (10:12 +1000)]
Fix validation

8 years agoMerge pull request #8475 from johanv/CRM-18696-addresses_in_reports_without_address_p...
colemanw [Sun, 5 Jun 2016 23:54:48 +0000 (17:54 -0600)]
Merge pull request #8475 from johanv/CRM-18696-addresses_in_reports_without_address_parsing

CRM-18696 - Street address filtering in reports for sites w/o address parsing

8 years agoCRM-18772 Create function to check if column already exists in the database
Seamus Lee [Sun, 5 Jun 2016 23:36:07 +0000 (09:36 +1000)]
CRM-18772 Create function to check if column already exists in the database