vcs.fsf.org Git - civicrm-core.git/log

commit | commitdiff | tree

colemanw [Tue, 29 Jul 2014 13:51:16 +0000 (14:51 +0100)]

Merge pull request #3749 from civicrm/4.4

Merge branch 4.4 into master

commit | commitdiff | tree

colemanw [Tue, 29 Jul 2014 13:41:54 +0000 (14:41 +0100)]

Merge pull request #3748 from colemanw/relMemberApi

CRM-13652 - Fix relationship api to process related memberships

commit | commitdiff | tree

colemanw [Tue, 29 Jul 2014 13:08:20 +0000 (14:08 +0100)]

Merge pull request #3745 from colemanw/relMemberApi

CRM-13652 - Fix relationship api to process related memberships

commit | commitdiff | tree

Kurund Jalmi [Tue, 29 Jul 2014 10:48:07 +0000 (16:18 +0530)]

Merge pull request #3744 from yashodha/CRM-15032

CRM-15032 - change 4.4.0.mysql.tpl to UTF-8 encoding

commit | commitdiff | tree

Kurund Jalmi [Tue, 29 Jul 2014 10:48:01 +0000 (16:18 +0530)]

Merge pull request #3737 from yashodha/4.4

CRM-15032 - change 4.4.0.mysql.tpl to UTF-8 encoding

commit | commitdiff | tree

Kurund Jalmi [Tue, 29 Jul 2014 10:46:51 +0000 (16:16 +0530)]

Merge pull request #3743 from rohankatkar/CRM-15037

CRM-15037

commit | commitdiff | tree

Coleman Watts [Tue, 29 Jul 2014 10:23:28 +0000 (11:23 +0100)]

CRM-13652 - Fix relationship api to process related memberships

commit | commitdiff | tree

CiviCRM [Tue, 29 Jul 2014 06:40:42 +0000 (12:10 +0530)]

CRM-15032 - change 4.4.0.mysql.tpl to UTF-8 encoding

commit | commitdiff | tree

Rohan Katkar [Tue, 29 Jul 2014 06:11:16 +0000 (11:41 +0530)]

commit | commitdiff | tree

Yashodha Chaku [Tue, 29 Jul 2014 05:28:48 +0000 (10:58 +0530)]

Merge pull request #3739 from rohankatkar/testCaseTypeDelete_InUse

Fix for assertion of status message for deletion of case type when in us...

commit | commitdiff | tree

Dave Greenberg [Tue, 29 Jul 2014 04:17:20 +0000 (21:17 -0700)]

Merge pull request #3742 from davecivicrm/CRM-14940

CRM-14940 - minor tweaks to responsive templates.

commit | commitdiff | tree

Dave Greenberg [Tue, 29 Jul 2014 04:13:57 +0000 (21:13 -0700)]

CRM-14940 - minor tweaks to responsive templates.

----------------------------------------
* CRM-14940:
https://issues.civicrm.org/jira/browse/CRM-14940

commit | commitdiff | tree

Dave Greenberg [Mon, 28 Jul 2014 23:03:35 +0000 (16:03 -0700)]

Merge pull request #3741 from davecivicrm/CRM-14997

CRM-14997 - fix regression that caused Add Contacts to Group button to b...

commit | commitdiff | tree

Dave Greenberg [Mon, 28 Jul 2014 23:02:22 +0000 (16:02 -0700)]

CRM-14997 - fix regression that caused Add Contacts to Group button to be ALWAYS hidden.

----------------------------------------
* CRM-14997:
https://issues.civicrm.org/jira/browse/CRM-14997

commit | commitdiff | tree

Dave Greenberg [Mon, 28 Jul 2014 21:16:23 +0000 (14:16 -0700)]

Merge pull request #3681 from eileenmcnaughton/CRM-14995

CRM-14995 contributions disappearing on pledge edit

commit | commitdiff | tree

Dave Greenberg [Mon, 28 Jul 2014 17:13:14 +0000 (10:13 -0700)]

Merge pull request #3738 from jitendrapurohit/CRM-15021

CRM-15021 Web Test Fix

commit | commitdiff | tree

colemanw [Mon, 28 Jul 2014 14:54:33 +0000 (15:54 +0100)]

Merge pull request #3740 from colemanw/acs

Finish migrating AlternateContactSelector.js to use entityRef

commit | commitdiff | tree

Coleman Watts [Mon, 28 Jul 2014 14:50:20 +0000 (15:50 +0100)]

Finish migrating AlternateContactSelector.js to use entityRef

commit | commitdiff | tree

