civicrm-core.git
10 years ago--HR-321 Simplify case-activity forms and add case_status as a url param
Poonam [Wed, 2 Apr 2014 06:16:50 +0000 (11:46 +0530)]
--HR-321 Simplify case-activity forms and add case_status as a url param

10 years agoMerge pull request #2808 from colemanw/popups
colemanw [Thu, 3 Apr 2014 01:01:24 +0000 (21:01 -0400)]
Merge pull request #2808 from colemanw/popups

popup/ajax work

10 years agoCRM-13966 - Refactor ScheduleReminders tokeninput to select2
Coleman Watts [Wed, 2 Apr 2014 21:33:42 +0000 (17:33 -0400)]
CRM-13966 - Refactor ScheduleReminders tokeninput to select2

10 years agoCRM-13966 - Fix gitlist api bug
Coleman Watts [Wed, 2 Apr 2014 21:32:52 +0000 (17:32 -0400)]
CRM-13966 - Fix gitlist api bug

10 years agoCRM-13966 - Refactor activityToCase tokeninput to select2
Coleman Watts [Wed, 2 Apr 2014 19:08:09 +0000 (15:08 -0400)]
CRM-13966 - Refactor activityToCase tokeninput to select2

10 years agoCRM-13863 - Add CRM.refreshParent helper
Coleman Watts [Wed, 2 Apr 2014 18:36:12 +0000 (14:36 -0400)]
CRM-13863 - Add CRM.refreshParent helper

10 years agoMerge pull request #2807 from colemanw/popups
colemanw [Wed, 2 Apr 2014 15:49:47 +0000 (11:49 -0400)]
Merge pull request #2807 from colemanw/popups

CRM-13863 - Fix for save & new

10 years agoFix reference to crmSnippet data
Coleman Watts [Wed, 2 Apr 2014 15:49:13 +0000 (11:49 -0400)]
Fix reference to crmSnippet data

10 years agoCRM-13863 - Fix for save & new - force reset of original url
Coleman Watts [Wed, 2 Apr 2014 15:48:50 +0000 (11:48 -0400)]
CRM-13863 - Fix for save & new - force reset of original url

10 years agoCRM-13863 - Fix for save & new - buffer the crmPopupFormSuccess event
Coleman Watts [Wed, 2 Apr 2014 15:41:13 +0000 (11:41 -0400)]
CRM-13863 - Fix for save & new - buffer the crmPopupFormSuccess event

10 years agoMerge pull request #2806 from jitendrapurohit/Web_Test_Fix
colemanw [Wed, 2 Apr 2014 15:04:24 +0000 (11:04 -0400)]
Merge pull request #2806 from jitendrapurohit/Web_Test_Fix

Web Test Fix

10 years agoWeb Test Fix
jitendrapurohit [Wed, 2 Apr 2014 14:48:36 +0000 (20:18 +0530)]
Web Test Fix

10 years agoMerge pull request #2802 from atif-shaikh/UpgradeFix
Kurund Jalmi [Wed, 2 Apr 2014 12:24:38 +0000 (17:54 +0530)]
Merge pull request #2802 from atif-shaikh/UpgradeFix

Upgrade Fix from 4.4 to 4.5

10 years agoUpgrade Fix from 4.4 to 4.5
Atif Shaikh [Wed, 2 Apr 2014 11:29:32 +0000 (16:59 +0530)]
Upgrade Fix from 4.4 to 4.5

10 years agoLocalize dashboard text
Coleman Watts [Tue, 1 Apr 2014 23:50:33 +0000 (19:50 -0400)]
Localize dashboard text

10 years agoMerge pull request #2797 from colemanw/master
colemanw [Tue, 1 Apr 2014 23:46:23 +0000 (19:46 -0400)]
Merge pull request #2797 from colemanw/master

Move dashboard.css out of packages and fix icon css

10 years agoMove dashboard.css out of packages and fix icon css
Coleman Watts [Tue, 1 Apr 2014 21:52:52 +0000 (17:52 -0400)]
Move dashboard.css out of packages and fix icon css

10 years agoMerge pull request #2781 from monishdeb/CRM-13981
Dave Greenberg [Tue, 1 Apr 2014 17:38:42 +0000 (10:38 -0700)]
Merge pull request #2781 from monishdeb/CRM-13981

CRM-13981 multilingual fix

10 years agoMerge pull request #2772 from monishdeb/CRM-14377
Dave Greenberg [Tue, 1 Apr 2014 17:36:42 +0000 (10:36 -0700)]
Merge pull request #2772 from monishdeb/CRM-14377

CRM-14377 fix

