civicrm-core.git
10 years agoMerge pull request #2634 from pratik-joshi/CRM-14317-NAN-field-not-found-bug
Kurund Jalmi [Thu, 13 Mar 2014 12:46:49 +0000 (18:16 +0530)]
Merge pull request #2634 from pratik-joshi/CRM-14317-NAN-field-not-found-bug

CRM-14317 fix for : while looking into this issue, found a DB: NAN field not found

10 years agoMerge pull request #2636 from pratik-joshi/CRM-14297
Kurund Jalmi [Thu, 13 Mar 2014 12:32:35 +0000 (18:02 +0530)]
Merge pull request #2636 from pratik-joshi/CRM-14297

CRM-14297 : added tables definition for member_is_test field

10 years agoMerge pull request #2552 from totten/4.4-report-test-output
Tim Otten [Wed, 12 Mar 2014 22:34:27 +0000 (15:34 -0700)]
Merge pull request #2552 from totten/4.4-report-test-output

HR-216 - CiviReportTestCase - Add more output for diagnosing errors

10 years agoMerge pull request #2633 from totten/4.4-wr-long
Tim Otten [Wed, 12 Mar 2014 22:33:49 +0000 (15:33 -0700)]
Merge pull request #2633 from totten/4.4-wr-long

CRM-14224 - Upgrade WordReplacements:

10 years agoMerge pull request #2644 from colemanw/inline
colemanw [Tue, 11 Mar 2014 19:22:51 +0000 (15:22 -0400)]
Merge pull request #2644 from colemanw/inline

CRM-14336 - Clear up potential memory leaks from ajaxForm

10 years agoCRM-14336 - Clear up potential memory leaks from ajaxForm
Coleman Watts [Tue, 11 Mar 2014 18:35:49 +0000 (14:35 -0400)]
CRM-14336 - Clear up potential memory leaks from ajaxForm

10 years agoMerge pull request #2640 from colemanw/4.4
colemanw [Mon, 10 Mar 2014 19:37:49 +0000 (15:37 -0400)]
Merge pull request #2640 from colemanw/4.4

CRM-13966 - Fix export prefix, suffix, gender

10 years agoCRM-13966 - Fix export prefix, suffix, gender
Coleman Watts [Mon, 10 Mar 2014 19:36:48 +0000 (15:36 -0400)]
CRM-13966 - Fix export prefix, suffix, gender

10 years agoMerge pull request #2639 from colemanw/4.4
colemanw [Mon, 10 Mar 2014 19:20:55 +0000 (15:20 -0400)]
Merge pull request #2639 from colemanw/4.4

CRM-14065 - Only compare date not time for activity status warning

10 years agoCRM-14065 - Only compare date not time for activity status warning
Coleman Watts [Mon, 10 Mar 2014 19:19:25 +0000 (15:19 -0400)]
CRM-14065 - Only compare date not time for activity status warning

10 years agoMerge pull request #2638 from colemanw/CRM-14196
colemanw [Mon, 10 Mar 2014 17:22:31 +0000 (13:22 -0400)]
Merge pull request #2638 from colemanw/CRM-14196

Apply eileen's patch for CRM-14196

10 years agoCRM-14196 - states missing from export fuzion fix - not sure what final fix will be
Eileen McNaughton [Tue, 18 Feb 2014 23:32:40 +0000 (12:32 +1300)]
CRM-14196 - states missing from export fuzion fix - not sure what final fix will be

10 years agoCRM-14196 - states missing from export fuzion fix - part 2 = resulting e-notice
Eileen [Mon, 24 Feb 2014 00:57:22 +0000 (13:57 +1300)]
CRM-14196 - states missing from export fuzion fix - part 2 = resulting e-notice

10 years agoMerge pull request #2637 from colemanw/4.4
colemanw [Mon, 10 Mar 2014 13:47:06 +0000 (09:47 -0400)]
Merge pull request #2637 from colemanw/4.4

ContactInfo.tpl - Fix broken markup

10 years agoContactInfo.tpl - Fix broken markup
Coleman Watts [Mon, 10 Mar 2014 13:45:50 +0000 (09:45 -0400)]
ContactInfo.tpl - Fix broken markup