Rohan Katkar [Mon, 28 Jul 2014 13:13:58 +0000 (18:43 +0530)]

Fix for assertion of status message for deletion of case type when in use.

commit | commitdiff | tree

Jitendra Purohit [Mon, 28 Jul 2014 11:15:34 +0000 (16:45 +0530)]

Notice Fix during test execution

commit | commitdiff | tree

Jitendra Purohit [Mon, 28 Jul 2014 10:36:14 +0000 (16:06 +0530)]

CRM-15021 Web Test Fix

commit | commitdiff | tree

CiviCRM [Mon, 28 Jul 2014 10:19:47 +0000 (15:49 +0530)]

CRM-15032 - change 4.4.0.mysql.tpl to UTF-8 encoding

commit | commitdiff | tree

Dave Greenberg [Fri, 25 Jul 2014 21:52:37 +0000 (14:52 -0700)]

Merge pull request #3735 from davecivicrm/CRM-15037

CRM-15037 - Extend webtest to test for this bug.

commit | commitdiff | tree

Dave Greenberg [Fri, 25 Jul 2014 21:51:49 +0000 (14:51 -0700)]

CRM-15037 - Extend webtest to test for this bug.

----------------------------------------
* CRM-15037:
https://issues.civicrm.org/jira/browse/CRM-15037

commit | commitdiff | tree

Dave Greenberg [Fri, 25 Jul 2014 21:19:02 +0000 (14:19 -0700)]

Merge pull request #3727 from monishdeb/CRM-14875

CRM-14875 fix - Related membership line_items missing from View Contribu...

commit | commitdiff | tree

Dave Greenberg [Fri, 25 Jul 2014 19:12:12 +0000 (12:12 -0700)]

Merge pull request #3732 from yashodha/CRM-15002

CRM-15002: fix case activity view

commit | commitdiff | tree

CiviCRM [Fri, 25 Jul 2014 07:37:48 +0000 (13:07 +0530)]

CRM-15002: fix case activity view

commit | commitdiff | tree

Dave Greenberg [Fri, 25 Jul 2014 00:32:42 +0000 (17:32 -0700)]

Merge pull request #3731 from davecivicrm/CRM-15031

CRM-15031 - Partial fixes for Event related webtests.

commit | commitdiff | tree

Dave Greenberg [Fri, 25 Jul 2014 00:31:46 +0000 (17:31 -0700)]

CRM-15031 - Partial fixes for Event related webtests.

----------------------------------------
* CRM-15031:
https://issues.civicrm.org/jira/browse/CRM-15031

commit | commitdiff | tree

Kurund Jalmi [Thu, 24 Jul 2014 18:09:53 +0000 (23:39 +0530)]

Merge pull request #3726 from jitendrapurohit/CRM-14983

Empty check for datetime field

commit | commitdiff | tree

Kurund Jalmi [Thu, 24 Jul 2014 18:09:32 +0000 (23:39 +0530)]

Merge pull request #3728 from atif-shaikh/CRM-14952-webtest-fix

Webtest for CRM-14952

commit | commitdiff | tree

Kurund Jalmi [Thu, 24 Jul 2014 18:09:02 +0000 (23:39 +0530)]

Merge pull request #3708 from atif-shaikh/CRM-14983

CRM-14983 - Sunning Contribution via Search Builder Fails Putting Contac...

commit | commitdiff | tree

atif-shaikh [Thu, 24 Jul 2014 13:07:46 +0000 (18:37 +0530)]

Webtest for CRM-14952

----------------------------------------
* CRM-14952: Sorting on state in search throws FATAL error: Database Error Code: Unknown column 'civicrm_state_province.name' in 'field list'
https://issues.civicrm.org/jira/browse/CRM-14952

commit | commitdiff | tree

monishdeb [Thu, 24 Jul 2014 12:30:39 +0000 (18:00 +0530)]

CRM-14875 fix - Related membership line_items missing from View Contribution page

https://issues.civicrm.org/jira/browse/CRM-14875

Empty check for datetime field

commit | commitdiff | tree

Yashodha Chaku [Thu, 24 Jul 2014 06:05:06 +0000 (11:35 +0530)]

Merge pull request #3725 from PoonamNalawade/HR-404

--HR-404 Clicking organization sub-types opens CiviHR Dashboard

commit | commitdiff | tree

Tim Otten [Thu, 24 Jul 2014 04:09:08 +0000 (21:09 -0700)]

Merge pull request #3723 from totten/master-phpunit-para

INFRA-124 - Facilitate parallel testing by making test environment more flexible

commit | commitdiff | tree

CiviCRM [Wed, 23 Jul 2014 14:56:59 +0000 (07:56 -0700)]

