vcs.fsf.org Git - civicrm-core.git/log

dlobo [Fri, 17 May 2013 00:45:47 +0000 (17:45 -0700)]

Merge pull request #782 from dlobo/FormattingFixes

fix formatting

Donald A. Lobo [Fri, 17 May 2013 00:44:23 +0000 (17:44 -0700)]

Kurund Jalmi [Thu, 16 May 2013 21:49:08 +0000 (14:49 -0700)]

Merge pull request #779 from davecivicrm/CRM-12637

Applied patch from Helen Bergin to include multiple contributions in sam...

commit | commitdiff | tree

Dave Greenberg [Thu, 16 May 2013 21:16:43 +0000 (14:16 -0700)]

Applied patch from Helen Bergin to include multiple contributions in same year in totals. Also fixed fatal error for this report in 4.3 - getOperationPair needs to be defined as a static function.

commit | commitdiff | tree

Kurund Jalmi [Thu, 16 May 2013 17:48:57 +0000 (10:48 -0700)]

Merge pull request #778 from colemanw/quickSearch

Fix quicksearch by id CRM-12475

commit | commitdiff | tree

Kurund Jalmi [Thu, 16 May 2013 17:48:32 +0000 (10:48 -0700)]

Merge pull request #775 from kurund/CRM-12631

don't show navigation menu on joomla front-end, worked on CRM-12631

commit | commitdiff | tree

Kurund Jalmi [Thu, 16 May 2013 17:48:14 +0000 (10:48 -0700)]

Merge pull request #777 from pratik-joshi/CRM-12615-webtest

CRM-12615 qa: updated WebTest_Event_AddEventTest::testEventAddMultiplePa...

commit | commitdiff | tree

Coleman Watts [Thu, 16 May 2013 14:35:10 +0000 (09:35 -0500)]

Fix quicksearch by id CRM-12475

commit | commitdiff | tree

Pratik Joshi [Thu, 16 May 2013 13:07:07 +0000 (18:37 +0530)]

CRM-12618 webtest updation: added checking in WebTest_Event_AddEventTest::testEventAddMultipleParticipant test case

commit | commitdiff | tree

Pratik Joshi [Thu, 16 May 2013 11:14:12 +0000 (16:44 +0530)]

CRM-12615 qa: updated WebTest_Event_AddEventTest::testEventAddMultipleParticipant test case

commit | commitdiff | tree

deepak-srivastava [Thu, 16 May 2013 09:30:26 +0000 (02:30 -0700)]

Merge pull request #776 from deepak-srivastava/ninja

CRM-12641

commit | commitdiff | tree

Deepak Srivastava [Thu, 16 May 2013 09:24:08 +0000 (14:54 +0530)]

commit | commitdiff | tree

Kurund Jalmi [Thu, 16 May 2013 05:37:49 +0000 (01:37 -0400)]

don't show navigation menu on joomla front-end, worked on CRM-12631

commit | commitdiff | tree

Kurund Jalmi [Thu, 16 May 2013 04:48:37 +0000 (21:48 -0700)]

Merge pull request #774 from kurund/CRM-12514

CRM-12514 expose petitions on activity search along with surveys

commit | commitdiff | tree

Kurund Jalmi [Thu, 16 May 2013 04:46:47 +0000 (00:46 -0400)]

CRM-12514 expose petitions on activity search along with surveys

commit | commitdiff | tree

Kurund Jalmi [Thu, 16 May 2013 03:57:30 +0000 (23:57 -0400)]

removed obsolete code

commit | commitdiff | tree

Kurund Jalmi [Thu, 16 May 2013 03:41:37 +0000 (20:41 -0700)]

Merge pull request #770 from davecivicrm/CRM-12618

CRM-12618 This includes Nicolas Ganivet patch to prevent editing of even...

commit | commitdiff | tree

Kurund Jalmi [Thu, 16 May 2013 03:39:11 +0000 (20:39 -0700)]

Merge pull request #772 from davecivicrm/CRM-12470_typofix

CRM-12470. Typo fixes in status messages

commit | commitdiff | tree

Dave Greenberg [Thu, 16 May 2013 02:09:44 +0000 (19:09 -0700)]

