kurund [Mon, 21 Apr 2014 15:51:45 +0000 (08:51 -0700)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-21-08-12-12
Conflicts:
CRM/Contact/Page/AJAX.php
CRM/Core/Payment.php
CRM/Event/Form/Registration/Register.php
api/v3/Membership.php
api/v3/utils.php
sql/civicrm_generated.mysql
xml/version.xml
colemanw [Mon, 21 Apr 2014 14:12:51 +0000 (07:12 -0700)]
Merge pull request #2922 from jitendrapurohit/Pledge_Webtest
Web Test Fix
jitendrapurohit [Mon, 21 Apr 2014 13:57:17 +0000 (19:27 +0530)]
Web Test Fix
colemanw [Mon, 21 Apr 2014 05:55:05 +0000 (22:55 -0700)]
Merge pull request #2919 from NileemaJadhav/HR-316
Add region to Case Activity form
Nileema [Mon, 21 Apr 2014 05:51:57 +0000 (11:21 +0530)]
HR-316 region name modification
Nileema [Fri, 18 Apr 2014 14:59:33 +0000 (20:29 +0530)]
Add region to Case Activity form
colemanw [Sun, 20 Apr 2014 00:20:29 +0000 (17:20 -0700)]
Merge pull request #2845 from elcapo/activity-contact-api
Create new API entity: ActivityContact (#CRM-14414)
pratik-joshi [Fri, 18 Apr 2014 14:29:42 +0000 (19:59 +0530)]
Merge pull request #2917 from jitendrapurohit/Contact_Web_Fixes
Web Test Fix
pratik-joshi [Fri, 18 Apr 2014 14:29:02 +0000 (19:59 +0530)]
Merge pull request #2918 from atif-shaikh/WebTextFix
WebTestFixes related to testCreateCampaign
Atif Shaikh [Fri, 18 Apr 2014 14:10:40 +0000 (19:40 +0530)]
WebTestFixes related to testCreateCampaign
jitendrapurohit [Fri, 18 Apr 2014 12:21:20 +0000 (17:51 +0530)]
Web Test Fix
Kurund Jalmi [Fri, 18 Apr 2014 05:22:24 +0000 (22:22 -0700)]
Merge pull request #2915 from yashodha/HR-330
save filter and grouping from xml to case type
yashodha [Fri, 18 Apr 2014 05:34:18 +0000 (11:04 +0530)]
save filter and grouping from xml to case type
Kurund Jalmi [Fri, 18 Apr 2014 05:22:06 +0000 (22:22 -0700)]
Merge pull request #2900 from yashodha/HR-324
HR-324 : add filter to case type
CiviCRM [Fri, 18 Apr 2014 01:14:52 +0000 (18:14 -0700)]
Update version to 4.4.6
Dave Greenberg [Thu, 17 Apr 2014 22:03:38 +0000 (15:03 -0700)]
Merge pull request #2914 from davecivicrm/CRM-14261
CRM-14261 - Apply same fix to Additional Participant template (top of pa...
Dave Greenberg [Thu, 17 Apr 2014 22:03:01 +0000 (15:03 -0700)]
CRM-14261 - Apply same fix to Additional Participant template (top of page profile goes ABOVE price set).
----------------------------------------
* CRM-14261:
https://issues.civicrm.org/jira/browse/CRM-14261
colemanw [Thu, 17 Apr 2014 18:38:25 +0000 (14:38 -0400)]
Merge pull request #2913 from colemanw/master
CRM-13966 - Change frozen markup to use span not div
Coleman Watts [Thu, 17 Apr 2014 18:37:53 +0000 (14:37 -0400)]
CRM-13966 - Change frozen markup to use span not div
Kurund Jalmi [Thu, 17 Apr 2014 18:10:59 +0000 (11:10 -0700)]
Merge pull request #2904 from atif-shaikh/CRM-14277
CRM-14277
Kurund Jalmi [Thu, 17 Apr 2014 18:09:36 +0000 (11:09 -0700)]
Merge pull request #2912 from colemanw/regions
HR-316 - Add generic form regions
Kurund Jalmi [Thu, 17 Apr 2014 18:07:33 +0000 (11:07 -0700)]
Merge pull request #2888 from eileenmcnaughton/patch-3
E-notice fix
Kurund Jalmi [Thu, 17 Apr 2014 18:07:15 +0000 (11:07 -0700)]
Merge pull request #2901 from eileenmcnaughton/E-notice
enotices when enabling logging on fields that don't (yet) exist in the l...
Kurund Jalmi [Thu, 17 Apr 2014 18:06:23 +0000 (11:06 -0700)]
Merge pull request #2910 from eileenmcnaughton/enotice2
eNotice fix
Kurund Jalmi [Thu, 17 Apr 2014 18:05:42 +0000 (11:05 -0700)]
Merge pull request #2903 from jitendrapurohit/Member_WebTests
Webtests Fix
Kurund Jalmi [Thu, 17 Apr 2014 18:05:27 +0000 (11:05 -0700)]
Merge pull request #2911 from jitendrapurohit/Contact_Webtest
Web Test Fix
Coleman Watts [Thu, 17 Apr 2014 17:46:54 +0000 (13:46 -0400)]
HR-316 - Add generic form regions
jitendrapurohit [Thu, 17 Apr 2014 14:12:08 +0000 (19:42 +0530)]
Web Test Fix
Eileen McNaughton [Thu, 17 Apr 2014 09:32:55 +0000 (21:32 +1200)]
eNotice fix
Tim Otten [Thu, 17 Apr 2014 06:47:25 +0000 (23:47 -0700)]
Merge pull request #2908 from totten/4.4-restrict-customDir
customFileUploadDir - Restrict remote access
Tim Otten [Thu, 17 Apr 2014 00:23:50 +0000 (17:23 -0700)]
customFileUploadDir - Restrict remote access
Kurund Jalmi [Wed, 16 Apr 2014 22:17:07 +0000 (15:17 -0700)]
Merge pull request #2886 from colemanw/4.4
CRM-14463 - Fix custom address fields to support location type
Tim Otten [Wed, 16 Apr 2014 19:11:44 +0000 (12:11 -0700)]
Merge pull request #2907 from totten/4.4-date-const
CRM-14446 - s/magic value/constant/
Tim Otten [Wed, 16 Apr 2014 19:10:40 +0000 (12:10 -0700)]
CRM-14446 - s/magic value/constant/
Tim Otten [Wed, 16 Apr 2014 19:08:03 +0000 (12:08 -0700)]
Merge pull request #2860 from eileenmcnaughton/CRM-14446
CRM-14446 contact.get api tests + fix on date filters
Tim Otten [Wed, 16 Apr 2014 19:06:07 +0000 (12:06 -0700)]
Merge pull request #2882 from totten/4.4-module-payproc
CRM-14396 - CRM_Core_Payment::handlePaymentMethod
colemanw [Wed, 16 Apr 2014 17:26:40 +0000 (13:26 -0400)]
Merge pull request #2906 from NileemaJadhav/HR-master
--HR-339 Pre-populate "email" activity with case contact(s)
colemanw [Wed, 16 Apr 2014 17:24:33 +0000 (13:24 -0400)]
Merge pull request #2905 from PoonamNalawade/HR321
--HR-321 changes related to status change and UI
Nileema [Wed, 16 Apr 2014 14:06:41 +0000 (19:36 +0530)]
--HR-339 Pre-populate "email" activity with case contact(s)
Poonam [Wed, 16 Apr 2014 14:02:16 +0000 (19:32 +0530)]
--HR-321 changes related to status change and UI
Atif Shaikh [Wed, 16 Apr 2014 13:55:18 +0000 (19:25 +0530)]
CRM-14277 Further Improvements
----------------------------------------
* CRM-14277: Error when clicking Done on viewing a Contribution
https://issues.civicrm.org/jira/browse/CRM-14277
Atif Shaikh [Wed, 16 Apr 2014 13:50:17 +0000 (19:20 +0530)]
CRM-14277 Fix - Error when clicking Done on viewing a Contribution
https://issues.civicrm.org/jira/browse/CRM-14277
jitendrapurohit [Wed, 16 Apr 2014 13:14:21 +0000 (18:44 +0530)]
Webtests Fix
Kurund Jalmi [Wed, 16 Apr 2014 02:22:06 +0000 (19:22 -0700)]
Merge pull request #2895 from jitendrapurohit/Web_Fix
Web Test Fix
Dave Greenberg [Wed, 16 Apr 2014 02:16:05 +0000 (19:16 -0700)]
Merge pull request #2902 from kurund/CRM-14429
code clean / fixes CRM-14429
kurund [Wed, 16 Apr 2014 02:11:40 +0000 (19:11 -0700)]
code clean / fixes CRM-14429
----------------------------------------
* CRM-14429: Contact import fails silently on lookup of custom field option values by label
https://issues.civicrm.org/jira/browse/CRM-14429
Eileen McNaughton [Wed, 16 Apr 2014 01:35:23 +0000 (13:35 +1200)]
enotices when enabling logging on fields that don't (yet) exist in the log tables
Dave Greenberg [Wed, 16 Apr 2014 01:26:36 +0000 (18:26 -0700)]
Merge pull request #2894 from pratik-joshi/CRM-13973-comment
CRM-13973 : #comment-59450 fix
yashodha [Wed, 16 Apr 2014 00:44:10 +0000 (06:14 +0530)]
HR-324 : add filter to case type
Dave Greenberg [Wed, 16 Apr 2014 00:27:16 +0000 (17:27 -0700)]
Merge pull request #2896 from agh1/format-pledge-money
CRM-14471: Pledge payment amount displays with dollar sign on contribution page
Dave Greenberg [Tue, 15 Apr 2014 23:40:02 +0000 (16:40 -0700)]
Merge pull request #2899 from davecivicrm/CRM-14191
CRM-14191 - fix notice in FourFour.php upgrade.
Dave Greenberg [Tue, 15 Apr 2014 23:37:32 +0000 (16:37 -0700)]
CRM-14191 - fix notice in FourFour.php upgrade.
----------------------------------------
* CRM-14191:
https://issues.civicrm.org/jira/browse/CRM-14191
Dave Greenberg [Tue, 15 Apr 2014 23:27:01 +0000 (16:27 -0700)]
Merge pull request #2897 from pradpnayak/CRM-14191
-- removed hardcoded values, added sql upgrade script to handle civicrm_...
Dave Greenberg [Tue, 15 Apr 2014 21:35:28 +0000 (14:35 -0700)]
Merge pull request #2898 from davecivicrm/CRM-14467
CRM-14467 - remove extra double-quote which messes up case_id in change ...
Dave Greenberg [Tue, 15 Apr 2014 21:34:06 +0000 (14:34 -0700)]
CRM-14467 - remove extra double-quote which messes up case_id in change status URL.
----------------------------------------
* CRM-14467:
https://issues.civicrm.org/jira/browse/CRM-14467
Pradeep Nayak [Tue, 15 Apr 2014 21:25:34 +0000 (02:55 +0530)]
-- removed hardcoded values and handled reopened status. CRM-14191
----------------------------------------
* CRM-14191:
https://issues.civicrm.org/jira/browse/CRM-14191
Pradeep Nayak [Tue, 15 Apr 2014 19:10:52 +0000 (00:40 +0530)]
-- removed hardcoded values, added sql upgrade script to handle civicrm_batch.status_id, CRM-14191
----------------------------------------
* CRM-14191: There are 3 options with value=0 in option group "batch_status"
https://issues.civicrm.org/jira/browse/CRM-14191
Andrew Hunt [Tue, 15 Apr 2014 16:02:19 +0000 (12:02 -0400)]
pull currency from scheduled payment
Andrew Hunt [Tue, 15 Apr 2014 15:39:41 +0000 (11:39 -0400)]
use money format instead of dollar sign for pledge payment due
jitendrapurohit [Tue, 15 Apr 2014 14:46:00 +0000 (20:16 +0530)]
Web Test Fix
dlobo [Tue, 15 Apr 2014 14:15:49 +0000 (07:15 -0700)]
Merge pull request #2786 from ar-jan/CRM-13946
CRM-13946: Backport PR #2185: set default database connection to UTF-8
Pratik Joshi [Tue, 15 Apr 2014 11:13:55 +0000 (16:43 +0530)]
CRM-13973 : #comment-59450 fix
pratik-joshi [Tue, 15 Apr 2014 05:20:29 +0000 (10:50 +0530)]
Merge pull request #2892 from jitendrapurohit/OfflineContribution_Webtests
Web Tests Fix
Dave Greenberg [Mon, 14 Apr 2014 16:01:58 +0000 (09:01 -0700)]
Merge pull request #2864 from monishdeb/CRM-13283
CRM-13283 fix - Number of terms does not update the end date of membership
Dave Greenberg [Mon, 14 Apr 2014 15:34:05 +0000 (08:34 -0700)]
Merge pull request #2862 from pratik-joshi/CRM-13973-comment
CRM-13973 : #comment-59275 fix
jitendrapurohit [Mon, 14 Apr 2014 13:57:25 +0000 (19:27 +0530)]
Web Tests Fix
Eileen McNaughton [Mon, 14 Apr 2014 03:36:30 +0000 (15:36 +1200)]
E-notice fix
Coleman Watts [Sun, 13 Apr 2014 23:28:35 +0000 (19:28 -0400)]
CRM-14463 - Fix custom address fields to support location type
Dave Greenberg [Sun, 13 Apr 2014 15:38:28 +0000 (08:38 -0700)]
Merge pull request #2885 from monishdeb/CRM-13833
CRM-13833 and CRM-13981 fixes
monishdeb [Sat, 12 Apr 2014 14:31:55 +0000 (20:01 +0530)]
Typo mistake
monishdeb [Sat, 12 Apr 2014 14:29:13 +0000 (19:59 +0530)]
CRM-13833 and CRM-13981 minor fixes
----------------------------------------
* CRM-13833: Implement Soft Credit Types
https://issues.civicrm.org/jira/browse/CRM-13833
* CRM-13981: Migrate "In Honor of" to Soft Credits
https://issues.civicrm.org/jira/browse/CRM-13981
Coleman Watts [Sat, 12 Apr 2014 13:50:36 +0000 (09:50 -0400)]
HR-321 - Keep accordions closed for special case activities
Coleman Watts [Sat, 12 Apr 2014 13:40:23 +0000 (09:40 -0400)]
Fix case email table
colemanw [Sat, 12 Apr 2014 13:22:40 +0000 (09:22 -0400)]
Merge pull request #2881 from colemanw/snippet
HR-316 - Add crmRegion support to snippets and remove old div
colemanw [Sat, 12 Apr 2014 12:23:23 +0000 (08:23 -0400)]
Merge pull request #2871 from divya-jose/HR-329-new
--HR-329 Fix datatable DOM collision
Kurund Jalmi [Sat, 12 Apr 2014 01:38:34 +0000 (18:38 -0700)]
Merge pull request #2884 from yashodha/HR-330
HR-330 : case status should return filter=0 by default
yashodha [Sat, 12 Apr 2014 00:51:22 +0000 (06:21 +0530)]
HR-330 : case status should return filter=0 by default
dlobo [Fri, 11 Apr 2014 23:46:51 +0000 (16:46 -0700)]
Merge pull request #2869 from kurund/CRM-14438
CRM-14438 and CRM-13996 fix to populate prev/next cache when sorting in ...
Tim Otten [Fri, 11 Apr 2014 23:15:31 +0000 (16:15 -0700)]
Merge pull request #2883 from totten/4.4-lazy-session
CRM-14356 - CRM_Core_Session - Handle Drupal's lazy sessions
Tim Otten [Fri, 11 Apr 2014 22:59:30 +0000 (15:59 -0700)]
CRM-14356 - CRM_Core_Session - Guard against unset value
Tim Otten [Fri, 11 Apr 2014 22:22:01 +0000 (15:22 -0700)]
CRM-14356 - CRM_Core_Session - Handle Drupal's lazy sessions
This is Ken's original patch from
http://forum.civicrm.org/index.php/topic,31800.msg136249.html
Tim Otten [Fri, 11 Apr 2014 21:54:33 +0000 (14:54 -0700)]
CRM-14396 - CRM_Core_Payment::handlePaymentMethod - Don't leak $paymentClass
across iterations of while()
Coleman Watts [Fri, 11 Apr 2014 21:52:27 +0000 (17:52 -0400)]
HR-316 - Add crmRegion support to snippets and remove old div
Tim Otten [Fri, 11 Apr 2014 21:48:47 +0000 (14:48 -0700)]
CRM-14396 - CRM_Core_Payment::handlePaymentMethod - Fix 'not found' error
There are two ways to locate handler class -- one via isExtensionKey() and
one via "CRM_Core_{$className}". Prior to this patch, the error would arise
even if a class was located via "CRM_Core_{$className}".
colemanw [Fri, 11 Apr 2014 21:27:54 +0000 (17:27 -0400)]
Merge pull request #2880 from colemanw/master
Update action-menu styles
Coleman Watts [Fri, 11 Apr 2014 21:26:40 +0000 (17:26 -0400)]
Update action-menu styles
colemanw [Fri, 11 Apr 2014 19:44:26 +0000 (15:44 -0400)]
Merge pull request #2879 from colemanw/master
TabHeader.js - extend to support HR-320
Coleman Watts [Fri, 11 Apr 2014 19:43:31 +0000 (15:43 -0400)]
TabHeader.js - extend to support HR-320
Kurund Jalmi [Fri, 11 Apr 2014 15:42:28 +0000 (08:42 -0700)]
Merge pull request #2877 from jitendrapurohit/Priceset_Webtest
Web Test Fix
colemanw [Fri, 11 Apr 2014 15:09:55 +0000 (11:09 -0400)]
Merge pull request #2872 from PoonamNalawade/HR_321
--HR-321 Simplify case-activity forms and add case_status as a url param
colemanw [Fri, 11 Apr 2014 15:08:40 +0000 (11:08 -0400)]
Merge pull request #2878 from colemanw/js
JS updates to support HR-337
jitendrapurohit [Fri, 11 Apr 2014 12:20:49 +0000 (17:50 +0530)]
Web Test Fix
Coleman Watts [Fri, 11 Apr 2014 01:22:17 +0000 (21:22 -0400)]
JS updates to support HR-337
Dave Greenberg [Thu, 10 Apr 2014 20:38:44 +0000 (13:38 -0700)]
Merge pull request #2875 from davecivicrm/CRM-14451
CRM-14451 - remove undefined / un-used variable.
Dave Greenberg [Thu, 10 Apr 2014 20:37:16 +0000 (13:37 -0700)]
CRM-14451 - remove undefined / un-used variable.
----------------------------------------
* CRM-14451:
https://issues.civicrm.org/jira/browse/CRM-14451
Dave Greenberg [Thu, 10 Apr 2014 19:41:30 +0000 (12:41 -0700)]
Merge pull request #2870 from kurund/CRM-14352
fixes for duplicate relationship error, CRM-14352
Kurund Jalmi [Thu, 10 Apr 2014 19:35:31 +0000 (12:35 -0700)]
Merge pull request #2873 from jitendrapurohit/PriceSet_Webtests
Webtest Fix
dlobo [Thu, 10 Apr 2014 17:33:11 +0000 (10:33 -0700)]
Merge pull request #2858 from totten/4.4-wp-breadcrumb-cacheclear
CRM-14439 - Fix WP breadcrumbs by forcibly pre-computing them with "wp-admin/admin.php"
dlobo [Thu, 10 Apr 2014 17:32:35 +0000 (10:32 -0700)]
Merge pull request #2859 from totten/4.4-wp-breadcrumb-forceBackend
CRM-14439 - Fix WP breadcrumbs by setting forceBackend=1 and consistently respecting that option
dlobo [Thu, 10 Apr 2014 17:26:39 +0000 (10:26 -0700)]
Merge pull request #2833 from lcdservices/CRM-14208b
CRM-14208 additional includes for J3.2.1+
projects / civicrm-core.git / log