civicrm-core.git
11 years agoCRM-14310 - Fix issue with custom validation not firing on Event Info and
Anthony Nemirovsky [Tue, 18 Mar 2014 00:18:41 +0000 (17:18 -0700)]
CRM-14310 - Fix issue with custom validation not firing on Event Info and
Settings page.

This commit makes both custom validation work and allows the form the reload with the values that were attempted to be submitted, rather than the previously successfully submitted values.

11 years agoMerge pull request #2684 from colemanw/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

11 years agoMerge pull request #2683 from monishdeb/CRM-13981
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

11 years agoCss fixes for hover links
Coleman Watts [Sun, 16 Mar 2014 20:09:16 +0000 (16:09 -0400)]
Css fixes for hover links

11 years agoCRM-14215 - More consistent elegibility for opening links inline
Coleman Watts [Sun, 16 Mar 2014 19:54:53 +0000 (15:54 -0400)]
CRM-14215 - More consistent elegibility for opening links inline

11 years agoCRM-14215 - Add method to prevent ajax form submit
Coleman Watts [Sun, 16 Mar 2014 18:07:16 +0000 (14:07 -0400)]
CRM-14215 - Add method to prevent ajax form submit

11 years agoCRM-13981 QA fix
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

11 years agoMerge pull request #2682 from pratik-joshi/CRM-13973-qa
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

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

11 years agoCRM-13863 - Update hover/popup classes
Coleman Watts [Sun, 16 Mar 2014 02:22:42 +0000 (22:22 -0400)]
CRM-13863 - Update hover/popup classes

11 years agoUpdate add-group select
Coleman Watts [Sun, 16 Mar 2014 02:21:44 +0000 (22:21 -0400)]
Update add-group select

11 years agoCRM-13863 - Change action-items to opt-in rather than opt-out of popups
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

11 years agoAdd hover & popup classes to payment links
Coleman Watts [Sun, 16 Mar 2014 00:11:22 +0000 (20:11 -0400)]
Add hover & popup classes to payment links

11 years agoDon't focus datepicker on popups
Coleman Watts [Sat, 15 Mar 2014 20:49:19 +0000 (16:49 -0400)]
Don't focus datepicker on popups

11 years agoRemove unused file
Coleman Watts [Sat, 15 Mar 2014 20:32:41 +0000 (16:32 -0400)]
Remove unused file

11 years agoCleanup and rearrange common js
Coleman Watts [Sat, 15 Mar 2014 20:17:52 +0000 (16:17 -0400)]
Cleanup and rearrange common js

11 years agoRemove unused file
Coleman Watts [Sat, 15 Mar 2014 16:19:28 +0000 (12:19 -0400)]
Remove unused file

11 years agoCRM-13863 - Add more sugar to CRM popup helper
Coleman Watts [Sat, 15 Mar 2014 16:05:37 +0000 (12:05 -0400)]
CRM-13863 - Add more sugar to CRM popup helper

11 years agoCRM-13863 - Add crmPopup method to centralize settings
Coleman Watts [Fri, 14 Mar 2014 17:23:28 +0000 (13:23 -0400)]
CRM-13863 - Add crmPopup method to centralize settings

11 years agoCRM-14215 - Fix group tpl markup
Coleman Watts [Fri, 14 Mar 2014 15:14:22 +0000 (11:14 -0400)]
CRM-14215 - Fix group tpl markup

11 years agoMerge pull request #2680 from pratik-joshi/CRM-13973-qa
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

11 years agoCRM-13973-qa : a minor fix for - no changes in selection page and on save causes...
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

11 years agoMerge pull request #2674 from deepak-srivastava/CRM-12467-soft-credit-search
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

11 years agoMerge pull request #2676 from pratik-joshi/CRM-13973-qa
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

11 years agoMerge pull request #2677 from colemanw/js
colemanw [Fri, 14 Mar 2014 15:03:52 +0000 (11:03 -0400)]
Merge pull request #2677 from colemanw/js

Popup fixes

11 years agoCRM-13863 - Consolidate livePage.js handling in parent page class
Coleman Watts [Fri, 14 Mar 2014 14:38:07 +0000 (10:38 -0400)]
CRM-13863 - Consolidate livePage.js handling in parent page class

11 years agoCRM-13863 - Whitelist open-inline contribution links
Coleman Watts [Fri, 14 Mar 2014 13:36:34 +0000 (09:36 -0400)]
CRM-13863 - Whitelist open-inline contribution links

11 years agoCRM-13863 - Whitelist instead of blacklist open-inline
Coleman Watts [Fri, 14 Mar 2014 13:21:05 +0000 (09:21 -0400)]
CRM-13863 - Whitelist instead of blacklist open-inline

