Kurund Jalmi [Fri, 3 May 2013 07:03:14 +0000 (00:03 -0700)]
Merge pull request #631 from yashodha/soft
CRM-12463
Kurund Jalmi [Fri, 3 May 2013 07:02:48 +0000 (00:02 -0700)]
Merge pull request #635 from pratik-joshi/CRM-12357-upgrade-part
CRM-12357 upgrade part
Kurund Jalmi [Fri, 3 May 2013 00:53:17 +0000 (17:53 -0700)]
Merge pull request #632 from kurund/CRM-12463-fixes
CRM-12463, formRule js fixes
Kurund Jalmi [Fri, 3 May 2013 00:51:44 +0000 (17:51 -0700)]
CRM-12463, formRule js fixes
yashodha [Fri, 3 May 2013 00:43:22 +0000 (06:13 +0530)]
CRM-12463
Kurund Jalmi [Fri, 3 May 2013 00:27:13 +0000 (17:27 -0700)]
Merge pull request #630 from kurund/CRM-12463-fixes
CRM-12463, fixed setdefaults for soft credit
Kurund Jalmi [Fri, 3 May 2013 00:26:18 +0000 (17:26 -0700)]
CRM-12463, fixed setdefaults for soft credit
Kurund Jalmi [Fri, 3 May 2013 00:25:27 +0000 (17:25 -0700)]
Merge pull request #629 from yashodha/soft
CRM-12463
yashodha [Thu, 2 May 2013 23:10:01 +0000 (04:40 +0530)]
CRM-12463
Kurund Jalmi [Thu, 2 May 2013 21:57:53 +0000 (14:57 -0700)]
Merge pull request #627 from kurund/CRM-12463-fixes
worked on CRM-12463, more cleanup
Kurund Jalmi [Thu, 2 May 2013 21:57:10 +0000 (14:57 -0700)]
worked on CRM-12463, more cleanup
Kurund Jalmi [Thu, 2 May 2013 21:33:35 +0000 (14:33 -0700)]
Merge pull request #626 from kurund/CRM-12463-fixes
worked on CRM-12463, more cleanup
Kurund Jalmi [Thu, 2 May 2013 21:31:49 +0000 (14:31 -0700)]
worked on CRM-12463, more cleanup
Pratik Joshi [Thu, 2 May 2013 13:41:59 +0000 (19:11 +0530)]
CRM-12357 upgrade part
Kurund Jalmi [Thu, 2 May 2013 08:17:44 +0000 (01:17 -0700)]
Merge pull request #618 from kurund/CRM-12463-fixes
whitespace fixes
Kurund Jalmi [Thu, 2 May 2013 08:16:53 +0000 (01:16 -0700)]
whitespace fixes
Kurund Jalmi [Thu, 2 May 2013 08:06:50 +0000 (01:06 -0700)]
Merge pull request #617 from kurund/CRM-12463-fixes
more work on CRM-12463, form building js fixes
Kurund Jalmi [Thu, 2 May 2013 08:05:40 +0000 (01:05 -0700)]
more work on CRM-12463, form building js fixes
Kurund Jalmi [Thu, 2 May 2013 07:28:50 +0000 (00:28 -0700)]
Merge pull request #616 from kurund/CRM-12463-fixes
CRM-12463 fixes
Kurund Jalmi [Thu, 2 May 2013 07:26:57 +0000 (00:26 -0700)]
worked on CRM-12463, more fixes
Kurund Jalmi [Thu, 2 May 2013 06:24:08 +0000 (23:24 -0700)]
whitespace fixes
Kurund Jalmi [Thu, 2 May 2013 05:26:03 +0000 (22:26 -0700)]
Merge pull request #614 from kurund/CRM-12357
worked on CRM-12357
Kurund Jalmi [Thu, 2 May 2013 05:24:49 +0000 (22:24 -0700)]
worked on CRM-12357
Kurund Jalmi [Thu, 2 May 2013 04:47:20 +0000 (21:47 -0700)]
Merge pull request #612 from kurund/CRM-12463-fixes
more work on CRM-12463
Kurund Jalmi [Thu, 2 May 2013 04:46:08 +0000 (21:46 -0700)]
more work on CRM-12463
Kurund Jalmi [Thu, 2 May 2013 04:32:17 +0000 (21:32 -0700)]
Merge pull request #609 from yashodha/NEW-CHANGES
CRM-12463 (BAO cleanup)
yashodha [Thu, 2 May 2013 04:24:48 +0000 (09:54 +0530)]
CRM-12463
yashodha [Wed, 1 May 2013 23:55:32 +0000 (05:25 +0530)]
CRM-12463 (BAO cleanup)
Kurund Jalmi [Thu, 2 May 2013 01:14:43 +0000 (18:14 -0700)]
Merge pull request #610 from kurund/CRM-12357
CRM-12357
Kurund Jalmi [Thu, 2 May 2013 01:09:51 +0000 (18:09 -0700)]
worked on CRM-12357, fixed position of dialog and also added new param to modify default label for CRM.confirm
Kurund Jalmi [Thu, 2 May 2013 00:47:21 +0000 (17:47 -0700)]
CRM-12357 fixed redirection to wrong contact record
Kurund Jalmi [Wed, 1 May 2013 23:17:40 +0000 (16:17 -0700)]
Merge pull request #608 from kurund/CRM-12357
CRM-12357
Kurund Jalmi [Wed, 1 May 2013 23:11:50 +0000 (16:11 -0700)]
Merge pull request #606 from yashodha/master
more cleanup for CRM-12463
yashodha [Wed, 1 May 2013 22:32:27 +0000 (04:02 +0530)]
CRM-12463
Kurund Jalmi [Wed, 1 May 2013 21:15:48 +0000 (14:15 -0700)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-01-14-11-47
Conflicts:
CRM/Core/BAO/ActionSchedule.php
CRM/Mailing/BAO/Mailing.php
Kurund Jalmi [Wed, 1 May 2013 21:09:00 +0000 (14:09 -0700)]
Merge pull request #605 from kurund/CRM-12452
refixed CRM-12452, normal new contact widget was broken
Kurund Jalmi [Wed, 1 May 2013 21:07:40 +0000 (14:07 -0700)]
refixed CRM-12452, normal new contact widget was broken
Kurund Jalmi [Wed, 1 May 2013 20:34:58 +0000 (13:34 -0700)]
Merge pull request #585 from agh1/fintyperel-relfirst
Put relationship ahead of account name in assigned financial accounts page (CRM-12474)
Kurund Jalmi [Wed, 1 May 2013 20:33:44 +0000 (13:33 -0700)]
Merge pull request #598 from dlobo/CRM-12488
CRM-12488
Kurund Jalmi [Wed, 1 May 2013 20:32:55 +0000 (13:32 -0700)]
Merge pull request #590 from PalanteJon/soft-credit-fixes
Soft credit changes - BAO and Contribution View
Kurund Jalmi [Wed, 1 May 2013 20:32:24 +0000 (13:32 -0700)]
Merge pull request #601 from dlobo/CRM-12475
CRM-12475
Kurund Jalmi [Wed, 1 May 2013 20:27:03 +0000 (13:27 -0700)]
Merge pull request #604 from yashodha/CRM-12463
clean up (CRM-12463)
Kurund Jalmi [Wed, 1 May 2013 20:17:36 +0000 (13:17 -0700)]
worked on CRM-12357, fixed redirecting back to correct page
Kurund Jalmi [Wed, 1 May 2013 20:07:28 +0000 (13:07 -0700)]
whitespace fixes
Kurund Jalmi [Wed, 1 May 2013 20:03:10 +0000 (13:03 -0700)]
more work on CRM-12357
Kurund Jalmi [Wed, 1 May 2013 20:00:12 +0000 (13:00 -0700)]
Merge pull request #603 from TobiasLounsbury/mailer-contact-api
Mailing contact api
yashodha [Wed, 1 May 2013 19:58:06 +0000 (01:28 +0530)]
CRM-12463 - Clean up
Kurund Jalmi [Wed, 1 May 2013 19:48:28 +0000 (12:48 -0700)]
Merge pull request #586 from yashodha/CRM-12401-reminder
CRM-12401
Kurund Jalmi [Wed, 1 May 2013 18:12:10 +0000 (11:12 -0700)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-01-11-04-54
Conflicts:
sql/civicrm_generated.mysql
Kurund Jalmi [Wed, 1 May 2013 17:53:16 +0000 (10:53 -0700)]
Merge pull request #602 from yashodha/CRM-12463
more BAO work(CRM-12463)
yashodha [Wed, 1 May 2013 17:50:37 +0000 (23:20 +0530)]
CRM-12463
yashodha [Wed, 1 May 2013 17:19:47 +0000 (22:49 +0530)]
CRM-12463
tobiaslounsbury [Wed, 1 May 2013 17:03:53 +0000 (10:03 -0700)]
Added for testing MailingContact_get
tobiaslounsbury [Wed, 1 May 2013 17:03:33 +0000 (10:03 -0700)]
Added for mailingcontact_get testing
tobiaslounsbury [Wed, 1 May 2013 17:03:09 +0000 (10:03 -0700)]
Added for mailing tests
tobiaslounsbury [Wed, 1 May 2013 17:01:53 +0000 (10:01 -0700)]
Added unit tests for MailingContact_get
yashodha [Wed, 1 May 2013 01:19:41 +0000 (06:49 +0530)]
more BAO work(CRM-12463)
Donald A. Lobo [Wed, 1 May 2013 15:50:46 +0000 (08:50 -0700)]
CRM-12475
----------------------------------------
* CRM-12475: Advanced search for CiviCRM ID fails
http://issues.civicrm.org/jira/browse/CRM-12475
Kurund Jalmi [Wed, 1 May 2013 07:41:48 +0000 (00:41 -0700)]
Merge pull request #592 from yashodha/CRM-12463
CRM-12463
Kurund Jalmi [Wed, 1 May 2013 07:28:31 +0000 (00:28 -0700)]
Merge pull request #600 from kurund/CRM-12357
worked CRM-12357, added stats to mailing tab and removed it from activit...
Kurund Jalmi [Wed, 1 May 2013 07:27:21 +0000 (00:27 -0700)]
worked CRM-12357, added stats to mailing tab and removed it from activity selector
Kurund Jalmi [Wed, 1 May 2013 07:15:56 +0000 (00:15 -0700)]
Merge pull request #599 from kurund/CRM-12357
CRM-12357
Kurund Jalmi [Wed, 1 May 2013 07:13:36 +0000 (00:13 -0700)]
CRM-12357, added dialog for view mailing
Kurund Jalmi [Wed, 1 May 2013 05:47:32 +0000 (22:47 -0700)]
whitespace fixes
Donald A. Lobo [Wed, 1 May 2013 05:03:02 +0000 (22:03 -0700)]
CRM-12488
----------------------------------------
* CRM-12488: CiviMail delivers only 10 emails on the first round
http://issues.civicrm.org/jira/browse/CRM-12488
Donald A. Lobo [Wed, 1 May 2013 05:00:31 +0000 (22:00 -0700)]
CRM-12488
----------------------------------------
* CRM-12488: CiviMail delivers only 10 emails on the first round
http://issues.civicrm.org/jira/browse/CRM-12488
Kurund Jalmi [Wed, 1 May 2013 02:20:04 +0000 (19:20 -0700)]
Merge pull request #597 from kurund/CRM-12357
fixed context for mailing report, CRM-12357
Kurund Jalmi [Wed, 1 May 2013 02:13:06 +0000 (19:13 -0700)]
fixed context for mailing report, CRM-12357
Kurund Jalmi [Wed, 1 May 2013 02:01:24 +0000 (19:01 -0700)]
Merge pull request #596 from kurund/CRM-12357
add more columns and links to selector, CRM-12357
Kurund Jalmi [Wed, 1 May 2013 01:58:33 +0000 (18:58 -0700)]
add more columns and links to selector, CRM-12357
Dave Greenberg [Wed, 1 May 2013 00:44:54 +0000 (17:44 -0700)]
Merge pull request #595 from Stoob/CRM-12483
CRM 12483 my first patch
Stoob [Wed, 1 May 2013 00:41:10 +0000 (17:41 -0700)]
CRM 12483 my first patch
Kurund Jalmi [Wed, 1 May 2013 00:29:08 +0000 (17:29 -0700)]
Merge pull request #593 from kurund/CRM-12463
worked on CRM-12463, fixed add more
Kurund Jalmi [Wed, 1 May 2013 00:26:41 +0000 (17:26 -0700)]
worked on CRM-12463, fixed add more
Kurund Jalmi [Wed, 1 May 2013 00:08:48 +0000 (17:08 -0700)]
Merge pull request #591 from davecivicrm/CRM-12482
CRM-12482 add call to crmSetting to get autocomplete result limit to all...
Dave Greenberg [Wed, 1 May 2013 00:00:28 +0000 (17:00 -0700)]
CRM-12482 add call to crmSetting to get autocomplete result limit to all relevant tpls.
----------------------------------------
* CRM-12482: Autocomplete Search Results limit setting should be used for all autocomplete widgets
http://issues.civicrm.org/jira/browse/CRM-12482
yashodha [Tue, 30 Apr 2013 23:55:20 +0000 (05:25 +0530)]
CRM-12463
Kurund Jalmi [Tue, 30 Apr 2013 23:51:41 +0000 (16:51 -0700)]
Merge pull request #589 from kurund/CRM-12463
worked on CRM-12463, fixed add more
Kurund Jalmi [Tue, 30 Apr 2013 23:50:23 +0000 (16:50 -0700)]
worked on CRM-12463, fixed add more
Jon goldberg - Linux laptop [Tue, 30 Apr 2013 23:20:47 +0000 (16:20 -0700)]
Add support to Contribution view for multiple soft credits
Jon goldberg - Linux laptop [Tue, 30 Apr 2013 22:31:05 +0000 (15:31 -0700)]
start modifying Contribution View to display multiple soft credits
Jon goldberg - Linux laptop [Tue, 30 Apr 2013 22:29:36 +0000 (15:29 -0700)]
Modify getSoftContribution in BAO to return multiple values
Jon goldberg - Linux laptop [Tue, 30 Apr 2013 17:39:46 +0000 (10:39 -0700)]
Update inline documentation of getSoftContribution
Jon goldberg - Linux laptop [Tue, 30 Apr 2013 17:14:15 +0000 (10:14 -0700)]
Fix assignment within an 'if' statement
Jon goldberg - Linux laptop [Tue, 30 Apr 2013 17:39:46 +0000 (10:39 -0700)]
Update inline documentation of getSoftContribution
Jon goldberg - Linux laptop [Tue, 30 Apr 2013 17:12:37 +0000 (10:12 -0700)]
Add support for returning soft credit amount
Jon goldberg - Linux laptop [Tue, 30 Apr 2013 17:12:37 +0000 (10:12 -0700)]
Add support for returning soft credit amount
Jon goldberg - Linux laptop [Tue, 30 Apr 2013 17:09:33 +0000 (10:09 -0700)]
Show amount next to soft credit
Kurund Jalmi [Tue, 30 Apr 2013 23:26:12 +0000 (16:26 -0700)]
Merge pull request #588 from kurund/CRM-12463
worked on CRM-12463 restructured code and fixes
Kurund Jalmi [Tue, 30 Apr 2013 23:24:39 +0000 (16:24 -0700)]
worked on CRM-12463 restructured code and fixes
dlobo [Tue, 30 Apr 2013 22:25:57 +0000 (15:25 -0700)]
Merge pull request #587 from dlobo/FormattingFixes
formatting fixes
Donald A. Lobo [Tue, 30 Apr 2013 22:19:30 +0000 (15:19 -0700)]
formatting fixes
yashodha [Tue, 30 Apr 2013 21:58:25 +0000 (03:28 +0530)]
CRM-12401
Andrew Hunt [Tue, 30 Apr 2013 19:41:47 +0000 (15:41 -0400)]
put relationship ahead of account name
Kurund Jalmi [Tue, 30 Apr 2013 18:58:36 +0000 (11:58 -0700)]
Merge pull request #584 from yashodha/CRM-12463
CRM-12463
yashodha [Tue, 30 Apr 2013 18:39:09 +0000 (00:09 +0530)]
CRM-12463
Kurund Jalmi [Tue, 30 Apr 2013 18:26:24 +0000 (11:26 -0700)]
Merge pull request #583 from yashodha/CRM-12463
CRM-12463
yashodha [Tue, 30 Apr 2013 18:20:22 +0000 (23:50 +0530)]
CRM-12463
yashodha [Tue, 30 Apr 2013 18:09:38 +0000 (23:39 +0530)]
CRM-12463
Kurund Jalmi [Tue, 30 Apr 2013 17:44:14 +0000 (10:44 -0700)]
Merge pull request #567 from dlobo/CRM-12452
CRM-12452
projects / civicrm-core.git / log