colemanw [Wed, 19 Mar 2014 14:20:04 +0000 (10:20 -0400)]
Merge pull request #2704 from jitendrapurohit/CRM_TestFix
CRM Test Fixes
jitendrapurohit [Wed, 19 Mar 2014 14:02:13 +0000 (19:32 +0530)]
CRM Test Fixes
Coleman Watts [Wed, 19 Mar 2014 03:13:42 +0000 (23:13 -0400)]
CRM-13863 - Add livePage to contact case tab
Coleman Watts [Wed, 19 Mar 2014 03:00:41 +0000 (23:00 -0400)]
CRM-13863 - Add livePage to case dashboard
Coleman Watts [Wed, 19 Mar 2014 02:48:17 +0000 (22:48 -0400)]
Test fix
colemanw [Wed, 19 Mar 2014 02:25:42 +0000 (22:25 -0400)]
Merge pull request #2700 from colemanw/master
Fix misnamed js file
Coleman Watts [Wed, 19 Mar 2014 02:24:39 +0000 (22:24 -0400)]
Fix misnamed js file
colemanw [Tue, 18 Mar 2014 21:11:57 +0000 (17:11 -0400)]
Merge pull request #2696 from colemanw/case
CRM-10693 HR-310 - Case and other ajax fixes
Coleman Watts [Tue, 18 Mar 2014 21:10:55 +0000 (17:10 -0400)]
CRM-10693 HR-310 - Case ajax fixes
Coleman Watts [Tue, 18 Mar 2014 20:18:12 +0000 (16:18 -0400)]
CRM-13863 - Update options.tpl
Coleman Watts [Tue, 18 Mar 2014 20:16:42 +0000 (16:16 -0400)]
CRM-13863 - Update pdf letter to use select2
Coleman Watts [Tue, 18 Mar 2014 19:57:22 +0000 (15:57 -0400)]
Fix wrapping of action items
colemanw [Tue, 18 Mar 2014 17:42:23 +0000 (13:42 -0400)]
Merge pull request #2694 from monishdeb/CRM-13981
CRM-13981, Minor fix on contribution page
Coleman Watts [Tue, 18 Mar 2014 17:39:18 +0000 (13:39 -0400)]
CRM-13863 - Add select2 class to activity links
Coleman Watts [Tue, 18 Mar 2014 17:37:51 +0000 (13:37 -0400)]
CRM-10693 - js fixes
monishdeb [Tue, 18 Mar 2014 17:33:03 +0000 (23:03 +0530)]
CRM-13981, Minor fix on contribution page
----------------------------------------
* CRM-13981: Migrate "In Honor of" to Soft Credits
http://issues.civicrm.org/jira/browse/CRM-13981
colemanw [Tue, 18 Mar 2014 13:53:11 +0000 (09:53 -0400)]
Merge pull request #2689 from pratik-joshi/ajax-save-and-new
CRM-13973 : fix for #comment-58346
Pratik Joshi [Tue, 18 Mar 2014 08:50:18 +0000 (14:20 +0530)]
CRM-13973 : fix for #comment-58346
Yashodha Chaku [Tue, 18 Mar 2014 06:15:17 +0000 (11:45 +0530)]
Merge pull request #2678 from monishdeb/CRM-14351
CRM-14351 fix - Impossible to add SoftCredit row once deleted on New Contribution form
Coleman Watts [Tue, 18 Mar 2014 03:18:53 +0000 (23:18 -0400)]
CRM-10693 HR-310 - Use ajax framework for edit case activities, relationships, etc
Coleman Watts [Tue, 18 Mar 2014 03:12:36 +0000 (23:12 -0400)]
Remove stray debug statement
Coleman Watts [Mon, 17 Mar 2014 20:28:10 +0000 (16:28 -0400)]
CRM-13966 - Simplify reassign case form with ajax framework and select2
Coleman Watts [Mon, 17 Mar 2014 19:32:29 +0000 (15:32 -0400)]
CRM-10693 HR-310 - Use ajax framework to view case activity & revisions
Coleman Watts [Mon, 17 Mar 2014 17:07:17 +0000 (13:07 -0400)]
CRM-14215 - add no-popup class to case links
Coleman Watts [Mon, 17 Mar 2014 16:46:02 +0000 (12:46 -0400)]
Remove activityChangeStatus.js
colemanw [Mon, 17 Mar 2014 02:21:11 +0000 (22:21 -0400)]
Merge pull request #2684 from colemanw/js
CRM-14215 - misc ajax related fixes & cleanup
Dave Greenberg [Mon, 17 Mar 2014 02:20:49 +0000 (19:20 -0700)]
Merge pull request #2683 from monishdeb/CRM-13981
CRM-13981 QA fix
Coleman Watts [Sun, 16 Mar 2014 20:09:16 +0000 (16:09 -0400)]
Css fixes for hover links
Coleman Watts [Sun, 16 Mar 2014 19:54:53 +0000 (15:54 -0400)]
CRM-14215 - More consistent elegibility for opening links inline
Coleman Watts [Sun, 16 Mar 2014 18:07:16 +0000 (14:07 -0400)]
CRM-14215 - Add method to prevent ajax form submit
monishdeb [Sun, 16 Mar 2014 11:29:40 +0000 (16:59 +0530)]
CRM-13981 QA fix
----------------------------------------
* CRM-13981: Migrate "In Honor of" to Soft Credits
http://issues.civicrm.org/jira/browse/CRM-13981
pratik-joshi [Sun, 16 Mar 2014 05:18:12 +0000 (10:48 +0530)]
Merge pull request #2682 from pratik-joshi/CRM-13973-qa
CRM-13973-qa : fix for bug reported by coleman #comment-58354
Pratik Joshi [Sun, 16 Mar 2014 05:12:43 +0000 (10:42 +0530)]
CRM-13973-qa : fix for bug reported by coleman #comment-58354
Coleman Watts [Sun, 16 Mar 2014 02:22:42 +0000 (22:22 -0400)]
CRM-13863 - Update hover/popup classes
Coleman Watts [Sun, 16 Mar 2014 02:21:44 +0000 (22:21 -0400)]
Update add-group select
Coleman Watts [Sun, 16 Mar 2014 01:10:55 +0000 (21:10 -0400)]
CRM-13863 - Change action-items to opt-in rather than opt-out of popups
Coleman Watts [Sun, 16 Mar 2014 00:11:22 +0000 (20:11 -0400)]
Add hover & popup classes to payment links
Coleman Watts [Sat, 15 Mar 2014 20:49:19 +0000 (16:49 -0400)]
Don't focus datepicker on popups
Coleman Watts [Sat, 15 Mar 2014 20:32:41 +0000 (16:32 -0400)]
Remove unused file
Coleman Watts [Sat, 15 Mar 2014 20:17:52 +0000 (16:17 -0400)]
Cleanup and rearrange common js
Coleman Watts [Sat, 15 Mar 2014 16:19:28 +0000 (12:19 -0400)]
Remove unused file
Coleman Watts [Sat, 15 Mar 2014 16:05:37 +0000 (12:05 -0400)]
CRM-13863 - Add more sugar to CRM popup helper
Coleman Watts [Fri, 14 Mar 2014 17:23:28 +0000 (13:23 -0400)]
CRM-13863 - Add crmPopup method to centralize settings
Coleman Watts [Fri, 14 Mar 2014 15:14:22 +0000 (11:14 -0400)]
CRM-14215 - Fix group tpl markup
pratik-joshi [Sat, 15 Mar 2014 07:22:42 +0000 (12:52 +0530)]
Merge pull request #2680 from pratik-joshi/CRM-13973-qa
CRM-13973-qa : a minor fix for - selection form is submitted unchanged results a DB Error
Pratik Joshi [Sat, 15 Mar 2014 07:11:59 +0000 (12:41 +0530)]
CRM-13973-qa : a minor fix for - no changes in selection page and on save causes DB Error
Dave Greenberg [Fri, 14 Mar 2014 20:37:31 +0000 (13:37 -0700)]
Merge pull request #2674 from deepak-srivastava/CRM-12467-soft-credit-search
CRM-12467 - soft credit search - task action related fixes
Dave Greenberg [Fri, 14 Mar 2014 19:57:01 +0000 (12:57 -0700)]
Merge pull request #2676 from pratik-joshi/CRM-13973-qa
Crm 13973 qa : fixes for points mentioned in #comment-58325
monishdeb [Fri, 14 Mar 2014 16:10:09 +0000 (21:40 +0530)]
CRM-14351 fix - Impossible to add SoftCredit row once deleted on New Contribution form
http://issues.civicrm.org/jira/browse/CRM-14351
colemanw [Fri, 14 Mar 2014 15:03:52 +0000 (11:03 -0400)]
Merge pull request #2677 from colemanw/js
Popup fixes
Coleman Watts [Fri, 14 Mar 2014 14:38:07 +0000 (10:38 -0400)]
CRM-13863 - Consolidate livePage.js handling in parent page class
Coleman Watts [Fri, 14 Mar 2014 13:36:34 +0000 (09:36 -0400)]
CRM-13863 - Whitelist open-inline contribution links
Coleman Watts [Fri, 14 Mar 2014 13:21:05 +0000 (09:21 -0400)]
CRM-13863 - Whitelist instead of blacklist open-inline
Coleman Watts [Fri, 14 Mar 2014 00:29:27 +0000 (20:29 -0400)]
CoreResources - code cleanup
Coleman Watts [Fri, 14 Mar 2014 00:17:10 +0000 (20:17 -0400)]
CoreResources - Segment js files by permission
Coleman Watts [Thu, 13 Mar 2014 23:10:22 +0000 (19:10 -0400)]
CRM-13863 - Added setting to disable ajax popups
Coleman Watts [Thu, 13 Mar 2014 20:43:37 +0000 (16:43 -0400)]
Trigger load event
Coleman Watts [Thu, 13 Mar 2014 20:12:41 +0000 (16:12 -0400)]
Nicer looking dashboard buttons
Coleman Watts [Thu, 13 Mar 2014 20:03:46 +0000 (16:03 -0400)]
Cleanup widgets to avoid memory leaks
Pratik Joshi [Fri, 14 Mar 2014 11:45:15 +0000 (17:15 +0530)]
CRM-13973-qa : added useful comment block
Pratik Joshi [Fri, 14 Mar 2014 11:34:49 +0000 (17:04 +0530)]
CRM-13973-qa : correct default price set fields selection display on fee selection screen
pratik-joshi [Fri, 14 Mar 2014 10:48:27 +0000 (16:18 +0530)]
Merge pull request #2675 from jitendrapurohit/select2_for_webtest
Select2 handling for Webtest
Pratik Joshi [Fri, 14 Mar 2014 10:40:32 +0000 (16:10 +0530)]
CRM-13973-qa : don't skip the base transaction entry
jitendrapurohit [Fri, 14 Mar 2014 10:31:37 +0000 (16:01 +0530)]
removing assertion
jitendrapurohit [Fri, 14 Mar 2014 10:18:05 +0000 (15:48 +0530)]
Select2 handling for Webtest
Kurund Jalmi [Fri, 14 Mar 2014 09:52:28 +0000 (15:22 +0530)]
Merge pull request #2671 from NileemaJadhav/CRM-14348
--CRM-14348 Dashboard fix
Deepak Srivastava [Fri, 14 Mar 2014 07:07:45 +0000 (12:37 +0530)]
filter / disable certain task actions for soft credit search
Nileema [Fri, 14 Mar 2014 06:23:39 +0000 (11:53 +0530)]
--CRM-14348 Dashboard fix
Dave Greenberg [Thu, 13 Mar 2014 23:17:32 +0000 (16:17 -0700)]
Merge pull request #2658 from JKingsnorth/CRM-14340
CRM-14340 - Fixes for iCals in event emails
Great. Thanks!
.John [Thu, 13 Mar 2014 22:57:25 +0000 (22:57 +0000)]
Improve coding style on HTML templates
Improve coding style on HTML templates
colemanw [Thu, 13 Mar 2014 19:33:12 +0000 (15:33 -0400)]
Merge pull request #2670 from colemanw/mini
CRM-13817 - Migrate simple success messages to mini-notifications
kurund [Thu, 13 Mar 2014 19:17:47 +0000 (00:47 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-03-14-00-44-17
Conflicts:
CRM/Export/BAO/Export.php
xml/GenCode.php
Dave Greenberg [Thu, 13 Mar 2014 18:46:10 +0000 (11:46 -0700)]
Merge pull request #2649 from rocxa/master
Fix - character causing urls to break in email confirmation text
Thanks for the patch!
Kurund Jalmi [Thu, 13 Mar 2014 16:30:56 +0000 (22:00 +0530)]
Merge pull request #2669 from kurund/test-fixes
fixes to html type for custom field
kurund [Thu, 13 Mar 2014 16:29:17 +0000 (21:59 +0530)]
fixes to html type for custom field
Kurund Jalmi [Thu, 13 Mar 2014 15:53:16 +0000 (21:23 +0530)]
Merge pull request #2668 from kurund/test-fixes
cleanup / fixes
kurund [Thu, 13 Mar 2014 15:52:02 +0000 (21:22 +0530)]
cleanup / fixes
Kurund Jalmi [Thu, 13 Mar 2014 15:43:13 +0000 (21:13 +0530)]
Merge pull request #2667 from kurund/CRM-14180
fixes for CRM-14180, also notice fixes
kurund [Thu, 13 Mar 2014 15:42:24 +0000 (21:12 +0530)]
fixes for CRM-14180, also notice fixes
----------------------------------------
* CRM-14180: Declined Credit card redirects user to wrong page.
http://issues.civicrm.org/jira/browse/CRM-14180
Coleman Watts [Thu, 13 Mar 2014 15:30:51 +0000 (11:30 -0400)]
Common.js - add doc links
Kurund Jalmi [Thu, 13 Mar 2014 14:58:58 +0000 (20:28 +0530)]
Merge pull request #2666 from kurund/test-fixes
test fixes, I feel it's caching issue
kurund [Thu, 13 Mar 2014 14:58:28 +0000 (20:28 +0530)]
test fixes, I feel it's caching issue
Kurund Jalmi [Thu, 13 Mar 2014 14:46:28 +0000 (20:16 +0530)]
Merge pull request #2665 from monishdeb/CRM-13981
CRM-13981 QA fixes
monishdeb [Thu, 13 Mar 2014 14:42:23 +0000 (20:12 +0530)]
CRM-13981 QA fixes
----------------------------------------
* CRM-13981: Migrate "In Honor of" to Soft Credits
http://issues.civicrm.org/jira/browse/CRM-13981
Coleman Watts [Thu, 13 Mar 2014 14:39:56 +0000 (10:39 -0400)]
enableDisableApi - cleanup
Coleman Watts [Thu, 13 Mar 2014 14:39:28 +0000 (10:39 -0400)]
CRM-13817 - Migrate simple success messages to mini-notifications
colemanw [Thu, 13 Mar 2014 14:36:01 +0000 (10:36 -0400)]
Merge pull request #2664 from colemanw/tabs
CRM-13863 - Update dependent tabs and blocks
Coleman Watts [Thu, 13 Mar 2014 14:35:36 +0000 (10:35 -0400)]
Update Pledge tab
colemanw [Thu, 13 Mar 2014 13:52:33 +0000 (09:52 -0400)]
Merge pull request #2663 from colemanw/tabs
CRM-13863 - Update dependent tabs and blocks
Kurund Jalmi [Thu, 13 Mar 2014 13:48:27 +0000 (19:18 +0530)]
Merge pull request #2661 from pratik-joshi/CRM-13973-qa
CRM-13973-qa : fixed for points mentioned in #comment-58264
Coleman Watts [Thu, 13 Mar 2014 13:44:50 +0000 (09:44 -0400)]
CRM-13863 - Update more dependent tabs and blocks
Pratik Joshi [Thu, 13 Mar 2014 13:30:46 +0000 (19:00 +0530)]
CRM-13973-qa : fixed for points mentioned in #comment-58264
Kurund Jalmi [Thu, 13 Mar 2014 13:15:44 +0000 (18:45 +0530)]
Merge pull request #2660 from kurund/test-fixes
more test fixes
kurund [Thu, 13 Mar 2014 13:14:45 +0000 (18:44 +0530)]
more test fixes
Kurund Jalmi [Thu, 13 Mar 2014 12:51:50 +0000 (18:21 +0530)]
Merge pull request #2656 from colemanw/mini
CRM-13863 - Update dependent tabs and blocks
Kurund Jalmi [Thu, 13 Mar 2014 12:46:49 +0000 (18:16 +0530)]
Merge pull request #2634 from pratik-joshi/CRM-14317-NAN-field-not-found-bug
CRM-14317 fix for : while looking into this issue, found a DB: NAN field not found
Kurund Jalmi [Thu, 13 Mar 2014 12:43:41 +0000 (18:13 +0530)]
Merge pull request #2596 from eileenmcnaughton/CRM-14299
Remove old check on how setting has been defined it has only been applie...
Kurund Jalmi [Thu, 13 Mar 2014 12:39:19 +0000 (18:09 +0530)]
Merge pull request #2568 from seamuslee001/master
Fix CRM-14275 membership contribution-detail report
Kurund Jalmi [Thu, 13 Mar 2014 12:32:35 +0000 (18:02 +0530)]
Merge pull request #2636 from pratik-joshi/CRM-14297
CRM-14297 : added tables definition for member_is_test field
Kurund Jalmi [Thu, 13 Mar 2014 12:28:26 +0000 (17:58 +0530)]
Merge pull request #2659 from kurund/test-fixes
more test fixes
projects / civicrm-core.git / log