11 years agoCoreResources - code cleanup
Coleman Watts [Fri, 14 Mar 2014 00:29:27 +0000 (20:29 -0400)]
CoreResources - code cleanup

11 years agoCoreResources - Segment js files by permission
Coleman Watts [Fri, 14 Mar 2014 00:17:10 +0000 (20:17 -0400)]
CoreResources - Segment js files by permission

11 years agoCRM-13863 - Added setting to disable ajax popups
Coleman Watts [Thu, 13 Mar 2014 23:10:22 +0000 (19:10 -0400)]
CRM-13863 - Added setting to disable ajax popups

11 years agoTrigger load event
Coleman Watts [Thu, 13 Mar 2014 20:43:37 +0000 (16:43 -0400)]
Trigger load event

11 years agoNicer looking dashboard buttons
Coleman Watts [Thu, 13 Mar 2014 20:12:41 +0000 (16:12 -0400)]
Nicer looking dashboard buttons

11 years agoCleanup widgets to avoid memory leaks
Coleman Watts [Thu, 13 Mar 2014 20:03:46 +0000 (16:03 -0400)]
Cleanup widgets to avoid memory leaks

11 years agoCRM-13973-qa : added useful comment block
Pratik Joshi [Fri, 14 Mar 2014 11:45:15 +0000 (17:15 +0530)]
CRM-13973-qa : added useful comment block

11 years agoCRM-13973-qa : correct default price set fields selection display on fee selection...
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

11 years agoMerge pull request #2675 from jitendrapurohit/select2_for_webtest
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

11 years agoCRM-13973-qa : don't skip the base transaction entry
Pratik Joshi [Fri, 14 Mar 2014 10:40:32 +0000 (16:10 +0530)]
CRM-13973-qa : don't skip the base transaction entry

11 years agoremoving assertion
jitendrapurohit [Fri, 14 Mar 2014 10:31:37 +0000 (16:01 +0530)]
removing assertion

11 years agoSelect2 handling for Webtest
jitendrapurohit [Fri, 14 Mar 2014 10:18:05 +0000 (15:48 +0530)]
Select2 handling for Webtest

11 years agoMerge pull request #2671 from NileemaJadhav/CRM-14348
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

11 years agofilter / disable certain task actions for soft credit search
Deepak Srivastava [Fri, 14 Mar 2014 07:07:45 +0000 (12:37 +0530)]
filter / disable certain task actions for soft credit search

11 years ago--CRM-14348 Dashboard fix
Nileema [Fri, 14 Mar 2014 06:23:39 +0000 (11:53 +0530)]
--CRM-14348 Dashboard fix

11 years agoMerge pull request #2658 from JKingsnorth/CRM-14340
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!

11 years agoImprove coding style on HTML templates
.John [Thu, 13 Mar 2014 22:57:25 +0000 (22:57 +0000)]
Improve coding style on HTML templates

Improve coding style on HTML templates

11 years agoMerge pull request #2670 from colemanw/mini
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

11 years agoMerge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-03-14-00-44-17
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

11 years agoMerge pull request #2649 from rocxa/master
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!

11 years agoMerge pull request #2669 from kurund/test-fixes
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

11 years agofixes 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

11 years agoMerge pull request #2668 from kurund/test-fixes
Kurund Jalmi [Thu, 13 Mar 2014 15:53:16 +0000 (21:23 +0530)]
Merge pull request #2668 from kurund/test-fixes

cleanup / fixes

11 years agocleanup / fixes
kurund [Thu, 13 Mar 2014 15:52:02 +0000 (21:22 +0530)]
cleanup / fixes

11 years agoMerge pull request #2667 from kurund/CRM-14180
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

11 years agofixes 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

11 years agoCommon.js - add doc links
Coleman Watts [Thu, 13 Mar 2014 15:30:51 +0000 (11:30 -0400)]
Common.js - add doc links

11 years agoMerge pull request #2666 from kurund/test-fixes
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

11 years agotest 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

11 years agoMerge pull request #2665 from monishdeb/CRM-13981
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

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

11 years agoenableDisableApi - cleanup
Coleman Watts [Thu, 13 Mar 2014 14:39:56 +0000 (10:39 -0400)]
enableDisableApi - cleanup

11 years agoCRM-13817 - Migrate simple success messages to mini-notifications
Coleman Watts [Thu, 13 Mar 2014 14:39:28 +0000 (10:39 -0400)]
CRM-13817 - Migrate simple success messages to mini-notifications

11 years agoMerge pull request #2664 from colemanw/tabs
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

11 years agoUpdate Pledge tab
Coleman Watts [Thu, 13 Mar 2014 14:35:36 +0000 (10:35 -0400)]
Update Pledge tab

