Coleman Watts [Thu, 14 Mar 2013 02:46:16 +0000 (19:46 -0700)]
Profile editor: Fetch pre/post help for custom fields
colemanw [Thu, 14 Mar 2013 00:59:38 +0000 (17:59 -0700)]
Merge pull request #141 from pradpnayak/CRM-12065
-- fixed formatting, static errors and replaced contribution_type to fin...
colemanw [Thu, 14 Mar 2013 00:07:50 +0000 (17:07 -0700)]
Merge pull request #143 from dlobo/CRM-11281
CRM-11281
Donald A. Lobo [Wed, 13 Mar 2013 23:32:48 +0000 (16:32 -0700)]
CRM-11281
Donald A. Lobo [Wed, 13 Mar 2013 21:17:10 +0000 (14:17 -0700)]
CRM-11281
Pradeep Nayak [Wed, 13 Mar 2013 19:14:54 +0000 (00:44 +0530)]
-- fixed formatting, static errors and replaced contribution_type to financial_type
dlobo [Wed, 13 Mar 2013 18:22:19 +0000 (11:22 -0700)]
Merge pull request #139 from lcdservices/master
CRM-11203 authenticate user when running jobs via cli
Brian Shaughnessy [Wed, 13 Mar 2013 18:20:06 +0000 (14:20 -0400)]
CRM-11203 update Joomla setUserSession to call parent method
Brian Shaughnessy [Wed, 13 Mar 2013 18:14:07 +0000 (14:14 -0400)]
CRM-11203 move setUserSession from Drupal to Base so we allow optional override on per CMS basis
colemanw [Wed, 13 Mar 2013 18:07:05 +0000 (11:07 -0700)]
Merge pull request #140 from dlobo/CRM-12111
CRM-12111
Donald A. Lobo [Wed, 13 Mar 2013 17:38:36 +0000 (10:38 -0700)]
CRM-12111
Brian Shaughnessy [Wed, 13 Mar 2013 17:23:47 +0000 (13:23 -0400)]
CRM-11203 authenticate user when running jobs via cli
Kurund Jalmi [Wed, 13 Mar 2013 16:52:00 +0000 (09:52 -0700)]
Merge pull request #138 from pratik-joshi/webtest-improvement
Webtest improvement
Pratik Joshi [Wed, 13 Mar 2013 14:54:55 +0000 (20:24 +0530)]
minor test fix
Pratik Joshi [Wed, 13 Mar 2013 14:41:47 +0000 (20:11 +0530)]
more test cleanup
Pratik Joshi [Wed, 13 Mar 2013 14:27:48 +0000 (19:57 +0530)]
webtest cleanup
Pratik Joshi [Wed, 13 Mar 2013 14:21:21 +0000 (19:51 +0530)]
more test cleanup
Pratik Joshi [Wed, 13 Mar 2013 14:12:26 +0000 (19:42 +0530)]
test cleanup
Kurund Jalmi [Wed, 13 Mar 2013 12:58:22 +0000 (05:58 -0700)]
Merge pull request #137 from pratik-joshi/CRM-12076-fix
CRM-12076 fix
Pratik Joshi [Wed, 13 Mar 2013 12:35:28 +0000 (18:05 +0530)]
CRM-12076-fix : gen data commit
Pratik Joshi [Wed, 13 Mar 2013 12:08:54 +0000 (17:38 +0530)]
CRM-12076 fix
Conflicts:
CRM/Upgrade/Incremental/sql/4.3.beta3.mysql.tpl
Kurund Jalmi [Wed, 13 Mar 2013 11:28:08 +0000 (04:28 -0700)]
Merge pull request #127 from dlobo/CRM-12100
CRM-12100
Kurund Jalmi [Wed, 13 Mar 2013 11:26:16 +0000 (04:26 -0700)]
Merge pull request #133 from pradpnayak/CRM-12061
--fixed for CRM-12061
Kurund Jalmi [Wed, 13 Mar 2013 11:25:22 +0000 (04:25 -0700)]
Merge pull request #134 from totten/fix-doc-comment
Fix doc-comment formatting
Tim Otten [Wed, 13 Mar 2013 11:17:30 +0000 (04:17 -0700)]
Merge pull request #136 from pratik-joshi/CRM-12084
CRM-12084 fix : comment https://github.com/civicrm/civicrm-core/pull/135...
Pratik Joshi [Wed, 13 Mar 2013 11:05:53 +0000 (16:35 +0530)]
CRM-12084 fix : comment https://github.com/civicrm/civicrm-core/pull/135#issuecomment-
14834797 by totten
Tim Otten [Wed, 13 Mar 2013 10:29:22 +0000 (03:29 -0700)]
Merge pull request #135 from pratik-joshi/CRM-12084
CRM-12084 fix : Upgrade verifyPreDBState - check for orphaned contribution records
Tim Otten [Wed, 13 Mar 2013 10:06:28 +0000 (03:06 -0700)]
Merge pull request #129 from dlobo/CRM-12101
CRM-12101 - fixed fatal error and also fixed mail/postProcess from cli which was broken
Pratik Joshi [Wed, 13 Mar 2013 09:55:50 +0000 (15:25 +0530)]
CRM-12084 fix
Tim Otten [Wed, 13 Mar 2013 09:49:50 +0000 (02:49 -0700)]
Merge pull request #128 from eileenmcnaughton/CRM-11915-comments
Crm 11915 comments
Coleman Watts [Tue, 12 Mar 2013 03:32:35 +0000 (20:32 -0700)]
Adding .listall back to .gitignore for legacy purposes
Coleman Watts [Tue, 12 Mar 2013 03:28:32 +0000 (20:28 -0700)]
Also update GenCode
Coleman Watts [Tue, 12 Mar 2013 03:19:16 +0000 (20:19 -0700)]
Move .permissions.php and .listAll.php
Tim Otten [Wed, 13 Mar 2013 09:10:20 +0000 (05:10 -0400)]
Fix doc-comment formatting
Pradeep Nayak [Wed, 13 Mar 2013 08:09:13 +0000 (13:39 +0530)]
--fixed for CRM-12061
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
Donald A. Lobo [Tue, 12 Mar 2013 22:56:56 +0000 (15:56 -0700)]
get mail to work, eliminate debug code - CRM-12101
Donald A. Lobo [Tue, 12 Mar 2013 22:24:17 +0000 (15:24 -0700)]
CRM-12101
Donald A. Lobo [Tue, 12 Mar 2013 20:14:56 +0000 (13:14 -0700)]
CRM-12101
eileen [Tue, 12 Mar 2013 20:48:14 +0000 (09:48 +1300)]
CRM-11915 code comments
Donald A. Lobo [Tue, 12 Mar 2013 20:36:06 +0000 (13:36 -0700)]
CRM-12100
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
projects / civicrm-core.git / log