10 years agoCRM-14297 : added tables for member_is_test field
Pratik Joshi [Mon, 10 Mar 2014 13:28:40 +0000 (18:58 +0530)]
CRM-14297 : added tables for member_is_test field

10 years agoCRM-14317 fix for : while looking into this issue, found a DB: NAN field not found
Pratik Joshi [Mon, 10 Mar 2014 08:33:39 +0000 (14:03 +0530)]
CRM-14317 fix for : while looking into this issue, found a DB: NAN field not found

10 years agoCRM-14224 - Upgrade WordReplacements:
Tim Otten [Mon, 10 Mar 2014 03:34:20 +0000 (20:34 -0700)]
CRM-14224 - Upgrade WordReplacements:

 * Display a pre-upgrade message if any WordReplacements are too long
 * Log old/long WordReplacements
 * Don't migrate WordRepalcements which are too long

10 years agoMerge pull request #2631 from totten/4.4-14210
Tim Otten [Mon, 10 Mar 2014 00:48:38 +0000 (17:48 -0700)]
Merge pull request #2631 from totten/4.4-14210

CRM-14210 - Use get_headers(). Add API.

10 years agoCRM-14210 - Add API for running security checks
Tim Otten [Mon, 10 Mar 2014 00:40:58 +0000 (17:40 -0700)]
CRM-14210 - Add API for running security checks

10 years agoCRM_Utils_Check_Security - Represent messages as objects
Tim Otten [Mon, 10 Mar 2014 00:40:31 +0000 (17:40 -0700)]
CRM_Utils_Check_Security - Represent messages as objects

10 years agoCRM-14210 - Add hidden option to disable security alerts
Tim Otten [Mon, 10 Mar 2014 00:22:23 +0000 (17:22 -0700)]
CRM-14210 - Add hidden option to disable security alerts

10 years agoCRM-14210. Use get_headers() and check for 200 response instead of file_get_contents...
Chris Burgess [Sun, 16 Feb 2014 22:14:31 +0000 (11:14 +1300)]
CRM-14210. Use get_headers() and check for 200 response instead of file_get_contents(), as some servers do not return FALSE on 40x response code.

10 years agoMerge pull request #2626 from jmcclelland/participants-to-event
dlobo [Sat, 8 Mar 2014 11:27:11 +0000 (16:57 +0530)]
Merge pull request #2626 from jmcclelland/participants-to-event

CRM-14325 - adding participants to event from manage groups

10 years agoMerge pull request #2342 from totten/4.4-cache-codegen
Tim Otten [Sat, 8 Mar 2014 07:55:28 +0000 (23:55 -0800)]
Merge pull request #2342 from totten/4.4-cache-codegen

GenCode - Add an optional caching mode.

10 years agoCRM-14325 - adding participants to event from manage groups
Jamie McClelland [Fri, 7 Mar 2014 19:16:11 +0000 (14:16 -0500)]
CRM-14325 - adding participants to event from manage groups

If default search profile is set, you cannot reliably add participants
to an event when doing so from the manage group interface.

----------------------------------------
* CRM-14325: when default search profile is set, can't reliably add contacts to event from manage group page
  http://issues.civicrm.org/jira/browse/CRM-14325

10 years agoMerge pull request #2547 from davecivicrm/CRM-14249
Kurund Jalmi [Wed, 5 Mar 2014 02:49:40 +0000 (08:19 +0530)]
Merge pull request #2547 from davecivicrm/CRM-14249

CRM-14249 - fix fatal error when anonymous user accesses civicrm/mailing...

10 years agoMerge pull request #2571 from mlutfy/4.4-crm13859
dlobo [Fri, 28 Feb 2014 23:24:34 +0000 (15:24 -0800)]
Merge pull request #2571 from mlutfy/4.4-crm13859

CRM-13859 Backport PR #2195: set database connection to UTF-8 during install (by clandmeter).

10 years agoMerge pull request #2580 from dlobo/CRM-14294
dlobo [Fri, 28 Feb 2014 20:20:39 +0000 (12:20 -0800)]
Merge pull request #2580 from dlobo/CRM-14294

CRM-14294 - Fix typo in function call to retrieve in Controller.php

