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
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
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
Coleman Watts [Fri, 1 Aug 2014 11:47:51 +0000 (12:47 +0100)]
Improve 'restore menu' button
Dave Greenberg [Thu, 31 Jul 2014 21:51:31 +0000 (14:51 -0700)]
Merge pull request #3770 from davecivicrm/CRM-13912
CRM-13912 - fix accordion header for SMS Message body.
Dave Greenberg [Thu, 31 Jul 2014 21:50:38 +0000 (14:50 -0700)]
CRM-13912 - fix accordion header for SMS Message body.
----------------------------------------
* CRM-13912:
https://issues.civicrm.org/jira/browse/CRM-13912
Dave Greenberg [Thu, 31 Jul 2014 19:44:32 +0000 (12:44 -0700)]
Merge pull request #3691 from eileenmcnaughton/master
fix inconsistent return value from fn
Coleman Watts [Thu, 31 Jul 2014 13:43:14 +0000 (14:43 +0100)]
Remove unused ac styles
Coleman Watts [Thu, 31 Jul 2014 13:01:53 +0000 (14:01 +0100)]
Menu quick search box style tweak
colemanw [Thu, 31 Jul 2014 12:09:49 +0000 (13:09 +0100)]
Merge pull request #3769 from colemanw/qsearch
Improve quick search box style
Coleman Watts [Thu, 31 Jul 2014 12:09:17 +0000 (13:09 +0100)]
Improve quick search box style
Kurund Jalmi [Thu, 31 Jul 2014 09:58:30 +0000 (15:28 +0530)]
Merge pull request #3768 from jitendrapurohit/CRM-15031CoreBugFix
CRM-15063 show/hide function fixes
Jitendra Purohit [Thu, 31 Jul 2014 09:47:10 +0000 (15:17 +0530)]
CRM-15063 display of datepicker
Kurund Jalmi [Thu, 31 Jul 2014 09:30:40 +0000 (15:00 +0530)]
Merge pull request #3767 from rohankatkar/webtest-CRM15037
CRM-15037 Added assertion for standalone contribution and membership web...
Rohan Katkar [Thu, 31 Jul 2014 09:00:18 +0000 (14:30 +0530)]
CRM-15037 Added assertion for standalone contribution and membership webtests.
Kurund Jalmi [Thu, 31 Jul 2014 06:03:10 +0000 (11:33 +0530)]
Merge pull request #3766 from davecivicrm/CRM-15037
Add check for send_receipt checkbox to WebTest_Event_AddParticipationTes...
Dave Greenberg [Wed, 30 Jul 2014 21:40:39 +0000 (14:40 -0700)]
Add check for send_receipt checkbox to WebTest_Event_AddParticipationTest::testEventParticipationAdd.
Kurund Jalmi [Wed, 30 Jul 2014 18:24:47 +0000 (23:54 +0530)]
Merge pull request #3762 from rohankatkar/webtest
Webtest fix for new contribution record and membership.
Kurund Jalmi [Wed, 30 Jul 2014 18:24:03 +0000 (23:54 +0530)]
Merge pull request #3763 from jitendrapurohit/CRM-15031
CRM-15031 Event Webtest Fix
Dave Greenberg [Wed, 30 Jul 2014 16:11:47 +0000 (09:11 -0700)]
Merge pull request #3764 from jmcclelland/reserve-respondents-force
CRM-15060 - don't load entire contacts table when reserving for survey.
Brian Shaughnessy [Wed, 30 Jul 2014 15:15:47 +0000 (11:15 -0400)]
CRM-14912 support import matching with external ID
colemanw [Wed, 30 Jul 2014 15:08:48 +0000 (16:08 +0100)]
Merge pull request #3761 from colemanw/unsavedWarning
CRM-15053 - Fix unsaved change warning in profile designer dialog
Jamie McClelland [Wed, 30 Jul 2014 13:50:32 +0000 (09:50 -0400)]
CRM-15060 - don't load entire contacts table when reserving for survey.
----------------------------------------
* CRM-15060: reserving survey respondents causes wait while entire database query is executed
https://issues.civicrm.org/jira/browse/CRM-15060
Jitendra Purohit [Wed, 30 Jul 2014 13:12:56 +0000 (18:42 +0530)]
CRM-15031 Event Webtest Fix
Rohan Katkar [Wed, 30 Jul 2014 11:56:55 +0000 (17:26 +0530)]
Webtest fix for new contribution record and membership.
CiviCRM [Wed, 30 Jul 2014 10:22:06 +0000 (03:22 -0700)]
Update version to 4.5.beta5
Coleman Watts [Wed, 30 Jul 2014 09:33:29 +0000 (10:33 +0100)]
CRM-15053 - Fix unsaved change warning in profile designer dialog
Coleman Watts [Wed, 30 Jul 2014 09:00:27 +0000 (10:00 +0100)]
CRM-14353 CRM-15053 - Better handler for dialog close events which accounts for esc key
Yashodha Chaku [Wed, 30 Jul 2014 06:14:56 +0000 (11:44 +0530)]
Merge pull request #3760 from jitendrapurohit/CRM-15047
clean check of _pledgeID in $form
Jitendra Purohit [Wed, 30 Jul 2014 06:06:57 +0000 (11:36 +0530)]
clean check of _pledgeID in
Kurund Jalmi [Wed, 30 Jul 2014 05:03:53 +0000 (10:33 +0530)]
Merge pull request #3757 from kenwest/CRM-15057
CRM-15057 CRM/Case/xml/configuration.sample/AdultDayCareReferral.xml ...
Yashodha Chaku [Wed, 30 Jul 2014 04:51:50 +0000 (10:21 +0530)]
Merge pull request #3758 from rohankatkar/CRM-15047
CRM-15047 Fix for Attempting to record ANY contribution throws a fatal e...
Rohan Katkar [Wed, 30 Jul 2014 03:57:57 +0000 (09:27 +0530)]
CRM-15047 Fix for Attempting to record ANY contribution throws a fatal error
Ken West [Wed, 30 Jul 2014 03:18:53 +0000 (13:18 +1000)]
CRM-15057 Renamed CRM/Case/xml/configuration.sample/AdultDayCareReferral.xml to adult_day_care_referral.xml
Dave Greenberg [Wed, 30 Jul 2014 00:02:29 +0000 (17:02 -0700)]
Merge pull request #3750 from kurund/CRM-15051
CRM-15051, fixed highlighting for fields during contribution import
Dave Greenberg [Tue, 29 Jul 2014 22:36:27 +0000 (15:36 -0700)]
Merge pull request #3755 from davecivicrm/CRM-15045
CRM-15045 - Improved links in Configuration Checklist.
Dave Greenberg [Tue, 29 Jul 2014 22:35:38 +0000 (15:35 -0700)]
CRM-15045 - Improved links in Configuration Checklist.
----------------------------------------
* CRM-15045:
https://issues.civicrm.org/jira/browse/CRM-15045
Dave Greenberg [Tue, 29 Jul 2014 22:17:30 +0000 (15:17 -0700)]
Merge pull request #3754 from davecivicrm/CRM-15052
Fix typos and incorrect terminology in Participant Import preview and su...
Dave Greenberg [Tue, 29 Jul 2014 22:16:27 +0000 (15:16 -0700)]
Fix typos and incorrect terminology in Participant Import preview and summary screens.
Dave Greenberg [Tue, 29 Jul 2014 21:36:06 +0000 (14:36 -0700)]
Merge pull request #3733 from lcdservices/CRM-15035
CRM-15035 include/exclude - set tag defaults
Dave Greenberg [Tue, 29 Jul 2014 21:25:55 +0000 (14:25 -0700)]
Merge pull request #3753 from colemanw/fee
CRM-14882 - Fix js for showing/hiding billing block when fee is zero
Coleman Watts [Tue, 29 Jul 2014 19:33:22 +0000 (20:33 +0100)]
CRM-14882 - Fix js for showing/hiding billing block when fee is zero
Coleman Watts [Tue, 29 Jul 2014 19:31:22 +0000 (20:31 +0100)]
Prevent js error on public pages
Dave Greenberg [Tue, 29 Jul 2014 19:14:02 +0000 (12:14 -0700)]
Merge pull request #3752 from colemanw/wr
CRM-15056 - Workaround for civicrm_worldregion bug in search builder
Coleman Watts [Tue, 29 Jul 2014 18:59:52 +0000 (19:59 +0100)]
CRM-15056 - Workaround for civicrm_worldregion bug in search builder
Dave Greenberg [Tue, 29 Jul 2014 17:26:36 +0000 (10:26 -0700)]
Merge pull request #3751 from kurund/CRM-14918
-- fixed code to save line item when contribution is updated for members...
Pradeep Nayak [Fri, 18 Jul 2014 07:43:59 +0000 (13:13 +0530)]
-- fixed code to save line item when contribution is updated for membership, CRM-14918
----------------------------------------
* CRM-14918: Line Items are created for Participant when contribution is not recorded
https://issues.civicrm.org/jira/browse/CRM-14918
kurund [Tue, 29 Jul 2014 16:44:51 +0000 (22:14 +0530)]
CRM-15051, fixed highlighting for fields during contribution import
----------------------------------------
* CRM-15051: Total Amount not shown as required for Import Contributions - update existing contributions
https://issues.civicrm.org/jira/browse/CRM-15051
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
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
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
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
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
Kurund Jalmi [Tue, 29 Jul 2014 10:46:51 +0000 (16:16 +0530)]
Merge pull request #3743 from rohankatkar/CRM-15037
CRM-15037
Coleman Watts [Tue, 29 Jul 2014 10:23:28 +0000 (11:23 +0100)]
CRM-13652 - Fix relationship api to process related memberships
CiviCRM [Tue, 29 Jul 2014 06:40:42 +0000 (12:10 +0530)]
CRM-15032 - change 4.4.0.mysql.tpl to UTF-8 encoding
Rohan Katkar [Tue, 29 Jul 2014 06:11:16 +0000 (11:41 +0530)]
CRM-15037
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...
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.
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
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...
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
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
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
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
Coleman Watts [Mon, 28 Jul 2014 14:50:20 +0000 (15:50 +0100)]
Finish migrating AlternateContactSelector.js to use entityRef
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.
Jitendra Purohit [Mon, 28 Jul 2014 11:15:34 +0000 (16:45 +0530)]
Notice Fix during test execution
Jitendra Purohit [Mon, 28 Jul 2014 10:36:14 +0000 (16:06 +0530)]
CRM-15021 Web Test Fix
CiviCRM [Mon, 28 Jul 2014 10:19:47 +0000 (15:49 +0530)]
CRM-15032 - change 4.4.0.mysql.tpl to UTF-8 encoding
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.
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
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
Keith Morgan [Fri, 25 Jul 2014 14:39:07 +0000 (09:39 -0500)]
CRM-15036 - force emailed social media image URLs to use HTTP.
----------------------------------------
* CRM-15036: Social media image URLs should always use HTTP in emails
https://issues.civicrm.org/jira/browse/CRM-15036
Brian Shaughnessy [Fri, 25 Jul 2014 14:27:17 +0000 (10:27 -0400)]
CRM-15035 include/exclude - set tag defaults
projects / civicrm-core.git / log