civicrm-core.git
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 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 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 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

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

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

10 years agoCRM-14094 - Require Edit all Contacts permission consistently for inline editing...
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

10 years agoHR-317 support Case Field in Profile
monishdeb [Wed, 26 Mar 2014 17:56:22 +0000 (23:26 +0530)]
HR-317 support Case Field in Profile

10 years agoMerge pull request #2746 from amitajgaonkar/WebtestIssues
colemanw [Wed, 26 Mar 2014 15:04:02 +0000 (11:04 -0400)]
Merge pull request #2746 from amitajgaonkar/WebtestIssues

webtest issues(fixed)

10 years agoTest fix
Coleman Watts [Wed, 26 Mar 2014 14:50:38 +0000 (10:50 -0400)]
Test fix

10 years agoTest fix
Coleman Watts [Wed, 26 Mar 2014 14:23:37 +0000 (10:23 -0400)]
Test fix

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

10 years agosolvedwebtest issues
Web Access [Wed, 26 Mar 2014 13:32:54 +0000 (19:02 +0530)]
solvedwebtest issues

10 years agoCRM-13992-temp_fix : handling the validation message show and redirection improvement
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

10 years agoMerge pull request #2742 from totten/master-httpclient-redir
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)

10 years agoCRM_Utils_HttpClient - Fix detection of safe-mode (which in turn determines whether...
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)

10 years agoMerge pull request #2714 from jitendrapurohit/CRMTestFix
pratik-joshi [Wed, 26 Mar 2014 06:43:35 +0000 (12:13 +0530)]
Merge pull request #2714 from jitendrapurohit/CRMTestFix

Report TestCaseTest DetailTest Fix

10 years agoMerge pull request #2741 from totten/master-api-error-cleanup
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

10 years agocivicrm_api3_create_error - Correction for weird SQL error reporting
Tim Otten [Wed, 26 Mar 2014 05:54:42 +0000 (22:54 -0700)]
civicrm_api3_create_error - Correction for weird SQL error reporting

10 years agocivicrm_api3_create_error, api/v3/Activity - Remove support for optional parameter...
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.

10 years agocivicrm_api3_create_error, api/v3/Generic/Update - Remove unnecessary indirection
Tim Otten [Wed, 26 Mar 2014 05:44:18 +0000 (22:44 -0700)]
civicrm_api3_create_error, api/v3/Generic/Update - Remove unnecessary indirection

10 years agocivicrm_api3_create_error, api/v3/Activity - Remove unnecessary args
Tim Otten [Wed, 26 Mar 2014 05:43:58 +0000 (22:43 -0700)]
civicrm_api3_create_error, api/v3/Activity - Remove unnecessary args

10 years agoFix testContactCreateCurrentEmployer
Coleman Watts [Wed, 26 Mar 2014 02:44:39 +0000 (22:44 -0400)]
Fix testContactCreateCurrentEmployer

10 years agoTest fix for renamed function
Coleman Watts [Wed, 26 Mar 2014 02:26:17 +0000 (22:26 -0400)]
Test fix for renamed function

10 years agoMenu style fixes for WP
Coleman Watts [Wed, 26 Mar 2014 00:27:05 +0000 (20:27 -0400)]
Menu style fixes for WP

10 years agoTest fix
Coleman Watts [Wed, 26 Mar 2014 00:01:19 +0000 (20:01 -0400)]
Test fix

10 years agoMerge pull request #2698 from totten/master-error-scopes
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

10 years agoMerge pull request #2708 from yashodha/sms-reminder
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

10 years agoCRM-14383 - Update closures that use lodash
Coleman Watts [Tue, 25 Mar 2014 19:27:56 +0000 (15:27 -0400)]
CRM-14383 - Update closures that use lodash

10 years agoCRM-14383 - Add CRM.$ and CRM._ noconflict objects
Coleman Watts [Tue, 25 Mar 2014 19:01:45 +0000 (15:01 -0400)]
CRM-14383 - Add CRM.$ and CRM._ noconflict objects

