civicrm-core.git
11 years agoMerge pull request #102 from colemanw/CRM-12067
colemanw [Sat, 9 Mar 2013 22:19:05 +0000 (14:19 -0800)]
Merge pull request #102 from colemanw/CRM-12067

Hack to fix joomla menu CRM-12067

11 years agoHack to fix joomla menu CRM-12067
Coleman Watts [Sat, 9 Mar 2013 00:54:44 +0000 (16:54 -0800)]
Hack to fix joomla menu CRM-12067

11 years agoMerge pull request #52 from eileenmcnaughton/newSettingStuff
Kurund Jalmi [Sat, 9 Mar 2013 14:03:49 +0000 (06:03 -0800)]
Merge pull request #52 from eileenmcnaughton/newSettingStuff

CRM-12031 - Minor tweaks to setting api to make it work with smarty edit-in-place

11 years agoMerge pull request #106 from colemanw/noconflict
Kurund Jalmi [Sat, 9 Mar 2013 14:02:26 +0000 (06:02 -0800)]
Merge pull request #106 from colemanw/noconflict

More consistent results with jquery.noconflict

11 years agoMerge pull request #105 from colemanw/CRM-12048
Kurund Jalmi [Sat, 9 Mar 2013 14:01:46 +0000 (06:01 -0800)]
Merge pull request #105 from colemanw/CRM-12048

Crm 12048

11 years agoMerge pull request #104 from dlobo/CRM-12065
Kurund Jalmi [Sat, 9 Mar 2013 14:01:01 +0000 (06:01 -0800)]
Merge pull request #104 from dlobo/CRM-12065

partial fix CRM-12065

11 years agoMerge pull request #103 from dlobo/CRM-12074
Kurund Jalmi [Sat, 9 Mar 2013 14:00:32 +0000 (06:00 -0800)]
Merge pull request #103 from dlobo/CRM-12074

fix CRM-12074

11 years agoMerge pull request #101 from colemanw/CRM-12054
Kurund Jalmi [Sat, 9 Mar 2013 13:59:19 +0000 (05:59 -0800)]
Merge pull request #101 from colemanw/CRM-12054

Fix broken subtype icon CRM-12054

11 years agoMerge pull request #100 from lcdservices/master
Kurund Jalmi [Sat, 9 Mar 2013 13:58:51 +0000 (05:58 -0800)]
Merge pull request #100 from lcdservices/master

CRM-12075 make recurring contrib links frontend flagged

11 years agoMerge pull request #98 from dlobo/CRM-12062
Kurund Jalmi [Sat, 9 Mar 2013 13:58:16 +0000 (05:58 -0800)]
Merge pull request #98 from dlobo/CRM-12062

fix CRM-12062

11 years agoMerge pull request #97 from tttp/bugfix
Kurund Jalmi [Sat, 9 Mar 2013 13:57:36 +0000 (05:57 -0800)]
Merge pull request #97 from tttp/bugfix

CRM-12046 add missing campaign id on petition signatures

11 years agoMerge pull request #96 from pratik-joshi/webtest-improvements
Kurund Jalmi [Sat, 9 Mar 2013 13:56:00 +0000 (05:56 -0800)]
Merge pull request #96 from pratik-joshi/webtest-improvements

more test cleanups

11 years agoMerge pull request #99 from lcdservices/joomla-contact-quicksearch
Kurund Jalmi [Sat, 9 Mar 2013 13:54:24 +0000 (05:54 -0800)]
Merge pull request #99 from lcdservices/joomla-contact-quicksearch

UI tweak for contact quick search menu in joomla

11 years agoMore consistent results with jquery.noconflict
Coleman Watts [Sat, 9 Mar 2013 05:42:39 +0000 (21:42 -0800)]
More consistent results with jquery.noconflict

11 years agoFix broken javascript to highlight importable fields CRM-12048
Coleman Watts [Sat, 9 Mar 2013 04:13:47 +0000 (20:13 -0800)]
Fix broken javascript to highlight importable fields CRM-12048

11 years agopartial fix CRM-12065
Donald A. Lobo [Sat, 9 Mar 2013 02:41:57 +0000 (18:41 -0800)]
partial fix CRM-12065

