civicrm-core.git
10 years agoMerge pull request #2351 from kurund/CRM-13996
colemanw [Wed, 15 Jan 2014 23:14:07 +0000 (15:14 -0800)]
Merge pull request #2351 from kurund/CRM-13996

CRM-13996, fixes sorting for search views

10 years agoCRM-13996, fixes sorting for search views
kurund [Wed, 15 Jan 2014 23:10:07 +0000 (15:10 -0800)]
CRM-13996, fixes sorting for search views

----------------------------------------
* CRM-13996: Advanced Search; Sorting of Results displayed in a custom profile fails and Advanced Search must be reset
  http://issues.civicrm.org/jira/browse/CRM-13996

10 years agoMerge pull request #2348 from dlobo/CRM-13278
Dave Greenberg [Wed, 15 Jan 2014 22:44:42 +0000 (14:44 -0800)]
Merge pull request #2348 from dlobo/CRM-13278

CRM-13278 - Select fields for export "- related contact info -" fields are not sorted properly

10 years agoCRM-13278 - Select fields for export "- related contact info -" fields are not sorted...
Donald A. Lobo [Wed, 15 Jan 2014 22:23:59 +0000 (14:23 -0800)]
CRM-13278 - Select fields for export "- related contact info -" fields are not sorted properly

http://issues.civicrm.org/jira/browse/CRM-13278

10 years agoMerge pull request #2347 from lcdservices/CRM-14062
dlobo [Wed, 15 Jan 2014 22:23:11 +0000 (14:23 -0800)]
Merge pull request #2347 from lcdservices/CRM-14062

CRM-14062 update api tests

10 years agoCRM-14062 update api tests
Brian Shaughnessy [Wed, 15 Jan 2014 22:16:58 +0000 (17:16 -0500)]
CRM-14062 update api tests

10 years agoMerge pull request #2332 from colemanw/CRM-13996
Dave Greenberg [Wed, 15 Jan 2014 21:59:58 +0000 (13:59 -0800)]
Merge pull request #2332 from colemanw/CRM-13996

CRM-13996 - Search views - hack to fix prefix, gender, suffix

10 years agoMerge pull request #2341 from colemanw/campaign_id
Dave Greenberg [Wed, 15 Jan 2014 21:56:26 +0000 (13:56 -0800)]
Merge pull request #2341 from colemanw/campaign_id

CRM-13810 - Display campaign name on search builder

10 years agoMerge pull request #2319 from lcdservices/CRM-13252
dlobo [Wed, 15 Jan 2014 21:45:57 +0000 (13:45 -0800)]
Merge pull request #2319 from lcdservices/CRM-13252

CRM-13252 exit nested api if getfields/getoptions action

10 years agoMerge pull request #2346 from jmcclelland/county-field-should-populate-with-counties
dlobo [Wed, 15 Jan 2014 18:29:32 +0000 (10:29 -0800)]
Merge pull request #2346 from jmcclelland/county-field-should-populate-with-counties

CRM-14077 - contact/address - county field should populate with counties...

10 years agoCRM-14077 - contact/address - county field should populate with counties not countries
Jamie McClelland [Wed, 15 Jan 2014 16:34:12 +0000 (11:34 -0500)]
CRM-14077 - contact/address - county field should populate with counties not countries

----------------------------------------
* CRM-14077: County drop down is populated with countries instead
  http://issues.civicrm.org/jira/browse/CRM-14077

10 years agoMerge pull request #2335 from yashodha/CRM-14066
Kurund Jalmi [Wed, 15 Jan 2014 06:11:03 +0000 (22:11 -0800)]
Merge pull request #2335 from yashodha/CRM-14066

CRM-14066: fix zero amount for discounted option

10 years agoMerge pull request #2343 from colemanw/locationTypeExport
colemanw [Wed, 15 Jan 2014 05:48:55 +0000 (21:48 -0800)]
Merge pull request #2343 from colemanw/locationTypeExport

CRM-14076 - Export - fix label to work as the query object expects

10 years agoCRM-14076 - Export - fix label to work as the query object expects
Coleman Watts [Wed, 15 Jan 2014 05:47:23 +0000 (21:47 -0800)]
CRM-14076 - Export - fix label to work as the query object expects

10 years agoMerge pull request #2325 from mepps/joomla-css-fix
pratik-joshi [Wed, 15 Jan 2014 04:44:40 +0000 (20:44 -0800)]
Merge pull request #2325 from mepps/joomla-css-fix