Update version to 4.5.beta4

commit | commitdiff | tree

Poonam [Wed, 23 Jul 2014 14:12:44 +0000 (19:42 +0530)]

--HR-404 Clicking organization sub-types opens CiviHR Dashboard

commit | commitdiff | tree

Kurund Jalmi [Wed, 23 Jul 2014 13:21:05 +0000 (18:51 +0530)]

Merge pull request #3724 from rohankatkar/CRM-15026

Fix for CRM-15026

commit | commitdiff | tree

Rohan Katkar [Wed, 23 Jul 2014 11:17:39 +0000 (16:47 +0530)]

commit | commitdiff | tree

Monish Deb [Wed, 23 Jul 2014 10:34:42 +0000 (16:04 +0530)]

Merge pull request #3679 from yashodha/CRM-14951

Tested, working fine.

commit | commitdiff | tree

Tim Otten [Wed, 23 Jul 2014 08:29:32 +0000 (01:29 -0700)]

INFRA-124 - CiviSeleniumTestCase - Load cookies from $this->settings->cookies

For INFRA-124, we'll need a way to distinguish requests that correspond to
different test-instances. We'll do that by passing along a cookie.

commit | commitdiff | tree

Tim Otten [Wed, 23 Jul 2014 07:21:21 +0000 (00:21 -0700)]

INFRA-124 - civicrm.settings.php - Softer define()s

INFRA-124 will require that we make some defines (e.g. CIVICRM_DSN) dynamic
when running multiple test processes. This patch allows us to
inject/override those settings without fully parsing/understanding the
content of civicrm.settings.php.

commit | commitdiff | tree

Kurund Jalmi [Wed, 23 Jul 2014 08:21:00 +0000 (13:51 +0530)]

Merge pull request #3719 from yashodha/CRM-15002

CRM-15002: fix case id in subject

commit | commitdiff | tree

Kurund Jalmi [Wed, 23 Jul 2014 08:19:20 +0000 (13:49 +0530)]

Merge pull request #3721 from totten/master-seqtest

Civi\CCase\SequenceListenerTest - Reduce timing sensitivity

commit | commitdiff | tree

Kurund Jalmi [Wed, 23 Jul 2014 08:18:21 +0000 (13:48 +0530)]

Merge pull request #3722 from totten/master-perm-regr

CRM-15023 - Fix regression in CRM_Core_Permission_GenericTest

commit | commitdiff | tree

Kurund Jalmi [Wed, 23 Jul 2014 07:32:25 +0000 (13:02 +0530)]

Merge pull request #3720 from yashodha/CRM-15027

CRM-15027- fix copy function for date fields

commit | commitdiff | tree

Tim Otten [Wed, 23 Jul 2014 06:53:54 +0000 (23:53 -0700)]

CRM-15023 - Fix regression in CRM_Core_Permission_GenericTest

Follow-up to 29f6fbb7c

commit | commitdiff | tree

CiviCRM [Wed, 23 Jul 2014 06:24:33 +0000 (11:54 +0530)]

CRM-15027- fix copy function for date fields

commit | commitdiff | tree

Tim Otten [Wed, 23 Jul 2014 06:16:06 +0000 (23:16 -0700)]

Civi\CCase\SequenceListenerTest - Reduce timing sensitivity

commit | commitdiff | tree

CiviCRM [Wed, 23 Jul 2014 04:37:50 +0000 (10:07 +0530)]

CRM-15002: fix case id in subject

commit | commitdiff | tree

Yashodha Chaku [Wed, 23 Jul 2014 04:13:10 +0000 (09:43 +0530)]

Merge pull request #3713 from yashodha/CRM-15002

CRM-15002: fix broken Link Case functionality

commit | commitdiff | tree

Dave Greenberg [Tue, 22 Jul 2014 23:19:29 +0000 (16:19 -0700)]

Merge pull request #3716 from monishdeb/CRM-15021

CRM-15021 fix - Reenabling 'Allow other amounts' on contribution page le...

commit | commitdiff | tree

monishdeb [Tue, 22 Jul 2014 21:47:08 +0000 (03:17 +0530)]

CRM-15021 fix - Reenabling 'Allow other amounts' on contribution page leaves field inactive

https://issues.civicrm.org/jira/browse/CRM-15021

commit | commitdiff | tree

Dave Greenberg [Tue, 22 Jul 2014 19:26:03 +0000 (12:26 -0700)]

Merge pull request #3715 from davecivicrm/CRM-15001

CRM-15001 - clarify field label, terminology and help text.

commit | commitdiff | tree