10 years agoFix double class declaration
Coleman Watts [Tue, 25 Mar 2014 19:11:25 +0000 (15:11 -0400)]
Fix double class declaration

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

10 years agoMerge pull request #2736 from colemanw/confirm
colemanw [Tue, 25 Mar 2014 18:35:08 +0000 (14:35 -0400)]
Merge pull request #2736 from colemanw/confirm

Improve CRM.confirm signature

10 years agoMore cleanup of mailing previews
Coleman Watts [Tue, 25 Mar 2014 16:37:35 +0000 (12:37 -0400)]
More cleanup of mailing previews

10 years agoImprove CRM.confirm signature
Coleman Watts [Tue, 25 Mar 2014 16:15:05 +0000 (12:15 -0400)]
Improve CRM.confirm signature

10 years agoMerge pull request #2728 from amitajgaonkar/select2
colemanw [Tue, 25 Mar 2014 13:58:57 +0000 (09:58 -0400)]
Merge pull request #2728 from amitajgaonkar/select2

Select2

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

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

10 years agomodification for select2 function
Web Access [Tue, 25 Mar 2014 10:37:29 +0000 (16:07 +0530)]
modification for select2 function

10 years agoModification for select2
Web Access [Mon, 24 Mar 2014 12:38:49 +0000 (18:08 +0530)]
Modification for select2

10 years agoSelect2 function
Web Access [Mon, 24 Mar 2014 11:37:10 +0000 (17:07 +0530)]
Select2 function

10 years agoModification for select2
Web Access [Mon, 24 Mar 2014 11:32:28 +0000 (17:02 +0530)]
Modification for select2

10 years agoModification for select2
Web Access [Mon, 24 Mar 2014 11:31:58 +0000 (17:01 +0530)]
Modification for select2

10 years agoMerge pull request #2733 from pratik-joshi/CRM-13973-qa
pratik-joshi [Tue, 25 Mar 2014 06:36:51 +0000 (12:06 +0530)]
Merge pull request #2733 from pratik-joshi/CRM-13973-qa

CRM-13973-qa : fix for NOTICE warning found

10 years agoCRM-13973-qa : fix for NOTICE warning found
Pratik Joshi [Tue, 25 Mar 2014 06:23:52 +0000 (11:53 +0530)]
CRM-13973-qa : fix for NOTICE warning found

10 years agoMerge pull request #2726 from pratik-joshi/CRM-13973-qa
Dave Greenberg [Tue, 25 Mar 2014 00:36:41 +0000 (17:36 -0700)]
Merge pull request #2726 from pratik-joshi/CRM-13973-qa

Crm 13973 qa : financial item data saving modifications refer comment #comment-58347

10 years agoMerge pull request #2732 from davecivicrm/CRM-14094
Dave Greenberg [Mon, 24 Mar 2014 22:40:33 +0000 (15:40 -0700)]
Merge pull request #2732 from davecivicrm/CRM-14094

Crm 14094

10 years agoCRM-14094 - Fix indents.
Dave Greenberg [Mon, 24 Mar 2014 22:39:50 +0000 (15:39 -0700)]
CRM-14094 - Fix indents.

----------------------------------------
* CRM-14094: Removing tags requires permission "delete contacts", should require "edit all contacts"
  http://issues.civicrm.org/jira/browse/CRM-14094

10 years agoCRM-14094 - Allow user to delete tags without requiring Delete Contacts permission.
Dave Greenberg [Mon, 24 Mar 2014 21:40:49 +0000 (14:40 -0700)]
CRM-14094 - Allow user to delete tags without requiring Delete Contacts permission.

----------------------------------------
* CRM-14094: Removing tags requires permission "delete contacts", should require "edit all contacts"
  http://issues.civicrm.org/jira/browse/CRM-14094

