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
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
Web Access [Mon, 24 Mar 2014 11:31:58 +0000 (17:01 +0530)]
Modification for select2
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
Pratik Joshi [Tue, 25 Mar 2014 06:23:52 +0000 (11:53 +0530)]
CRM-13973-qa : fix for NOTICE warning found
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
Dave Greenberg [Mon, 24 Mar 2014 22:40:33 +0000 (15:40 -0700)]
Merge pull request #2732 from davecivicrm/CRM-14094
Crm 14094
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
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
colemanw [Mon, 24 Mar 2014 20:53:38 +0000 (16:53 -0400)]
Merge pull request #2731 from colemanw/dialog
js/api work
Coleman Watts [Mon, 24 Mar 2014 20:52:30 +0000 (16:52 -0400)]
Allow nonstandard apis to declare their dao
Coleman Watts [Mon, 24 Mar 2014 20:51:26 +0000 (16:51 -0400)]
Improved method for adding crm-container to dialogs
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
Coleman Watts [Mon, 24 Mar 2014 17:11:26 +0000 (13:11 -0400)]
Merge branch 'divya-jose-HR-313_new'
Coleman Watts [Mon, 24 Mar 2014 17:09:56 +0000 (13:09 -0400)]
HR-313 cleanup
Coleman Watts [Mon, 24 Mar 2014 16:33:19 +0000 (12:33 -0400)]
Mailing popups - JS cleanup
colemanw [Mon, 24 Mar 2014 14:34:48 +0000 (10:34 -0400)]
Merge pull request #2730 from colemanw/attachments
CRM-14378 - Cleanup attachment js
Coleman Watts [Mon, 24 Mar 2014 13:54:46 +0000 (09:54 -0400)]
CRM-14378 - Cleanup attachment js
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
Pratik Joshi [Mon, 24 Mar 2014 13:13:34 +0000 (18:43 +0530)]
CRM-13878 fix
Divya Jose [Mon, 24 Mar 2014 10:41:38 +0000 (16:11 +0530)]
--HR-312 Fix Client links in case-activity popup
Divya Jose [Mon, 24 Mar 2014 10:00:33 +0000 (15:30 +0530)]
--HR-313 Split case activity datatable tpl into separate file
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'
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
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
Coleman Watts [Mon, 24 Mar 2014 01:07:49 +0000 (21:07 -0400)]
CRM-13966 Remove unautocomplete
Coleman Watts [Mon, 24 Mar 2014 00:45:12 +0000 (20:45 -0400)]
remove console.log
colemanw [Sun, 23 Mar 2014 20:01:02 +0000 (16:01 -0400)]
Merge pull request #2723 from colemanw/autocomplete
Autocomplete work
Coleman Watts [Sun, 23 Mar 2014 20:00:08 +0000 (16:00 -0400)]
CRM-13966 - Fix pcp autocomplete default
Coleman Watts [Sun, 23 Mar 2014 19:47:54 +0000 (15:47 -0400)]
Fix getlist infinite-scroll
Coleman Watts [Sun, 23 Mar 2014 14:34:36 +0000 (10:34 -0400)]
CRM-13966 - Replace pcp autocomplete with select2
Coleman Watts [Sun, 23 Mar 2014 01:26:25 +0000 (21:26 -0400)]
Fix variable scope error
colemanw [Sun, 23 Mar 2014 02:02:45 +0000 (22:02 -0400)]
Merge pull request #2722 from colemanw/case
-mCaseView tweaks
Coleman Watts [Sat, 22 Mar 2014 23:48:28 +0000 (19:48 -0400)]
CaseView - Keep the state of accordions when refreshing
Coleman Watts [Sat, 22 Mar 2014 21:24:38 +0000 (17:24 -0400)]
Fix php warnings
Coleman Watts [Sat, 22 Mar 2014 21:18:46 +0000 (17:18 -0400)]
Case cleanup
colemanw [Fri, 21 Mar 2014 23:29:32 +0000 (19:29 -0400)]
Merge pull request #2719 from colemanw/tweaks
Case form refactoring
Coleman Watts [Fri, 21 Mar 2014 21:26:44 +0000 (17:26 -0400)]
CRM-13966 - Remove autocompletes and improve case ui
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...
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...
monishdeb [Fri, 21 Mar 2014 16:27:56 +0000 (21:57 +0530)]
em position change
Dave Greenberg [Fri, 21 Mar 2014 16:27:03 +0000 (09:27 -0700)]
Merge pull request #2712 from pratik-joshi/CRM-14363
CRM-14363
monishdeb [Fri, 21 Mar 2014 16:20:09 +0000 (21:50 +0530)]
Minor fix
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
jitendrapurohit [Fri, 21 Mar 2014 11:51:52 +0000 (17:21 +0530)]
Report TestCaseTest DetailTest Fix
Pradeep Nayak [Fri, 21 Mar 2014 09:50:42 +0000 (15:20 +0530)]
-- fixed regression error for comment mention in issues.civicrm.org/jira/browse/CRM-13848?focusedCommentId=56206&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-56206, CRM-13848
Pratik Joshi [Fri, 21 Mar 2014 06:20:44 +0000 (11:50 +0530)]
CRM-14363
Coleman Watts [Fri, 21 Mar 2014 03:26:59 +0000 (23:26 -0400)]
Case ui enhancements & code cleanup
Tim Otten [Fri, 21 Mar 2014 00:19:24 +0000 (17:19 -0700)]
Merge pull request #2711 from totten/master-testobj-enum
CRM-14369 - DAO::createTestObject - Restore autogeneration of enums
Tim Otten [Fri, 21 Mar 2014 00:15:52 +0000 (17:15 -0700)]
CRM-14369 - DAO::createTestObject - Restore autogeneration of enums
Tim Otten [Thu, 20 Mar 2014 23:38:36 +0000 (16:38 -0700)]
Merge pull request #2710 from totten/master-selectvalue-cleanup
CRM_Core_SelectValues - Fix bad code / warnings which break test
Tim Otten [Thu, 20 Mar 2014 23:14:18 +0000 (16:14 -0700)]
CRM_Core_SelectValues - Fix bad code / warnings which break test
Tim Otten [Thu, 20 Mar 2014 22:54:02 +0000 (15:54 -0700)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-03-20-15-52-17
Conflicts:
CRM/Core/BAO/UFGroup.php
Coleman Watts [Thu, 20 Mar 2014 16:37:46 +0000 (12:37 -0400)]
Tweak prefix/suffix fields on contact edit form
Coleman Watts [Thu, 20 Mar 2014 00:53:58 +0000 (20:53 -0400)]
Update event link css
yashodha [Thu, 20 Mar 2014 06:31:04 +0000 (12:01 +0530)]
fix js to insert tokens for text message box
pratik-joshi [Thu, 20 Mar 2014 06:28:48 +0000 (11:58 +0530)]
Merge pull request #2709 from pratik-joshi/CRM-13973-qa
CRM-13973-qa : online pay later scenario partial payment
pratik-joshi [Thu, 20 Mar 2014 06:13:10 +0000 (11:43 +0530)]
Merge pull request #2648 from atif-shaikh/CRM-14309
Fix for CRM-14309
Tim Otten [Wed, 19 Mar 2014 22:03:18 +0000 (15:03 -0700)]
Merge pull request #2702 from eileenmcnaughton/CRM-14355
CRM-14355 fix test-exposed bugs in contribute, participant, pledge get
colemanw [Wed, 19 Mar 2014 21:31:54 +0000 (17:31 -0400)]
Merge pull request #2706 from colemanw/act
update jQuery, etc
Coleman Watts [Wed, 19 Mar 2014 21:28:38 +0000 (17:28 -0400)]
Move dashboard.js to main repo - it's too modified to be considered an external package
Coleman Watts [Wed, 19 Mar 2014 21:25:08 +0000 (17:25 -0400)]
Add civicrm logo to dialog titlebar
Coleman Watts [Wed, 19 Mar 2014 21:24:13 +0000 (17:24 -0400)]
Cleanup ui.dialog params and css
projects / civicrm-core.git / log