Dave Greenberg [Tue, 22 Jul 2014 19:25:17 +0000 (12:25 -0700)]

CRM-15001 - clarify field label, terminology and help text.

----------------------------------------
* CRM-15001:
https://issues.civicrm.org/jira/browse/CRM-15001

commit | commitdiff | tree

Monish Deb [Tue, 22 Jul 2014 13:36:37 +0000 (19:06 +0530)]

Merge pull request #3712 from tadpolecc/tadpolecc

Tested working fine

commit | commitdiff | tree

CiviCRM [Tue, 22 Jul 2014 06:24:54 +0000 (11:54 +0530)]

CRM-15002: fix broken Link Case functionality

commit | commitdiff | tree

kcristiano [Tue, 22 Jul 2014 01:33:47 +0000 (21:33 -0400)]

CRM-15023 - Fatal errors thrown on Event Info, registration, Contribution Pages

Simple workaround to ensure that pluggable.php is loaded before we check
capabilities in WordPress

commit | commitdiff | tree

Dave Greenberg [Mon, 21 Jul 2014 23:58:28 +0000 (16:58 -0700)]

Merge pull request #3711 from davecivicrm/CRM-14978

CRM-14978 - add pop-up link to edit participant statuses from event titl...

commit | commitdiff | tree

Dave Greenberg [Mon, 21 Jul 2014 23:57:40 +0000 (16:57 -0700)]

CRM-14978 - add pop-up link to edit participant statuses from event title and settings config form.

----------------------------------------
* CRM-14978:
https://issues.civicrm.org/jira/browse/CRM-14978

commit | commitdiff | tree

Dave Greenberg [Mon, 21 Jul 2014 23:02:46 +0000 (16:02 -0700)]

Merge pull request #3710 from jmcclelland/import-participant-register-date

CRM-15019 - avoid validation error on register date if not using ISO

commit | commitdiff | tree

Dave Greenberg [Mon, 21 Jul 2014 17:35:09 +0000 (10:35 -0700)]

Merge pull request #3705 from eileenmcnaughton/CRM-15009

CRM-15009 extend permitted length of field on payment processor signatur...

commit | commitdiff | tree

Jamie McClelland [Mon, 21 Jul 2014 17:25:11 +0000 (13:25 -0400)]

CRM-15019 - avoid validation error on register date if not using ISO
date format.

----------------------------------------
* CRM-15019: Importing participant record with register date in a format other than YYYY-MM-DD results in validation error
https://issues.civicrm.org/jira/browse/CRM-15019

commit | commitdiff | tree

atif-shaikh [Mon, 21 Jul 2014 12:40:10 +0000 (18:10 +0530)]

CRM-14983 - Sunning Contribution via Search Builder Fails Putting Contacts in Smart Group

https://issues.civicrm.org/jira/browse/CRM-14983

commit | commitdiff | tree

colemanw [Mon, 21 Jul 2014 11:22:34 +0000 (12:22 +0100)]

Merge pull request #3707 from colemanw/er

Form_Renderer - ensure params is an array

commit | commitdiff | tree

Coleman Watts [Mon, 21 Jul 2014 08:39:48 +0000 (09:39 +0100)]

Form_Renderer - ensure params is an array

commit | commitdiff | tree

Eileen McNaughton [Mon, 21 Jul 2014 02:56:27 +0000 (14:56 +1200)]

CRM-15009 extend permitted length of field on payment processor signature

commit | commitdiff | tree

colemanw [Sun, 20 Jul 2014 14:09:47 +0000 (15:09 +0100)]

Merge pull request #3704 from colemanw/memberOrg

CRM-15017 - Fix existing member check & remove unnecessary checkemail callback

commit | commitdiff | tree

Coleman Watts [Sun, 20 Jul 2014 13:45:44 +0000 (14:45 +0100)]

CRM-15017 - Fix existing member check & remove unnecessary checkemail callback

commit | commitdiff | tree

Coleman Watts [Sun, 20 Jul 2014 13:43:44 +0000 (14:43 +0100)]

Trigger change after loading remote EntityRef default

commit | commitdiff | tree

Coleman Watts [Sun, 20 Jul 2014 13:36:20 +0000 (14:36 +0100)]

Ensure 'extra' data gets loaded with EntityRef

commit | commitdiff | tree

Coleman Watts [Sun, 20 Jul 2014 01:23:15 +0000 (02:23 +0100)]

CRM-14949 - Remove unneeded tpl include

commit | commitdiff | tree

Coleman Watts [Sat, 19 Jul 2014 21:51:10 +0000 (22:51 +0100)]

Fix contribution context