11 years agoMerge pull request #2663 from colemanw/tabs
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

11 years agoMerge pull request #2661 from pratik-joshi/CRM-13973-qa
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

11 years agoCRM-13863 - Update more dependent tabs and blocks
Coleman Watts [Thu, 13 Mar 2014 13:44:50 +0000 (09:44 -0400)]
CRM-13863 - Update more dependent tabs and blocks

11 years agoCRM-13973-qa : fixed for points mentioned in #comment-58264
Pratik Joshi [Thu, 13 Mar 2014 13:30:46 +0000 (19:00 +0530)]
CRM-13973-qa : fixed for points mentioned in #comment-58264

11 years agoMerge pull request #2660 from kurund/test-fixes
Kurund Jalmi [Thu, 13 Mar 2014 13:15:44 +0000 (18:45 +0530)]
Merge pull request #2660 from kurund/test-fixes

more test fixes

11 years agomore test fixes
kurund [Thu, 13 Mar 2014 13:14:45 +0000 (18:44 +0530)]
more test fixes

11 years agoMerge pull request #2656 from colemanw/mini
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

11 years agoMerge pull request #2634 from pratik-joshi/CRM-14317-NAN-field-not-found-bug
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

11 years agoMerge pull request #2596 from eileenmcnaughton/CRM-14299
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...

11 years agoMerge pull request #2568 from seamuslee001/master
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

11 years agoMerge pull request #2636 from pratik-joshi/CRM-14297
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

11 years agoMerge pull request #2659 from kurund/test-fixes
Kurund Jalmi [Thu, 13 Mar 2014 12:28:26 +0000 (17:58 +0530)]
Merge pull request #2659 from kurund/test-fixes

more test fixes

11 years agomore test fixes
kurund [Thu, 13 Mar 2014 12:27:23 +0000 (17:57 +0530)]
more test fixes

11 years agoCRM-14340 - Fixes for iCals in event emails
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

11 years agoMerge pull request #2657 from kurund/test-fixes
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

11 years agotest 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

11 years agotask action related fixes - counts / stats
Deepak Srivastava [Thu, 13 Mar 2014 06:37:59 +0000 (12:07 +0530)]
task action related fixes - counts / stats

11 years agoCRM-13863 - Update dependent tabs and blocks
Coleman Watts [Thu, 13 Mar 2014 02:00:15 +0000 (22:00 -0400)]
CRM-13863 - Update dependent tabs and blocks

11 years agoMerge pull request #2655 from colemanw/mini
colemanw [Thu, 13 Mar 2014 01:38:37 +0000 (21:38 -0400)]
Merge pull request #2655 from colemanw/mini

Mini notification updates

11 years agoFix incorrect variable
Coleman Watts [Thu, 13 Mar 2014 01:07:38 +0000 (21:07 -0400)]
Fix incorrect variable

11 years agoMerge pull request #2651 from pratik-joshi/CRM-13973-qa
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

11 years agoCRM-13817 - mini notification default messages based on api action
Coleman Watts [Thu, 13 Mar 2014 00:13:13 +0000 (20:13 -0400)]
CRM-13817 - mini notification default messages based on api action

11 years agoCRM-13863 - Ensure cancel button gets needed css class
Coleman Watts [Thu, 13 Mar 2014 00:12:26 +0000 (20:12 -0400)]
CRM-13863 - Ensure cancel button gets needed css class

11 years agoMerge pull request #2654 from davecivicrm/CRM-14133
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 ...

11 years agoCRM-14133 - Fix add2Group query when Show No. of Top Donors field has a value (e...
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

11 years agoMerge pull request #2552 from totten/4.4-report-test-output
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

11 years agoMerge pull request #2633 from totten/4.4-wr-long
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:

11 years agoMenu js tweak
Coleman Watts [Wed, 12 Mar 2014 21:41:37 +0000 (17:41 -0400)]
Menu js tweak

11 years agoMerge pull request #2653 from colemanw/mini
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

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

11 years agoMerge pull request #2647 from sushantpaste/activitydatesort
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

11 years agoCRM-13973-qa : financial_item statuses fix on change selection
Pratik Joshi [Wed, 12 Mar 2014 14:23:14 +0000 (19:53 +0530)]
CRM-13973-qa : financial_item statuses fix on change selection

11 years agoMerge pull request #2650 from atif-shaikh/CRM-10256
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

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

11 years agoFix - causing urls to break in email confirmation text
Alex [Wed, 12 Mar 2014 10:47:06 +0000 (10:47 +0000)]
Fix - causing urls to break in email confirmation text

11 years agoCRM-13973-qa : fix for the critical bug found mentioned in comment : 58222
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

11 years agoCRM-13973-qa : consists of fix for most of the points mentioned in #58122
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