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

10 years agoCRM-14091 - Change URLs for doc links
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

10 years agoCRM_Utils_Check_Security - Autoformat
Tim Otten [Wed, 5 Feb 2014 18:55:38 +0000 (10:55 -0800)]
CRM_Utils_Check_Security - Autoformat

10 years agoMore consistently restrict access to template, config/log, and upload dirs.
Tim Otten [Wed, 5 Feb 2014 18:54:22 +0000 (10:54 -0800)]
More consistently restrict access to template, config/log, and upload dirs.

10 years agoMerge pull request #2454 from eileenmcnaughton/CRM-14159
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

10 years agotest cleanup
colemanw [Wed, 5 Feb 2014 18:39:55 +0000 (10:39 -0800)]
test cleanup

10 years agocode/comment cleanup
colemanw [Wed, 5 Feb 2014 18:38:26 +0000 (10:38 -0800)]
code/comment cleanup

10 years agoTest fixes
Coleman Watts [Wed, 5 Feb 2014 18:22:39 +0000 (10:22 -0800)]
Test fixes

10 years agoCRM_Utils_Check_Security - Remove hard dependency on CRM_Core_Session::setStatus
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

10 years agoCRM_Utils_Check_Security - Split allChecks in two:
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

10 years agoCRM_Utils_Check_Security - Make getFilePathMarker non-static
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.

10 years agoCRM_Utils_Check_Security - Change case of function names
Tim Otten [Wed, 5 Feb 2014 17:58:26 +0000 (09:58 -0800)]
CRM_Utils_Check_Security - Change case of function names

10 years agoMerge pull request #2471 from eileenmcnaughton/CRM-14148
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

10 years agoCRM-14092. Generate blank index.html files in public directories.
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

10 years agoAccount for differing path structures in different CMS backends.
Chris Burgess [Tue, 4 Feb 2014 23:08:50 +0000 (12:08 +1300)]
Account for differing path structures in different CMS backends.

10 years agoCRM-14091. Run checks at most once a day for each user with administrative permissions.
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.

10 years agoCRM-14091. Look for obvious misconfigurations and warn.
Chris Burgess [Thu, 30 Jan 2014 10:42:28 +0000 (23:42 +1300)]
CRM-14091. Look for obvious misconfigurations and warn.

10 years agoMerge pull request #2463 from yashodha/CRM-14099
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

10 years agoMerge pull request #2464 from eileenmcnaughton/test-fix
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

10 years agoMerge pull request #2468 from kurund/CRM-14162
colemanw [Wed, 5 Feb 2014 04:02:15 +0000 (20:02 -0800)]
Merge pull request #2468 from kurund/CRM-14162

CRM-14162

10 years agoMerge pull request #2472 from kurund/CRM-14167
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

10 years agoMerge pull request #2470 from eileenmcnaughton/CRM-13967
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...

10 years agoCRM-14148 cope with half hour timezones
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

10 years agoadd index for civicrm_activity_contact
kurund [Wed, 5 Feb 2014 01:19:37 +0000 (17:19 -0800)]
add index for civicrm_activity_contact

10 years agoCRM-13967 allow additional of anonymous tokens for logged out users when viewing...
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

10 years agofixes for CRM-14162, switch labels
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

10 years agoRevert "CRM-13996 - Search views - hack to fix prefix, gender, suffix"
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.

10 years agoMerge pull request #2467 from davecivicrm/CRM-14169
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...

10 years agoCRM-14169 - require access CiviCRM permission in addtion to access CiviEvent permissi...
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

10 years agoCRM-14121 - Apply patch by Ben Wilhelm
Coleman Watts [Tue, 4 Feb 2014 23:14:16 +0000 (15:14 -0800)]
CRM-14121 - Apply patch by Ben Wilhelm

10 years agoCRM-13889 - api_v3_DashboardContact - Fix validation
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).

10 years agoadjust test for grammar improvement
Eileen McNaughton [Tue, 4 Feb 2014 20:00:30 +0000 (09:00 +1300)]
adjust test for grammar improvement

10 years agoMerge pull request #2462 from NileemaJadhav/HR-253
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

