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 10:48:27 +0000 (16:18 +0530)]
Merge pull request #2675 from jitendrapurohit/select2_for_webtest
Select2 handling for Webtest
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
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
kurund [Thu, 13 Mar 2014 12:27:23 +0000 (17:57 +0530)]
more test fixes
JKingsnorth [Thu, 13 Mar 2014 11:49:51 +0000 (11:49 +0000)]
CRM-14340 - Fixes for iCals in event emails
CRM-14340 - Fixes for empty / unnecessary iCal feeds in event emails
Kurund Jalmi [Thu, 13 Mar 2014 10:34:45 +0000 (16:04 +0530)]
Merge pull request #2657 from kurund/test-fixes
test fixes related to enum to varchar changes
kurund [Thu, 13 Mar 2014 10:33:41 +0000 (16:03 +0530)]
test fixes related to enum to varchar changes
Coleman Watts [Thu, 13 Mar 2014 02:00:15 +0000 (22:00 -0400)]
CRM-13863 - Update dependent tabs and blocks
colemanw [Thu, 13 Mar 2014 01:38:37 +0000 (21:38 -0400)]
Merge pull request #2655 from colemanw/mini
Mini notification updates
Coleman Watts [Thu, 13 Mar 2014 01:07:38 +0000 (21:07 -0400)]
Fix incorrect variable
Dave Greenberg [Thu, 13 Mar 2014 01:06:43 +0000 (18:06 -0700)]
Merge pull request #2651 from pratik-joshi/CRM-13973-qa
Crm 13973 qa fixes
Coleman Watts [Thu, 13 Mar 2014 00:13:13 +0000 (20:13 -0400)]
CRM-13817 - mini notification default messages based on api action
Coleman Watts [Thu, 13 Mar 2014 00:12:26 +0000 (20:12 -0400)]
CRM-13863 - Ensure cancel button gets needed css class
Dave Greenberg [Wed, 12 Mar 2014 22:41:12 +0000 (15:41 -0700)]
Merge pull request #2654 from davecivicrm/CRM-14133
CRM-14133 - Fix add2Group query when Show No. of Top Donors field has a ...
Dave Greenberg [Wed, 12 Mar 2014 22:40:12 +0000 (15:40 -0700)]
CRM-14133 - Fix add2Group query when Show No. of Top Donors field has a value (e.g. limit). Prior version was returning empty result set.
----------------------------------------
* CRM-14133: Top Donor Report Results "Add to Group" Doesn't Work if "Show no." Filter Used
http://issues.civicrm.org/jira/browse/CRM-14133
Tim Otten [Wed, 12 Mar 2014 22:34:27 +0000 (15:34 -0700)]
Merge pull request #2552 from totten/4.4-report-test-output
HR-216 - CiviReportTestCase - Add more output for diagnosing errors
Tim Otten [Wed, 12 Mar 2014 22:33:49 +0000 (15:33 -0700)]
Merge pull request #2633 from totten/4.4-wr-long
CRM-14224 - Upgrade WordReplacements:
Coleman Watts [Wed, 12 Mar 2014 21:41:37 +0000 (17:41 -0400)]
Menu js tweak
colemanw [Wed, 12 Mar 2014 21:37:34 +0000 (17:37 -0400)]
Merge pull request #2653 from colemanw/mini
CRM-13817 - Improve mini notification styling and function signature
Coleman Watts [Wed, 12 Mar 2014 21:35:57 +0000 (17:35 -0400)]
CRM-13817 - Improve mini notification styling and function signature
Dave Greenberg [Wed, 12 Mar 2014 21:14:48 +0000 (14:14 -0700)]
Merge pull request #2647 from sushantpaste/activitydatesort
Fix for Activity tab date column sorting
Pratik Joshi [Wed, 12 Mar 2014 14:23:14 +0000 (19:53 +0530)]
CRM-13973-qa : financial_item statuses fix on change selection
Kurund Jalmi [Wed, 12 Mar 2014 14:18:56 +0000 (19:48 +0530)]
Merge pull request #2650 from atif-shaikh/CRM-10256
CRM-10256 fix - Deleted Contacts included in Reports
Atif Shaikh [Wed, 12 Mar 2014 13:44:23 +0000 (19:14 +0530)]
CRM-10256 fix - Deleted Contacts included in Reports
http://issues.civicrm.org/jira/browse/CRM-10256
Alex [Wed, 12 Mar 2014 10:47:06 +0000 (10:47 +0000)]
Fix - causing urls to break in email confirmation text
Pratik Joshi [Wed, 12 Mar 2014 08:01:37 +0000 (13:31 +0530)]
CRM-13973-qa : fix for the critical bug found mentioned in comment : 58222
Pratik Joshi [Wed, 12 Mar 2014 01:29:30 +0000 (06:59 +0530)]
CRM-13973-qa : consists of fix for most of the points mentioned in #58122
colemanw [Wed, 12 Mar 2014 01:29:24 +0000 (21:29 -0400)]
Merge pull request #2646 from colemanw/editable
crmeditable - code cleanup and remove crmForm fn
Coleman Watts [Wed, 12 Mar 2014 01:28:06 +0000 (21:28 -0400)]
Autocomplete & option list fixes
Coleman Watts [Wed, 12 Mar 2014 01:11:49 +0000 (21:11 -0400)]
crmeditable - code cleanup and remove crmForm fn
$.crmForm is supplanted by CRM.loadForm
Coleman Watts [Wed, 12 Mar 2014 00:31:12 +0000 (20:31 -0400)]
CRM-13863 - Ensure scrollbars get re-enabled
colemanw [Wed, 12 Mar 2014 00:20:33 +0000 (20:20 -0400)]
Merge pull request #2645 from colemanw/dialog
CRM-13863 - Disable browser scrollbars for modal dialogs
Coleman Watts [Wed, 12 Mar 2014 00:17:29 +0000 (20:17 -0400)]
CRM-13863 - Disable browser scrollbars for modal dialogs
Dave Greenberg [Tue, 11 Mar 2014 22:39:52 +0000 (15:39 -0700)]
Merge pull request #2642 from pratik-joshi/CRM-13965-qa-fixes
CRM-13965-qa-fixes
Pratik Joshi [Wed, 12 Mar 2014 07:06:13 +0000 (12:36 +0530)]
CRM-13965-qa-fixes
colemanw [Tue, 11 Mar 2014 19:22:51 +0000 (15:22 -0400)]
Merge pull request #2644 from colemanw/inline
CRM-14336 - Clear up potential memory leaks from ajaxForm
Coleman Watts [Tue, 11 Mar 2014 18:35:49 +0000 (14:35 -0400)]
CRM-14336 - Clear up potential memory leaks from ajaxForm
Coleman Watts [Tue, 11 Mar 2014 15:49:18 +0000 (11:49 -0400)]
Getlist api - respect search_autocomplete_count vis-a-vis pager
sushantpaste [Tue, 11 Mar 2014 14:09:45 +0000 (19:39 +0530)]
Fix for activity report date column sorting
colemanw [Mon, 10 Mar 2014 19:37:49 +0000 (15:37 -0400)]
Merge pull request #2640 from colemanw/4.4
CRM-13966 - Fix export prefix, suffix, gender
Coleman Watts [Mon, 10 Mar 2014 19:36:48 +0000 (15:36 -0400)]
CRM-13966 - Fix export prefix, suffix, gender
colemanw [Mon, 10 Mar 2014 19:20:55 +0000 (15:20 -0400)]
Merge pull request #2639 from colemanw/4.4
CRM-14065 - Only compare date not time for activity status warning
Coleman Watts [Mon, 10 Mar 2014 19:19:25 +0000 (15:19 -0400)]
CRM-14065 - Only compare date not time for activity status warning
colemanw [Mon, 10 Mar 2014 17:22:31 +0000 (13:22 -0400)]
Merge pull request #2638 from colemanw/CRM-14196
Apply eileen's patch for CRM-14196
Eileen McNaughton [Tue, 18 Feb 2014 23:32:40 +0000 (12:32 +1300)]
CRM-14196 - states missing from export fuzion fix - not sure what final fix will be
Eileen [Mon, 24 Feb 2014 00:57:22 +0000 (13:57 +1300)]
CRM-14196 - states missing from export fuzion fix - part 2 = resulting e-notice
colemanw [Mon, 10 Mar 2014 13:47:06 +0000 (09:47 -0400)]
Merge pull request #2637 from colemanw/4.4
ContactInfo.tpl - Fix broken markup
Coleman Watts [Mon, 10 Mar 2014 13:45:50 +0000 (09:45 -0400)]
ContactInfo.tpl - Fix broken markup
Pratik Joshi [Mon, 10 Mar 2014 13:28:40 +0000 (18:58 +0530)]
CRM-14297 : added tables for member_is_test field
colemanw [Mon, 10 Mar 2014 13:25:55 +0000 (09:25 -0400)]
Merge pull request #2635 from colemanw/master
Relationship form/xml tweaks
Coleman Watts [Mon, 10 Mar 2014 13:25:11 +0000 (09:25 -0400)]
Relationship form/xml tweaks
Pratik Joshi [Mon, 10 Mar 2014 08:33:39 +0000 (14:03 +0530)]
CRM-14317 fix for : while looking into this issue, found a DB: NAN field not found
Tim Otten [Mon, 10 Mar 2014 03:34:20 +0000 (20:34 -0700)]
CRM-14224 - Upgrade WordReplacements:
* Display a pre-upgrade message if any WordReplacements are too long
* Log old/long WordReplacements
* Don't migrate WordRepalcements which are too long
Tim Otten [Mon, 10 Mar 2014 00:48:38 +0000 (17:48 -0700)]
Merge pull request #2631 from totten/4.4-14210
CRM-14210 - Use get_headers(). Add API.
Tim Otten [Mon, 10 Mar 2014 00:40:58 +0000 (17:40 -0700)]
CRM-14210 - Add API for running security checks
Tim Otten [Mon, 10 Mar 2014 00:40:31 +0000 (17:40 -0700)]
CRM_Utils_Check_Security - Represent messages as objects
Tim Otten [Mon, 10 Mar 2014 00:22:23 +0000 (17:22 -0700)]
CRM-14210 - Add hidden option to disable security alerts
Chris Burgess [Sun, 16 Feb 2014 22:14:31 +0000 (11:14 +1300)]
CRM-14210. Use get_headers() and check for 200 response instead of file_get_contents(), as some servers do not return FALSE on 40x response code.
colemanw [Sat, 8 Mar 2014 16:24:06 +0000 (11:24 -0500)]
Merge pull request #2630 from colemanw/ajax
CRM-10693 - Trigger crmLoad event when loading content
projects / civicrm-core.git / log