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"
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
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
Tim Otten [Fri, 21 Feb 2014 22:10:18 +0000 (14:10 -0800)]
CRM_Utils_SQL_Select - Backport
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
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
Tim Otten [Thu, 20 Feb 2014 23:39:01 +0000 (15:39 -0800)]
GenCode - Ensure separate temp dirs on multi-user system
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"
Tim Otten [Thu, 20 Feb 2014 01:58:13 +0000 (17:58 -0800)]
HR-216 - Setting.API - Ignore "options"
Tim Otten [Thu, 20 Feb 2014 00:48:16 +0000 (16:48 -0800)]
CRM-14253 - CRM_Utils_REST - Read $_GET/$_POST but not $_COOKIE
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
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
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.
Mathieu Lutfy [Tue, 18 Feb 2014 21:03:36 +0000 (16:03 -0500)]
CRM-14243: 'ts' fix for file upload description.
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
yashodha [Tue, 18 Feb 2014 12:11:52 +0000 (17:41 +0530)]
HR-231 : support for Report menu items based on grouping
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.
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.
colemanw [Thu, 13 Feb 2014 02:33:52 +0000 (18:33 -0800)]
Merge pull request #2517 from eileenmcnaughton/examples
Examples
Eileen [Thu, 13 Feb 2014 00:55:49 +0000 (00:55 +0000)]
updated examples
dlobo [Wed, 12 Feb 2014 14:57:25 +0000 (06:57 -0800)]
Merge pull request #2512 from lcdservices/CRM-14208
CRM-14208
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
Brian Shaughnessy [Wed, 12 Feb 2014 03:37:35 +0000 (22:37 -0500)]
CRM-14208 support new joomla authentication method
Coleman Watts [Tue, 11 Feb 2014 05:15:40 +0000 (21:15 -0800)]
Reorganize and update api examples
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...
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
Coleman Watts [Wed, 12 Feb 2014 00:13:15 +0000 (16:13 -0800)]
CRM-14196 - Fix export of non-primary phone numbers
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
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.
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
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
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.
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.
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
Mathieu Lutfy [Mon, 10 Feb 2014 22:48:56 +0000 (17:48 -0500)]
CRM-14200: Tell a friend i18n translation dialog/popups fix.
colemanw [Sun, 9 Feb 2014 01:21:29 +0000 (17:21 -0800)]
Merge pull request #2494 from colemanw/4.4
Add missing metadata
Coleman Watts [Sun, 9 Feb 2014 01:16:30 +0000 (17:16 -0800)]
Add missing metadata
Coleman Watts [Fri, 7 Feb 2014 21:49:41 +0000 (13:49 -0800)]
IM.xml - Add missing metadata
CiviCRM [Fri, 7 Feb 2014 03:34:59 +0000 (19:34 -0800)]
Update version to 4.4.5
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
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
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
Coleman Watts [Fri, 7 Feb 2014 01:14:23 +0000 (17:14 -0800)]
CRM-10466 - Ensure token hooks are always called
Tim Otten [Fri, 7 Feb 2014 00:42:00 +0000 (16:42 -0800)]
CRM-14092 - isBrowsable - 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.
Tim Otten [Thu, 6 Feb 2014 23:18:39 +0000 (15:18 -0800)]
Revert "Update version to 4.4.5"
This reverts commit
94e9b0c54b018c68691cd715aa0f1978896b53d5.
CiviCRM [Thu, 6 Feb 2014 22:57:39 +0000 (14:57 -0800)]
Update version to 4.4.5
Tim Otten [Thu, 6 Feb 2014 19:21:20 +0000 (11:21 -0800)]
Merge pull request #2488 from colemanw/4.4
Remove unnecessary tpl
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
Coleman Watts [Thu, 6 Feb 2014 18:17:13 +0000 (10:17 -0800)]
Remove unused template
Tim Otten [Thu, 6 Feb 2014 16:52:50 +0000 (08:52 -0800)]
CRM-14091, CRM-14092 - restrictAccess - Avoid unnecessary writes
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
Tim Otten [Thu, 6 Feb 2014 16:35:55 +0000 (08:35 -0800)]
CRM-14091, CRM-14092 - Defensive programming
Brian Shaughnessy [Thu, 6 Feb 2014 16:33:18 +0000 (11:33 -0500)]
CRM-14179 fix word replacement existing rows count
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
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!"
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...
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
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
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
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
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
dlobo [Wed, 5 Feb 2014 19:49:48 +0000 (11:49 -0800)]
Merge pull request #2476 from davecivicrm/CRM-14169b
Crm 14169b
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
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.
Tim Otten [Wed, 5 Feb 2014 19:25:32 +0000 (11:25 -0800)]
CRM-14091 - Change URLs for doc links
----------------------------------------
* CRM-14091:
http://issues.civicrm.org/jira/browse/CRM-14091
Tim Otten [Wed, 5 Feb 2014 18:55:38 +0000 (10:55 -0800)]
CRM_Utils_Check_Security - Autoformat
Tim Otten [Wed, 5 Feb 2014 18:54:22 +0000 (10:54 -0800)]
More consistently restrict access to template, config/log, and upload dirs.
colemanw [Wed, 5 Feb 2014 18:40:11 +0000 (10:40 -0800)]
Merge pull request #2454 from eileenmcnaughton/CRM-14159
CRM-14159 API Add generic options['metadata'] = labels functionality
colemanw [Wed, 5 Feb 2014 18:39:55 +0000 (10:39 -0800)]
test cleanup
colemanw [Wed, 5 Feb 2014 18:38:26 +0000 (10:38 -0800)]
code/comment cleanup
Coleman Watts [Wed, 5 Feb 2014 18:22:39 +0000 (10:22 -0800)]
Test fixes
Tim Otten [Wed, 5 Feb 2014 18:20:21 +0000 (10:20 -0800)]
CRM_Utils_Check_Security - Remove hard dependency on CRM_Core_Session::setStatus
Tim Otten [Wed, 5 Feb 2014 18:04:01 +0000 (10:04 -0800)]
CRM_Utils_Check_Security - Split allChecks in two:
* checkAll - Simply aggregates the other checks
* showPeriodicAlerts - Application logic for when/how to run check
Tim Otten [Wed, 5 Feb 2014 17:59:48 +0000 (09:59 -0800)]
CRM_Utils_Check_Security - Make getFilePathMarker non-static
If we write tests for this, it will be harder to run with different markers
if the function is static.
Tim Otten [Wed, 5 Feb 2014 17:58:26 +0000 (09:58 -0800)]
CRM_Utils_Check_Security - Change case of function names
dlobo [Wed, 5 Feb 2014 17:53:44 +0000 (09:53 -0800)]
Merge pull request #2471 from eileenmcnaughton/CRM-14148
CRM-14148 cope with half hour timezones
Chris Burgess [Thu, 30 Jan 2014 11:12:26 +0000 (00:12 +1300)]
CRM-14092. Generate blank index.html files in public directories.
Conflicts:
CRM/Utils/Check/Security.php
Chris Burgess [Tue, 4 Feb 2014 23:08:50 +0000 (12:08 +1300)]
Account for differing path structures in different CMS backends.
Chris Burgess [Fri, 31 Jan 2014 02:35:31 +0000 (15:35 +1300)]
CRM-14091. Run checks at most once a day for each user with administrative permissions.
Chris Burgess [Thu, 30 Jan 2014 10:42:28 +0000 (23:42 +1300)]
CRM-14091. Look for obvious misconfigurations and warn.
Kurund Jalmi [Wed, 5 Feb 2014 17:32:40 +0000 (09:32 -0800)]
Merge pull request #2463 from yashodha/CRM-14099
CRM-14099 : added support for months in scheduled reminder
Kurund Jalmi [Wed, 5 Feb 2014 17:31:38 +0000 (09:31 -0800)]
Merge pull request #2464 from eileenmcnaughton/test-fix
adjust test for grammar improvement
colemanw [Wed, 5 Feb 2014 04:02:15 +0000 (20:02 -0800)]
Merge pull request #2468 from kurund/CRM-14162
CRM-14162
Dave Greenberg [Wed, 5 Feb 2014 01:48:13 +0000 (17:48 -0800)]
Merge pull request #2472 from kurund/CRM-14167
add index for civicrm_activity_contact
dlobo [Wed, 5 Feb 2014 01:23:33 +0000 (17:23 -0800)]
Merge pull request #2470 from eileenmcnaughton/CRM-13967
CRM-13967 allow additional of anonymous tokens for logged out users when...
Eileen McNaughton [Wed, 5 Feb 2014 01:22:43 +0000 (14:22 +1300)]
CRM-14148 cope with half hour timezones
----------------------------------------
* CRM-14148: Timezones with partial hours cause core crash
http://issues.civicrm.org/jira/browse/CRM-14148
kurund [Wed, 5 Feb 2014 01:19:37 +0000 (17:19 -0800)]
add index for civicrm_activity_contact
Eileen McNaughton [Wed, 5 Feb 2014 01:15:59 +0000 (14:15 +1300)]
CRM-13967 allow additional of anonymous tokens for logged out users when viewing mailing
----------------------------------------
* CRM-13967: Public Mailing View page doesn't render hook tokens
http://issues.civicrm.org/jira/browse/CRM-13967
kurund [Wed, 5 Feb 2014 00:34:04 +0000 (16:34 -0800)]
fixes for CRM-14162, switch labels
----------------------------------------
* CRM-14162: Inconsistencies and test failures with gender, prefix, suffix
http://issues.civicrm.org/jira/browse/CRM-14162
kurund [Tue, 4 Feb 2014 23:52:35 +0000 (15:52 -0800)]
Revert "CRM-13996 - Search views - hack to fix prefix, gender, suffix"
This reverts commit
e30e8c3cd8ea9e63d01902f9141e774988db8fe7.
Kurund Jalmi [Tue, 4 Feb 2014 23:33:29 +0000 (15:33 -0800)]
Merge pull request #2467 from davecivicrm/CRM-14169
CRM-14169 - require access CiviCRM permission in addtion to access CiviE...
Dave Greenberg [Tue, 4 Feb 2014 23:29:10 +0000 (15:29 -0800)]
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).
----------------------------------------
* CRM-14169:
http://issues.civicrm.org/jira/browse/CRM-14169
Coleman Watts [Tue, 4 Feb 2014 23:14:16 +0000 (15:14 -0800)]
CRM-14121 - Apply patch by Ben Wilhelm
Tim Otten [Tue, 4 Feb 2014 23:02:51 +0000 (15:02 -0800)]
CRM-13889 - api_v3_DashboardContact - Fix validation
The validation of dashboard_id implicitly involved a permission-check. This
permission-check would be wrong in some cases (eg running a drush script
without any particular user), but it could be right in other cases (eg
issuing an AJAX call).
Eileen McNaughton [Tue, 4 Feb 2014 20:00:30 +0000 (09:00 +1300)]
adjust test for grammar improvement
Tim Otten [Tue, 4 Feb 2014 16:57:21 +0000 (08:57 -0800)]
Merge pull request #2462 from NileemaJadhav/HR-253
--HR-253 Activity.get API - Filter by target_contact_id
Yashodha Chaku [Tue, 4 Feb 2014 16:24:14 +0000 (08:24 -0800)]
Merge pull request #2392 from eileenmcnaughton/CRM-14108
CRM-14108 add scheduled reminder id as a params on scheduled job
Nileema [Tue, 4 Feb 2014 13:30:05 +0000 (19:00 +0530)]
--HR-253 Activity.get API - Filter by target_contact_id
yashodha [Tue, 4 Feb 2014 11:25:03 +0000 (16:55 +0530)]
CRM-14099 : added support for months in scheduled reminder