Stopped .crm-container fieldset label from floating left in Joomla edit ...

10 years agoCRM-13810 - Display campaign name on search builder
Coleman Watts [Wed, 15 Jan 2014 04:09:08 +0000 (20:09 -0800)]
CRM-13810 - Display campaign name on search builder

10 years agoMerge pull request #2339 from totten/4.4-test-mysqlport
Tim Otten [Wed, 15 Jan 2014 01:12:32 +0000 (17:12 -0800)]
Merge pull request #2339 from totten/4.4-test-mysqlport

tests/phpunit - Fix for running with MySQL on alternative port

10 years agotests/phpunit - Fix for running with MySQL on alternative port
Tim Otten [Sat, 4 Jan 2014 02:24:04 +0000 (18:24 -0800)]
tests/phpunit - Fix for running with MySQL on alternative port

10 years agoMerge pull request #2330 from colemanw/CRM-14059
Dave Greenberg [Tue, 14 Jan 2014 23:07:59 +0000 (15:07 -0800)]
Merge pull request #2330 from colemanw/CRM-14059

CRM-14059 - Contribution form - Fix onbehalf profile ajax load

10 years agoMerge pull request #2338 from kurund/CRM-14064
Kurund Jalmi [Tue, 14 Jan 2014 22:57:01 +0000 (14:57 -0800)]
Merge pull request #2338 from kurund/CRM-14064

fixes for CRM-14064

10 years agofixes for CRM-14064
kurund [Tue, 14 Jan 2014 22:55:44 +0000 (14:55 -0800)]
fixes for CRM-14064

----------------------------------------
* CRM-14064: Uploading content for mailing results in empty message text and subject line
  http://issues.civicrm.org/jira/browse/CRM-14064

10 years agoRemoved repeated line
Maggie [Tue, 14 Jan 2014 14:35:44 +0000 (09:35 -0500)]
Removed repeated line

10 years agoRemade change of adding float:none
Maggie [Tue, 14 Jan 2014 14:33:29 +0000 (09:33 -0500)]
Remade change of adding float:none

10 years agoMerge pull request #2336 from deepak-srivastava/CRM-14057
deepak-srivastava [Tue, 14 Jan 2014 11:05:32 +0000 (03:05 -0800)]
Merge pull request #2336 from deepak-srivastava/CRM-14057

CRM-14057 - contact logging detail report may have missing/wrong altered...

10 years agoCRM-14057 - contact logging detail report may have missing/wrong altered and altered...
Deepak Srivastava [Tue, 14 Jan 2014 11:00:50 +0000 (16:30 +0530)]
CRM-14057 - contact logging detail report may have missing/wrong altered and altered by name

----------------------------------------
* CRM-14057: contact logging detail report may have missing/wrong altered and altered by name
  http://issues.civicrm.org/jira/browse/CRM-14057

10 years agoCRM-14066: fix zero amount for discounted option
yashodha [Tue, 14 Jan 2014 09:46:46 +0000 (15:16 +0530)]
CRM-14066: fix zero amount for discounted option

10 years agoMerge pull request #2324 from yashodha/4.4
Kurund Jalmi [Tue, 14 Jan 2014 06:54:50 +0000 (22:54 -0800)]
Merge pull request #2324 from yashodha/4.4

CRM-13947: fix where clause condition

10 years agoMerge pull request #2334 from totten/4.4-14046-undefvar
Tim Otten [Tue, 14 Jan 2014 06:54:44 +0000 (22:54 -0800)]
Merge pull request #2334 from totten/4.4-14046-undefvar

CRM-14046 - CRM_Extension_Manager - Fix undefined variable references

10 years agoCRM-14046 - CRM_Extension_Manager - Fix undefined variable references
Tim Otten [Sun, 5 Jan 2014 00:16:13 +0000 (16:16 -0800)]
CRM-14046 - CRM_Extension_Manager - Fix undefined variable references

10 years agoMerge pull request #2171 from lcdservices/CRM-13909
Tim Otten [Tue, 14 Jan 2014 06:48:41 +0000 (22:48 -0800)]
Merge pull request #2171 from lcdservices/CRM-13909

CRM-13909 also rebuild word replacement when clearing cache

10 years agoCRM-13996 - Search views - hack to fix prefix, gender, suffix
Coleman Watts [Tue, 14 Jan 2014 00:51:23 +0000 (16:51 -0800)]
CRM-13996 - Search views - hack to fix prefix, gender, suffix