10 years agoMerge pull request #2795 from jitendrapurohit/APITestHandling
colemanw [Tue, 1 Apr 2014 17:10:02 +0000 (13:10 -0400)]
Merge pull request #2795 from jitendrapurohit/APITestHandling

SyntaxConformanceTest handling For Encoding and Decoding

10 years agoMerge branch 'rcsheets-docstring-cleanup'
Coleman Watts [Tue, 1 Apr 2014 17:06:57 +0000 (13:06 -0400)]
Merge branch 'rcsheets-docstring-cleanup'

Conflicts:
CRM/Utils/Array.php

10 years agoIcon tweak
Coleman Watts [Tue, 1 Apr 2014 17:04:49 +0000 (13:04 -0400)]
Icon tweak

10 years agoMerge pull request #2791 from eileenmcnaughton/CRM-14399-master
colemanw [Tue, 1 Apr 2014 16:37:43 +0000 (12:37 -0400)]
Merge pull request #2791 from eileenmcnaughton/CRM-14399-master

CRM-14399 fix test, add right number of extra params

10 years agoMerge pull request #2796 from colemanw/master
colemanw [Tue, 1 Apr 2014 16:23:12 +0000 (12:23 -0400)]
Merge pull request #2796 from colemanw/master

Dialog & select2 improvements

10 years agoDialog & select2 improvements
Coleman Watts [Tue, 1 Apr 2014 16:21:33 +0000 (12:21 -0400)]
Dialog & select2 improvements

10 years agoSyntaxConformanceTest handling Encoding and Decoding
jitendrapurohit [Tue, 1 Apr 2014 14:15:43 +0000 (19:45 +0530)]
SyntaxConformanceTest handling Encoding and Decoding

10 years agoCRM-14399 fix test, add right number of extra params
Eileen McNaughton [Tue, 1 Apr 2014 07:51:13 +0000 (20:51 +1300)]
CRM-14399 fix test, add right number of extra params

10 years agoMerge pull request #2790 from eileenmcnaughton/CRM-14399-master
Tim Otten [Tue, 1 Apr 2014 02:09:44 +0000 (19:09 -0700)]
Merge pull request #2790 from eileenmcnaughton/CRM-14399-master

CRM-14399 4.5 signature for hook

10 years agoCRM-14399 4.5 signature for hook (somehow got reverted when I prepared the PR I guess)
Eileen McNaughton [Tue, 1 Apr 2014 00:40:35 +0000 (13:40 +1300)]
CRM-14399 4.5 signature for hook (somehow got reverted when I prepared the PR I guess)

10 years agoMerge pull request #2789 from eileenmcnaughton/CRM-14399-master
Tim Otten [Tue, 1 Apr 2014 00:20:52 +0000 (17:20 -0700)]
Merge pull request #2789 from eileenmcnaughton/CRM-14399-master

CRM-14399 this is probably safer & less like to wind up @colemanw than t...

10 years agoCRM-14399 this is probably safer & less like to wind up @colemanw than the prev versi...
Eileen McNaughton [Tue, 1 Apr 2014 00:17:50 +0000 (13:17 +1300)]
CRM-14399 this is probably safer & less like to wind up @colemanw than the prev version on this line

10 years agoMerge pull request #2785 from eileenmcnaughton/CRM-14399-master
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

10 years agoCRM-14399 one more call to getMembershipStatusByDate + update add function call to...
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

10 years agoMerge pull request #2787 from totten/master-gencode-escape
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

10 years agoGenCode - 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

10 years agoCRM-14399 add alterCalculatedMembershipStatus hook
Eileen McNaughton [Fri, 28 Mar 2014 03:58:49 +0000 (16:58 +1300)]
CRM-14399 add alterCalculatedMembershipStatus hook

Conflicts:
api/v3/MembershipStatus.php

10 years agoMerge pull request #2775 from ErichBSchulz/patch-3
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

10 years agoCRM-13981 multilingual fix
monishdeb [Mon, 31 Mar 2014 14:36:10 +0000 (20:06 +0530)]
CRM-13981 multilingual fix

----------------------------------------
* CRM-13981:
  http://issues.civicrm.org/jira/browse/CRM-13981

10 years agoMerge pull request #2777 from colemanw/accordions
colemanw [Mon, 31 Mar 2014 02:18:31 +0000 (22:18 -0400)]
Merge pull request #2777 from colemanw/accordions

js work

10 years agoCRM-14408 - get rid of unnecessary calls to crmAccordions
Coleman Watts [Mon, 31 Mar 2014 02:15:12 +0000 (22:15 -0400)]
CRM-14408 - get rid of unnecessary calls to crmAccordions

10 years agoCRM-14408 - handle accordions automatically
Coleman Watts [Mon, 31 Mar 2014 02:02:22 +0000 (22:02 -0400)]
CRM-14408 - handle accordions automatically

