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

10 years agoFix membership join date from being overwritten by api
Coleman Watts [Fri, 31 Jan 2014 22:35:56 +0000 (14:35 -0800)]
Fix membership join date from being overwritten by api

10 years agoCRM-14151 add hacky-handling to receive date like other date fields in completetransa...
Eileen McNaughton [Fri, 31 Jan 2014 20:12:42 +0000 (09:12 +1300)]
CRM-14151 add hacky-handling to receive date like other date fields in completetransaction function to mitigate DAO->find() followed by DAO->save() fatalling on date fields .. sometimes

----------------------------------------
* CRM-14151: BaseIPN fails when receipt_date is set
  http://issues.civicrm.org/jira/browse/CRM-14151

10 years agoMerge pull request #2443 from davecivicrm/CRM-14149
Dave Greenberg [Fri, 31 Jan 2014 19:15:43 +0000 (11:15 -0800)]
Merge pull request #2443 from davecivicrm/CRM-14149

CRM-14149 - fix bad markup in Job.tpl

10 years agoCRM-14149 - fix bad markup in Job.tpl
Dave Greenberg [Fri, 31 Jan 2014 19:14:56 +0000 (11:14 -0800)]
CRM-14149 - fix bad markup in Job.tpl

----------------------------------------
* CRM-14149: Bad tags on Add Scheduled Job page break page layout
  http://issues.civicrm.org/jira/browse/CRM-14149

10 years agoMerge pull request #2442 from davecivicrm/CRM-14146
Dave Greenberg [Fri, 31 Jan 2014 18:57:35 +0000 (10:57 -0800)]
Merge pull request #2442 from davecivicrm/CRM-14146

CRM-14146 - conditionally change contribution button text  based on whet...

10 years agoCRM-14146 - conditionally change contribution button text based on whether confirm...
Dave Greenberg [Fri, 31 Jan 2014 18:55:25 +0000 (10:55 -0800)]
CRM-14146 - conditionally change contribution button text  based on whether confirm page is skipped.

----------------------------------------
* CRM-14146: Button on contribution page should be "Confirm Contribution"
  http://issues.civicrm.org/jira/browse/CRM-14146

10 years agoMerge pull request #2440 from dlobo/CRM-14150
dlobo [Fri, 31 Jan 2014 17:42:39 +0000 (09:42 -0800)]
Merge pull request #2440 from dlobo/CRM-14150

CRM-14150 - Auto reply fails

10 years agoCRM-14150 - Auto reply fails
Donald A. Lobo [Fri, 31 Jan 2014 17:41:33 +0000 (09:41 -0800)]
CRM-14150 - Auto reply fails

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

10 years agoReport/Form as deepaks pointed out getTitle exists in parent class
Eileen McNaughton [Fri, 31 Jan 2014 09:59:55 +0000 (22:59 +1300)]
Report/Form as deepaks pointed out getTitle exists in parent class

10 years agoMerge branch '4.4' into CRM-14128
Deepak Srivastava [Fri, 31 Jan 2014 07:52:18 +0000 (13:22 +0530)]
Merge branch '4.4' into CRM-14128

10 years agoCRM-14128 - Participant Count Report offers 'is not role' criteria - but treats it...
Deepak Srivastava [Fri, 31 Jan 2014 07:37:59 +0000 (13:07 +0530)]
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 #2438 from deepak-srivastava/CRM-14129
deepak-srivastava [Fri, 31 Jan 2014 07:30:38 +0000 (23:30 -0800)]
Merge pull request #2438 from deepak-srivastava/CRM-14129

CRM-14129 - Core reports - passing mhas as a URL criteria is ignored

10 years agotest suite, one more fn to change groupCreate signature on
Eileen McNaughton [Fri, 31 Jan 2014 02:15:51 +0000 (15:15 +1300)]
test suite, one more fn to change groupCreate signature on

10 years agoCRM-14139 ajax grouplist call - fixes notices on non-static functions
Eileen McNaughton [Tue, 28 Jan 2014 01:23:22 +0000 (14:23 +1300)]
CRM-14139 ajax grouplist call - fixes notices on non-static functions