10 years agoCRM-14059 - Contribution form - Fix onbehalf profile ajax load
Coleman Watts [Mon, 13 Jan 2014 23:31:55 +0000 (15:31 -0800)]
CRM-14059 - Contribution form - Fix onbehalf profile ajax load

10 years agoMerge pull request #2329 from davecivicrm/CRM-13726
Dave Greenberg [Mon, 13 Jan 2014 20:29:50 +0000 (12:29 -0800)]
Merge pull request #2329 from davecivicrm/CRM-13726

CRM-13726 includes PR 1934 plus fix from https://github.com/eileenmcnaug...

10 years agoCRM-13726 includes PR 1934 plus fix from https://github.com/eileenmcnaughton/civicrm...
Dave Greenberg [Mon, 13 Jan 2014 20:27:54 +0000 (12:27 -0800)]
CRM-13726 includes PR 1934 plus fix from https://github.com/eileenmcnaughton/civicrm-core/commit/c1622a21afb8fa86f92be8dc90879ad5aed7e3f5

----------------------------------------
* CRM-13726: Only show 'billing addres is same as above' checkbox if there is an address above
  http://issues.civicrm.org/jira/browse/CRM-13726

10 years agoMerge pull request #2327 from colemanw/4.4
colemanw [Sat, 11 Jan 2014 04:36:04 +0000 (20:36 -0800)]
Merge pull request #2327 from colemanw/4.4

Edit activity date warning broken

10 years agoCRM-14065 - Activity Form - Fix activityStatus js function
Coleman Watts [Sat, 11 Jan 2014 04:32:58 +0000 (20:32 -0800)]
CRM-14065 - Activity Form - Fix activityStatus js function

10 years agoStopped .crm-container fieldset label from floating left in Joomla edit default templ...
Maggie [Fri, 10 Jan 2014 21:58:32 +0000 (16:58 -0500)]
Stopped .crm-container fieldset label from floating left in Joomla edit default template view

10 years agoMerge pull request #2321 from lcdservices/CRM-14062
Dave Greenberg [Fri, 10 Jan 2014 20:29:26 +0000 (12:29 -0800)]
Merge pull request #2321 from lcdservices/CRM-14062

CRM-14062 support passing name to group API

10 years agoMerge pull request #2320 from kurund/CRM-14052
Kurund Jalmi [Fri, 10 Jan 2014 20:06:23 +0000 (12:06 -0800)]
Merge pull request #2320 from kurund/CRM-14052

delete tags that belongs to tagset, CRM-14052

10 years agoadded more comments for the code, CRM-14052
kurund [Fri, 10 Jan 2014 20:06:03 +0000 (12:06 -0800)]
added more comments for the code, CRM-14052

----------------------------------------
* CRM-14052: Tagset fixes
  http://issues.civicrm.org/jira/browse/CRM-14052

10 years agoadded more comments for the code, CRM-14052
kurund [Fri, 10 Jan 2014 20:04:44 +0000 (12:04 -0800)]
added more comments for the code, CRM-14052

----------------------------------------
* CRM-14052: Tagset fixes
  http://issues.civicrm.org/jira/browse/CRM-14052

10 years agofew more fixes for tagset delete logic, CRM-14052
kurund [Fri, 10 Jan 2014 19:48:05 +0000 (11:48 -0800)]
few more fixes for tagset delete logic, CRM-14052

----------------------------------------
* CRM-14052: Tagset fixes
  http://issues.civicrm.org/jira/browse/CRM-14052

10 years agoCRM-14062 rework group name param check so we still allow appending ID via UI
Brian Shaughnessy [Fri, 10 Jan 2014 19:37:44 +0000 (14:37 -0500)]
CRM-14062 rework group name param check so we still allow appending ID via UI

10 years agoMerge pull request #2323 from NileemaJadhav/CRM-14056
pratik-joshi [Fri, 10 Jan 2014 08:41:56 +0000 (00:41 -0800)]
Merge pull request #2323 from NileemaJadhav/CRM-14056

-- CRM-14056 Fix for Multi-lingual 4.4.4 upgrade fails due to dashboard upgrade

10 years agoCRM-13947: fix where clause condition
yashodha [Fri, 10 Jan 2014 08:20:42 +0000 (13:50 +0530)]
CRM-13947: fix where clause condition