10 years agoAdd dialog resize button
Coleman Watts [Mon, 31 Mar 2014 01:40:26 +0000 (21:40 -0400)]
Add dialog resize button

10 years agoImprove dialog titlebar button style
Coleman Watts [Mon, 31 Mar 2014 00:45:21 +0000 (20:45 -0400)]
Improve dialog titlebar button style

10 years agoCRM-14407 - Fixup case custom tpl
Coleman Watts [Mon, 31 Mar 2014 00:22:18 +0000 (20:22 -0400)]
CRM-14407 - Fixup case custom tpl

10 years agoMerge pull request #2776 from colemanw/caseCustom
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

10 years agoCRM-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

10 years agoTweak to CRM.popup
Coleman Watts [Sun, 30 Mar 2014 18:30:47 +0000 (14:30 -0400)]
Tweak to CRM.popup

10 years agocorrect record_type_id description
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

10 years agoremoved unwanted file
kurund [Sat, 29 Mar 2014 18:25:35 +0000 (23:55 +0530)]
removed unwanted file

10 years agoMerge pull request #2773 from colemanw/custom
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

10 years agoCRM-14327 - Cleanup custom delete links
Coleman Watts [Sat, 29 Mar 2014 14:59:47 +0000 (10:59 -0400)]
CRM-14327 - Cleanup custom delete links

10 years agoCRM-14377 fix - http://issues.civicrm.org/jira/browse/CRM-14377
monishdeb [Sat, 29 Mar 2014 12:42:23 +0000 (18:12 +0530)]
CRM-14377 fix - issues.civicrm.org/jira/browse/CRM-14377

10 years agoMerge pull request #2758 from pratik-joshi/CRM-14278
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.

10 years agoMerge pull request #2769 from colemanw/cj
colemanw [Fri, 28 Mar 2014 18:50:29 +0000 (14:50 -0400)]
Merge pull request #2769 from colemanw/cj

CRM-14383 - Update cj closures

10 years agoCRM-14383 - Update cj closures
Coleman Watts [Fri, 28 Mar 2014 15:08:53 +0000 (11:08 -0400)]
CRM-14383 - Update cj closures

10 years agoMerge pull request #2768 from pratik-joshi/CRM-14327
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

10 years agoCRM-14327 : added save and new button
Pratik Joshi [Fri, 28 Mar 2014 15:36:10 +0000 (21:06 +0530)]
CRM-14327 : added save and new button

10 years agocss tweaks
Coleman Watts [Fri, 28 Mar 2014 15:03:05 +0000 (11:03 -0400)]
css tweaks

10 years agoMerge pull request #2763 from colemanw/master
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

10 years agoMerge pull request #2767 from jitendrapurohit/APITestsFix
Kurund Jalmi [Fri, 28 Mar 2014 14:35:04 +0000 (20:05 +0530)]
Merge pull request #2767 from jitendrapurohit/APITestsFix

API Tests Fix

10 years agoAPI Tests Fix
jitendrapurohit [Fri, 28 Mar 2014 14:07:47 +0000 (19:37 +0530)]
API Tests Fix

10 years agoMerge pull request #2762 from amitajgaonkar/WebtestIssues
colemanw [Fri, 28 Mar 2014 13:57:38 +0000 (09:57 -0400)]
Merge pull request #2762 from amitajgaonkar/WebtestIssues

Webtest fixes

10 years agoCRM-14400
Pratik Joshi [Fri, 28 Mar 2014 09:14:42 +0000 (14:44 +0530)]
CRM-14400

10 years agoCRM-14400 : migration to use LivePage AJAX
Pratik Joshi [Fri, 28 Mar 2014 08:31:30 +0000 (14:01 +0530)]
CRM-14400 : migration to use LivePage AJAX

10 years agoCRM-14327 : title fixes
Pratik Joshi [Fri, 28 Mar 2014 07:33:50 +0000 (13:03 +0530)]
CRM-14327 : title fixes

10 years agoCRM-14327 : code cleanup and following implementation for livePage ajax
Pratik Joshi [Fri, 28 Mar 2014 06:21:42 +0000 (11:51 +0530)]
CRM-14327 : code cleanup and following implementation for livePage ajax

10 years agoMerge pull request #2766 from pratik-joshi/CRM-13992-temp_fix
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

10 years agoCRM-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

10 years agoWebtest Fixes
Web Access [Fri, 28 Mar 2014 13:02:11 +0000 (18:32 +0530)]
Webtest Fixes

10 years agocopyright and version fixes
kurund [Fri, 28 Mar 2014 10:20:01 +0000 (15:50 +0530)]
copyright and version fixes