10 years agoMerge pull request #2392 from eileenmcnaughton/CRM-14108
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

10 years ago--HR-253 Activity.get API - Filter by target_contact_id
Nileema [Tue, 4 Feb 2014 13:30:05 +0000 (19:00 +0530)]
--HR-253  Activity.get API - Filter by target_contact_id

10 years agoCRM-14099 : added support for months in scheduled reminder
yashodha [Tue, 4 Feb 2014 11:25:03 +0000 (16:55 +0530)]
CRM-14099 : added support for months in scheduled reminder

10 years agoMerge pull request #2459 from deepak-srivastava/CRM-14128
deepak-srivastava [Tue, 4 Feb 2014 08:43:09 +0000 (00:43 -0800)]
Merge pull request #2459 from deepak-srivastava/CRM-14128

CRM-14128 - make mhas available, make where() generic

10 years agoFix e-notice on Case/Demographics report so it does not need to be excluded from...
Eileen McNaughton [Tue, 4 Feb 2014 01:42:40 +0000 (14:42 +1300)]
Fix e-notice on Case/Demographics report so it does not need to be excluded from test

10 years agoCRM-14137 alter report metadata in api result to be keyed as 'metadata' per discussions
Eileen McNaughton [Tue, 4 Feb 2014 06:51:58 +0000 (19:51 +1300)]
CRM-14137 alter report metadata in api result to be keyed as 'metadata' per discussions

----------------------------------------
* CRM-14137: Report_template.getrows api - allow retrieval of metadata at the top level
  http://issues.civicrm.org/jira/browse/CRM-14137

10 years agoMerge pull request #2419 from eileenmcnaughton/CRM-14137
deepak-srivastava [Tue, 4 Feb 2014 06:39:27 +0000 (22:39 -0800)]
Merge pull request #2419 from eileenmcnaughton/CRM-14137

CRM-14137 , CRM-14138 , report_template.getrows api tidy up

10 years agoCRM-14128 - change to mhas
Deepak Srivastava [Tue, 4 Feb 2014 06:19:33 +0000 (11:49 +0530)]
CRM-14128 - change to mhas

----------------------------------------
* CRM-14128: Participant Count Report offers 'is not role' criteria - but treats it the same as 'is role'
  http://issues.civicrm.org/jira/browse/CRM-14128

10 years agoMerge pull request #2456 from eileenmcnaughton/test-fix
Kurund Jalmi [Tue, 4 Feb 2014 00:57:31 +0000 (16:57 -0800)]
Merge pull request #2456 from eileenmcnaughton/test-fix

test -fix on test set-up (group contact)

10 years agotest -fix on test set-up (group contact)
Eileen McNaughton [Tue, 4 Feb 2014 00:53:56 +0000 (13:53 +1300)]
test -fix on test set-up (group contact)

10 years agoMerge pull request #2455 from davecivicrm/CRM-14161
Kurund Jalmi [Tue, 4 Feb 2014 00:46:33 +0000 (16:46 -0800)]
Merge pull request #2455 from davecivicrm/CRM-14161

CRM-14161 - adjust width and height of multi-select widgets on New Maili...

10 years agoCRM-14161 - adjust width and height of multi-select widgets on New Mailing form to...
Dave Greenberg [Tue, 4 Feb 2014 00:40:35 +0000 (16:40 -0800)]
CRM-14161 - adjust width and height of multi-select widgets on New Mailing form to handle long names.

----------------------------------------
* CRM-14161: New Mailing form - adjust height and width of multi-select fields to better accommodate long names
  http://issues.civicrm.org/jira/browse/CRM-14161

10 years agoCRM-14159 API Add generic options['metadata'] = labels functionality
Eileen [Thu, 23 Jan 2014 16:16:04 +0000 (16:16 +0000)]
CRM-14159 API Add generic options['metadata'] = labels functionality

----------------------------------------
* CRM-14159: Add ability to return labels as top level metadata
  http://issues.civicrm.org/jira/browse/CRM-14159

10 years agoMerge pull request #2434 from mlutfy/crm14147-4.4
Kurund Jalmi [Mon, 3 Feb 2014 22:01:24 +0000 (14:01 -0800)]
Merge pull request #2434 from mlutfy/crm14147-4.4