10 years agoCRM-14294 - Fix typo in function call to retrieve in Controller.php
Donald A. Lobo [Fri, 28 Feb 2014 20:19:12 +0000 (12:19 -0800)]
CRM-14294 - Fix typo in function call to retrieve in Controller.php

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

10 years agoCRM-13859 Backport PR #2195: set database connection to UTF-8 during install (by...
Mathieu Lutfy [Thu, 27 Feb 2014 13:26:06 +0000 (08:26 -0500)]
CRM-13859 Backport PR #2195: set database connection to UTF-8 during install (by clandmeter).

10 years agoMerge pull request #2554 from totten/4.4-settings-hook-dedupe
Tim Otten [Tue, 25 Feb 2014 01:28:18 +0000 (17:28 -0800)]
Merge pull request #2554 from totten/4.4-settings-hook-dedupe

HR-287 - CRM_Core_BAO_Setting - Guard against duplicate settings folders

10 years agoHR-287 - CRM_Core_BAO_Setting - Guard against duplicate settings folders
Tim Otten [Tue, 25 Feb 2014 01:16:53 +0000 (17:16 -0800)]
HR-287 - CRM_Core_BAO_Setting - Guard against duplicate settings folders

Not sure this is needed, but there's been some example code floating around
in which extensions use buggy self-defenses to avoid duplicates.

10 years agoMerge pull request #2538 from totten/4.4-crm-button
Tim Otten [Mon, 24 Feb 2014 23:23:31 +0000 (15:23 -0800)]
Merge pull request #2538 from totten/4.4-crm-button

HR-216 - civicrm.css - Use same styling for "crm-button" in ".crm-container" and "#crm-container"

10 years agoMerge pull request #2544 from totten/4.4-query-builder
Tim Otten [Mon, 24 Feb 2014 23:20:43 +0000 (15:20 -0800)]
Merge pull request #2544 from totten/4.4-query-builder

CRM_Utils_SQL_Select - Backport

10 years agoCRM_Utils_SQL_Select cleanup:
Tim Otten [Mon, 24 Feb 2014 22:56:08 +0000 (14:56 -0800)]
CRM_Utils_SQL_Select cleanup:

 * Add more docs
 * Add test for ORDER BY
 * Add support for LIMIT

10 years agoHR-216 - CiviReportTestCase - Add more output for diagnosing errors
Tim Otten [Mon, 24 Feb 2014 22:33:03 +0000 (14:33 -0800)]
HR-216 - CiviReportTestCase - Add more output for diagnosing errors

10 years agoCRM-14249 - fix fatal error when anonymous user accesses civicrm/mailing/view.
Dave Greenberg [Sun, 23 Feb 2014 02:35:45 +0000 (18:35 -0800)]
CRM-14249 - fix fatal error when anonymous user accesses civicrm/mailing/view.

----------------------------------------
* CRM-14249: Can't view public mailings when logged out
  http://issues.civicrm.org/jira/browse/CRM-14249

10 years agoCRM_Utils_SQL_Select - Backport
Tim Otten [Fri, 21 Feb 2014 22:10:18 +0000 (14:10 -0800)]
CRM_Utils_SQL_Select - Backport

10 years agoMerge pull request #2537 from totten/4.4-rest-cookie
Tim Otten [Fri, 21 Feb 2014 00:21:03 +0000 (16:21 -0800)]
Merge pull request #2537 from totten/4.4-rest-cookie

CRM-14253 - CRM_Utils_REST - Read $_GET/$_POST but not $_COOKIE

10 years agoMerge pull request #2541 from totten/4.4-gencode-uid
Tim Otten [Thu, 20 Feb 2014 23:40:23 +0000 (15:40 -0800)]
Merge pull request #2541 from totten/4.4-gencode-uid

GenCode - Ensure separate temp dirs on multi-user system

10 years agoGenCode - Ensure separate temp dirs on multi-user system
Tim Otten [Thu, 20 Feb 2014 23:39:01 +0000 (15:39 -0800)]
GenCode - Ensure separate temp dirs on multi-user system

