Tim Otten [Tue, 1 Apr 2014 00:15:53 +0000 (17:15 -0700)]
Merge pull request #2785 from eileenmcnaughton/CRM-14399-master
CRM-14399 add alterCalculatedMembershipStatus hook
Eileen McNaughton [Tue, 1 Apr 2014 00:12:09 +0000 (13:12 +1300)]
CRM-14399 one more call to getMembershipStatusByDate + update add function call to be more standard
Tim Otten [Mon, 31 Mar 2014 22:33:34 +0000 (15:33 -0700)]
Merge pull request #2787 from totten/master-gencode-escape
GenCode - Apply SQL-escaping to table comments
Tim Otten [Mon, 31 Mar 2014 22:31:27 +0000 (15:31 -0700)]
GenCode - Apply SQL-escaping to table comments
Fix regression stemming from
9e64deca
Eileen McNaughton [Fri, 28 Mar 2014 03:58:49 +0000 (16:58 +1300)]
CRM-14399 add alterCalculatedMembershipStatus hook
Conflicts:
api/v3/MembershipStatus.php
Dave Greenberg [Mon, 31 Mar 2014 16:05:31 +0000 (09:05 -0700)]
Merge pull request #2775 from ErichBSchulz/patch-3
correct record_type_id description
colemanw [Mon, 31 Mar 2014 02:18:31 +0000 (22:18 -0400)]
Merge pull request #2777 from colemanw/accordions
js work
Coleman Watts [Mon, 31 Mar 2014 02:15:12 +0000 (22:15 -0400)]
CRM-14408 - get rid of unnecessary calls to crmAccordions
Coleman Watts [Mon, 31 Mar 2014 02:02:22 +0000 (22:02 -0400)]
CRM-14408 - handle accordions automatically
Coleman Watts [Mon, 31 Mar 2014 01:40:26 +0000 (21:40 -0400)]
Add dialog resize button
Coleman Watts [Mon, 31 Mar 2014 00:45:21 +0000 (20:45 -0400)]
Improve dialog titlebar button style
Coleman Watts [Mon, 31 Mar 2014 00:22:18 +0000 (20:22 -0400)]
CRM-14407 - Fixup case custom tpl
colemanw [Sun, 30 Mar 2014 22:41:39 +0000 (18:41 -0400)]
Merge pull request #2776 from colemanw/caseCustom
CRM-14407 - Fix case custom field popup
Coleman Watts [Sun, 30 Mar 2014 22:41:09 +0000 (18:41 -0400)]
CRM-14407 - Fix case custom field popup
Coleman Watts [Sun, 30 Mar 2014 18:30:47 +0000 (14:30 -0400)]
Tweak to CRM.popup
Erich [Sun, 30 Mar 2014 02:44:23 +0000 (12:44 +1000)]
correct record_type_id description
fixed per further discussion http://forum.civicrm.org/index.php/topic,31282.msg136415.html#msg136415 with Eileen
kurund [Sat, 29 Mar 2014 18:25:35 +0000 (23:55 +0530)]
removed unwanted file
colemanw [Sat, 29 Mar 2014 15:10:15 +0000 (11:10 -0400)]
Merge pull request #2773 from colemanw/custom
CRM-14327 - Cleanup custom delete links
Coleman Watts [Sat, 29 Mar 2014 14:59:47 +0000 (10:59 -0400)]
CRM-14327 - Cleanup custom delete links
Dave Greenberg [Fri, 28 Mar 2014 21:29:47 +0000 (14:29 -0700)]
Merge pull request #2758 from pratik-joshi/CRM-14278
CRM-14278 : fix, removed extra check for radio/checkbox related 0 amount checking, instead applied the condition for zero amount checking directly on the final total price value.
colemanw [Fri, 28 Mar 2014 18:50:29 +0000 (14:50 -0400)]
Merge pull request #2769 from colemanw/cj
CRM-14383 - Update cj closures
Coleman Watts [Fri, 28 Mar 2014 15:08:53 +0000 (11:08 -0400)]
CRM-14383 - Update cj closures
colemanw [Fri, 28 Mar 2014 18:41:12 +0000 (14:41 -0400)]
Merge pull request #2768 from pratik-joshi/CRM-14327
CRM-14327 and CRM-14400
Pratik Joshi [Fri, 28 Mar 2014 15:36:10 +0000 (21:06 +0530)]
CRM-14327 : added save and new button
Coleman Watts [Fri, 28 Mar 2014 15:03:05 +0000 (11:03 -0400)]
css tweaks
colemanw [Fri, 28 Mar 2014 15:01:09 +0000 (11:01 -0400)]
Merge pull request #2763 from colemanw/master
CRM-14383 - Update additional script closures
Kurund Jalmi [Fri, 28 Mar 2014 14:35:04 +0000 (20:05 +0530)]
Merge pull request #2767 from jitendrapurohit/APITestsFix
API Tests Fix
jitendrapurohit [Fri, 28 Mar 2014 14:07:47 +0000 (19:37 +0530)]
API Tests Fix
colemanw [Fri, 28 Mar 2014 13:57:38 +0000 (09:57 -0400)]
Merge pull request #2762 from amitajgaonkar/WebtestIssues
Webtest fixes
Pratik Joshi [Fri, 28 Mar 2014 09:14:42 +0000 (14:44 +0530)]
CRM-14400
Pratik Joshi [Fri, 28 Mar 2014 08:31:30 +0000 (14:01 +0530)]
CRM-14400 : migration to use LivePage AJAX
Pratik Joshi [Fri, 28 Mar 2014 07:33:50 +0000 (13:03 +0530)]
CRM-14327 : title fixes
Pratik Joshi [Fri, 28 Mar 2014 06:21:42 +0000 (11:51 +0530)]
CRM-14327 : code cleanup and following implementation for livePage ajax
pratik-joshi [Fri, 28 Mar 2014 13:21:25 +0000 (18:51 +0530)]
Merge pull request #2766 from pratik-joshi/CRM-13992-temp_fix
CRM-13992-temp_fix : for comment #comment-58801
Pratik Joshi [Fri, 28 Mar 2014 13:16:25 +0000 (18:46 +0530)]
CRM-13992-temp_fix : for comment #comment-58801
Web Access [Fri, 28 Mar 2014 13:02:11 +0000 (18:32 +0530)]
Webtest Fixes
kurund [Fri, 28 Mar 2014 10:20:01 +0000 (15:50 +0530)]
copyright and version fixes
kurund [Fri, 28 Mar 2014 10:16:18 +0000 (15:46 +0530)]
copyright and version fixes
kurund [Fri, 28 Mar 2014 10:15:34 +0000 (15:45 +0530)]
copyright and version fixes
kurund [Fri, 28 Mar 2014 10:14:39 +0000 (15:44 +0530)]
copyright and version fixes
kurund [Fri, 28 Mar 2014 10:13:49 +0000 (15:43 +0530)]
copyright and version fixes
kurund [Fri, 28 Mar 2014 09:51:57 +0000 (15:21 +0530)]
copyright and version fixes
kurund [Fri, 28 Mar 2014 09:46:40 +0000 (15:16 +0530)]
copyright and version fixes
kurund [Fri, 28 Mar 2014 09:45:47 +0000 (15:15 +0530)]
copyright and version fixes
Coleman Watts [Fri, 28 Mar 2014 02:23:11 +0000 (22:23 -0400)]
CRM-14383 - Update additional script closures
Web Access [Thu, 27 Mar 2014 15:16:19 +0000 (20:46 +0530)]
Webtest fixes
pratik-joshi [Thu, 27 Mar 2014 14:41:26 +0000 (20:11 +0530)]
Merge pull request #2761 from jitendrapurohit/SurveyTest_Fix
SurveyTest Fix
jitendrapurohit [Thu, 27 Mar 2014 14:33:12 +0000 (20:03 +0530)]
SurveyTest Fix
Web Access [Thu, 27 Mar 2014 14:13:50 +0000 (19:43 +0530)]
Webtest fixes
Yashodha Chaku [Thu, 27 Mar 2014 08:41:31 +0000 (14:11 +0530)]
Merge pull request #2749 from monishdeb/HR-317
HR-317 support Case Field in Profile
pratik-joshi [Thu, 27 Mar 2014 07:04:35 +0000 (12:34 +0530)]
Merge pull request #2757 from jitendrapurohit/API_Testfix
API test fixes
Pratik Joshi [Thu, 27 Mar 2014 06:53:24 +0000 (12:23 +0530)]
CRM-14278 : fix, removed extra check for radio/checkbox related 0 amount checking, instead applied the condition for zero amount checking directly on the final total price value.
jitendrapurohit [Thu, 27 Mar 2014 06:43:41 +0000 (12:13 +0530)]
API test fixes
Tim Otten [Thu, 27 Mar 2014 00:58:10 +0000 (17:58 -0700)]
Merge pull request #2753 from fuzionnz/CRM-14394
Issue CRM-14394. Check that $path is not NULL, and that the file exists.
Tim Otten [Thu, 27 Mar 2014 00:40:53 +0000 (17:40 -0700)]
Merge pull request #2755 from eileenmcnaughton/patch-3
CRM-14396 - add module extension support to handlePaymentNotification
Eileen McNaughton [Thu, 27 Mar 2014 00:38:14 +0000 (13:38 +1300)]
CRM-14396 - add module extension support to handlePaymentNotification
Coleman Watts [Thu, 27 Mar 2014 00:30:54 +0000 (20:30 -0400)]
Css fix
Dave Greenberg [Wed, 26 Mar 2014 23:13:44 +0000 (16:13 -0700)]
Merge pull request #2754 from davecivicrm/CRM-14395
CRM-14395 - Prevent Edit button from being displayed on contact summary ...
Dave Greenberg [Wed, 26 Mar 2014 23:12:23 +0000 (16:12 -0700)]
CRM-14395 - Prevent Edit button from being displayed on contact summary if user does not have edit permission on that contact. It was incorrectly showing for all contacts when user role had edit my contact permission.
----------------------------------------
* CRM-14395: Edit button is displayed for users who do NOT have permission to edit the contact
http://issues.civicrm.org/jira/browse/CRM-14395
Chris Burgess [Wed, 26 Mar 2014 22:40:46 +0000 (11:40 +1300)]
Issue CRM-14394. Check that $path is not NULL, and that the file exists.
Dave Greenberg [Wed, 26 Mar 2014 22:09:16 +0000 (15:09 -0700)]
Merge pull request #2752 from davecivicrm/CRM-13578
CRM-13578 adding template for Assign Tags to Activities which somehow di...
Dave Greenberg [Wed, 26 Mar 2014 22:08:33 +0000 (15:08 -0700)]
CRM-13578 adding template for Assign Tags to Activities which somehow disappeared from a prior merged PR (https://github.com/civicrm/civicrm-core/pull/1818).
----------------------------------------
* CRM-13578: Tag Activities (assign tags) Action
http://issues.civicrm.org/jira/browse/CRM-13578
Tim Otten [Wed, 26 Mar 2014 22:05:49 +0000 (15:05 -0700)]
Merge pull request #2739 from colemanw/noconflict
CRM-14383 - Update js noconflict signature for jQuery & lo-dash
Dave Greenberg [Wed, 26 Mar 2014 20:15:21 +0000 (13:15 -0700)]
Merge pull request #2750 from davecivicrm/CRM-14094
CRM-14094 - Require Edit all Contacts permission consistently for inline...
Dave Greenberg [Wed, 26 Mar 2014 20:14:17 +0000 (13:14 -0700)]
CRM-14094 - Require Edit all Contacts permission consistently for inline editing deletion of contact-related objects e.g. address, email, phone. This is consistent with behavior of full Edit form.
----------------------------------------
* CRM-14094: Removing tags requires permission "delete contacts", should require "edit all contacts"
http://issues.civicrm.org/jira/browse/CRM-14094
monishdeb [Wed, 26 Mar 2014 17:56:22 +0000 (23:26 +0530)]
HR-317 support Case Field in Profile
colemanw [Wed, 26 Mar 2014 15:04:02 +0000 (11:04 -0400)]
Merge pull request #2746 from amitajgaonkar/WebtestIssues
webtest issues(fixed)
Coleman Watts [Wed, 26 Mar 2014 14:50:38 +0000 (10:50 -0400)]
Test fix
Coleman Watts [Wed, 26 Mar 2014 14:23:37 +0000 (10:23 -0400)]
Test fix
pratik-joshi [Wed, 26 Mar 2014 13:33:32 +0000 (19:03 +0530)]
Merge pull request #2745 from pratik-joshi/CRM-13992-temp_fix
CRM-13992-temp_fix : handling the validation message show and redirection improvement
Web Access [Wed, 26 Mar 2014 13:32:54 +0000 (19:02 +0530)]
solvedwebtest issues
Pratik Joshi [Wed, 26 Mar 2014 12:36:26 +0000 (18:06 +0530)]
CRM-13992-temp_fix : handling the validation message show and redirection improvement
Tim Otten [Wed, 26 Mar 2014 07:09:08 +0000 (00:09 -0700)]
Merge pull request #2742 from totten/master-httpclient-redir
CRM_Utils_HttpClient - Fix detection of safe-mode (which in turn determines whether follow-redirects is enabled)
Tim Otten [Wed, 26 Mar 2014 07:05:41 +0000 (00:05 -0700)]
CRM_Utils_HttpClient - Fix detection of safe-mode (which in turn determines whether follow-redirects is enabled)
pratik-joshi [Wed, 26 Mar 2014 06:43:35 +0000 (12:13 +0530)]
Merge pull request #2714 from jitendrapurohit/CRMTestFix
Report TestCaseTest DetailTest Fix
Tim Otten [Wed, 26 Mar 2014 06:01:51 +0000 (23:01 -0700)]
Merge pull request #2741 from totten/master-api-error-cleanup
civicrm_api3_create_error - Misc cleanup/simplification
Tim Otten [Wed, 26 Mar 2014 05:54:42 +0000 (22:54 -0700)]
civicrm_api3_create_error - Correction for weird SQL error reporting
Tim Otten [Wed, 26 Mar 2014 05:48:56 +0000 (22:48 -0700)]
civicrm_api3_create_error, api/v3/Activity - Remove support for optional parameter, $dao
The option is only used in one place.
Tim Otten [Wed, 26 Mar 2014 05:44:18 +0000 (22:44 -0700)]
civicrm_api3_create_error, api/v3/Generic/Update - Remove unnecessary indirection
Tim Otten [Wed, 26 Mar 2014 05:43:58 +0000 (22:43 -0700)]
civicrm_api3_create_error, api/v3/Activity - Remove unnecessary args
Coleman Watts [Wed, 26 Mar 2014 02:44:39 +0000 (22:44 -0400)]
Fix testContactCreateCurrentEmployer
Coleman Watts [Wed, 26 Mar 2014 02:26:17 +0000 (22:26 -0400)]
Test fix for renamed function
Coleman Watts [Wed, 26 Mar 2014 00:27:05 +0000 (20:27 -0400)]
Menu style fixes for WP
Coleman Watts [Wed, 26 Mar 2014 00:01:19 +0000 (20:01 -0400)]
Test fix
Kurund Jalmi [Tue, 25 Mar 2014 19:36:31 +0000 (01:06 +0530)]
Merge pull request #2698 from totten/master-error-scopes
Error handling - Remove old, unsafe, temporary error handlers
Kurund Jalmi [Tue, 25 Mar 2014 19:34:52 +0000 (01:04 +0530)]
Merge pull request #2708 from yashodha/sms-reminder
CRM-13912 : fix js to insert tokens for text message box
Coleman Watts [Tue, 25 Mar 2014 19:27:56 +0000 (15:27 -0400)]
CRM-14383 - Update closures that use lodash
Coleman Watts [Tue, 25 Mar 2014 19:01:45 +0000 (15:01 -0400)]
CRM-14383 - Add CRM.$ and CRM._ noconflict objects
Coleman Watts [Tue, 25 Mar 2014 19:11:25 +0000 (15:11 -0400)]
Fix double class declaration
Kurund Jalmi [Tue, 25 Mar 2014 19:04:21 +0000 (00:34 +0530)]
Merge pull request #2724 from colemanw/ids
CRM-14378 - Fix invalid markup and add descriptive classes to custom data
colemanw [Tue, 25 Mar 2014 18:35:08 +0000 (14:35 -0400)]
Merge pull request #2736 from colemanw/confirm
Improve CRM.confirm signature
Coleman Watts [Tue, 25 Mar 2014 16:37:35 +0000 (12:37 -0400)]
More cleanup of mailing previews
Coleman Watts [Tue, 25 Mar 2014 16:15:05 +0000 (12:15 -0400)]
Improve CRM.confirm signature
colemanw [Tue, 25 Mar 2014 13:58:57 +0000 (09:58 -0400)]
Merge pull request #2728 from amitajgaonkar/select2
Select2
pratik-joshi [Tue, 25 Mar 2014 13:49:56 +0000 (19:19 +0530)]
Merge pull request #2735 from pratik-joshi/CRM-13992_temp_fix
CRM-13992_temp_fix : fix for comment #comment-58624
Pratik Joshi [Tue, 25 Mar 2014 12:49:05 +0000 (18:19 +0530)]
CRM-13992_temp_fix : fix for comment #comment-58624
Web Access [Tue, 25 Mar 2014 10:37:29 +0000 (16:07 +0530)]
modification for select2 function
Web Access [Mon, 24 Mar 2014 12:38:49 +0000 (18:08 +0530)]
Modification for select2
Web Access [Mon, 24 Mar 2014 11:37:10 +0000 (17:07 +0530)]
Select2 function
Web Access [Mon, 24 Mar 2014 11:32:28 +0000 (17:02 +0530)]
Modification for select2
projects / civicrm-core.git / log