CRM-12470. Typo fixes in status messages

----------------------------------------
* CRM-12470: Creating new financial type without AR account leads to unbalanced transactions
http://issues.civicrm.org/jira/browse/CRM-12470

commit | commitdiff | tree

Dave Greenberg [Thu, 16 May 2013 02:06:25 +0000 (19:06 -0700)]

Merge pull request #771 from davecivicrm/CRM-10771

Help for multi-record custom data set incorrectly says they can not be u...

commit | commitdiff | tree

Dave Greenberg [Thu, 16 May 2013 02:03:28 +0000 (19:03 -0700)]

Help for multi-record custom data set incorrectly says they can not be used in profiles. This changed in 4.3 due to CRM-10771.

----------------------------------------
* CRM-10771: Multiple-record Custom Data Sets in Profiles
http://issues.civicrm.org/jira/browse/CRM-10771

commit | commitdiff | tree

Dave Greenberg [Thu, 16 May 2013 01:40:53 +0000 (18:40 -0700)]

CRM-12618 This includes Nicolas Ganivet patch to prevent editing of event fee for paid additional participants, and fix to hide Record Payment checkbox for them as well.

----------------------------------------
* CRM-12618: Event registration edit screen for additional registrants is incorrect
http://issues.civicrm.org/jira/browse/CRM-12618

commit | commitdiff | tree

Kurund Jalmi [Wed, 15 May 2013 23:27:24 +0000 (19:27 -0400)]

removed obsolete code

commit | commitdiff | tree

colemanw [Wed, 15 May 2013 22:47:03 +0000 (15:47 -0700)]

Merge pull request #753 from pratik-joshi/CRM-12570-fix

CRM-12570 fix

commit | commitdiff | tree

Kurund Jalmi [Wed, 15 May 2013 22:40:06 +0000 (15:40 -0700)]

Merge pull request #764 from davecivicrm/CRM-12614

Crm 12614

commit | commitdiff | tree

Kurund Jalmi [Wed, 15 May 2013 22:39:09 +0000 (15:39 -0700)]

Merge pull request #765 from totten/gitignore-allcoretables

gitignore - Change path for AllCoreTables

commit | commitdiff | tree

Kurund Jalmi [Wed, 15 May 2013 22:38:04 +0000 (15:38 -0700)]

Merge pull request #768 from pradpnayak/CRM-12470

Crm 12470

commit | commitdiff | tree

Kurund Jalmi [Wed, 15 May 2013 22:37:30 +0000 (15:37 -0700)]

Merge pull request #769 from pradpnayak/CRM-12492

-- fixed status msg for CRM-12492

commit | commitdiff | tree

Pradeep Nayak [Wed, 15 May 2013 22:31:13 +0000 (04:01 +0530)]

-- fixed status msg for CRM-12492

----------------------------------------
* CRM-12492: Prevent deletion of last AR financial account, and of A/R relationship for Financial Type
http://issues.civicrm.org/jira/browse/CRM-12492

commit | commitdiff | tree

Pradeep Nayak [Wed, 15 May 2013 22:26:06 +0000 (03:56 +0530)]

-- worked on CRM-12470 and fixed formatting

----------------------------------------
* CRM-12470: Creating new financial type without AR account leads to unbalanced transactions
http://issues.civicrm.org/jira/browse/CRM-12470

commit | commitdiff | tree

Pradeep Nayak [Wed, 15 May 2013 22:25:10 +0000 (03:55 +0530)]

--worked on CRM-12470

----------------------------------------
* CRM-12470: Creating new financial type without AR account leads to unbalanced transactions
http://issues.civicrm.org/jira/browse/CRM-12470

commit | commitdiff | tree

Tim Otten [Wed, 15 May 2013 20:03:19 +0000 (16:03 -0400)]

gitignore - Change path for AllCoreTables

commit | commitdiff | tree

Dave Greenberg [Wed, 15 May 2013 19:44:48 +0000 (12:44 -0700)]

CRM-12614 adding empty mysql.tpl file for 4.3.4 release. Seems like this is still required in order to user postUpgradeMessage function for a release.

