Coleman Watts [Tue, 5 Aug 2014 15:43:44 +0000 (16:43 +0100)]
Advanced search - prevent unwanted popup from reset button
Coleman Watts [Mon, 4 Aug 2014 21:07:59 +0000 (22:07 +0100)]
CRM-15061 - Standardize custom field options search widget to always be multiselect
colemanw [Wed, 13 Aug 2014 08:43:30 +0000 (09:43 +0100)]
Merge pull request #3832 from colemanw/underline
Fix submit-link css
Coleman Watts [Wed, 13 Aug 2014 08:43:18 +0000 (09:43 +0100)]
Fix submit-link css
Dave Greenberg [Wed, 13 Aug 2014 01:08:17 +0000 (18:08 -0700)]
Merge pull request #3829 from davecivicrm/CRM-14126
CRM-14126 - Correct problem with isRedirectSupported() returning an erro...
Dave Greenberg [Wed, 13 Aug 2014 01:07:29 +0000 (18:07 -0700)]
CRM-14126 - Correct problem with isRedirectSupported() returning an erroneous FALSE result.
----------------------------------------
* CRM-14126:
https://issues.civicrm.org/jira/browse/CRM-14126
Tim Otten [Tue, 12 Aug 2014 21:05:34 +0000 (14:05 -0700)]
Merge pull request #3823 from totten/master-casetype-badnames2
CRM-14798 - Allow editing case-type names even if malformed
colemanw [Tue, 12 Aug 2014 17:43:00 +0000 (18:43 +0100)]
Merge pull request #3826 from colemanw/sgPopup
Add no-popup class to group contact list buttons
Coleman Watts [Tue, 12 Aug 2014 17:41:29 +0000 (18:41 +0100)]
Add no-popup class to group contact list buttons
Kurund Jalmi [Tue, 12 Aug 2014 12:55:55 +0000 (18:25 +0530)]
Merge pull request #3825 from jitendrapurohit/api_test4.5beta6
api test fix api_v3_MembershipTest
Kurund Jalmi [Tue, 12 Aug 2014 11:13:54 +0000 (16:43 +0530)]
Merge pull request #3822 from totten/master-casetype-fork
CRM-15097 - crmCaseType - Manage locking/forking/reverting of case-types.
Jitendra Purohit [Tue, 12 Aug 2014 10:45:02 +0000 (16:15 +0530)]
api test fix for testCreateWithRelationship() MembershipTest
Kurund Jalmi [Tue, 12 Aug 2014 10:39:58 +0000 (16:09 +0530)]
Merge pull request #3824 from jitendrapurohit/casetypewebtest4.5
Casetypewebtest4.5
Jitendra Purohit [Tue, 12 Aug 2014 10:17:46 +0000 (15:47 +0530)]
proper name for function
Jitendra Purohit [Tue, 12 Aug 2014 09:56:37 +0000 (15:26 +0530)]
CaseType Webtest CRM-15098
Tim Otten [Tue, 12 Aug 2014 09:22:19 +0000 (02:22 -0700)]
CRM-14798 - Allow editing case-type names even if malformed
This is a follow-up to #3820
Tim Otten [Tue, 12 Aug 2014 08:02:51 +0000 (01:02 -0700)]
CRM-15097 - crmCaseType - Allow reverting changes to case-types
Tim Otten [Tue, 12 Aug 2014 07:07:49 +0000 (00:07 -0700)]
CRM-15097 - crmCaseType - If a case-type isn't forkable, then don't allow editing of its definition.
Tim Otten [Tue, 12 Aug 2014 07:20:34 +0000 (00:20 -0700)]
CRM-15097 - CaseType - Compute & enforce pseudo-properties, isForkable & isForked
Tim Otten [Tue, 12 Aug 2014 06:29:34 +0000 (23:29 -0700)]
CRM-15097 - CiviCase XML - Parse/encode property "forkable"
Tim Otten [Tue, 12 Aug 2014 08:07:22 +0000 (01:07 -0700)]
Merge pull request #3820 from totten/master-casetype-badnames
CRM-14798 - Allow loading CiviCase XML files even if case-type name is malformed
Kurund Jalmi [Tue, 12 Aug 2014 07:02:42 +0000 (12:32 +0530)]
Merge pull request #3804 from atif-shaikh/CRM-15087
CRM-15087 - DB Error on enable CiviCase Component for Multilingual Setup
Kurund Jalmi [Tue, 12 Aug 2014 06:44:06 +0000 (12:14 +0530)]
Merge pull request #3821 from rohankatkar/CRM-15027webtest
Webtest for assign case to another client - CRM-15027
Rohan Katkar [Tue, 12 Aug 2014 06:28:18 +0000 (11:58 +0530)]
Webtest for
kurund [Tue, 12 Aug 2014 05:44:51 +0000 (11:14 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-12-10-27-52
Conflicts:
CRM/Member/Form/MembershipRenewal.php
Tim Otten [Tue, 12 Aug 2014 03:52:11 +0000 (20:52 -0700)]
CRM-14798 - Allow loading CiviCase XML files even if case-type name is malformed
For case-types registered via GUI in old (pre-4.5) versions, the
autogenerated machine names were often ucky, and there was no way to clean
them up. We'll allow backward-compatibility in 4.5 -- and also provide
warnings/tools to facilitate cleanup.
Tim Otten [Mon, 11 Aug 2014 22:55:48 +0000 (15:55 -0700)]
Merge pull request #3819 from totten/master-casetype-negatives
CRM-14534 - crmCaseType - Allow entry of negative offsets
colemanw [Mon, 11 Aug 2014 20:40:31 +0000 (21:40 +0100)]
Merge pull request #3818 from colemanw/casePager
CRM-15093 - Add pager and details to contact-summary case tab
Coleman Watts [Mon, 11 Aug 2014 20:39:12 +0000 (21:39 +0100)]
CRM-15093 - Add pager and details to contact-summary case tab
Tim Otten [Mon, 11 Aug 2014 20:38:52 +0000 (13:38 -0700)]
CRM-14534 - crmCaseType - Allow entry of negative offsets
Coleman Watts [Mon, 11 Aug 2014 19:06:55 +0000 (20:06 +0100)]
CRM-14434 - Further cleanup
colemanw [Mon, 11 Aug 2014 18:29:35 +0000 (19:29 +0100)]
Merge pull request #3817 from colemanw/note
CRM-15092 - Update notes link to use popups and fix done button
Coleman Watts [Mon, 11 Aug 2014 18:22:59 +0000 (19:22 +0100)]
CRM-15092 - Update notes link to use popups and fix done button
colemanw [Mon, 11 Aug 2014 17:07:36 +0000 (18:07 +0100)]
Merge pull request #3495 from JohnFF/patch-5
Refactored ParticipantListing.php
Coleman Watts [Mon, 11 Aug 2014 17:00:28 +0000 (18:00 +0100)]
Merge branch 'JohnFF-patch-1'
Conflicts:
CRM/Event/BAO/Participant.php
colemanw [Mon, 11 Aug 2014 15:26:17 +0000 (16:26 +0100)]
Merge pull request #3785 from eileenmcnaughton/CRM-15075
CRM-15075 fatal on membership renew with long text (plus this line seems...
colemanw [Mon, 11 Aug 2014 15:12:33 +0000 (16:12 +0100)]
Merge pull request #3815 from jitendrapurohit/LinkCaseWebtest
Link Cases Webtest CRM-15002
colemanw [Mon, 11 Aug 2014 14:57:30 +0000 (15:57 +0100)]
Merge pull request #3816 from colemanw/ca
Fix ActivityToCase default value
Coleman Watts [Mon, 11 Aug 2014 14:53:01 +0000 (15:53 +0100)]
CRM-15003 - Fix ActivityToCase default value
Jitendra Purohit [Mon, 11 Aug 2014 13:43:13 +0000 (19:13 +0530)]
Link Cases Webtest CRM-15002
Kurund Jalmi [Mon, 11 Aug 2014 08:32:25 +0000 (14:02 +0530)]
Merge pull request #3730 from wellebee/CRM-12370
CRM-12370 - add extension modules immediately after civicrm drupal modul...
Coleman Watts [Sun, 10 Aug 2014 21:00:09 +0000 (22:00 +0100)]
jsortable.tpl - code cleanup
Tim Otten [Sun, 10 Aug 2014 00:46:55 +0000 (17:46 -0700)]
Merge pull request #3812 from totten/master-envtests
CRM-15011, INFRA-124, CRM-13899 - Add EnvTests
colemanw [Sat, 9 Aug 2014 17:03:18 +0000 (18:03 +0100)]
Merge pull request #3811 from colemanw/dynPath
Fix dynamicResourcepath for windows systems
Coleman Watts [Sat, 9 Aug 2014 16:43:39 +0000 (17:43 +0100)]
Fix dynamicResourcepath for windows systems
colemanw [Sat, 9 Aug 2014 16:26:45 +0000 (17:26 +0100)]
Merge pull request #3810 from colemanw/dynPath
Fix dynamicResourceUrl for windows systems
Coleman Watts [Sat, 9 Aug 2014 16:06:48 +0000 (17:06 +0100)]
Fix dynamicResourceUrl for windows systems
colemanw [Sat, 9 Aug 2014 15:33:28 +0000 (16:33 +0100)]
Merge pull request #3809 from colemanw/sorted
CRM-13819 - Remove jsortable from tables with weight controls
Coleman Watts [Sat, 9 Aug 2014 15:30:53 +0000 (16:30 +0100)]
jsortable.tpl code cleanup
Coleman Watts [Sat, 9 Aug 2014 15:23:36 +0000 (16:23 +0100)]
CRM-13819 - Remove jsortable from tables with weight controls
Coleman Watts [Sat, 9 Aug 2014 15:23:01 +0000 (16:23 +0100)]
Whitespace cleanup
colemanw [Sat, 9 Aug 2014 12:15:02 +0000 (13:15 +0100)]
Merge pull request #3808 from colemanw/monishdeb-CRM-15066
CRM-15066 fix - Choose to cancel one recurring contribution plan, but Civi cancels the other
Coleman Watts [Sat, 9 Aug 2014 12:03:57 +0000 (13:03 +0100)]
crmEditable - consistent treatment of action params
Coleman Watts [Sat, 9 Aug 2014 11:54:31 +0000 (12:54 +0100)]
Clarify button labels
Tim Otten [Fri, 8 Aug 2014 23:40:38 +0000 (16:40 -0700)]
Merge pull request #3807 from totten/master-emptytest
AuthorizeNetIPNTest - Remove empty test file
monishdeb [Fri, 8 Aug 2014 21:26:00 +0000 (02:56 +0530)]
minor improvements
Tim Otten [Fri, 8 Aug 2014 20:25:34 +0000 (13:25 -0700)]
AuthorizeNetIPNTest - Remove empty test file
colemanw [Fri, 8 Aug 2014 16:48:17 +0000 (17:48 +0100)]
Merge pull request #3805 from colemanw/groups
Group selector improvements and js cleanup
Coleman Watts [Fri, 8 Aug 2014 16:23:43 +0000 (17:23 +0100)]
redirectJS.tpl - Fix whitespace
Coleman Watts [Fri, 8 Aug 2014 14:30:26 +0000 (15:30 +0100)]
Legacy js cleanup - change cj to $ within closures
Kurund Jalmi [Fri, 8 Aug 2014 15:48:49 +0000 (21:18 +0530)]
Merge pull request #3803 from jitendrapurohit/CRM-15031AdditionalFix
CRM-15031 Additional Fix
monishdeb [Fri, 8 Aug 2014 14:46:43 +0000 (20:16 +0530)]
CRM-15066 fix - Choose to cancel one recurring contribution plan, but Civi cancels the other
https://issues.civicrm.org/jira/browse/CRM-15066
atif-shaikh [Fri, 8 Aug 2014 11:55:09 +0000 (17:25 +0530)]
CRM-15087 - DB Error on enable CiviCase Component for Multilingual Setup
https://issues.civicrm.org/jira/browse/CRM-15087
Jitendra Purohit [Fri, 8 Aug 2014 11:25:05 +0000 (16:55 +0530)]
CRM-15031 Additional Fix
Kurund Jalmi [Fri, 8 Aug 2014 08:40:27 +0000 (14:10 +0530)]
Merge pull request #3783 from jitendrapurohit/api_testfix_4.5beta5
API Test Fix
Kurund Jalmi [Fri, 8 Aug 2014 08:39:53 +0000 (14:09 +0530)]
Merge pull request #3792 from jitendrapurohit/CRM-12782AdditionalFix
CRM-12872 Additional Fix
Kurund Jalmi [Fri, 8 Aug 2014 08:39:30 +0000 (14:09 +0530)]
Merge pull request #3793 from yashodha/version-fix
version fixes
Kurund Jalmi [Fri, 8 Aug 2014 04:50:20 +0000 (10:20 +0530)]
Merge pull request #3794 from rohankatkar/CRM-15070
CRM-15070 Fix for defualt value.
Kurund Jalmi [Fri, 8 Aug 2014 04:38:46 +0000 (10:08 +0530)]
Merge pull request #3797 from pradpnayak/CRM-15082
-- CRM-15082, changed the function name
Kurund Jalmi [Fri, 8 Aug 2014 04:33:35 +0000 (10:03 +0530)]
Merge pull request #3801 from kurund/CRM-12722
CRM-12722, added fixed that was missed during forward merging from 4.3 t...
kurund [Fri, 8 Aug 2014 04:32:18 +0000 (10:02 +0530)]
CRM-12722, added fixed that was missed during forward merging from 4.3 to 4.4
----------------------------------------
* CRM-12722: Group page only shows 25 child groups
https://issues.civicrm.org/jira/browse/CRM-12722
Tim Otten [Fri, 8 Aug 2014 01:59:09 +0000 (18:59 -0700)]
CRM-15011, INFRA-124, CRM-13899 - Add EnvTests
Coleman Watts [Fri, 8 Aug 2014 00:23:42 +0000 (01:23 +0100)]
Always show parent/child nesting in group selectors
Coleman Watts [Fri, 8 Aug 2014 00:22:36 +0000 (01:22 +0100)]
code cleanup - remove unused var
Coleman Watts [Fri, 8 Aug 2014 00:22:07 +0000 (01:22 +0100)]
Better default title for CRM.confirm
Tim Otten [Thu, 7 Aug 2014 23:29:50 +0000 (16:29 -0700)]
Merge pull request #3800 from mlutfy/4.4-crm15086
CRM-15086: remove {ts} on a few civicrm_option_value.name strings
Mathieu Lutfy [Thu, 7 Aug 2014 22:24:31 +0000 (18:24 -0400)]
CRM-15086: remove {ts} on civicrm_option_value.name strings for: default conference slots, default batch type and default batch statuses.
Tim Otten [Thu, 7 Aug 2014 20:29:13 +0000 (13:29 -0700)]
Merge pull request #3798 from totten/master-phpunit-cleanup
CRM-15011 - phpunit - Fixes for using normal phpunit
Tim Otten [Thu, 7 Aug 2014 08:59:52 +0000 (01:59 -0700)]
HelloTest - Remove extraneous "require_once"
Tim Otten [Thu, 24 Jul 2014 04:33:17 +0000 (21:33 -0700)]
CRM-15011 - CiviSeleniumTestCase - Remove unnecessary require_once statement
Tim Otten [Tue, 22 Jul 2014 07:47:53 +0000 (00:47 -0700)]
CRM-15011 - Fix inter-test-case leak
Tim Otten [Tue, 22 Jul 2014 07:35:55 +0000 (00:35 -0700)]
CRM-15011 - tests - Fix dbunit references
Tim Otten [Tue, 22 Jul 2014 07:47:33 +0000 (00:47 -0700)]
CRM-15011 - CiviUnitTestCase - Remove unnecessary require_once statements
Tim Otten [Tue, 22 Jul 2014 07:45:34 +0000 (00:45 -0700)]
CRM-15011 - Add phpunit.xml and bootstrap.php
Pradeep Nayak [Thu, 7 Aug 2014 16:43:36 +0000 (22:13 +0530)]
-- CRM-15082, changed the function name
----------------------------------------
* CRM-15082: WSOD on advanced search when proximity search is performed
https://issues.civicrm.org/jira/browse/CRM-15082
colemanw [Thu, 7 Aug 2014 16:09:37 +0000 (17:09 +0100)]
Merge pull request #3796 from colemanw/rows
Fix table row striping & css cleanup
Coleman Watts [Thu, 7 Aug 2014 16:05:47 +0000 (17:05 +0100)]
Fix select2 border-box property
Coleman Watts [Thu, 7 Aug 2014 15:55:20 +0000 (16:55 +0100)]
Add striping effect to highlighted table rows
Coleman Watts [Thu, 7 Aug 2014 15:49:41 +0000 (16:49 +0100)]
civicrm.css cleanup
Coleman Watts [Thu, 7 Aug 2014 15:44:35 +0000 (16:44 +0100)]
Fix table row striping
colemanw [Thu, 7 Aug 2014 12:07:36 +0000 (13:07 +0100)]
Merge pull request #3795 from colemanw/form-submit
Change form-submit css class to crm-form-submit
Coleman Watts [Thu, 7 Aug 2014 12:06:18 +0000 (13:06 +0100)]
Change form-submit css class to crm-form-submit
Rohan Katkar [Thu, 7 Aug 2014 11:30:45 +0000 (17:00 +0530)]
CRM-15070 Fix for defualt value.
Monish Deb [Thu, 7 Aug 2014 10:52:40 +0000 (16:22 +0530)]
Merge pull request #3771 from monishdeb/CRM-15041
CRM-15041 fix - View Event Registration / Change Selections : Total Paid...
CiviCRM [Thu, 7 Aug 2014 07:20:04 +0000 (12:50 +0530)]
version fixes
Jitendra Purohit [Thu, 7 Aug 2014 05:03:07 +0000 (10:33 +0530)]
CRM-12872 Additional Fix
Coleman Watts [Wed, 6 Aug 2014 12:57:08 +0000 (13:57 +0100)]
Open options-edit popup in a smaller dialog
colemanw [Wed, 6 Aug 2014 12:52:01 +0000 (13:52 +0100)]
Merge pull request #3791 from colemanw/import
CRM-15028 - Fix participant import field labels
Coleman Watts [Wed, 6 Aug 2014 12:49:23 +0000 (13:49 +0100)]
CRM-15028 - Fix participant import field labels
colemanw [Wed, 6 Aug 2014 12:07:02 +0000 (13:07 +0100)]
Merge pull request #3790 from colemanw/export
CRM-15048 - Respect custom field text_length during export
projects / civicrm-core.git / log