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: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
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.
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 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
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
Coleman Watts [Wed, 6 Aug 2014 11:59:25 +0000 (12:59 +0100)]
CRM-15048 - Respect custom field text_length during export
colemanw [Wed, 6 Aug 2014 10:47:50 +0000 (11:47 +0100)]
Merge pull request #3789 from colemanw/menu
CRM-15076 - Fix drop-down menu height
Coleman Watts [Wed, 6 Aug 2014 10:45:41 +0000 (11:45 +0100)]
CRM-15076 - Fix drop-down menu height
Jitendra Purohit [Wed, 6 Aug 2014 10:42:06 +0000 (16:12 +0530)]
Fixed hardcoded contribution_id
Monish Deb [Wed, 6 Aug 2014 10:23:25 +0000 (15:53 +0530)]
Merge pull request #3788 from jitendrapurohit/Upgrade_fixes
Removed accidental adding of sample data to upgrade
Jitendra Purohit [Wed, 6 Aug 2014 10:13:07 +0000 (15:43 +0530)]
Removed accidental adding of sample data to upgrade
colemanw [Wed, 6 Aug 2014 09:46:20 +0000 (10:46 +0100)]
Merge pull request #3787 from colemanw/email
Change contact summary email links from 'mailto' to email activity popup
Coleman Watts [Wed, 6 Aug 2014 09:45:44 +0000 (10:45 +0100)]
Change contact summary email links from 'mailto' to email activity popup
Yashodha Chaku [Wed, 6 Aug 2014 08:33:34 +0000 (14:03 +0530)]
Merge pull request #3786 from jitendrapurohit/CRM-15063BillingFix
Billing Name saved as Participant Name Fix
Jitendra Purohit [Wed, 6 Aug 2014 05:54:33 +0000 (11:24 +0530)]
Billing Name saved as Participant Name Fix
Coleman Watts [Tue, 5 Aug 2014 20:52:55 +0000 (21:52 +0100)]
Email code cleanup
Coleman Watts [Tue, 5 Aug 2014 19:45:56 +0000 (20:45 +0100)]
Send email js fixes and cleanup
Kurund Jalmi [Tue, 5 Aug 2014 18:29:38 +0000 (23:59 +0530)]
Merge pull request #3765 from lcdservices/CRM-14912
CRM-14912 support import matching with external ID
Jitendra Purohit [Tue, 5 Aug 2014 10:09:41 +0000 (15:39 +0530)]
API Test Fix
Yashodha Chaku [Tue, 5 Aug 2014 09:41:08 +0000 (15:11 +0530)]
Merge pull request #3782 from jitendrapurohit/CRM-Test-4.5beta5
CRM test Fix 4.5beta5 For ActivityTest
Jitendra Purohit [Tue, 5 Aug 2014 07:17:43 +0000 (12:47 +0530)]
CRM test Fix 4.5beta5
Kurund Jalmi [Mon, 4 Aug 2014 17:12:00 +0000 (22:42 +0530)]
Merge pull request #3776 from crusonweb/patch-3
Update Contribution.php
Kurund Jalmi [Mon, 4 Aug 2014 17:03:17 +0000 (22:33 +0530)]
Merge pull request #3779 from anttiviljami/master
Wrapped some unlocalised elements in ts-tags
kurund [Mon, 4 Aug 2014 17:01:05 +0000 (22:31 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-04-22-25-32
Conflicts:
CRM/Utils/Type.php
Yashodha Chaku [Mon, 4 Aug 2014 13:40:36 +0000 (19:10 +0530)]
Merge pull request #3734 from wellebee/CRM-15036
CRM-15036 - force emailed social media image URLs to use HTTP.
colemanw [Mon, 4 Aug 2014 12:31:40 +0000 (13:31 +0100)]
Merge pull request #3780 from colemanw/sorting
Fix sort icons
Coleman Watts [Mon, 4 Aug 2014 11:06:10 +0000 (12:06 +0100)]
Removed unused datatable example styles
Coleman Watts [Mon, 4 Aug 2014 11:02:35 +0000 (12:02 +0100)]
Fix sort icons
colemanw [Mon, 4 Aug 2014 10:03:59 +0000 (11:03 +0100)]
Merge pull request #3778 from colemanw/apiActions
Improve lookup of api actions from function names
Coleman Watts [Mon, 4 Aug 2014 10:03:43 +0000 (11:03 +0100)]
Improve lookup of api actions from function names
Antti Kuosmanen [Mon, 4 Aug 2014 07:31:18 +0000 (10:31 +0300)]
Wrapped some unlocalised elements in ts-tags
colemanw [Sun, 3 Aug 2014 16:12:49 +0000 (17:12 +0100)]
Merge pull request #3777 from colemanw/psueodoConstant
Re-add case_type pseudoconstant to schema
Coleman Watts [Sun, 3 Aug 2014 15:50:38 +0000 (16:50 +0100)]
Change select option to use more standard pseudoconstant callback
Coleman Watts [Sun, 3 Aug 2014 15:49:27 +0000 (16:49 +0100)]
Increase pseudoconstant test coverage
Coleman Watts [Sun, 3 Aug 2014 15:48:45 +0000 (16:48 +0100)]
Remove useless tag from the old Preferences.xml
Coleman Watts [Sun, 3 Aug 2014 15:48:17 +0000 (16:48 +0100)]
Remove incorrect property from Grant.xml
Coleman Watts [Sat, 2 Aug 2014 16:59:39 +0000 (17:59 +0100)]
Re-add case_type pseudoconstant to schema
Kurund Jalmi [Fri, 1 Aug 2014 19:06:55 +0000 (00:36 +0530)]
Merge pull request #3774 from jitendrapurohit/CRM-15063additionalprofilefix
Additional profile select box fix in Manage Event Page
Dan Cruson [Fri, 1 Aug 2014 17:50:43 +0000 (13:50 -0400)]
Update Contribution.php
Fix regression that was causing Event Resets with Offline Contributions to be garbled. Detailed in CRM-15069
colemanw [Fri, 1 Aug 2014 14:49:49 +0000 (15:49 +0100)]
Merge pull request #3775 from colemanw/file
CRM-15068 - Add api support for custom file fields
Coleman Watts [Fri, 1 Aug 2014 14:49:08 +0000 (15:49 +0100)]
CRM-15068 - Add api support for custom file fields
Jitendra Purohit [Fri, 1 Aug 2014 14:38:32 +0000 (20:08 +0530)]
Additional profile select box fix in Manage Event Page
colemanw [Fri, 1 Aug 2014 11:48:36 +0000 (12:48 +0100)]
Merge pull request #3772 from colemanw/menuRestore
Improve 'restore menu' button
projects / civicrm-core.git / log