11 years agofix CRM-12074
Donald A. Lobo [Sat, 9 Mar 2013 02:01:04 +0000 (18:01 -0800)]
fix CRM-12074

11 years agoFix broken subtype icon CRM-12054
Coleman Watts [Sat, 9 Mar 2013 00:07:08 +0000 (16:07 -0800)]
Fix broken subtype icon CRM-12054

11 years agoCRM-12075 make recurring contrib links frontend flagged
Brian Shaughnessy [Fri, 8 Mar 2013 22:30:19 +0000 (17:30 -0500)]
CRM-12075 make recurring contrib links frontend flagged

11 years agoUI tweak for contact quick search menu in joomla
Brian Shaughnessy [Fri, 8 Mar 2013 18:16:57 +0000 (13:16 -0500)]
UI tweak for contact quick search menu in joomla

11 years agofix CRM-12062
Donald A. Lobo [Fri, 8 Mar 2013 18:02:45 +0000 (10:02 -0800)]
fix CRM-12062

11 years agoCRM-12046 add missing campaign id on petition signatures
Xavier Dutoit [Fri, 8 Mar 2013 17:49:47 +0000 (18:49 +0100)]
CRM-12046 add missing campaign id on petition signatures

11 years agomore test cleanups
Pratik Joshi [Fri, 8 Mar 2013 17:22:28 +0000 (22:52 +0530)]
more test cleanups

11 years agoMerge pull request #84 from pradpnayak/CRM-12018
Kurund Jalmi [Fri, 8 Mar 2013 14:39:29 +0000 (06:39 -0800)]
Merge pull request #84 from pradpnayak/CRM-12018

--added webtest for CRM-12018 and did some code cleanup

11 years agoMerge pull request #85 from dlobo/CRM-12052
Kurund Jalmi [Fri, 8 Mar 2013 14:38:53 +0000 (06:38 -0800)]
Merge pull request #85 from dlobo/CRM-12052

fix CRM-12052

11 years agoMerge pull request #86 from dlobo/CRM-12051
Kurund Jalmi [Fri, 8 Mar 2013 14:37:47 +0000 (06:37 -0800)]
Merge pull request #86 from dlobo/CRM-12051

fix CRM-12051

11 years agoMerge pull request #87 from dlobo/CRM-12043
Kurund Jalmi [Fri, 8 Mar 2013 14:37:21 +0000 (06:37 -0800)]
Merge pull request #87 from dlobo/CRM-12043

fix CRM-12043

11 years agoMerge pull request #88 from dlobo/MiscFixes
Kurund Jalmi [Fri, 8 Mar 2013 14:36:34 +0000 (06:36 -0800)]
Merge pull request #88 from dlobo/MiscFixes

More php 5.4 notice fixes and errors

11 years agoMerge pull request #89 from colemanw/d6
Kurund Jalmi [Fri, 8 Mar 2013 14:35:01 +0000 (06:35 -0800)]
Merge pull request #89 from colemanw/d6

drupal_add_js isn't working - disabling seems the easiest fix

11 years agoMerge pull request #92 from pratik-joshi/webtest-improvement
Kurund Jalmi [Fri, 8 Mar 2013 14:34:22 +0000 (06:34 -0800)]
Merge pull request #92 from pratik-joshi/webtest-improvement

webtests improvements

11 years agoMerge pull request #94 from yashodha/CRM-12058
Kurund Jalmi [Fri, 8 Mar 2013 14:33:52 +0000 (06:33 -0800)]
Merge pull request #94 from yashodha/CRM-12058

CRM-12058

11 years agoMerge pull request #95 from ravishnair/webtest-improvement
Kurund Jalmi [Fri, 8 Mar 2013 14:33:24 +0000 (06:33 -0800)]
Merge pull request #95 from ravishnair/webtest-improvement

-- improved webtests

11 years ago-- improved webtests
Ravish Nair [Fri, 8 Mar 2013 14:12:59 +0000 (19:42 +0530)]
-- improved webtests

11 years agoCRM-12058
yashodha [Fri, 8 Mar 2013 12:18:58 +0000 (17:48 +0530)]
CRM-12058

11 years agoMerge pull request #93 from totten/show-variables-like
Tim Otten [Fri, 8 Mar 2013 12:18:42 +0000 (04:18 -0800)]
Merge pull request #93 from totten/show-variables-like