10 years ago-- CRM-14056 Added comment for dashboard schema upgrade
Nileema [Fri, 10 Jan 2014 07:10:47 +0000 (12:40 +0530)]
-- CRM-14056 Added comment for dashboard schema upgrade

----------------------------------------
* CRM-14056: Multi-lingual 4.4.4 upgrade fails due to dashboard upgrade
  http://issues.civicrm.org/jira/browse/CRM-14056

10 years agoCRM-14065 - Activity Form - Consolodate misplaced/duplicate js code
Coleman Watts [Fri, 10 Jan 2014 06:13:57 +0000 (22:13 -0800)]
CRM-14065 - Activity Form - Consolodate misplaced/duplicate js code

10 years ago-- CRM-14056 Fix for Multi-lingual 4.4.4 upgrade fails due to dashboard upgrade
Nileema [Fri, 10 Jan 2014 06:00:00 +0000 (11:30 +0530)]
-- CRM-14056 Fix for Multi-lingual 4.4.4 upgrade fails due to dashboard upgrade

----------------------------------------
* CRM-14056: Multi-lingual 4.4.4 upgrade fails due to dashboard upgrade
  http://issues.civicrm.org/jira/browse/CRM-14056

10 years agomore fixes for delete of tags in a tagset
kurund [Thu, 9 Jan 2014 22:10:49 +0000 (14:10 -0800)]
more fixes for delete of tags in a tagset

10 years agomore fixes for delete of tags in a tagset
kurund [Thu, 9 Jan 2014 22:06:37 +0000 (14:06 -0800)]
more fixes for delete of tags in a tagset

10 years agoCRM-14062 all passing name to group API
Brian Shaughnessy [Thu, 9 Jan 2014 21:00:21 +0000 (16:00 -0500)]
CRM-14062 all passing name to group API

10 years agodelete tags that belongs to tagset, CRM-14052
kurund [Thu, 9 Jan 2014 20:17:02 +0000 (12:17 -0800)]
delete tags that belongs to tagset, CRM-14052

----------------------------------------
* CRM-14052: Tagset fixes
  http://issues.civicrm.org/jira/browse/CRM-14052

10 years agoCRM-13252 exit nested api if getfields/getoptions action
Brian Shaughnessy [Thu, 9 Jan 2014 17:08:33 +0000 (12:08 -0500)]
CRM-13252 exit nested api if getfields/getoptions action

10 years agoMerge pull request #2258 from NileemaJadhav/CRM-13889
Yashodha Chaku [Thu, 9 Jan 2014 07:29:21 +0000 (23:29 -0800)]
Merge pull request #2258 from NileemaJadhav/CRM-13889

-- CRM-13889 APIs for Dashboard, DashboardContact and new hook hook_civicrm_dashboard_defaults

10 years agoMerge pull request #2316 from davecivicrm/CRM-14016
Dave Greenberg [Thu, 9 Jan 2014 01:02:46 +0000 (17:02 -0800)]
Merge pull request #2316 from davecivicrm/CRM-14016

CRM-14016 - Fix fatal error in Save Copy due to NULL instanceID.

10 years agoCRM-14016 - Use elseif instead of else if
Dave Greenberg [Thu, 9 Jan 2014 01:01:47 +0000 (17:01 -0800)]
CRM-14016 - Use elseif instead of else if

----------------------------------------
* CRM-14016: remove report instance from navigation via report settings
  http://issues.civicrm.org/jira/browse/CRM-14016

10 years agoCRM-14016 - Fix fatal error in Save Copy due to NULL instanceID.
Dave Greenberg [Thu, 9 Jan 2014 00:58:27 +0000 (16:58 -0800)]
CRM-14016 - Fix fatal error in Save Copy due to NULL instanceID.

----------------------------------------
* CRM-14016: remove report instance from navigation via report settings
  http://issues.civicrm.org/jira/browse/CRM-14016

10 years agoMerge pull request #2298 from kurund/tagset-fixes
colemanw [Wed, 8 Jan 2014 22:44:19 +0000 (14:44 -0800)]
Merge pull request #2298 from kurund/tagset-fixes

CRM-14052: Tagset fixes

10 years agoMerge pull request #2236 from eileenmcnaughton/CRM-14008
Dave Greenberg [Wed, 8 Jan 2014 20:42:44 +0000 (12:42 -0800)]
Merge pull request #2236 from eileenmcnaughton/CRM-14008

