Kurund Jalmi [Wed, 8 May 2013 16:06:54 +0000 (09:06 -0700)]
Merge pull request #681 from GiantRobot/CRM-12560
Fix CRM-12560 by matching test trxn_ids only which can be incremented.
deepak-srivastava [Wed, 8 May 2013 14:02:06 +0000 (07:02 -0700)]
Merge pull request #576 from eileenmcnaughton/CRM-12053
CRM-12053 fix operators back to non-static
Chris Burgess [Wed, 8 May 2013 02:42:41 +0000 (14:42 +1200)]
Fix CRM-12560 by matching test trxn_ids only which can be incremented.
dlobo [Wed, 8 May 2013 00:29:07 +0000 (17:29 -0700)]
Merge pull request #514 from adamwight/cache_acl_entityTable
Cache CRM_ACL_BAO_ACL::entityTable per-request
Kurund Jalmi [Wed, 8 May 2013 00:01:27 +0000 (17:01 -0700)]
Merge pull request #676 from yashodha/SOFT
final clean up(CRM-12463)
yashodha [Tue, 7 May 2013 23:37:31 +0000 (05:07 +0530)]
final clean up(CRM-12463)
Kurund Jalmi [Tue, 7 May 2013 18:19:21 +0000 (11:19 -0700)]
Merge pull request #672 from kurund/CRM-12515
worked on CRM-12515, fixed the icon button for offiline mode / when bill...
Kurund Jalmi [Tue, 7 May 2013 18:17:18 +0000 (11:17 -0700)]
worked on CRM-12515, fixed the icon button for offiline mode / when billing block is laoded via ajax
Kurund Jalmi [Tue, 7 May 2013 18:10:42 +0000 (11:10 -0700)]
Merge pull request #639 from mlutfy/cc-icons
CRM-12515: improve how credit card types/numbers are handled
Kurund Jalmi [Tue, 7 May 2013 06:44:51 +0000 (23:44 -0700)]
updated .gitignore
Kurund Jalmi [Tue, 7 May 2013 00:40:01 +0000 (17:40 -0700)]
Merge pull request #664 from yashodha/soft-cre
CRM-12463
Tim Otten [Mon, 6 May 2013 23:23:43 +0000 (16:23 -0700)]
Merge pull request #665 from adamwight/groupId_in_CustomFieldTest
fix unit test by... using deprecated param name :p
Adam Roses Wight [Mon, 6 May 2013 23:05:03 +0000 (16:05 -0700)]
fix unit test by... using deprecated param name :p
yashodha [Mon, 6 May 2013 22:46:44 +0000 (04:16 +0530)]
CRM-12463
Kurund Jalmi [Mon, 6 May 2013 21:02:45 +0000 (14:02 -0700)]
Merge pull request #663 from kurund/CRM-10592
CRM-10592
Kurund Jalmi [Mon, 6 May 2013 20:57:38 +0000 (13:57 -0700)]
manually merged work on CRM-10592, #527
Kurund Jalmi [Mon, 6 May 2013 18:11:26 +0000 (11:11 -0700)]
Merge pull request #634 from mmikitka/crm-12399-integrate-official-twilio-library
CRM-12399: Integrate official Twilio PHP library with org.civicrm.sms.twilio
Kurund Jalmi [Mon, 6 May 2013 17:38:10 +0000 (10:38 -0700)]
Merge pull request #650 from cdoten/CRM-12528
Crm 12528
Kurund Jalmi [Mon, 6 May 2013 17:19:30 +0000 (10:19 -0700)]
Merge pull request #645 from ergonlogic/master
Set full version in Drupal .info files
Kurund Jalmi [Mon, 6 May 2013 17:12:05 +0000 (10:12 -0700)]
Merge pull request #649 from yashodha/softCredit
Soft credit
Kurund Jalmi [Mon, 6 May 2013 17:11:10 +0000 (10:11 -0700)]
Merge pull request #658 from yashodha/newSoft
notice fix
Kurund Jalmi [Mon, 6 May 2013 17:10:51 +0000 (10:10 -0700)]
Merge pull request #659 from deepak-srivastava/mastro
Fixes towards CRM-12490, performance improvements, adherence to options ...
Deepak Srivastava [Mon, 6 May 2013 14:44:34 +0000 (20:14 +0530)]
Fixes towards CRM-12490, performance improvements, adherence to options settings
yashodha [Mon, 6 May 2013 05:39:04 +0000 (11:09 +0530)]
notice fix
Chris Doten [Sun, 5 May 2013 01:09:29 +0000 (01:09 +0000)]
Added Campaign organizing functionality in the Pledge 'Summary' page which is on the Detail page.
Chris Doten [Sat, 4 May 2013 23:51:23 +0000 (23:51 +0000)]
Some additional comments in Contribute/Summary. Added Campaign functionality to Member/Summary
Chris Doten [Sat, 4 May 2013 23:16:47 +0000 (23:16 +0000)]
Removed defunct order_by override from Member/Detail; added campaign functionality to ParticipantListing
Kurund Jalmi [Sat, 4 May 2013 23:09:34 +0000 (16:09 -0700)]
Merge pull request #648 from kurund/CRM-12463-fixes
added delete link for soft credit, CRM-12463
Kurund Jalmi [Sat, 4 May 2013 23:09:08 +0000 (16:09 -0700)]
added delete link for soft credit, CRM-12463
yashodha [Sat, 4 May 2013 23:05:26 +0000 (04:35 +0530)]
CRM-12463
yashodha [Sat, 4 May 2013 22:43:49 +0000 (04:13 +0530)]
CRM-12463
Chris Doten [Sat, 4 May 2013 22:44:05 +0000 (22:44 +0000)]
Cleaned up print statements
Chris Doten [Sat, 4 May 2013 22:42:55 +0000 (22:42 +0000)]
Fixed order_by functions for names
colemanw [Sat, 4 May 2013 22:20:43 +0000 (15:20 -0700)]
Merge pull request #647 from PalanteJon/soft-credit-api-3
Soft Credit API plus unit tests
Jon goldberg - Linux laptop [Sat, 4 May 2013 22:07:53 +0000 (15:07 -0700)]
Soft Credit API plus unit tests
Christopher Gervais [Sat, 4 May 2013 21:24:57 +0000 (14:24 -0700)]
Set full version in Drupal module .info files.
Chris Doten [Sat, 4 May 2013 21:10:05 +0000 (21:10 +0000)]
Updated report display to show campaign name, not ID number
Kurund Jalmi [Sat, 4 May 2013 21:07:16 +0000 (14:07 -0700)]
Merge pull request #643 from deepak-srivastava/mastro
Fix towards CRM-12490
Chris Doten [Sat, 4 May 2013 21:05:16 +0000 (21:05 +0000)]
Changed array references from civicrm_contribution to civicrm_membership; now generates SQL properly.
Debian Live user [Sat, 4 May 2013 20:38:08 +0000 (20:38 +0000)]
Added campaign information to membership report details form. Added a couple of comments to the contribute Detail functions.
Deepak Srivastava [Sat, 4 May 2013 19:15:54 +0000 (00:45 +0530)]
Fix towards CRM-12490
Mathieu Lutfy [Sat, 4 May 2013 18:09:45 +0000 (14:09 -0400)]
Merge credit card icons into one sprint file, and use the term 'icon' instead of 'logo'.
Mathieu Lutfy [Fri, 3 May 2013 19:20:07 +0000 (15:20 -0400)]
CRM-12515: add China Union Pay
Mathieu Lutfy [Fri, 3 May 2013 19:09:17 +0000 (15:09 -0400)]
CRM-12515: better credit card handling in contribution forms.
Kurund Jalmi [Fri, 3 May 2013 18:22:14 +0000 (11:22 -0700)]
Merge pull request #613 from Stoob/master
These are my web test enhancements for soft credit multiples
Kurund Jalmi [Fri, 3 May 2013 18:16:55 +0000 (11:16 -0700)]
Merge pull request #637 from deepak-srivastava/mastro
CRM-12490
Mathieu Lutfy [Fri, 3 May 2013 16:06:04 +0000 (12:06 -0400)]
CRM-12515: improving the credit card type in contribution forms.
Deepak Srivastava [Fri, 3 May 2013 14:50:39 +0000 (20:20 +0530)]
CRM-12490
Kurund Jalmi [Fri, 3 May 2013 07:07:09 +0000 (00:07 -0700)]
Merge pull request #636 from kurund/CRM-12463-fixes
more work on CRM-12463, fixed api for backward compatibility
Kurund Jalmi [Fri, 3 May 2013 07:05:21 +0000 (00:05 -0700)]
more work on CRM-12463, fixed api for backward compatibility
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
mmikitka [Fri, 3 May 2013 04:26:46 +0000 (00:26 -0400)]
Load the api_type string value in getProviderInfo. Fixed a typo bug in the Clickatell and Twilio files.
mmikitka [Fri, 3 May 2013 04:25:40 +0000 (00:25 -0400)]
Added the Services_Twilio PEAR-compatible library. See CRM-12399 for more information.
----------------------------------------
* CRM-12399: Integrate official Twilio PHP library with org.civicrm.sms.twilio
http://issues.civicrm.org/jira/browse/CRM-12399
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
Stoob [Thu, 2 May 2013 23:24:23 +0000 (16:24 -0700)]
CRM-12507
----------------------------------------
* CRM-12507: Add ID number to <div container in tpl for: EventInfo.tpl, (Event) Register.tpl, Contribution Main.tpl
http://issues.civicrm.org/jira/browse/CRM-12507
Stoob [Thu, 2 May 2013 23:23:45 +0000 (16:23 -0700)]
CRM-12507
----------------------------------------
* CRM-12507: Add ID number to <div container in tpl for: EventInfo.tpl, (Event) Register.tpl, Contribution Main.tpl
http://issues.civicrm.org/jira/browse/CRM-12507
Stoob [Thu, 2 May 2013 23:22:49 +0000 (16:22 -0700)]
CRM-12507
----------------------------------------
* CRM-12507: Add ID number to <div container in tpl for: EventInfo.tpl, (Event) Register.tpl, Contribution Main.tpl
http://issues.civicrm.org/jira/browse/CRM-12507
Stoob [Thu, 2 May 2013 23:18:52 +0000 (16:18 -0700)]
Merge branch 'master' of git://github.com/civicrm/civicrm-core
yashodha [Thu, 2 May 2013 23:10:01 +0000 (04:40 +0530)]
CRM-12463
Stoob [Thu, 2 May 2013 23:06:27 +0000 (16:06 -0700)]
CRM-12505 remove social block from Main.tpl form
----------------------------------------
* CRM-12505: Social Networking block should only be included on Thank-you page for online contributions and event registration
http://issues.civicrm.org/jira/browse/CRM-12505
Stoob [Thu, 2 May 2013 23:04:44 +0000 (16:04 -0700)]
CRM-12505
----------------------------------------
* CRM-12505: Social Networking block should only be included on Thank-you page for online contributions and event registration
http://issues.civicrm.org/jira/browse/CRM-12505
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
Stoob [Thu, 2 May 2013 04:42:58 +0000 (21:42 -0700)]
enhance contribution test to handle multiple soft credits
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
projects / civicrm-core.git / log