10 years agoHR-216 - civicrm.css - Use same styling for "crm-button" in ".crm-container" and...
Tim Otten [Thu, 20 Feb 2014 02:13:43 +0000 (18:13 -0800)]
HR-216 - civicrm.css - Use same styling for "crm-button" in ".crm-container" and "#crm-container"

10 years agoHR-216 - Setting.API - Ignore "options"
Tim Otten [Thu, 20 Feb 2014 01:58:13 +0000 (17:58 -0800)]
HR-216 - Setting.API - Ignore "options"

10 years agoCRM-14253 - CRM_Utils_REST - Read $_GET/$_POST but not $_COOKIE
Tim Otten [Thu, 20 Feb 2014 00:48:16 +0000 (16:48 -0800)]
CRM-14253 - CRM_Utils_REST - Read $_GET/$_POST but not $_COOKIE

10 years agoMerge pull request #2536 from totten/4.4-backbone-return
Tim Otten [Thu, 20 Feb 2014 00:07:54 +0000 (16:07 -0800)]
Merge pull request #2536 from totten/4.4-backbone-return

HR-216 - crm.backbone.js - Allow limiting the return to specific fields

10 years agoHR-216 - crm.backbone.js - Allow limiting the return to specific fields
Tim Otten [Wed, 19 Feb 2014 23:39:57 +0000 (15:39 -0800)]
HR-216 - crm.backbone.js - Allow limiting the return to specific fields

10 years agoMerge pull request #2534 from mlutfy/4.4-crm14243-tsfix
dlobo [Wed, 19 Feb 2014 14:33:14 +0000 (06:33 -0800)]
Merge pull request #2534 from mlutfy/4.4-crm14243-tsfix

CRM-14243: 'ts' fix for file upload description.

10 years agoCRM-14243: 'ts' fix for file upload description.
Mathieu Lutfy [Tue, 18 Feb 2014 21:03:36 +0000 (16:03 -0500)]
CRM-14243: 'ts' fix for file upload description.

10 years agoMerge pull request #2533 from yashodha/4.4
Kurund Jalmi [Tue, 18 Feb 2014 12:24:00 +0000 (17:54 +0530)]
Merge pull request #2533 from yashodha/4.4

HR-231 : support for Report menu items based on grouping

10 years agoHR-231 : support for Report menu items based on grouping
yashodha [Tue, 18 Feb 2014 12:11:52 +0000 (17:41 +0530)]
HR-231 : support for Report menu items based on grouping

10 years agoMerge pull request #2522 from mlutfy/4.4-crm14217
dlobo [Fri, 14 Feb 2014 00:31:01 +0000 (16:31 -0800)]
Merge pull request #2522 from mlutfy/4.4-crm14217

CRM-14217: Fixes for CSS of PCPAccount pages (also affects profiles) where the password/confirm fields are shown.

10 years agoCRM-14217: Fixes for CSS of PCPAccount pages (also affects profiles) where the passwo...
Mathieu Lutfy [Thu, 13 Feb 2014 22:22:54 +0000 (17:22 -0500)]
CRM-14217: Fixes for CSS of PCPAccount pages (also affects profiles) where the password/confirm fields are shown.

10 years agoMerge pull request #2517 from eileenmcnaughton/examples
colemanw [Thu, 13 Feb 2014 02:33:52 +0000 (18:33 -0800)]
Merge pull request #2517 from eileenmcnaughton/examples

Examples

10 years agoupdated examples
Eileen [Thu, 13 Feb 2014 00:55:49 +0000 (00:55 +0000)]
updated examples

10 years agoMerge pull request #2512 from lcdservices/CRM-14208
dlobo [Wed, 12 Feb 2014 14:57:25 +0000 (06:57 -0800)]
Merge pull request #2512 from lcdservices/CRM-14208

CRM-14208

10 years agoCRM-14208, CRM-14140 use more of jsproffitt patch to simplify logic
Brian Shaughnessy [Wed, 12 Feb 2014 04:10:17 +0000 (23:10 -0500)]
CRM-14208, CRM-14140 use more of jsproffitt patch to simplify logic

10 years agoCRM-14208 support new joomla authentication method
Brian Shaughnessy [Wed, 12 Feb 2014 03:37:35 +0000 (22:37 -0500)]
CRM-14208 support new joomla authentication method