10 years agoMerge pull request #2731 from colemanw/dialog
colemanw [Mon, 24 Mar 2014 20:53:38 +0000 (16:53 -0400)]
Merge pull request #2731 from colemanw/dialog

js/api work

10 years agoAllow nonstandard apis to declare their dao
Coleman Watts [Mon, 24 Mar 2014 20:52:30 +0000 (16:52 -0400)]
Allow nonstandard apis to declare their dao

10 years agoImproved method for adding crm-container to dialogs
Coleman Watts [Mon, 24 Mar 2014 20:51:26 +0000 (16:51 -0400)]
Improved method for adding crm-container to dialogs

10 years agoMerge pull request #2729 from pratik-joshi/CRM-13878
Dave Greenberg [Mon, 24 Mar 2014 17:44:38 +0000 (10:44 -0700)]
Merge pull request #2729 from pratik-joshi/CRM-13878

CRM-13878 fix

10 years agoMerge branch 'divya-jose-HR-313_new'
Coleman Watts [Mon, 24 Mar 2014 17:11:26 +0000 (13:11 -0400)]
Merge branch 'divya-jose-HR-313_new'

10 years agoHR-313 cleanup
Coleman Watts [Mon, 24 Mar 2014 17:09:56 +0000 (13:09 -0400)]
HR-313 cleanup

10 years agoMailing popups - JS cleanup
Coleman Watts [Mon, 24 Mar 2014 16:33:19 +0000 (12:33 -0400)]
Mailing popups - JS cleanup

10 years agoMerge pull request #2730 from colemanw/attachments
colemanw [Mon, 24 Mar 2014 14:34:48 +0000 (10:34 -0400)]
Merge pull request #2730 from colemanw/attachments

CRM-14378 - Cleanup attachment js

10 years agoCRM-14378 - Cleanup attachment js
Coleman Watts [Mon, 24 Mar 2014 13:54:46 +0000 (09:54 -0400)]
CRM-14378 - Cleanup attachment js

10 years agoMerge pull request #2727 from divya-jose/HR-312-new
colemanw [Mon, 24 Mar 2014 13:46:50 +0000 (09:46 -0400)]
Merge pull request #2727 from divya-jose/HR-312-new

--HR-312 Fix Client links in case-activity popup

10 years agoCRM-13878 fix
Pratik Joshi [Mon, 24 Mar 2014 13:13:34 +0000 (18:43 +0530)]
CRM-13878 fix

10 years ago--HR-312 Fix Client links in case-activity popup
Divya Jose [Mon, 24 Mar 2014 10:41:38 +0000 (16:11 +0530)]
--HR-312 Fix Client links in case-activity popup

10 years ago--HR-313 Split case activity datatable tpl into separate file
Divya Jose [Mon, 24 Mar 2014 10:00:33 +0000 (15:30 +0530)]
--HR-313 Split case activity datatable tpl into separate file

10 years agoCRM-13973-qa : financial status value should be Paid, when contribution is 'Pending...
Pratik Joshi [Mon, 24 Mar 2014 09:56:38 +0000 (15:26 +0530)]
CRM-13973-qa :  financial status value should be Paid, when contribution is 'Pending refund'

10 years agoCRM-13973-qa : done financial data records saving changes as per Joe's comment #comme...
Pratik Joshi [Fri, 21 Mar 2014 15:45:55 +0000 (21:15 +0530)]
CRM-13973-qa : done financial data records saving changes as per Joe's comment #comment-58347

10 years agoCRM-14378 - Fix invalid markup and add descriptive classes to custom data
Coleman Watts [Mon, 24 Mar 2014 01:50:25 +0000 (21:50 -0400)]
CRM-14378 - Fix invalid markup and add descriptive classes to custom data

10 years agoCRM-13966 Remove unautocomplete
Coleman Watts [Mon, 24 Mar 2014 01:07:49 +0000 (21:07 -0400)]
CRM-13966 Remove unautocomplete

