Tim Otten [Wed, 13 Mar 2013 09:10:20 +0000 (05:10 -0400)]
Fix doc-comment formatting
Tim Otten [Wed, 13 Mar 2013 06:05:35 +0000 (02:05 -0400)]
Add tpl-lint tool inspired by pull request #132
Tim Otten [Wed, 13 Mar 2013 04:41:31 +0000 (00:41 -0400)]
Cleanup extra spaces around HTML id attributes
Tim Otten [Wed, 13 Mar 2013 04:31:24 +0000 (00:31 -0400)]
Merge branch 'CRM-12019-b' of github.com:colemanw/civicrm-core into colemanw-CRM-12019-b
Tim Otten [Wed, 13 Mar 2013 03:36:35 +0000 (20:36 -0700)]
Merge pull request #132 from colemanw/CRM-12107
Don't include lock js on add new contact page CRM-12107
Coleman Watts [Wed, 13 Mar 2013 03:29:13 +0000 (20:29 -0700)]
Don't include lock js on add new contact page CRM-12107
colemanw [Wed, 13 Mar 2013 03:26:32 +0000 (20:26 -0700)]
Merge pull request #131 from eileenmcnaughton/CRM-12042
CRM-12042 edge case protection
eileen [Wed, 13 Mar 2013 03:19:49 +0000 (16:19 +1300)]
CRM-12042 edge case protection
Coleman Watts [Wed, 13 Mar 2013 02:28:48 +0000 (19:28 -0700)]
Change onclick handlers to be IE friendly CRM-12019
Tim Otten [Tue, 12 Mar 2013 15:01:59 +0000 (08:01 -0700)]
Merge pull request #126 from totten/abstract-err
CRM_Extension_Container_AllTests - Fix error about abstract method
Tim Otten [Tue, 12 Mar 2013 15:01:00 +0000 (11:01 -0400)]
CRM_Extension_Container_AllTests - Fix error about abstract method
Kurund Jalmi [Tue, 12 Mar 2013 14:48:15 +0000 (07:48 -0700)]
Merge pull request #125 from pradpnayak/CRM-11983
--made Financial Account Code - Credit and Financial Account Code - Debi...
Kurund Jalmi [Tue, 12 Mar 2013 14:42:10 +0000 (07:42 -0700)]
Merge pull request #123 from yashodha/CRM-9394
CRM-9394
Kurund Jalmi [Tue, 12 Mar 2013 14:41:13 +0000 (07:41 -0700)]
Merge pull request #122 from twomice/CRM-12013
Fix CRM-12013.
Kurund Jalmi [Tue, 12 Mar 2013 14:40:32 +0000 (07:40 -0700)]
Merge pull request #121 from colemanw/CRM-12099
Specify location of jstree css and improve menu-editing theme
Kurund Jalmi [Tue, 12 Mar 2013 14:38:56 +0000 (07:38 -0700)]
Merge pull request #118 from dlobo/CRM-12096
fix CRM-12096
Kurund Jalmi [Tue, 12 Mar 2013 14:38:08 +0000 (07:38 -0700)]
Merge pull request #117 from pradpnayak/CRM-12077
--worked on CRM-12077
yashodha [Tue, 12 Mar 2013 14:32:34 +0000 (20:02 +0530)]
CRM-9394
yashodha [Tue, 12 Mar 2013 14:09:37 +0000 (19:39 +0530)]
CRM-9394
Pradeep Nayak [Tue, 12 Mar 2013 13:26:08 +0000 (18:56 +0530)]
--made Financial Account Code - Credit and Financial Account Code - Debit optional, worked on CRM-11983
yashodha [Tue, 12 Mar 2013 09:21:36 +0000 (14:51 +0530)]
CRM-9394
Allen Shaw [Tue, 12 Mar 2013 06:03:13 +0000 (01:03 -0500)]
Fix CRM-12013.
Coleman Watts [Tue, 12 Mar 2013 04:29:16 +0000 (21:29 -0700)]
Specify location of jstree css and improve menu-editing theme
Tim Otten [Tue, 12 Mar 2013 01:35:16 +0000 (18:35 -0700)]
Merge pull request #119 from totten/git-hooks-reponame
gitify - In hook stubs, set GIT_CANONICAL_REPO_NAME.
Tim Otten [Tue, 12 Mar 2013 01:31:46 +0000 (21:31 -0400)]
gitify - In hook stubs, set GIT_CANONICAL_REPO_NAME.
The hook functions are called by multiple repos, and we may want to tweak the behavior within each repo. The GIT_CANONICAL_REPO_NAME provides a value like "civicrm-packages" or "civicrm-core".
Donald A. Lobo [Mon, 11 Mar 2013 22:29:02 +0000 (15:29 -0700)]
fix CRM-12096
Pradeep Nayak [Mon, 11 Mar 2013 20:04:20 +0000 (01:34 +0530)]
--worked on CRM-12077
Kurund Jalmi [Mon, 11 Mar 2013 18:34:23 +0000 (11:34 -0700)]
Merge pull request #116 from dlobo/CRM-12093
fix CRM-12093
Donald A. Lobo [Mon, 11 Mar 2013 18:01:20 +0000 (11:01 -0700)]
fix CRM-12093
Kurund Jalmi [Mon, 11 Mar 2013 17:50:16 +0000 (10:50 -0700)]
Merge pull request #115 from dlobo/CRM-12088
fix CRM-12088
Kurund Jalmi [Mon, 11 Mar 2013 17:49:54 +0000 (10:49 -0700)]
Merge pull request #114 from dlobo/CRM-12091
fix CRM-12091
Kurund Jalmi [Mon, 11 Mar 2013 17:49:06 +0000 (10:49 -0700)]
Merge pull request #112 from pradpnayak/CRM-11983
Crm 11983
Kurund Jalmi [Mon, 11 Mar 2013 17:47:45 +0000 (10:47 -0700)]
Merge pull request #111 from ravishnair/webtest-improvement
-- more webtest improvements
Donald A. Lobo [Mon, 11 Mar 2013 16:46:28 +0000 (09:46 -0700)]
fix CRM-12088
Donald A. Lobo [Mon, 11 Mar 2013 16:10:42 +0000 (09:10 -0700)]
fix CRM-12091
Ravish Nair [Mon, 11 Mar 2013 14:00:16 +0000 (19:30 +0530)]
-- more webtest improvements
Pradeep Nayak [Mon, 11 Mar 2013 13:13:47 +0000 (18:43 +0530)]
--worked on CRM-11983
Pradeep Nayak [Mon, 11 Mar 2013 10:44:14 +0000 (16:14 +0530)]
--worked on CRM-11983
Kurund Jalmi [Mon, 11 Mar 2013 04:05:47 +0000 (21:05 -0700)]
Merge pull request #109 from totten/gitify-pre-commit
gitify: Setup pre-commit hook
Kurund Jalmi [Mon, 11 Mar 2013 03:39:30 +0000 (20:39 -0700)]
Merge pull request #110 from totten/install-tweaks
Tweaks for developer installation
Tim Otten [Mon, 11 Mar 2013 02:35:17 +0000 (22:35 -0400)]
gitify - Automatically run GenCode on new installs
Tim Otten [Mon, 11 Mar 2013 02:29:40 +0000 (22:29 -0400)]
README.txt - Make Github instructions more prominent
Tim Otten [Mon, 11 Mar 2013 01:50:20 +0000 (21:50 -0400)]
Add more hook stubs for future use
Tim Otten [Sun, 10 Mar 2013 11:11:37 +0000 (07:11 -0400)]
gitify - Add support for "--hooks" which installs recommended git hooks
Tim Otten [Sun, 10 Mar 2013 11:10:55 +0000 (07:10 -0400)]
tools/scripts/git - Add recommended hooks
Tim Otten [Sun, 10 Mar 2013 02:00:05 +0000 (18:00 -0800)]
Merge pull request #107 from dlobo/CRM-12080
fix CRM-12080
Tim Otten [Sun, 10 Mar 2013 01:52:23 +0000 (17:52 -0800)]
Merge pull request #108 from dlobo/CRM-12079
fix CRM-12079
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
Coleman Watts [Sat, 9 Mar 2013 00:54:44 +0000 (16:54 -0800)]
Hack to fix joomla menu CRM-12067
Donald A. Lobo [Sat, 9 Mar 2013 17:27:45 +0000 (09:27 -0800)]
fix CRM-12079
Donald A. Lobo [Sat, 9 Mar 2013 17:44:37 +0000 (09:44 -0800)]
fix CRM-12080
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
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
Kurund Jalmi [Sat, 9 Mar 2013 14:01:46 +0000 (06:01 -0800)]
Merge pull request #105 from colemanw/CRM-12048
Crm 12048
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
Kurund Jalmi [Sat, 9 Mar 2013 14:00:32 +0000 (06:00 -0800)]
Merge pull request #103 from dlobo/CRM-12074
fix CRM-12074
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
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
Kurund Jalmi [Sat, 9 Mar 2013 13:58:16 +0000 (05:58 -0800)]
Merge pull request #98 from dlobo/CRM-12062
fix CRM-12062
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
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
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
Coleman Watts [Sat, 9 Mar 2013 05:42:39 +0000 (21:42 -0800)]
More consistent results with jquery.noconflict
Coleman Watts [Sat, 9 Mar 2013 04:13:47 +0000 (20:13 -0800)]
Fix broken javascript to highlight importable fields CRM-12048
Donald A. Lobo [Sat, 9 Mar 2013 02:41:57 +0000 (18:41 -0800)]
partial fix CRM-12065
Donald A. Lobo [Sat, 9 Mar 2013 02:01:04 +0000 (18:01 -0800)]
fix CRM-12074
Coleman Watts [Sat, 9 Mar 2013 00:07:08 +0000 (16:07 -0800)]
Fix broken subtype icon CRM-12054
Brian Shaughnessy [Fri, 8 Mar 2013 22:30:19 +0000 (17:30 -0500)]
CRM-12075 make recurring contrib links frontend flagged
Brian Shaughnessy [Fri, 8 Mar 2013 18:16:57 +0000 (13:16 -0500)]
UI tweak for contact quick search menu in joomla
Donald A. Lobo [Fri, 8 Mar 2013 18:02:45 +0000 (10:02 -0800)]
fix CRM-12062
Xavier Dutoit [Fri, 8 Mar 2013 17:49:47 +0000 (18:49 +0100)]
CRM-12046 add missing campaign id on petition signatures
Pratik Joshi [Fri, 8 Mar 2013 17:22:28 +0000 (22:52 +0530)]
more test cleanups
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
Kurund Jalmi [Fri, 8 Mar 2013 14:38:53 +0000 (06:38 -0800)]
Merge pull request #85 from dlobo/CRM-12052
fix CRM-12052
Kurund Jalmi [Fri, 8 Mar 2013 14:37:47 +0000 (06:37 -0800)]
Merge pull request #86 from dlobo/CRM-12051
fix CRM-12051
Kurund Jalmi [Fri, 8 Mar 2013 14:37:21 +0000 (06:37 -0800)]
Merge pull request #87 from dlobo/CRM-12043
fix CRM-12043
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
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
Kurund Jalmi [Fri, 8 Mar 2013 14:34:22 +0000 (06:34 -0800)]
Merge pull request #92 from pratik-joshi/webtest-improvement
webtests improvements
Kurund Jalmi [Fri, 8 Mar 2013 14:33:52 +0000 (06:33 -0800)]
Merge pull request #94 from yashodha/CRM-12058
CRM-12058
Kurund Jalmi [Fri, 8 Mar 2013 14:33:24 +0000 (06:33 -0800)]
Merge pull request #95 from ravishnair/webtest-improvement
-- improved webtests
Ravish Nair [Fri, 8 Mar 2013 14:12:59 +0000 (19:42 +0530)]
-- improved webtests
yashodha [Fri, 8 Mar 2013 12:18:58 +0000 (17:48 +0530)]
CRM-12058
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...
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
Pratik Joshi [Fri, 8 Mar 2013 11:38:15 +0000 (17:08 +0530)]
webtests improvements
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()
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().
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
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
Tim Otten [Fri, 8 Mar 2013 10:24:02 +0000 (05:24 -0500)]
CRM-11925 - Fix error message
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)
Tim Otten [Fri, 8 Mar 2013 07:31:18 +0000 (02:31 -0500)]
Doc tweak
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)
Coleman Watts [Fri, 8 Mar 2013 03:59:42 +0000 (19:59 -0800)]
drupal_add_js isn't working - disabling seems the easiest fix
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.)
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
Tim Otten [Thu, 7 Mar 2013 09:30:34 +0000 (04:30 -0500)]
CRM-11925 - Loosen coupling between permission enumeration (getModulePermissions) and storage (upgradePermissions)
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)
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").
projects / civicrm-core.git / log