CRM-14008 alter update greeting to update blanks as well as null

10 years agoMerge pull request #2288 from eileenmcnaughton/CRM-14043
Kurund Jalmi [Wed, 8 Jan 2014 20:31:07 +0000 (12:31 -0800)]
Merge pull request #2288 from eileenmcnaughton/CRM-14043

CRM-14043 - cid=0 contribution form giving contribution to logged in use...

10 years agoMerge pull request #2315 from davecivicrm/CRM-14034
Dave Greenberg [Wed, 8 Jan 2014 20:29:11 +0000 (12:29 -0800)]
Merge pull request #2315 from davecivicrm/CRM-14034

CRM-14034 - Fix soft credit form rule to handle editing contributions us...

10 years agoCRM-14034 - additional fix.
Dave Greenberg [Wed, 8 Jan 2014 20:28:41 +0000 (12:28 -0800)]
CRM-14034 - additional fix.

----------------------------------------
* CRM-14034: Editing a contribution from a PCP gets an error saying "soft credit amount cannot be more than the total amount."
  http://issues.civicrm.org/jira/browse/CRM-14034

10 years agoCRM-14034 - additional fix.
Dave Greenberg [Wed, 8 Jan 2014 20:27:51 +0000 (12:27 -0800)]
CRM-14034 - additional fix.

----------------------------------------
* CRM-14034: Editing a contribution from a PCP gets an error saying "soft credit amount cannot be more than the total amount."
  http://issues.civicrm.org/jira/browse/CRM-14034

10 years agoCRM-14034 - additional fix.
Dave Greenberg [Wed, 8 Jan 2014 20:27:03 +0000 (12:27 -0800)]
CRM-14034 - additional fix.

----------------------------------------
* CRM-14034: Editing a contribution from a PCP gets an error saying "soft credit amount cannot be more than the total amount."
  http://issues.civicrm.org/jira/browse/CRM-14034

10 years agoCRM-14034 - Fix soft credit form rule to handle editing contributions using a price...
Dave Greenberg [Wed, 8 Jan 2014 20:16:56 +0000 (12:16 -0800)]
CRM-14034 - Fix soft credit form rule to handle editing contributions using a price set AND with linked soft credit(s).

----------------------------------------
* CRM-14034: Editing a contribution from a PCP gets an error saying "soft credit amount cannot be more than the total amount."
  http://issues.civicrm.org/jira/browse/CRM-14034

10 years agoMerge pull request #2297 from davecivicrm/CRM-14051
Kurund Jalmi [Wed, 8 Jan 2014 19:59:24 +0000 (11:59 -0800)]
Merge pull request #2297 from davecivicrm/CRM-14051

CRM-14501 - Fix CRM_Contact_BAO_Relationship::getPermissionedContacts so...

10 years agoMerge pull request #2292 from davecivicrm/CRM-14047
Kurund Jalmi [Wed, 8 Jan 2014 19:56:40 +0000 (11:56 -0800)]
Merge pull request #2292 from davecivicrm/CRM-14047

CRM-14047 - add clarification text to Total Fee(s) display

10 years agoMerge pull request #2264 from dlobo/CRM-13606
Kurund Jalmi [Wed, 8 Jan 2014 19:56:03 +0000 (11:56 -0800)]
Merge pull request #2264 from dlobo/CRM-13606

CRM-13606 - Include / Exclude custom Search does not work properly

10 years agoMerge pull request #2299 from kurund/CRM-12506
Kurund Jalmi [Wed, 8 Jan 2014 19:47:25 +0000 (11:47 -0800)]
Merge pull request #2299 from kurund/CRM-12506

fix the broken link to view all the contributions for a contact, CRM-125...

10 years agofixes for entity delete function, CRM-14052
kurund [Wed, 8 Jan 2014 19:38:31 +0000 (11:38 -0800)]
fixes for entity delete function, CRM-14052

----------------------------------------
* CRM-14052: Tagset fixes
  http://issues.civicrm.org/jira/browse/CRM-14052

10 years agoMerge pull request #2313 from mgbdev/CRM-13926
Kurund Jalmi [Wed, 8 Jan 2014 19:18:20 +0000 (11:18 -0800)]
Merge pull request #2313 from mgbdev/CRM-13926

CRM-13926 new changess

10 years agoCRM-13926 new changess
mgbdev [Wed, 8 Jan 2014 13:34:08 +0000 (19:04 +0530)]
CRM-13926 new changess