----------------------------------------
* CRM-14139: Static methods called non-statically
  http://issues.civicrm.org/jira/browse/CRM-14139

10 years agoCRM-14147: Fix 4.1 to 4.2 upgrade in non-english (ex: french, where the profileTitle...
Mathieu Lutfy [Thu, 30 Jan 2014 21:07:16 +0000 (16:07 -0500)]
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 agoCRM-14129 - Core reports - passing mhas as a URL criteria is ignored
Deepak Srivastava [Thu, 30 Jan 2014 08:31:38 +0000 (14:01 +0530)]
CRM-14129 - Core reports - passing mhas as a URL criteria is ignored

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

10 years agoMerge pull request #2429 from dlobo/CRM-14085
dlobo [Wed, 29 Jan 2014 22:12:17 +0000 (14:12 -0800)]
Merge pull request #2429 from dlobo/CRM-14085

CRM-14085 - wrong syntax on inner join for contribution report

10 years agoCRM-14085 - wrong syntax on inner join for contribution report
Donald A. Lobo [Wed, 29 Jan 2014 22:11:24 +0000 (14:11 -0800)]
CRM-14085 - wrong syntax on inner join for contribution report

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

10 years agoMerge pull request #2428 from dlobo/CRM-14101
dlobo [Wed, 29 Jan 2014 22:09:20 +0000 (14:09 -0800)]
Merge pull request #2428 from dlobo/CRM-14101

CRM-14101 - Unauthenticated/anonymous users can register for events even when Drupal permissions should stop them

10 years agoCRM-14101 - Unauthenticated/anonymous users can register for events even when Drupal...
Donald A. Lobo [Wed, 29 Jan 2014 22:07:47 +0000 (14:07 -0800)]
CRM-14101 - Unauthenticated/anonymous users can register for events even when Drupal permissions should stop them

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

10 years agoMerge pull request #2424 from eileenmcnaughton/test-fixes
dlobo [Wed, 29 Jan 2014 21:46:10 +0000 (13:46 -0800)]
Merge pull request #2424 from eileenmcnaughton/test-fixes

test suite - fix signature on GroupCreate call

10 years agoMerge pull request #2425 from dlobo/CRM-14130
dlobo [Wed, 29 Jan 2014 21:43:40 +0000 (13:43 -0800)]
Merge pull request #2425 from dlobo/CRM-14130

CRM-14130 - Undefined property: CRM_Core_DAO...reply.php

10 years agoMerge pull request #2426 from davecivicrm/CRM-14143
colemanw [Wed, 29 Jan 2014 01:57:35 +0000 (17:57 -0800)]
Merge pull request #2426 from davecivicrm/CRM-14143

CRM-14143 - Fix group selector display when showOrgInfo is true - multi-...

10 years agoCRM-14143 - Fix group selector display when showOrgInfo is true - multi-site enabled.
Dave Greenberg [Wed, 29 Jan 2014 01:44:38 +0000 (17:44 -0800)]
CRM-14143 - Fix group selector display when showOrgInfo is true - multi-site enabled.

----------------------------------------
* CRM-14143: Sub-group display off when multi-site enabled
  http://issues.civicrm.org/jira/browse/CRM-14143

10 years agoCRM-14130 - Undefined property: CRM_Core_DAO...reply.php
Donald A. Lobo [Wed, 29 Jan 2014 00:09:49 +0000 (16:09 -0800)]
CRM-14130 - Undefined property: CRM_Core_DAO...reply.php

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

10 years agotest suite - fix signature on GroupCreate call
Eileen McNaughton [Tue, 28 Jan 2014 18:35:49 +0000 (07:35 +1300)]
test suite - fix signature on GroupCreate call

10 years agoCRM-14138 report_template.get_rows api make report id optional on getrows
Eileen [Mon, 27 Jan 2014 04:57:46 +0000 (17:57 +1300)]
CRM-14138 report_template.get_rows api make report id optional on getrows

----------------------------------------
* CRM-14138: Report_template.getrows api - make report_id OR instance_id required (currently report id is required)
  http://issues.civicrm.org/jira/browse/CRM-14138

10 years agoapi tidy-up add missing spaces
Eileen [Thu, 23 Jan 2014 16:00:57 +0000 (16:00 +0000)]
api tidy-up add missing spaces

10 years agoCRM-14137 report_template api - add ability to retrieve related metadata
Eileen McNaughton [Tue, 28 Jan 2014 00:18:55 +0000 (13:18 +1300)]
CRM-14137 report_template api - add ability to retrieve related metadata

----------------------------------------
* 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 #2412 from dlobo/CRM-14125
dlobo [Sat, 25 Jan 2014 01:51:17 +0000 (17:51 -0800)]
Merge pull request #2412 from dlobo/CRM-14125

CRM-14125 - Joining a group from the user dashboard throws a fatal error...

10 years agoCRM-14125 - Joining a group from the user dashboard throws a fatal error IF assigned...
Donald A. Lobo [Sat, 25 Jan 2014 01:50:50 +0000 (17:50 -0800)]
CRM-14125 - Joining a group from the user dashboard throws a fatal error IF assigned activities pane is enabled

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

10 years agoMerge pull request #2410 from dlobo/CRM-14127
dlobo [Fri, 24 Jan 2014 23:19:58 +0000 (15:19 -0800)]
Merge pull request #2410 from dlobo/CRM-14127

CRM-14127 - CiviCRM WordPress not correctly generating frontend URL

10 years agoCRM-14127 - CiviCRM WordPress not correctly generating frontend URL
Donald A. Lobo [Fri, 24 Jan 2014 23:19:21 +0000 (15:19 -0800)]
CRM-14127 - CiviCRM WordPress not correctly generating frontend URL

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

10 years agoMerge pull request #2409 from davecivicrm/CRM-14117
Dave Greenberg [Fri, 24 Jan 2014 20:23:55 +0000 (12:23 -0800)]
Merge pull request #2409 from davecivicrm/CRM-14117

CRM-14117 - Rebuilt generated with navigation fix.

10 years agoCRM-14117 - Rebuilt generated with navigation fix.
Dave Greenberg [Fri, 24 Jan 2014 20:23:10 +0000 (12:23 -0800)]
CRM-14117 - Rebuilt generated with navigation fix.

----------------------------------------
* CRM-14117: Help/About leads to a non-existant page
  http://issues.civicrm.org/jira/browse/CRM-14117

10 years agoMerge pull request #2404 from davecivicrm/CRM-14119
Dave Greenberg [Fri, 24 Jan 2014 01:05:06 +0000 (17:05 -0800)]
Merge pull request #2404 from davecivicrm/CRM-14119

CRM-14119 This includes https://github.com/civicrm/civicrm-core/pull/240...

10 years agoCRM-14119 This includes https://github.com/civicrm/civicrm-core/pull/2400 and adds...
Dave Greenberg [Fri, 24 Jan 2014 00:50:16 +0000 (16:50 -0800)]
CRM-14119 This includes https://github.com/civicrm/civicrm-core/pull/2400 and adds truncation of Details column display with conditional (more) link as we do with Notes selector.

----------------------------------------
* CRM-14119: Add activity details as field / filter on activity details report
  http://issues.civicrm.org/jira/browse/CRM-14119

10 years agoMerge pull request #2403 from dlobo/CRM-14117
Dave Greenberg [Thu, 23 Jan 2014 23:56:55 +0000 (15:56 -0800)]
Merge pull request #2403 from dlobo/CRM-14117

CRM-14117 - Help/About leads to a non-existant page

10 years agoCRM-14117 - Help/About leads to a non-existant page
Donald A. Lobo [Thu, 23 Jan 2014 23:30:02 +0000 (15:30 -0800)]
CRM-14117 - Help/About leads to a non-existant page

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

10 years agoMerge pull request #2402 from dlobo/CRM-14118
dlobo [Thu, 23 Jan 2014 22:56:50 +0000 (14:56 -0800)]
Merge pull request #2402 from dlobo/CRM-14118

CRM-14118 - Unescaped user input sent to MySQL from geolocation scheduled job

10 years agoCRM-14118 - Unescaped user input sent to MySQL from geolocation scheduled job
Donald A. Lobo [Thu, 23 Jan 2014 22:50:53 +0000 (14:50 -0800)]
CRM-14118 - Unescaped user input sent to MySQL from geolocation scheduled job

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

10 years agoMerge pull request #2401 from eileenmcnaughton/CRM-14120
dlobo [Thu, 23 Jan 2014 22:13:18 +0000 (14:13 -0800)]
Merge pull request #2401 from eileenmcnaughton/CRM-14120

CRM-14120 e-notice error due to returning NULL not by reference,

10 years agoCRM-14120 e-notice error due to returning NULL not by reference, From what I recall...
Eileen McNaughton [Thu, 23 Jan 2014 20:57:27 +0000 (09:57 +1300)]
CRM-14120 e-notice error due to returning NULL not by reference, From what I recall php lazy copying means that we don't lose any performance benefit by not returning as a referenct

----------------------------------------
* CRM-14120: Notice Notice: Only variable references should be returned by reference in event() (line 122 of /srv/www/womenslibrary.org.uk/sites/all/modules/civicrm/CRM/Event/PseudoConstant.php).
  http://issues.civicrm.org/jira/browse/CRM-14120

10 years agoCRM-14108 add scheduled reminder id as a params on scheduled job
Eileen [Wed, 22 Jan 2014 01:39:37 +0000 (01:39 +0000)]
CRM-14108 add scheduled reminder id as a params on scheduled job

----------------------------------------

----------------------------------------
* CRM-14108: Add Param for id to scheduled reminders
  http://issues.civicrm.org/jira/browse/CRM-14108

10 years agoMerge pull request #2370 from kurund/CRM-14087
Kurund Jalmi [Tue, 21 Jan 2014 19:24:31 +0000 (11:24 -0800)]
Merge pull request #2370 from kurund/CRM-14087

fix contact subtype unset during domain update, CRM-14087

10 years agoMerge pull request #2388 from colemanw/4.4
colemanw [Tue, 21 Jan 2014 17:47:52 +0000 (09:47 -0800)]
Merge pull request #2388 from colemanw/4.4

CRM-14028 - Fix test

10 years agoCRM-14028 - Fix test
Coleman Watts [Tue, 21 Jan 2014 17:47:34 +0000 (09:47 -0800)]
CRM-14028 - Fix test

10 years agofixed bug in saving email, phone and address CRM-14087
kurund [Tue, 21 Jan 2014 07:15:23 +0000 (23:15 -0800)]
fixed bug in saving email, phone and address CRM-14087

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

10 years agoMerge pull request #2386 from colemanw/tokenFix
colemanw [Tue, 21 Jan 2014 04:24:28 +0000 (20:24 -0800)]
Merge pull request #2386 from colemanw/tokenFix

CRM-14095 - Fix bug where email token hook not called if no core tokens present

10 years agoCRM-14095 - Fix bug where email token hook not called if no core tokens present
Coleman Watts [Tue, 21 Jan 2014 01:00:43 +0000 (17:00 -0800)]
CRM-14095 - Fix bug where email token hook not called if no core tokens present

10 years agoMerge pull request #2367 from kurund/CRM-14082
Kurund Jalmi [Tue, 21 Jan 2014 01:50:56 +0000 (17:50 -0800)]
Merge pull request #2367 from kurund/CRM-14082

preserve sorting for task actions, CRM-14082

10 years agoMerge pull request #2382 from eileenmcnaughton/failing-test
Tim Otten [Mon, 20 Jan 2014 22:37:48 +0000 (14:37 -0800)]
Merge pull request #2382 from eileenmcnaughton/failing-test

Failing test

10 years agoAdditional test on return.address_name
Eileen McNaughton [Mon, 20 Jan 2014 19:07:49 +0000 (08:07 +1300)]
Additional test on return.address_name

10 years agofix failing profile api test by preventing double-adding of same alias
Eileen McNaughton [Mon, 20 Jan 2014 11:55:20 +0000 (00:55 +1300)]
fix failing profile api test by preventing double-adding of same alias