commit | commitdiff | tree

Coleman Watts [Sat, 19 Jul 2014 19:22:18 +0000 (20:22 +0100)]

Slightly smaller Civi spinner

commit | commitdiff | tree

colemanw [Sat, 19 Jul 2014 14:01:50 +0000 (15:01 +0100)]

Merge pull request #3703 from colemanw/spinner

Add CiviCRM-branded spinner

commit | commitdiff | tree

Coleman Watts [Sat, 19 Jul 2014 13:58:58 +0000 (14:58 +0100)]

CiviCRM-branded spinner

commit | commitdiff | tree

colemanw [Sat, 19 Jul 2014 12:48:31 +0000 (13:48 +0100)]

Merge pull request #3702 from colemanw/limit

CRM-14984 - Fix default 25 limit being applied to getlist api when retrieving default values

commit | commitdiff | tree

Coleman Watts [Sat, 19 Jul 2014 12:22:41 +0000 (13:22 +0100)]

CRM-14984 - Fix default 25 limit being applied to getlist api when retrieving default values

commit | commitdiff | tree

Coleman Watts [Fri, 18 Jul 2014 23:50:45 +0000 (00:50 +0100)]

commit | commitdiff | tree

colemanw [Fri, 18 Jul 2014 22:21:24 +0000 (23:21 +0100)]

Merge pull request #3700 from colemanw/spinner

Style jQuery block-ui to use a spinner instead of 'Please wait'

commit | commitdiff | tree

Coleman Watts [Fri, 18 Jul 2014 22:18:42 +0000 (23:18 +0100)]

Style jQuery block-ui to use a spinner instead of 'Please wait'

commit | commitdiff | tree

Dave Greenberg [Fri, 18 Jul 2014 21:32:57 +0000 (14:32 -0700)]

Merge pull request #3699 from monishdeb/CRM-14996

CRM-14996 fix

commit | commitdiff | tree

Dave Greenberg [Fri, 18 Jul 2014 19:08:40 +0000 (12:08 -0700)]

Merge pull request #3695 from totten/master-link-cases

CRM-15002 - Link Cases - Fix fatal error

commit | commitdiff | tree

monishdeb [Fri, 18 Jul 2014 17:30:53 +0000 (23:00 +0530)]

commit | commitdiff | tree

monishdeb [Fri, 18 Jul 2014 06:43:32 +0000 (12:13 +0530)]

CRM-14996 fix - Reports county filter option shows all counties regardless of state or states chosen

https://issues.civicrm.org/jira/browse/CRM-14996

commit | commitdiff | tree

Tim Otten [Thu, 17 Jul 2014 23:44:26 +0000 (16:44 -0700)]

Merge pull request #3697 from totten/master-commsg-times

CRM_Core_CommunityMessagesTest - Reduce probability of test-failure due to timing

commit | commitdiff | tree

Tim Otten [Thu, 17 Jul 2014 23:42:45 +0000 (16:42 -0700)]

CRM_Core_CommunityMessagesTest - Reduce probability of test-failure due to
timing

commit | commitdiff | tree

Dave Greenberg [Thu, 17 Jul 2014 23:40:51 +0000 (16:40 -0700)]

Merge pull request #3696 from davecivicrm/CRM-15002

CRM-15002 - Fix missing case types from case selectors (probably an erro...

commit | commitdiff | tree

Dave Greenberg [Thu, 17 Jul 2014 23:39:23 +0000 (16:39 -0700)]

CRM-15002 - Fix missing case types from case selectors (probably an error from typo when replacing CRM_Utils_Array instances with empty).

----------------------------------------
* CRM-15002:
https://issues.civicrm.org/jira/browse/CRM-15002

commit | commitdiff | tree

Tim Otten [Thu, 17 Jul 2014 22:47:19 +0000 (15:47 -0700)]

CRM-15002 - Link Cases - Fix fatal error

commit | commitdiff | tree

Kurund Jalmi [Thu, 17 Jul 2014 18:47:43 +0000 (00:17 +0530)]

Merge pull request #3689 from atif-shaikh/CRM-14999

CRM-14999 - Fix notice on Online Registration screen

commit | commitdiff | tree

Dave Greenberg [Thu, 17 Jul 2014 18:46:42 +0000 (11:46 -0700)]

Merge pull request #3668 from jitendrapurohit/CRM14967_Fix

CRM-14961 Fix

commit | commitdiff | tree

Dave Greenberg [Thu, 17 Jul 2014 17:52:17 +0000 (10:52 -0700)]

Merge pull request #3694 from ginkgomzd/patch-1

typo in variable name