CRM-12056 - Avoid SQL error during pre-install check on older version of...

11 years agoCRM-12056 - Avoid SQL error during pre-install check on older version of MySQL
Tim Otten [Fri, 8 Mar 2013 12:11:40 +0000 (07:11 -0500)]
CRM-12056 - Avoid SQL error during pre-install check on older version of MySQL

11 years agowebtests improvements
Pratik Joshi [Fri, 8 Mar 2013 11:38:15 +0000 (17:08 +0530)]
webtests improvements

11 years agoMerge pull request #91 from totten/hook_permission-uninstall
Tim Otten [Fri, 8 Mar 2013 11:36:02 +0000 (03:36 -0800)]
Merge pull request #91 from totten/hook_permission-uninstall

CRM-11925 - Remove uninstallPermissions()

11 years agoCRM-11925 - Remove uninstallPermissions()
Tim Otten [Fri, 8 Mar 2013 11:25:56 +0000 (06:25 -0500)]
CRM-11925 - Remove uninstallPermissions()

upgradePermissions() addresses a superset of cases handled by uninstallPermissions().

11 years agoMerge pull request #90 from totten/hook_permissions
Tim Otten [Fri, 8 Mar 2013 11:18:29 +0000 (03:18 -0800)]
Merge pull request #90 from totten/hook_permissions

CRM-11925 Fix, cleanup for hook_permissions

11 years agoCRM-11925 - Add comments to explain why D6 works with empty permission functions
Tim Otten [Fri, 8 Mar 2013 11:04:09 +0000 (06:04 -0500)]
CRM-11925 - Add comments to explain why D6 works with empty permission functions

11 years agoCRM-11925 - Fix error message
Tim Otten [Fri, 8 Mar 2013 10:24:02 +0000 (05:24 -0500)]
CRM-11925 - Fix error message