10 years agoReorganize and update api examples
Coleman Watts [Tue, 11 Feb 2014 05:15:40 +0000 (21:15 -0800)]
Reorganize and update api examples

10 years agoMerge pull request #2509 from totten/4.4-HR-268
Tim Otten [Wed, 12 Feb 2014 00:35:09 +0000 (16:35 -0800)]
Merge pull request #2509 from totten/4.4-HR-268

HR-268 - Activity API - Extract necessary bits so that we re-use in...

10 years agoMerge pull request #2511 from colemanw/4.4
colemanw [Wed, 12 Feb 2014 00:25:58 +0000 (16:25 -0800)]
Merge pull request #2511 from colemanw/4.4

CRM-14196 - Fix export of non-primary phone numbers

10 years agoCRM-14196 - Fix export of non-primary phone numbers
Coleman Watts [Wed, 12 Feb 2014 00:13:15 +0000 (16:13 -0800)]
CRM-14196 - Fix export of non-primary phone numbers

10 years agoHR-268 - Activity API - Extract necessary bits so that we re-use in alternative ...
Tim Otten [Tue, 11 Feb 2014 21:41:39 +0000 (13:41 -0800)]
HR-268 - Activity API - Extract necessary bits so that we re-use in alternative "get" implementation

10 years agoMerge pull request #2499 from mlutfy/4.4-crm14200
Dave Greenberg [Tue, 11 Feb 2014 20:10:00 +0000 (12:10 -0800)]
Merge pull request #2499 from mlutfy/4.4-crm14200

CRM-14200: Tell a friend i18n translation dialog/popups fix.

10 years agoMerge pull request #2501 from kurund/CRM-14175
Kurund Jalmi [Tue, 11 Feb 2014 19:22:33 +0000 (11:22 -0800)]
Merge pull request #2501 from kurund/CRM-14175

fixed activity count bug, CRM-14175

10 years agoMerge pull request #2508 from mlutfy/4.4-ts-pcp
Dave Greenberg [Tue, 11 Feb 2014 19:22:03 +0000 (11:22 -0800)]
Merge pull request #2508 from mlutfy/4.4-ts-pcp

CRM/Contribute/Form/Contribution/Main.php: Fix ts() usage for PCP string.
http://issues.civicrm.org/jira/browse/CRM-14205

10 years agoCRM/Contribute/Form/Contribution/Main.php: Fix ts() usage for PCP string.
Mathieu Lutfy [Tue, 11 Feb 2014 18:59:12 +0000 (13:59 -0500)]
CRM/Contribute/Form/Contribution/Main.php: Fix ts() usage for PCP string.

10 years agotemplates/CRM/Friend/Form/Friend.tpl: fix the thank_you_title/message field i18n.
Mathieu Lutfy [Tue, 11 Feb 2014 14:27:42 +0000 (09:27 -0500)]
templates/CRM/Friend/Form/Friend.tpl: fix the thank_you_title/message field i18n.

10 years agofixed activity count bug, CRM-14175
kurund [Tue, 11 Feb 2014 00:31:51 +0000 (16:31 -0800)]
fixed activity count bug, CRM-14175

----------------------------------------
* CRM-14175: activity tab on contact summary is super slow
  http://issues.civicrm.org/jira/browse/CRM-14175

10 years agoCRM-14200: Tell a friend i18n translation dialog/popups fix.
Mathieu Lutfy [Mon, 10 Feb 2014 22:48:56 +0000 (17:48 -0500)]
CRM-14200: Tell a friend i18n translation dialog/popups fix.

10 years agoMerge pull request #2494 from colemanw/4.4
colemanw [Sun, 9 Feb 2014 01:21:29 +0000 (17:21 -0800)]
Merge pull request #2494 from colemanw/4.4

Add missing metadata

10 years agoAdd missing metadata
Coleman Watts [Sun, 9 Feb 2014 01:16:30 +0000 (17:16 -0800)]
Add missing metadata

10 years agoIM.xml - Add missing metadata
Coleman Watts [Fri, 7 Feb 2014 21:49:41 +0000 (13:49 -0800)]
IM.xml - Add missing metadata