----------------------------------------
* CRM-12614: Password required again for CLI cron
http://issues.civicrm.org/jira/browse/CRM-12614

commit | commitdiff | tree

Dave Greenberg [Wed, 15 May 2013 19:43:28 +0000 (12:43 -0700)]

CRM-12614. Add postUpgradeMessage for 4.3.4 which warns system admins that cli.php now requires a password.

----------------------------------------
* CRM-12614: Password required again for CLI cron
http://issues.civicrm.org/jira/browse/CRM-12614

commit | commitdiff | tree

Kurund Jalmi [Wed, 15 May 2013 17:08:31 +0000 (10:08 -0700)]

Merge pull request #763 from kurund/notice-fixes

notice fixes

commit | commitdiff | tree

Kurund Jalmi [Wed, 15 May 2013 17:07:08 +0000 (13:07 -0400)]

commit | commitdiff | tree

Kurund Jalmi [Wed, 15 May 2013 16:57:34 +0000 (09:57 -0700)]

Merge pull request #762 from kurund/notice-fixes

notice fixes

commit | commitdiff | tree

Kurund Jalmi [Wed, 15 May 2013 16:56:23 +0000 (12:56 -0400)]

commit | commitdiff | tree

Kurund Jalmi [Wed, 15 May 2013 15:13:17 +0000 (08:13 -0700)]

Merge pull request #760 from JoeMurray/CRM-12603

fix arg passed to hook

commit | commitdiff | tree

Joe Murray [Wed, 15 May 2013 14:50:54 +0000 (10:50 -0400)]

fix arg passed to hook

----------------------------------------
* CRM-12603: grant pre hook invoked with wrong arg
http://issues.civicrm.org/jira/browse/CRM-12603

commit | commitdiff | tree

Kurund Jalmi [Wed, 15 May 2013 14:21:07 +0000 (07:21 -0700)]

Merge pull request #746 from kurund/CRM-12540

CRM-12540, removed Search Results link and obsolete code

commit | commitdiff | tree

Kurund Jalmi [Wed, 15 May 2013 14:19:51 +0000 (07:19 -0700)]

Merge pull request #751 from pratik-joshi/CRM-12378-improvement

fix for CRM-12378 comment : WebTest_Member_StandaloneAddTest.testAjaxCus...

commit | commitdiff | tree

Kurund Jalmi [Wed, 15 May 2013 14:17:49 +0000 (07:17 -0700)]

Merge pull request #750 from ravishnair/webtest-fix

-- webtest-fix related to issue CRM-12397 and fix for other failing tests

commit | commitdiff | tree

Kurund Jalmi [Wed, 15 May 2013 14:13:15 +0000 (07:13 -0700)]

Merge pull request #758 from yashodha/CRM-12615

CRM-12615

commit | commitdiff | tree

Kurund Jalmi [Wed, 15 May 2013 14:11:56 +0000 (07:11 -0700)]

Merge pull request #757 from pradpnayak/CRM-12492

-- worked on CRM-12492

commit | commitdiff | tree

yashodha [Wed, 15 May 2013 13:25:59 +0000 (18:55 +0530)]

commit | commitdiff | tree

Pradeep Nayak [Wed, 15 May 2013 12:37:51 +0000 (18:07 +0530)]

-- worked on CRM-12492

----------------------------------------
* CRM-12492: Prevent deletion of last AR financial account, and of A/R relationship for Financial Type
http://issues.civicrm.org/jira/browse/CRM-12492

commit | commitdiff | tree

Pratik Joshi [Wed, 15 May 2013 08:42:42 +0000 (14:12 +0530)]

commit | commitdiff | tree

Pratik Joshi [Wed, 15 May 2013 06:29:15 +0000 (11:59 +0530)]