CRM-14147: Fix 4.1 to 4.2 upgrade in non-english (ex: french, where the profileTitle may have an apostrophe in it.

10 years agoMerge pull request #2453 from davecivicrm/CRM-14047b
Dave Greenberg [Mon, 3 Feb 2014 21:05:29 +0000 (13:05 -0800)]
Merge pull request #2453 from davecivicrm/CRM-14047b

CRM-14047 - for this participant should only be appended when additional...

10 years agoCRM-14047 - for this participant should only be appended when additionalParticipants...
Dave Greenberg [Mon, 3 Feb 2014 21:04:09 +0000 (13:04 -0800)]
CRM-14047 - for this participant should only be appended when additionalParticipants flag is true - otherwise it is confusing.

----------------------------------------
* 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 agoMerge pull request #2449 from eileenmcnaughton/CRM-14155
Dave Greenberg [Mon, 3 Feb 2014 20:59:09 +0000 (12:59 -0800)]
Merge pull request #2449 from eileenmcnaughton/CRM-14155

CRM-14155 Participant Reports - add event custom fields as fields & filt...

10 years agoMerge pull request #2436 from eileenmcnaughton/test-fix
Kurund Jalmi [Mon, 3 Feb 2014 20:04:26 +0000 (12:04 -0800)]
Merge pull request #2436 from eileenmcnaughton/test-fix

Test fix

10 years agoMerge pull request #2444 from eileenmcnaughton/CRM-14151
Kurund Jalmi [Mon, 3 Feb 2014 19:32:08 +0000 (11:32 -0800)]
Merge pull request #2444 from eileenmcnaughton/CRM-14151

CRM-14151 add hacky-handling to receive date like other date fields in c...

10 years agoMerge pull request #2446 from pradpnayak/CRM-13968
Dave Greenberg [Mon, 3 Feb 2014 03:45:47 +0000 (19:45 -0800)]
Merge pull request #2446 from pradpnayak/CRM-13968

Crm 13968

10 years agoCRM-14156 Participant Reports add group filter & tag filters
Eileen [Mon, 3 Feb 2014 01:19:10 +0000 (14:19 +1300)]
CRM-14156 Participant Reports add group filter & tag filters

10 years agoCRM-14155 Participant Reports - add event custom fields as fields & filters
Eileen [Mon, 3 Feb 2014 01:02:14 +0000 (14:02 +1300)]
CRM-14155 Participant Reports - add event custom fields as fields & filters

10 years ago-- CRM-13968, added upgrade code to handle errorneous data with incorrect values
Pradeep Nayak [Sat, 1 Feb 2014 18:16:27 +0000 (23:46 +0530)]
-- CRM-13968, added upgrade code to handle errorneous data with incorrect values
for to_financial_account_id and status_id

----------------------------------------
* CRM-13968: Contributions with "In Progress" status can't be edited and saved
  http://issues.civicrm.org/jira/browse/CRM-13968

10 years ago-- CRM-13968, Added code to handle transaction for In progress contribution status
Pradeep Nayak [Sat, 1 Feb 2014 18:15:03 +0000 (23:45 +0530)]
-- CRM-13968, Added code to handle transaction for In progress contribution status

----------------------------------------
* CRM-13968: Contributions with "In Progress" status can't be edited and saved
  http://issues.civicrm.org/jira/browse/CRM-13968

10 years agoCRM-13968, handled In-progress to Completed contribution status change
Pradeep Nayak [Sat, 1 Feb 2014 18:11:31 +0000 (23:41 +0530)]
CRM-13968, handled In-progress to Completed contribution status change

----------------------------------------
* CRM-13968: Contributions with "In Progress" status can't be edited and saved
  http://issues.civicrm.org/jira/browse/CRM-13968

10 years agoMerge pull request #2445 from colemanw/4.4
colemanw [Fri, 31 Jan 2014 22:44:19 +0000 (14:44 -0800)]
Merge pull request #2445 from colemanw/4.4

Fix membership join date from being overwritten by api