10 years agoUpdate version to 4.4.5
CiviCRM [Fri, 7 Feb 2014 03:34:59 +0000 (19:34 -0800)]
Update version to 4.4.5

10 years agoMerge pull request #2466 from totten/4.4-dashboard-api-fix
Kurund Jalmi [Fri, 7 Feb 2014 03:21:58 +0000 (19:21 -0800)]
Merge pull request #2466 from totten/4.4-dashboard-api-fix

CRM-13889 - api_v3_DashboardContact - Fix validation

10 years agoMerge pull request #2489 from totten/4.4-restrictBrowsing-defensive
Tim Otten [Fri, 7 Feb 2014 03:20:06 +0000 (19:20 -0800)]
Merge pull request #2489 from totten/4.4-restrictBrowsing-defensive

CRM-14092 - restrictBrowsing - Defensive programming

10 years agoMerge pull request #2490 from colemanw/4.4
colemanw [Fri, 7 Feb 2014 01:20:31 +0000 (17:20 -0800)]
Merge pull request #2490 from colemanw/4.4

CRM-10466 - Ensure token hooks are always called

10 years agoCRM-10466 - Ensure token hooks are always called
Coleman Watts [Fri, 7 Feb 2014 01:14:23 +0000 (17:14 -0800)]
CRM-10466 - Ensure token hooks are always called

10 years agoCRM-14092 - isBrowsable - Defensive programming
Tim Otten [Fri, 7 Feb 2014 00:42:00 +0000 (16:42 -0800)]
CRM-14092 - isBrowsable - Defensive programming

10 years agoCRM-14092 - restrictBrowsing - Defensive programming
Tim Otten [Thu, 6 Feb 2014 23:19:03 +0000 (15:19 -0800)]
CRM-14092 - restrictBrowsing - Defensive programming

It's OK if restrictBrowsing fails -- because we'll still perform a
behavioral test and alert admin if browsing is enabled.

10 years agoRevert "Update version to 4.4.5"
Tim Otten [Thu, 6 Feb 2014 23:18:39 +0000 (15:18 -0800)]
Revert "Update version to 4.4.5"

This reverts commit 94e9b0c54b018c68691cd715aa0f1978896b53d5.

10 years agoUpdate version to 4.4.5
CiviCRM [Thu, 6 Feb 2014 22:57:39 +0000 (14:57 -0800)]
Update version to 4.4.5

10 years agoMerge pull request #2488 from colemanw/4.4
Tim Otten [Thu, 6 Feb 2014 19:21:20 +0000 (11:21 -0800)]
Merge pull request #2488 from colemanw/4.4

Remove unnecessary tpl

10 years agoMerge pull request #2485 from totten/4.4-security-cleanup
colemanw [Thu, 6 Feb 2014 18:26:25 +0000 (10:26 -0800)]
Merge pull request #2485 from totten/4.4-security-cleanup

CRM-14091, CRM-14092 - More caution

10 years agoRemove unused template
Coleman Watts [Thu, 6 Feb 2014 18:17:13 +0000 (10:17 -0800)]
Remove unused template

10 years agoCRM-14091, CRM-14092 - restrictAccess - Avoid unnecessary writes
Tim Otten [Thu, 6 Feb 2014 16:52:50 +0000 (08:52 -0800)]
CRM-14091, CRM-14092 - restrictAccess - Avoid unnecessary writes

10 years agoMerge pull request #2484 from lcdservices/CRM-14179
Tim Otten [Thu, 6 Feb 2014 16:40:29 +0000 (08:40 -0800)]
Merge pull request #2484 from lcdservices/CRM-14179

CRM-14179 fix word replacement existing rows count

10 years agoCRM-14091, CRM-14092 - Defensive programming
Tim Otten [Thu, 6 Feb 2014 16:35:55 +0000 (08:35 -0800)]
CRM-14091, CRM-14092 - Defensive programming

10 years agoCRM-14179 fix word replacement existing rows count
Brian Shaughnessy [Thu, 6 Feb 2014 16:33:18 +0000 (11:33 -0500)]
CRM-14179 fix word replacement existing rows count