10 years agoMerge pull request #2294 from pratik-joshi/CRM-14036_fix
dlobo [Wed, 8 Jan 2014 08:23:29 +0000 (00:23 -0800)]
Merge pull request #2294 from pratik-joshi/CRM-14036_fix

CRM-14036_fix

10 years agoMerge pull request #2302 from monishdeb/CRM-14037
dlobo [Wed, 8 Jan 2014 08:20:42 +0000 (00:20 -0800)]
Merge pull request #2302 from monishdeb/CRM-14037

CRM-14037 fix -  Class 'CRM_Activity_BAO_Contact' not found /civicrm/CRM/Activity/BAO/Activity.php DLTK Problem

10 years agoMerge pull request #2263 from kurund/CRM-12753
dlobo [Wed, 8 Jan 2014 08:08:47 +0000 (00:08 -0800)]
Merge pull request #2263 from kurund/CRM-12753

CRM-12753, advanced search, change log fixes

10 years agofixes to case view tagset and tags CRM-14052
kurund [Wed, 8 Jan 2014 00:42:33 +0000 (16:42 -0800)]
fixes to case view tagset and tags CRM-14052

----------------------------------------
* CRM-14052: Tagset fixes
  http://issues.civicrm.org/jira/browse/CRM-14052

10 years agoMerge pull request #2243 from eileenmcnaughton/CRM-14021
Dave Greenberg [Wed, 8 Jan 2014 00:37:38 +0000 (16:37 -0800)]
Merge pull request #2243 from eileenmcnaughton/CRM-14021

CRM-14021 respect for .extra.hlp files & for alterations in help page vi...

10 years agoMerge pull request #2305 from davecivicrm/CRM-12753a
Dave Greenberg [Wed, 8 Jan 2014 00:27:15 +0000 (16:27 -0800)]
Merge pull request #2305 from davecivicrm/CRM-12753a

CRM-12753 - Add Created date to contact view footer.

10 years agoCRM-12753 - Add Created date to contact view footer.
Dave Greenberg [Wed, 8 Jan 2014 00:21:56 +0000 (16:21 -0800)]
CRM-12753 - Add Created date to contact view footer.

----------------------------------------
* CRM-12753: Searching for contacts by date created
  http://issues.civicrm.org/jira/browse/CRM-12753

10 years agoMerge pull request #2301 from davecivicrm/CRM-13995a
Dave Greenberg [Tue, 7 Jan 2014 02:37:11 +0000 (18:37 -0800)]
Merge pull request #2301 from davecivicrm/CRM-13995a

CRM-13995 - Add is_object check to prevent notices.

10 years agoCRM-13995 - Add is_object check to prevent notices.
Dave Greenberg [Tue, 7 Jan 2014 02:35:59 +0000 (18:35 -0800)]
CRM-13995 - Add is_object check to prevent notices.

----------------------------------------
* CRM-13995: contact export when merging households: some household fields missing
  http://issues.civicrm.org/jira/browse/CRM-13995

10 years agoMerge pull request #2300 from davecivicrm/CRM-13995
Dave Greenberg [Tue, 7 Jan 2014 01:52:26 +0000 (17:52 -0800)]
Merge pull request #2300 from davecivicrm/CRM-13995

CRM -13995 - Additional change needed to get Country column exported for merge into h...

10 years agoAdditional change needed to get Country column exported for merge into household.
Dave Greenberg [Tue, 7 Jan 2014 01:51:04 +0000 (17:51 -0800)]
Additional change needed to get Country column exported for merge into household.

10 years agoMerge pull request #2223 from lcdservices/CRM-13995
Dave Greenberg [Tue, 7 Jan 2014 01:48:43 +0000 (17:48 -0800)]
Merge pull request #2223 from lcdservices/CRM-13995

CRM-13995 fix export when merging households

10 years agodo not create/delete tags via tagset unless explicit save, CRM-14052
kurund [Tue, 7 Jan 2014 01:35:14 +0000 (17:35 -0800)]
do not create/delete tags via tagset unless explicit save, CRM-14052

----------------------------------------
* CRM-14052: Tagset fixes
  http://issues.civicrm.org/jira/browse/CRM-14052

10 years agofix the broken link to view all the contributions for a contact, CRM-12506
kurund [Tue, 7 Jan 2014 00:55:24 +0000 (16:55 -0800)]
fix the broken link to view all the contributions for a contact, CRM-12506