10 years agoremove console.log
Coleman Watts [Mon, 24 Mar 2014 00:45:12 +0000 (20:45 -0400)]
remove console.log

10 years agoMerge pull request #2723 from colemanw/autocomplete
colemanw [Sun, 23 Mar 2014 20:01:02 +0000 (16:01 -0400)]
Merge pull request #2723 from colemanw/autocomplete

Autocomplete work

10 years agoCRM-13966 - Fix pcp autocomplete default
Coleman Watts [Sun, 23 Mar 2014 20:00:08 +0000 (16:00 -0400)]
CRM-13966 - Fix pcp autocomplete default

10 years agoFix getlist infinite-scroll
Coleman Watts [Sun, 23 Mar 2014 19:47:54 +0000 (15:47 -0400)]
Fix getlist infinite-scroll

10 years agoCRM-13966 - Replace pcp autocomplete with select2
Coleman Watts [Sun, 23 Mar 2014 14:34:36 +0000 (10:34 -0400)]
CRM-13966 - Replace pcp autocomplete with select2

10 years agoFix variable scope error
Coleman Watts [Sun, 23 Mar 2014 01:26:25 +0000 (21:26 -0400)]
Fix variable scope error

10 years agoMerge pull request #2722 from colemanw/case
colemanw [Sun, 23 Mar 2014 02:02:45 +0000 (22:02 -0400)]
Merge pull request #2722 from colemanw/case

-mCaseView tweaks

10 years agoCaseView - Keep the state of accordions when refreshing
Coleman Watts [Sat, 22 Mar 2014 23:48:28 +0000 (19:48 -0400)]
CaseView - Keep the state of accordions when refreshing

10 years agoFix php warnings
Coleman Watts [Sat, 22 Mar 2014 21:24:38 +0000 (17:24 -0400)]
Fix php warnings

10 years agoCase cleanup
Coleman Watts [Sat, 22 Mar 2014 21:18:46 +0000 (17:18 -0400)]
Case cleanup

10 years agoMerge pull request #2719 from colemanw/tweaks
colemanw [Fri, 21 Mar 2014 23:29:32 +0000 (19:29 -0400)]
Merge pull request #2719 from colemanw/tweaks

Case form refactoring

10 years agoCRM-13966 - Remove autocompletes and improve case ui
Coleman Watts [Fri, 21 Mar 2014 21:26:44 +0000 (17:26 -0400)]
CRM-13966 - Remove autocompletes and improve case ui

10 years agoMerge pull request #2713 from pradpnayak/CRM-13848
Dave Greenberg [Fri, 21 Mar 2014 21:10:34 +0000 (14:10 -0700)]
Merge pull request #2713 from pradpnayak/CRM-13848

-- fixed regression error for comment mention in http://issues.civicrm.o...

10 years agoMerge pull request #2718 from monishdeb/CRM-14374
colemanw [Fri, 21 Mar 2014 17:18:57 +0000 (13:18 -0400)]
Merge pull request #2718 from monishdeb/CRM-14374

CRM-14374 fix - Improve TabHeader.tpl to include count against each acti...

10 years agoem position change
monishdeb [Fri, 21 Mar 2014 16:27:56 +0000 (21:57 +0530)]
em position change

10 years agoMerge pull request #2712 from pratik-joshi/CRM-14363
Dave Greenberg [Fri, 21 Mar 2014 16:27:03 +0000 (09:27 -0700)]
Merge pull request #2712 from pratik-joshi/CRM-14363

CRM-14363

10 years agoMinor fix
monishdeb [Fri, 21 Mar 2014 16:20:09 +0000 (21:50 +0530)]
Minor fix

10 years agoCRM-14374 fix - Improve TabHeader.tpl to include count against each active tabName
monishdeb [Fri, 21 Mar 2014 15:57:47 +0000 (21:27 +0530)]
CRM-14374 fix - Improve TabHeader.tpl to include count against each active tabName

http://issues.civicrm.org/jira/browse/CRM-14374