10 years agoMerge pull request #2483 from totten/4.4-security-warning
Tim Otten [Thu, 6 Feb 2014 16:00:30 +0000 (08:00 -0800)]
Merge pull request #2483 from totten/4.4-security-warning

CRM-14092 - CRM_Utils_Check_Security::isBrowseable - Fix warning

10 years agoCRM-14092 - CRM_Utils_Check_Security::isBrowseable - Fix warning
Tim Otten [Thu, 6 Feb 2014 15:58:44 +0000 (07:58 -0800)]
CRM-14092 - CRM_Utils_Check_Security::isBrowseable - Fix warning

We don't care if there's an HTTP 404 when checking for browsability --
because 404 is another of saying "not browseable!"

10 years agoMerge pull request #2480 from kurund/activity-optimization
Kurund Jalmi [Thu, 6 Feb 2014 01:09:58 +0000 (17:09 -0800)]
Merge pull request #2480 from kurund/activity-optimization

fixes CRM-14175, ignore bulk activities while fetching contact names for...

10 years agofixes CRM-14175, ignore bulk activities while fetching contact names for activities
kurund [Thu, 6 Feb 2014 00:40:52 +0000 (16:40 -0800)]
fixes CRM-14175, ignore bulk activities while fetching contact names for activities

----------------------------------------
* CRM-14175: activity tab on contact summary is super slow
  http://issues.civicrm.org/jira/browse/CRM-14175

10 years agoMerge pull request #2461 from eileenmcnaughton/CRM-14137-2
colemanw [Thu, 6 Feb 2014 00:23:10 +0000 (16:23 -0800)]
Merge pull request #2461 from eileenmcnaughton/CRM-14137-2

CRM-14137 - further PR on returning report_template metadata in getrows api action

10 years agoMerge pull request #2478 from totten/4.4-CRM-14092-b
Tim Otten [Wed, 5 Feb 2014 21:42:19 +0000 (13:42 -0800)]
Merge pull request #2478 from totten/4.4-CRM-14092-b

CRM-14092 - Restrict browsing of imageUploadDir via imageUploadURL

10 years agoCRM-14092 - Restrict browsing of imageUploadDir via imageUploadURL
Tim Otten [Wed, 5 Feb 2014 21:36:08 +0000 (13:36 -0800)]
CRM-14092 - Restrict browsing of imageUploadDir via imageUploadURL

Previously, it attempted to restrict browsing of uploadDir and
configAndLogDir.  However, this is extraneoous because we have other checks
to ensure that those directories are inaccessible.  However, imageUploadDir
is different because we want to expose its file -- we just don't want to
expose a listing of them.

This commit also breaks out checkDirectoriesAreNotBrowseable() into
three functions.

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

10 years agoMerge pull request #2475 from totten/4.4-CRM-14092
Tim Otten [Wed, 5 Feb 2014 20:39:23 +0000 (12:39 -0800)]
Merge pull request #2475 from totten/4.4-CRM-14092

CRM-14091, CRM-14092

10 years agoMerge pull request #2476 from davecivicrm/CRM-14169b
dlobo [Wed, 5 Feb 2014 19:49:48 +0000 (11:49 -0800)]
Merge pull request #2476 from davecivicrm/CRM-14169b

Crm 14169b

10 years agoCRM-14169 - Reverted the change to require access CiviCRM since creating an event...
Dave Greenberg [Wed, 5 Feb 2014 19:46:59 +0000 (11:46 -0800)]
CRM-14169 - Reverted the change to require access CiviCRM since creating an event does work for auth user with access CiviEvent and there are use cases for this. We will add a config warning separately if inappropriate perms have been granted to anonymous users. Removed access CiviCRM requirement from ajax.locBlock since that breaks the Location tab in events for users who can otherwise properly create an event.

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

10 years agoRevert "CRM-14169 - require access CiviCRM permission in addtion to access CiviEvent...
Dave Greenberg [Wed, 5 Feb 2014 19:38:46 +0000 (11:38 -0800)]
Revert "CRM-14169 - require access CiviCRM permission in addtion to access CiviEvent permission in order to create a new event and in order to access Manage Events page (event/manage path)."

This reverts commit be87f5a989291fc7f2d5f247daa26375664bb9ec.