10 years agocopyright and version fixes
kurund [Fri, 28 Mar 2014 10:16:18 +0000 (15:46 +0530)]
copyright and version fixes

10 years agocopyright and version fixes
kurund [Fri, 28 Mar 2014 10:15:34 +0000 (15:45 +0530)]
copyright and version fixes

10 years agocopyright and version fixes
kurund [Fri, 28 Mar 2014 10:14:39 +0000 (15:44 +0530)]
copyright and version fixes

10 years agocopyright and version fixes
kurund [Fri, 28 Mar 2014 10:13:49 +0000 (15:43 +0530)]
copyright and version fixes

10 years agocopyright and version fixes
kurund [Fri, 28 Mar 2014 09:51:57 +0000 (15:21 +0530)]
copyright and version fixes

10 years agocopyright and version fixes
kurund [Fri, 28 Mar 2014 09:46:40 +0000 (15:16 +0530)]
copyright and version fixes

10 years agocopyright and version fixes
kurund [Fri, 28 Mar 2014 09:45:47 +0000 (15:15 +0530)]
copyright and version fixes

10 years agoAdds docstrings to the methods of class CRM_Utils_Crypt.
Robert C. Sheets [Fri, 28 Mar 2014 08:26:40 +0000 (01:26 -0700)]
Adds docstrings to the methods of class CRM_Utils_Crypt.

10 years agoCleans up class CRM_Utils_Constant doc string slightly.
Robert C. Sheets [Fri, 28 Mar 2014 08:04:46 +0000 (01:04 -0700)]
Cleans up class CRM_Utils_Constant doc string slightly.

10 years agoMerge branch 'master' of github.com:civicrm/civicrm-core into docstring-cleanup
Robert C. Sheets [Fri, 28 Mar 2014 06:20:33 +0000 (23:20 -0700)]
Merge branch 'master' of github.com:civicrm/civicrm-core into docstring-cleanup

10 years agoCRM-14383 - Update additional script closures
Coleman Watts [Fri, 28 Mar 2014 02:23:11 +0000 (22:23 -0400)]
CRM-14383 - Update additional script closures

10 years agoWebtest fixes
Web Access [Thu, 27 Mar 2014 15:16:19 +0000 (20:46 +0530)]
Webtest fixes

10 years agoMerge pull request #2761 from jitendrapurohit/SurveyTest_Fix
pratik-joshi [Thu, 27 Mar 2014 14:41:26 +0000 (20:11 +0530)]
Merge pull request #2761 from jitendrapurohit/SurveyTest_Fix

SurveyTest Fix

10 years agoSurveyTest Fix
jitendrapurohit [Thu, 27 Mar 2014 14:33:12 +0000 (20:03 +0530)]
SurveyTest Fix

10 years agoWebtest fixes
Web Access [Thu, 27 Mar 2014 14:13:50 +0000 (19:43 +0530)]
Webtest fixes

10 years agoImproves doc strings in class CRM_Utils_Array.
Robert C. Sheets [Thu, 27 Mar 2014 11:10:58 +0000 (04:10 -0700)]
Improves doc strings in class CRM_Utils_Array.

10 years agoImproves doc strings in class CRM_Utils_Api.
Robert C. Sheets [Thu, 27 Mar 2014 11:10:37 +0000 (04:10 -0700)]
Improves doc strings in class CRM_Utils_Api.

10 years agoMerge pull request #2749 from monishdeb/HR-317
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

10 years agoMerge pull request #2757 from jitendrapurohit/API_Testfix
pratik-joshi [Thu, 27 Mar 2014 07:04:35 +0000 (12:34 +0530)]
Merge pull request #2757 from jitendrapurohit/API_Testfix

API test fixes

10 years agoCRM-14278 : fix, removed extra check for radio/checkbox related 0 amount checking...
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.

10 years agoAPI test fixes
jitendrapurohit [Thu, 27 Mar 2014 06:43:41 +0000 (12:13 +0530)]
API test fixes

10 years agoMerge pull request #2753 from fuzionnz/CRM-14394
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.

10 years agoMerge pull request #2755 from eileenmcnaughton/patch-3
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

10 years agoCRM-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

10 years agoCss fix
Coleman Watts [Thu, 27 Mar 2014 00:30:54 +0000 (20:30 -0400)]
Css fix

10 years agoMerge pull request #2754 from davecivicrm/CRM-14395
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 ...

10 years agoCRM-14395 - Prevent Edit button from being displayed on contact summary if user does...
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

10 years agoIssue CRM-14394. Check that $path is not NULL, and that the file exists.
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.

10 years agoMerge pull request #2752 from davecivicrm/CRM-13578
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...

10 years agoCRM-13578 adding template for Assign Tags to Activities which somehow disappeared...
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