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...
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
CiviCRM [Fri, 25 Jul 2014 07:37:48 +0000 (13:07 +0530)]
CRM-15002: fix case activity view
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.
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
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
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
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...
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
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
jitendra.purohit@webaccessglobal.com [Thu, 24 Jul 2014 08:37:24 +0000 (14:07 +0530)]
Empty check for datetime field
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
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
CiviCRM [Wed, 23 Jul 2014 14:56:59 +0000 (07:56 -0700)]
Update version to 4.5.beta4
Poonam [Wed, 23 Jul 2014 14:12:44 +0000 (19:42 +0530)]
--HR-404 Clicking organization sub-types opens CiviHR Dashboard
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
Rohan Katkar [Wed, 23 Jul 2014 11:17:39 +0000 (16:47 +0530)]
Fix for CRM-15026
Monish Deb [Wed, 23 Jul 2014 10:34:42 +0000 (16:04 +0530)]
Merge pull request #3679 from yashodha/CRM-14951
Tested, working fine.
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.
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.
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
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
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
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
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
CiviCRM [Wed, 23 Jul 2014 06:24:33 +0000 (11:54 +0530)]
CRM-15027- fix copy function for date fields
Tim Otten [Wed, 23 Jul 2014 06:16:06 +0000 (23:16 -0700)]
Civi\CCase\SequenceListenerTest - Reduce timing sensitivity
CiviCRM [Wed, 23 Jul 2014 04:37:50 +0000 (10:07 +0530)]
CRM-15002: fix case id in subject
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
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...
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
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.
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
Monish Deb [Tue, 22 Jul 2014 13:36:37 +0000 (19:06 +0530)]
Merge pull request #3712 from tadpolecc/tadpolecc
Tested working fine
CiviCRM [Tue, 22 Jul 2014 06:24:54 +0000 (11:54 +0530)]
CRM-15002: fix broken Link Case functionality
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
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...
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
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
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...
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
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
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
Coleman Watts [Mon, 21 Jul 2014 08:39:48 +0000 (09:39 +0100)]
Form_Renderer - ensure params is an array
Eileen McNaughton [Mon, 21 Jul 2014 02:56:27 +0000 (14:56 +1200)]
CRM-15009 extend permitted length of field on payment processor signature
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
Coleman Watts [Sun, 20 Jul 2014 13:45:44 +0000 (14:45 +0100)]
CRM-15017 - Fix existing member check & remove unnecessary checkemail callback
Coleman Watts [Sun, 20 Jul 2014 13:43:44 +0000 (14:43 +0100)]
Trigger change after loading remote EntityRef default
Coleman Watts [Sun, 20 Jul 2014 13:36:20 +0000 (14:36 +0100)]
Ensure 'extra' data gets loaded with EntityRef
Coleman Watts [Sun, 20 Jul 2014 01:23:15 +0000 (02:23 +0100)]
CRM-14949 - Remove unneeded tpl include
Coleman Watts [Sat, 19 Jul 2014 21:51:10 +0000 (22:51 +0100)]
Fix contribution context
Coleman Watts [Sat, 19 Jul 2014 19:22:18 +0000 (20:22 +0100)]
Slightly smaller Civi spinner
colemanw [Sat, 19 Jul 2014 14:01:50 +0000 (15:01 +0100)]
Merge pull request #3703 from colemanw/spinner
Add CiviCRM-branded spinner
Coleman Watts [Sat, 19 Jul 2014 13:58:58 +0000 (14:58 +0100)]
CiviCRM-branded spinner
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
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
Coleman Watts [Fri, 18 Jul 2014 23:50:45 +0000 (00:50 +0100)]
Block UI tweaks
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'
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'
Dave Greenberg [Fri, 18 Jul 2014 21:32:57 +0000 (14:32 -0700)]
Merge pull request #3699 from monishdeb/CRM-14996
CRM-14996 fix
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
monishdeb [Fri, 18 Jul 2014 17:30:53 +0000 (23:00 +0530)]
minor change
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
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
Tim Otten [Thu, 17 Jul 2014 23:42:45 +0000 (16:42 -0700)]
CRM_Core_CommunityMessagesTest - Reduce probability of test-failure due to
timing
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...
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
Tim Otten [Thu, 17 Jul 2014 22:47:19 +0000 (15:47 -0700)]
CRM-15002 - Link Cases - Fix fatal error
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
Dave Greenberg [Thu, 17 Jul 2014 18:46:42 +0000 (11:46 -0700)]
Merge pull request #3668 from jitendrapurohit/CRM14967_Fix
CRM-14961 Fix
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
Michael Z Daryabeygi [Thu, 17 Jul 2014 17:22:02 +0000 (13:22 -0400)]
typo in variable name
correct name of extracted variable, 'profileEntities'
Dave Greenberg [Thu, 17 Jul 2014 16:30:37 +0000 (09:30 -0700)]
Merge pull request #3690 from colemanw/quest
CRM-10780 - Remove quest-related files
CiviCRM [Thu, 17 Jul 2014 14:52:10 +0000 (20:22 +0530)]
Removal of Notice, warning and Communication label Fix
jitendrapurohit [Tue, 15 Jul 2014 14:44:12 +0000 (20:14 +0530)]
CRM-14961 Fix
colemanw [Thu, 17 Jul 2014 13:15:01 +0000 (14:15 +0100)]
Merge pull request #3693 from colemanw/CRM-14998
CRM-14998 - Fix mark-all checkbox in merge contacts screen
Coleman Watts [Thu, 17 Jul 2014 13:13:54 +0000 (14:13 +0100)]
CRM-14998 - Fix mark-all checkbox in merge contacts screen
colemanw [Thu, 17 Jul 2014 12:47:56 +0000 (13:47 +0100)]
Merge pull request #3692 from colemanw/caseSearch
CRM-15003 - Allow autocomplete to select closed cases
Coleman Watts [Thu, 17 Jul 2014 12:47:19 +0000 (13:47 +0100)]
CRM-15003 - Supply contacts' open case as a default
Coleman Watts [Thu, 17 Jul 2014 12:09:56 +0000 (13:09 +0100)]
CRM-15003 - Allow autocomplete to select closed cases
Coleman Watts [Thu, 17 Jul 2014 09:13:24 +0000 (10:13 +0100)]
CRM-10780 - Remove quest-related files
Coleman Watts [Thu, 17 Jul 2014 09:06:09 +0000 (10:06 +0100)]
Update group selectors to use select2 instead of advmultiselect
atif-shaikh [Thu, 17 Jul 2014 08:03:26 +0000 (13:33 +0530)]
CRM-14999 - Fix notice on Online Registration screen
https://issues.civicrm.org/jira/browse/CRM-14999
CiviCRM [Thu, 17 Jul 2014 06:26:57 +0000 (23:26 -0700)]
Update version to 4.5.beta3
Dave Greenberg [Thu, 17 Jul 2014 01:22:21 +0000 (18:22 -0700)]
Merge pull request #3672 from kurund/CRM-14937
CRM-14937
Dave Greenberg [Wed, 16 Jul 2014 22:55:47 +0000 (15:55 -0700)]
Merge pull request #3687 from GinkgoFJG/CRM-14990-2
CRM-14990: Round two.
Frank J. Gómez [Wed, 16 Jul 2014 21:57:49 +0000 (17:57 -0400)]
CRM-14990. Update strictness of param comparison for consistency with the rest of Civi's codebase, per Eileen's recommendation: https://github.com/civicrm/civicrm-core/commit/
f329e1deb8ebc36b68b3fe4448b16fc6f5cf52bd#commitcomment-
7036984.
Dave Greenberg [Wed, 16 Jul 2014 19:00:19 +0000 (12:00 -0700)]
Merge pull request #3673 from colemanw/mailing
CRM-14161 - Use select2 for mailing and group selectors
Kurund Jalmi [Wed, 16 Jul 2014 14:40:46 +0000 (20:10 +0530)]
Merge pull request #3685 from monishdeb/45beta2-upgrade-fix
multilingual related fix
monishdeb [Wed, 16 Jul 2014 14:38:42 +0000 (20:08 +0530)]
multilingual related fix
Frank J. Gómez [Wed, 16 Jul 2014 14:28:29 +0000 (10:28 -0400)]
CRM-14990: Don't force a value for is_reserved if it isn't passed into CRM_Core_BAO_CustomGroup::create().
Frank J. Gómez [Wed, 16 Jul 2014 14:15:59 +0000 (10:15 -0400)]
Added pre- hook to CRM_Core_BAO_CustomGroup::create().
Monish Deb [Wed, 16 Jul 2014 08:55:00 +0000 (14:25 +0530)]
Merge pull request #3682 from monishdeb/CRM-14969
Minor fix - CRM-14969
monishdeb [Wed, 16 Jul 2014 08:49:45 +0000 (14:19 +0530)]
Minor fix
kurund [Wed, 16 Jul 2014 07:38:50 +0000 (13:08 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-07-16-12-52-48
Conflicts:
CRM/Contact/Form/Contact.php
CRM/Profile/Form.php
CRM/Upgrade/Incremental/php/FourFour.php
CRM/Utils/String.php
Kurund Jalmi [Wed, 16 Jul 2014 07:18:33 +0000 (12:48 +0530)]
Merge pull request #3538 from totten/4.4-wordrep
CRM-14224 - CRM_Upgrade_Incremental_php_FourFour - Fix isValidWordReplacement()
Kurund Jalmi [Wed, 16 Jul 2014 07:15:09 +0000 (12:45 +0530)]
Merge pull request #3670 from monishdeb/CRM-14888
CRM-14888 fix - historical smart groups with membership status break on ...
Yashodha Chaku [Wed, 16 Jul 2014 04:55:14 +0000 (10:25 +0530)]
Merge pull request #3678 from kenwest/CRM-14994
CRM-14994 Fix activity type values
CiviCRM [Wed, 16 Jul 2014 04:27:52 +0000 (09:57 +0530)]
CRM-14951: no of terms should be calculated on contribution id rather than entity id/table
Eileen McNaughton [Wed, 16 Jul 2014 04:18:51 +0000 (16:18 +1200)]
Merge pull request #3677 from eileenmcnaughton/test-fix
reformat whitespace
projects / civicrm-core.git / log