11 years agoCRM-11925 - Modify upgradePermissions to work with all permissions (not just single...
Tim Otten [Fri, 8 Mar 2013 08:02:26 +0000 (03:02 -0500)]
CRM-11925 - Modify upgradePermissions to work with all permissions (not just single-module permissions)

11 years agoDoc tweak
Tim Otten [Fri, 8 Mar 2013 07:31:18 +0000 (02:31 -0500)]
Doc tweak

11 years agoCRM-11925 - Remove filterPermissions.
Tim Otten [Fri, 8 Mar 2013 07:30:09 +0000 (02:30 -0500)]
CRM-11925 - Remove filterPermissions.

The filtering presents an imperfect facade (see JIRA)

11 years agodrupal_add_js isn't working - disabling seems the easiest fix
Coleman Watts [Fri, 8 Mar 2013 03:59:42 +0000 (19:59 -0800)]
drupal_add_js isn't working - disabling seems the easiest fix

11 years agoCRM-11925 - Allow permission-enumeration on all platforms. (This facilitates error...
Tim Otten [Thu, 7 Mar 2013 10:12:05 +0000 (05:12 -0500)]
CRM-11925 - Allow permission-enumeration on all platforms. (This facilitates error-reporting when a module is installed on an incompatible CMS.)

11 years agoCRM-11925 - Only run cleanupPermissions/uninstallPermissions if our CMS driver suppor...
Tim Otten [Thu, 7 Mar 2013 09:53:21 +0000 (04:53 -0500)]
CRM-11925 - Only run cleanupPermissions/uninstallPermissions if our CMS driver supports it

11 years agoCRM-11925 - Loosen coupling between permission enumeration (getModulePermissions...
Tim Otten [Thu, 7 Mar 2013 09:30:34 +0000 (04:30 -0500)]
CRM-11925 - Loosen coupling between permission enumeration (getModulePermissions) and storage (upgradePermissions)

11 years agoCRM-11925 - Call Drupal::filterPermissions when writing to permission-store (rather...
Tim Otten [Thu, 7 Mar 2013 09:07:19 +0000 (04:07 -0500)]
CRM-11925 - Call Drupal::filterPermissions when writing to permission-store (rather than during permission-enumeration)

11 years agoCRM-11925 - Extract Drupal::filterPermissions from Drupal::getModulePermissions
Tim Otten [Thu, 7 Mar 2013 08:55:50 +0000 (03:55 -0500)]
CRM-11925 - Extract Drupal::filterPermissions from Drupal::getModulePermissions

Permission-enumeration is only being used with Civi ext-modules, so the
hook-invocation can be done in another (more portable) spot. However,
the string-length-limit appears to be specific to D7's permission-store,
so it'll need to stay in this class (as "filterPermissions").

11 years agoCRM-11925 - CRM_Utils_Hook - Remove moduleImplements.
Tim Otten [Thu, 7 Mar 2013 08:28:28 +0000 (03:28 -0500)]
CRM-11925 - CRM_Utils_Hook - Remove moduleImplements.

The Drupal implementation is good, but we don't need the functionality, and
it's a bit of a liability because the design isn't portable to Joomla.
Keeping it might encourage others to write unportable hook code.

However, if we find that we do need the functionality, then we should use
this code as a starting point.  (Aside: For a non-Drupal example, the
WordPress implementation is better than the Joomla implementation.  The WP
version looks like it would still work with Civi ext-modules.)

11 years agoCRM-11925 - Remove DrupalBase::getAllModulePermissions() because:
Tim Otten [Thu, 7 Mar 2013 08:19:06 +0000 (03:19 -0500)]
CRM-11925 - Remove DrupalBase::getAllModulePermissions() because:

1. We only need to support hook_permissions for Civi ext-modules, so we don't need a special way to invoke that hook in Drupal.
2. The parent class implements the function in a simpler/more portable way.

11 years agoMore php 5.4 notice fixes and errors
Donald A. Lobo [Thu, 7 Mar 2013 21:59:32 +0000 (13:59 -0800)]
More php 5.4 notice fixes and errors

11 years agoMore php 5.4 notice fixes and errors
Donald A. Lobo [Thu, 7 Mar 2013 21:54:32 +0000 (13:54 -0800)]
More php 5.4 notice fixes and errors

11 years agoMerge pull request #66 from colemanw/Webtests
colemanw [Fri, 8 Mar 2013 00:35:32 +0000 (16:35 -0800)]
Merge pull request #66 from colemanw/Webtests

Fix 3 webtests, and cleanup

11 years agoLogout should not wait for civicrm-footer
Coleman Watts [Wed, 6 Mar 2013 22:11:57 +0000 (14:11 -0800)]
Logout should not wait for civicrm-footer

11 years agoThe cut-n-paste code avanger strikes again
Coleman Watts [Wed, 6 Mar 2013 19:58:21 +0000 (11:58 -0800)]
The cut-n-paste code avanger strikes again

11 years agoFix 3 webtests, and cleanup
Coleman Watts [Wed, 6 Mar 2013 19:29:14 +0000 (11:29 -0800)]
Fix 3 webtests, and cleanup

11 years agostandardise naming of _spec functions & add support for 'id' as pseudonym of domain_id
eileen [Wed, 6 Mar 2013 08:46:39 +0000 (21:46 +1300)]
standardise naming of _spec functions & add support for 'id' as pseudonym of domain_id

11 years agoextra fields to ignore from API, NB I can't recall why I made this a hard fail rather...
eileen [Wed, 6 Mar 2013 08:39:52 +0000 (21:39 +1300)]
extra fields to ignore from API, NB I can't recall why I made this a hard fail rather than a soft ignore

11 years agodon't preset irrelevant params when doing a create - can cause unexpected results
eileen [Wed, 6 Mar 2013 08:38:58 +0000 (21:38 +1300)]
don't preset irrelevant params when doing a create - can cause unexpected results

11 years agofix up optiongroup & type in settings for a couple of settings
eileen [Wed, 6 Mar 2013 08:38:09 +0000 (21:38 +1300)]
fix up optiongroup & type in settings for a couple of settings

11 years agofix CRM-12052
Donald A. Lobo [Thu, 7 Mar 2013 21:11:08 +0000 (13:11 -0800)]
fix CRM-12052

11 years agofix CRM-12051
Donald A. Lobo [Thu, 7 Mar 2013 20:43:52 +0000 (12:43 -0800)]
fix CRM-12051

11 years agofix CRM-12043
Donald A. Lobo [Thu, 7 Mar 2013 20:27:10 +0000 (12:27 -0800)]
fix CRM-12043

11 years ago--added webtest for CRM-12018 and did some code cleanup
Pradeep Nayak [Thu, 7 Mar 2013 19:28:38 +0000 (00:58 +0530)]
--added webtest for CRM-12018 and did some code cleanup

11 years agoMerge pull request #83 from pradpnayak/CRM-12024
Kurund Jalmi [Thu, 7 Mar 2013 18:26:55 +0000 (10:26 -0800)]
Merge pull request #83 from pradpnayak/CRM-12024

--code cleanup for CRM-12024

11 years agoMerge pull request #82 from pratik-joshi/webtests-fixes
Kurund Jalmi [Thu, 7 Mar 2013 15:18:19 +0000 (07:18 -0800)]
Merge pull request #82 from pratik-joshi/webtests-fixes

Webtests fixes

11 years agoMerge pull request #80 from ravishnair/CRM-11778_grant-page-title-fix
Kurund Jalmi [Thu, 7 Mar 2013 15:14:28 +0000 (07:14 -0800)]
Merge pull request #80 from ravishnair/CRM-11778_grant-page-title-fix

-- CRM-11778 fix for Grant edit/view page title

11 years agoMerge pull request #81 from ravishnair/webtest-improvement
Kurund Jalmi [Thu, 7 Mar 2013 15:14:15 +0000 (07:14 -0800)]
Merge pull request #81 from ravishnair/webtest-improvement

-- improved webtests, applied patch and made modifications

11 years ago--code cleanup for CRM-12024
Pradeep Nayak [Thu, 7 Mar 2013 15:14:04 +0000 (20:44 +0530)]
--code cleanup for CRM-12024

11 years agowebtest improvements for mailing tests
Pratik Joshi [Thu, 7 Mar 2013 15:06:44 +0000 (20:36 +0530)]
webtest improvements for mailing tests

11 years agowebtest improvement
Pratik Joshi [Thu, 7 Mar 2013 13:09:50 +0000 (18:39 +0530)]
webtest improvement

11 years ago-- CRM-11778 fix for Grant edit/view page title
Ravish Nair [Thu, 7 Mar 2013 15:02:16 +0000 (20:32 +0530)]
-- CRM-11778 fix for Grant edit/view page title

11 years ago-- improved webtests, applied patch and made modifications
Ravish Nair [Thu, 7 Mar 2013 14:55:12 +0000 (20:25 +0530)]
-- improved webtests, applied patch and made modifications

11 years agoreleaser - Extract variable "$distmaker_tgt"
Tim Otten [Thu, 7 Mar 2013 12:51:08 +0000 (07:51 -0500)]
releaser - Extract variable "$distmaker_tgt"

11 years agoreleaser - Publish starterkit tgz file (but not on sf.net)
Tim Otten [Thu, 7 Mar 2013 12:47:37 +0000 (07:47 -0500)]
releaser - Publish starterkit tgz file (but not on sf.net)

11 years agodistmaker/joomlaxml - Disable MySQL strict (which causes extraneous DB request)
Tim Otten [Thu, 7 Mar 2013 12:43:51 +0000 (07:43 -0500)]
distmaker/joomlaxml - Disable MySQL strict (which causes extraneous DB request)

11 years agoMerge pull request #79 from pradpnayak/CRM-12018
Kurund Jalmi [Thu, 7 Mar 2013 12:33:50 +0000 (04:33 -0800)]
Merge pull request #79 from pradpnayak/CRM-12018

--notice fixes for CRM-12018

11 years ago--notice fixes for CRM-12018
Pradeep Nayak [Thu, 7 Mar 2013 12:24:50 +0000 (17:54 +0530)]
--notice fixes for CRM-12018

11 years agoMerge pull request #77 from pratik-joshi/webtest-improvement
Kurund Jalmi [Thu, 7 Mar 2013 11:40:19 +0000 (03:40 -0800)]
Merge pull request #77 from pratik-joshi/webtest-improvement

webtest fix : deleting profiles created through webtest

11 years agoMerge pull request #76 from pradpnayak/CRM-12018
Kurund Jalmi [Thu, 7 Mar 2013 09:09:48 +0000 (01:09 -0800)]
Merge pull request #76 from pradpnayak/CRM-12018

--fixed for CRM-12018

11 years agoMerge pull request #75 from ravishnair/postUpgradeMessage-fix
Kurund Jalmi [Thu, 7 Mar 2013 09:09:11 +0000 (01:09 -0800)]
Merge pull request #75 from ravishnair/postUpgradeMessage-fix

-- postupgrade message for beta2 to display the modified message templat...

11 years ago--fixed for CRM-12018
Pradeep Nayak [Thu, 7 Mar 2013 08:50:15 +0000 (14:20 +0530)]
--fixed for CRM-12018

11 years ago-- postupgrade message for beta2 to display the modified message templates
Ravish Nair [Thu, 7 Mar 2013 08:49:27 +0000 (14:19 +0530)]
-- postupgrade message for beta2 to display the modified message templates

11 years agoMerge pull request #65 from twomice/CRM-12013
Kurund Jalmi [Thu, 7 Mar 2013 07:56:31 +0000 (23:56 -0800)]
Merge pull request #65 from twomice/CRM-12013

Fix CRM-12013.

11 years agoMerge pull request #74 from dlobo/MiscFixes
Kurund Jalmi [Thu, 7 Mar 2013 07:54:37 +0000 (23:54 -0800)]
Merge pull request #74 from dlobo/MiscFixes

fix notices for PHP 5.4

11 years agowebtest fix : deleting profiles created through webtest
Pratik Joshi [Thu, 7 Mar 2013 07:51:59 +0000 (13:21 +0530)]
webtest fix : deleting profiles created through webtest

11 years agofix notices for PHP 5.4
Donald A. Lobo [Thu, 7 Mar 2013 05:53:02 +0000 (21:53 -0800)]
fix notices for PHP 5.4

11 years agoMerge pull request #67 from dlobo/CRM-12027
Kurund Jalmi [Thu, 7 Mar 2013 05:52:20 +0000 (21:52 -0800)]
Merge pull request #67 from dlobo/CRM-12027

fix CRM-12027

11 years agoMerge pull request #72 from colemanw/CRM-12029
Kurund Jalmi [Thu, 7 Mar 2013 05:51:51 +0000 (21:51 -0800)]
Merge pull request #72 from colemanw/CRM-12029

Restore context to CRM.api CRM-12029

11 years agoMerge pull request #73 from totten/ext-url-warning
Kurund Jalmi [Thu, 7 Mar 2013 05:51:22 +0000 (21:51 -0800)]
Merge pull request #73 from totten/ext-url-warning

CRM-12039 - Warning about undefined extensionsUrl

11 years agoCRM-12039 - Display warning to prevent downloads if the default container doesn't...
Tim Otten [Thu, 7 Mar 2013 02:19:47 +0000 (21:19 -0500)]
CRM-12039 - Display warning to prevent downloads if the default container doesn't have a URL

11 years agoCRM-12039 - Add checkRequirements to CRM_Extension_Container_Interface
Tim Otten [Thu, 7 Mar 2013 02:17:50 +0000 (21:17 -0500)]
CRM-12039 - Add checkRequirements to CRM_Extension_Container_Interface

11 years agoRestore context to CRM.api CRM-12029
Coleman Watts [Thu, 7 Mar 2013 01:38:00 +0000 (17:38 -0800)]
Restore context to CRM.api CRM-12029

11 years agoCleanup - Ignore test byproducts
Tim Otten [Thu, 7 Mar 2013 01:38:00 +0000 (20:38 -0500)]
Cleanup - Ignore test byproducts

11 years agoMerge pull request #71 from colemanw/CRM-12038
Tim Otten [Thu, 7 Mar 2013 01:34:03 +0000 (17:34 -0800)]
Merge pull request #71 from colemanw/CRM-12038

Crm 12038 - Fix help popups for custom fields

11 years agoHmm, help file version numbers haven't been updated in a while
Coleman Watts [Thu, 7 Mar 2013 00:59:29 +0000 (16:59 -0800)]
Hmm, help file version numbers haven't been updated in a while

11 years agoRemove unneeded param
Coleman Watts [Thu, 7 Mar 2013 00:53:20 +0000 (16:53 -0800)]
Remove unneeded param