----------------------------------------
* CRM-12506: Contact Contribution tab will not show more than 50 contributions
  http://issues.civicrm.org/jira/browse/CRM-12506

10 years agoUpdate Main.php
Dave Greenberg [Tue, 7 Jan 2014 00:55:00 +0000 (16:55 -0800)]
Update Main.php

Fix form rule error for number of pledge installments.

10 years agoMerge pull request #2296 from lcdservices/CRM-14049
Dave Greenberg [Mon, 6 Jan 2014 23:09:48 +0000 (15:09 -0800)]
Merge pull request #2296 from lcdservices/CRM-14049

CRM-14049 allow on-hold email when retrieving details and pass contactId...

10 years agoworked on #2 fixes, CRM-14052
kurund [Mon, 6 Jan 2014 22:59:34 +0000 (14:59 -0800)]
worked on #2 fixes, CRM-14052

----------------------------------------
* CRM-14052: Tagset fixes
  http://issues.civicrm.org/jira/browse/CRM-14052

10 years agofixes #1 and #2 for CRM-14052
kurund [Mon, 6 Jan 2014 22:17:07 +0000 (14:17 -0800)]
fixes #1 and #2 for CRM-14052

----------------------------------------
* CRM-14052: Tagset fixes
  http://issues.civicrm.org/jira/browse/CRM-14052

10 years agoCRM-14501 - Fix CRM_Contact_BAO_Relationship::getPermissionedContacts so it can handl...
Dave Greenberg [Mon, 6 Jan 2014 22:15:54 +0000 (14:15 -0800)]
CRM-14501 - Fix CRM_Contact_BAO_Relationship::getPermissionedContacts so it can handle a list of one or more relationshipTypeIDs.

----------------------------------------
* CRM-14501:
  http://issues.civicrm.org/jira/browse/CRM-14501

10 years agoCRM-14049 allow on-hold email when retrieving details and pass contactId if exists
Brian Shaughnessy [Mon, 6 Jan 2014 21:32:27 +0000 (16:32 -0500)]
CRM-14049 allow on-hold email when retrieving details and pass contactId if exists

10 years agoMerge pull request #2293 from kurund/notice-fixes
Kurund Jalmi [Mon, 6 Jan 2014 19:39:49 +0000 (11:39 -0800)]
Merge pull request #2293 from kurund/notice-fixes

strict warning fixes

10 years agostrict warning fixes
kurund [Mon, 6 Jan 2014 19:39:04 +0000 (11:39 -0800)]
strict warning fixes

10 years agoCRM-14036_fix
Pratik Joshi [Mon, 6 Jan 2014 19:29:03 +0000 (00:59 +0530)]
CRM-14036_fix

10 years agoCRM-14047 - add clarification text to Total Fee(s) display
Dave Greenberg [Mon, 6 Jan 2014 19:13:28 +0000 (11:13 -0800)]
CRM-14047 - add clarification text to Total Fee(s) display

----------------------------------------
* CRM-14047: Online event registration: add text to clarify the meaning of the Total Fee(s) calculated value
  http://issues.civicrm.org/jira/browse/CRM-14047

10 years agoCRM-14037 fix - Class 'CRM_Activity_BAO_Contact' not found Activity.php /civicrm...
monishdeb [Mon, 6 Jan 2014 15:21:07 +0000 (20:51 +0530)]
CRM-14037 fix -  Class 'CRM_Activity_BAO_Contact' not found Activity.php /civicrm/CRM/Activity/BAO line 2366 DLTK Problem

http://issues.civicrm.org/jira/browse/CRM-14037

10 years agoMerge pull request #2290 from yashodha/CRM-13892
Yashodha Chaku [Mon, 6 Jan 2014 11:36:43 +0000 (03:36 -0800)]
Merge pull request #2290 from yashodha/CRM-13892

CRM-13892 : fix upgrade function

10 years agoCRM-13892 : fix upgrade function
yashodha [Mon, 6 Jan 2014 08:11:44 +0000 (13:41 +0530)]
CRM-13892 : fix upgrade function

10 years agoMerge pull request #2273 from monishdeb/CRM-13977
Yashodha Chaku [Mon, 6 Jan 2014 08:07:10 +0000 (00:07 -0800)]
Merge pull request #2273 from monishdeb/CRM-13977

CRM-13977 related fix