fix for CRM-12378 comment : WebTest_Member_StandaloneAddTest.testAjaxCustomGroupLoad was failing (https://test.civicrm.org/job/CiviCRM-4.3-WebTest-git/LABEL=ubuntu1204,SUITE=WebTest_AllTests/24/)

commit | commitdiff | tree

Ravish Nair [Wed, 15 May 2013 06:28:33 +0000 (11:58 +0530)]

-- webtest-fix related to issue CRM-12397 and fix for other failing tests

commit | commitdiff | tree

Kurund Jalmi [Wed, 15 May 2013 04:53:07 +0000 (21:53 -0700)]

Merge pull request #747 from dlobo/CRM-12624

CRM-12624

commit | commitdiff | tree

Donald A. Lobo [Wed, 15 May 2013 04:12:17 +0000 (21:12 -0700)]

CRM-12624

----------------------------------------
* CRM-12624: WordPress does not allow anon user to access subscribe/unsubscribe CiviMail pages
http://issues.civicrm.org/jira/browse/CRM-12624

commit | commitdiff | tree

Kurund Jalmi [Wed, 15 May 2013 03:45:34 +0000 (23:45 -0400)]

CRM-12540, removed Search Results link

commit | commitdiff | tree

Kurund Jalmi [Tue, 14 May 2013 23:45:53 +0000 (16:45 -0700)]

Merge pull request #744 from kurund/notice-fixes

fixed more notices on pledge and while sending email receipt

commit | commitdiff | tree

Kurund Jalmi [Tue, 14 May 2013 23:43:11 +0000 (19:43 -0400)]

commit | commitdiff | tree

Kurund Jalmi [Tue, 14 May 2013 23:22:11 +0000 (16:22 -0700)]

Merge pull request #741 from dlobo/CRM-10431

CRM-10431 - regression due to coder modifitcations

commit | commitdiff | tree

dlobo [Tue, 14 May 2013 21:26:26 +0000 (14:26 -0700)]

Merge pull request #740 from JoeMurray/CRM-12603

fixing args passed to hook pre

commit | commitdiff | tree

Donald A. Lobo [Tue, 14 May 2013 21:18:23 +0000 (14:18 -0700)]

CRM-10431 - regression due to coder modifitcations

----------------------------------------
* CRM-10431: some regular expression strings were broken by coder module formatting
http://issues.civicrm.org/jira/browse/CRM-10431

commit | commitdiff | tree

Joe Murray [Tue, 14 May 2013 21:09:47 +0000 (17:09 -0400)]

fixing args passed to hook pre

----------------------------------------
* CRM-12603: grant pre hook invoked with wrong arg
http://issues.civicrm.org/jira/browse/CRM-12603

commit | commitdiff | tree

dlobo [Tue, 14 May 2013 18:36:48 +0000 (11:36 -0700)]

Merge pull request #739 from dlobo/CRM-12607

CRM-12607

commit | commitdiff | tree

Donald A. Lobo [Tue, 14 May 2013 18:34:47 +0000 (11:34 -0700)]

CRM-12607

----------------------------------------
* CRM-12607: Add employer and address fields to the Event Participants List report
http://issues.civicrm.org/jira/browse/CRM-12607

commit | commitdiff | tree

dlobo [Tue, 14 May 2013 17:53:09 +0000 (10:53 -0700)]

Merge pull request #735 from dlobo/CRM-12591

CRM-12591

commit | commitdiff | tree

Donald A. Lobo [Tue, 14 May 2013 17:52:09 +0000 (10:52 -0700)]

CRM-12591

----------------------------------------
* CRM-12591: Event Income Report (Detail): inacuracy in Payment Method Breakdown
http://issues.civicrm.org/jira/browse/CRM-12591

commit | commitdiff | tree

dlobo [Tue, 14 May 2013 16:46:40 +0000 (09:46 -0700)]

Merge pull request #734 from mlutfy/crm12606

CRM-12606: do not escape() the strings twice.

commit | commitdiff | tree

Mathieu Lutfy [Tue, 14 May 2013 16:42:20 +0000 (12:42 -0400)]

CRM-12606: do not escape() the strings twice.

commit | commitdiff | tree

Kurund Jalmi [Mon, 13 May 2013 19:38:32 +0000 (12:38 -0700)]

Merge pull request #724 from kurund/CRM-12551

CRM-12551, fixed datatable break due to tab character's

commit | commitdiff | tree

Kurund Jalmi [Mon, 13 May 2013 19:31:24 +0000 (12:31 -0700)]

Merge pull request #722 from dlobo/CRM-12597

CRM-12597 - Handle changed / unknown fields in a better way

commit | commitdiff | tree

Kurund Jalmi [Mon, 13 May 2013 19:30:07 +0000 (12:30 -0700)]

Merge pull request #725 from davecivicrm/CRM-12562

CRM-12562 Mis-named array item check in Batch.php was causing batch upda...

commit | commitdiff | tree

Kurund Jalmi [Mon, 13 May 2013 19:29:10 +0000 (12:29 -0700)]

Merge pull request #723 from davecivicrm/CRM-12563

CRM-12563 Removed extraneous else and </table> tag. Fixed indenting thro...

commit | commitdiff | tree

Dave Greenberg [Mon, 13 May 2013 19:23:15 +0000 (12:23 -0700)]

CRM-12562 Mis-named array item check in Batch.php was causing batch update to set participant role profile field as is_multiple (conditional on line 204 was checking for participant_role_id instead of participant_role).

----------------------------------------
* CRM-12562: Batch Update Participant Roles Not Set, Not Checkboxes, Data Overwritten
http://issues.civicrm.org/jira/browse/CRM-12562

commit | commitdiff | tree

Kurund Jalmi [Mon, 13 May 2013 19:13:38 +0000 (15:13 -0400)]

worked on CRM-12551, fix the datatable break due to tab character

commit | commitdiff | tree

Dave Greenberg [Mon, 13 May 2013 19:02:52 +0000 (12:02 -0700)]

CRM-12563 Removed extraneous else and </table> tag. Fixed indenting throughout tpl file.

----------------------------------------
* CRM-12563: Mismatched <table> tags in MembershipRenewal.tpl
http://issues.civicrm.org/jira/browse/CRM-12563

commit | commitdiff | tree

Dave Greenberg [Mon, 13 May 2013 18:39:53 +0000 (11:39 -0700)]

Merge pull request #697 from agh1/manual-membership-and-price

Clarify switch between price set and manual membership (CRM-12575)

commit | commitdiff | tree

Donald A. Lobo [Mon, 13 May 2013 18:39:26 +0000 (11:39 -0700)]

CRM-12597

----------------------------------------
* CRM-12597: CLONE - Undefined variable: val in CRM_Contribute_BAO_Query::whereClauseSingle()
http://issues.civicrm.org/jira/browse/CRM-12597

commit | commitdiff | tree

Donald A. Lobo [Mon, 13 May 2013 18:36:57 +0000 (11:36 -0700)]

CRM-12597

----------------------------------------
* CRM-12597: CLONE - Undefined variable: val in CRM_Contribute_BAO_Query::whereClauseSingle()
http://issues.civicrm.org/jira/browse/CRM-12597

commit | commitdiff | tree

Kurund Jalmi [Mon, 13 May 2013 16:21:45 +0000 (12:21 -0400)]

commit | commitdiff | tree

Kurund Jalmi [Mon, 13 May 2013 04:19:53 +0000 (21:19 -0700)]

Merge pull request #719 from kurund/css-fixes

display fixes for admin console in j3

commit | commitdiff | tree

Kurund Jalmi [Mon, 13 May 2013 04:18:43 +0000 (00:18 -0400)]

display fixes for admin console in j3

commit | commitdiff | tree

Kurund Jalmi [Mon, 13 May 2013 01:44:58 +0000 (18:44 -0700)]

Merge pull request #707 from dlobo/CRM-12581

CRM-12581 - fix some notices

commit | commitdiff | tree

Kurund Jalmi [Mon, 13 May 2013 01:42:29 +0000 (18:42 -0700)]

Merge pull request #716 from kurund/css-fixes

fixed dark background for td for joomla 3.x

commit | commitdiff | tree

Kurund Jalmi [Mon, 13 May 2013 01:26:01 +0000 (21:26 -0400)]

fixed dark background for td for joomla 3.x

commit | commitdiff | tree

Kurund Jalmi [Sat, 11 May 2013 18:42:03 +0000 (11:42 -0700)]

Merge pull request #713 from mlutfy/4.3-case-tpl

Minor HTML fix in Case.tpl duration field.

commit | commitdiff | tree

Mathieu Lutfy [Sat, 11 May 2013 18:10:31 +0000 (14:10 -0400)]

Minor HTML fix in Case.tpl duration field.

commit | commitdiff | tree

Tim Otten [Sat, 11 May 2013 00:44:45 +0000 (17:44 -0700)]

Merge pull request #711 from totten/autoconfigure-api-key

CRM-12556 - Set admin API key for new test sites

commit | commitdiff | tree

Tim Otten [Sat, 11 May 2013 00:39:44 +0000 (20:39 -0400)]

CRM-12556 - Set admin API key for new test sites

----------------------------------------
* CRM-12556: Assign api_key for a user via command-line
http://issues.civicrm.org/jira/browse/CRM-12556

commit | commitdiff | tree

Kurund Jalmi [Fri, 10 May 2013 17:53:02 +0000 (10:53 -0700)]

Merge pull request #706 from kurund/reg-site

fixed regsite

commit | commitdiff | tree

Kurund Jalmi [Fri, 10 May 2013 17:49:54 +0000 (10:49 -0700)]

commit | commitdiff | tree

Donald A. Lobo [Fri, 10 May 2013 17:44:19 +0000 (10:44 -0700)]

CRM-12581 - fix some notices

----------------------------------------
* CRM-12581: Group(s) Selection for Profile Create Mode Not Saving
http://issues.civicrm.org/jira/browse/CRM-12581

commit | commitdiff | tree

Kurund Jalmi [Fri, 10 May 2013 17:20:25 +0000 (10:20 -0700)]

Merge pull request #704 from dlobo/CRM-12466

CRM-12466

commit | commitdiff | tree

Kurund Jalmi [Fri, 10 May 2013 17:19:56 +0000 (10:19 -0700)]

Merge pull request #705 from dlobo/CRM-12587

CRM-12587

commit | commitdiff | tree

Kurund Jalmi [Fri, 10 May 2013 17:19:28 +0000 (10:19 -0700)]

Merge pull request #703 from pratik-joshi/CRM-12571

CRM-12571 fix

commit | commitdiff | tree

dlobo [Fri, 10 May 2013 17:14:15 +0000 (10:14 -0700)]

Merge pull request #702 from eileenmcnaughton/CRM-12584

CRM-12584 GenCode shouldn't reduce memory_limit

commit | commitdiff | tree

Donald A. Lobo [Fri, 10 May 2013 16:04:47 +0000 (09:04 -0700)]

CRM-12587

----------------------------------------
* CRM-12587: setting group contact cache to zero results in it being set to 5
http://issues.civicrm.org/jira/browse/CRM-12587

commit | commitdiff | tree

Donald A. Lobo [Fri, 10 May 2013 15:54:48 +0000 (08:54 -0700)]

CRM-12466

----------------------------------------
* CRM-12466: Group listings don't load
http://issues.civicrm.org/jira/browse/CRM-12466

commit | commitdiff | tree

Pratik Joshi [Fri, 10 May 2013 08:45:47 +0000 (14:15 +0530)]

commit | commitdiff | tree

eileen [Fri, 10 May 2013 08:10:01 +0000 (20:10 +1200)]

GenCode shouldn't reduce memory_limit

commit | commitdiff | tree

Kurund Jalmi [Thu, 9 May 2013 22:48:20 +0000 (15:48 -0700)]

Merge pull request #700 from dlobo/CRM-12559

CRM-12559

commit | commitdiff | tree

dlobo [Thu, 9 May 2013 20:17:47 +0000 (13:17 -0700)]

Merge pull request #677 from eileenmcnaughton/CRM-12557

CRM-12557 - ACL users cannot see removed , pending groups on contact sum...

commit | commitdiff | tree

Donald A. Lobo [Thu, 9 May 2013 20:15:51 +0000 (13:15 -0700)]

CRM-12559

----------------------------------------
* CRM-12559: Handle failed contributions in CRM_Contribute_BAO_Contribution_Confirm::processContribution()
http://issues.civicrm.org/jira/browse/CRM-12559

commit | commitdiff | tree

Kurund Jalmi [Thu, 9 May 2013 16:52:56 +0000 (09:52 -0700)]