civicrm-core.git
11 years agoCRM-12623, php 5.3 syntax error fix
Deepak Srivastava [Mon, 24 Jun 2013 06:28:07 +0000 (11:58 +0530)]
CRM-12623, php 5.3 syntax error fix

----------------------------------------
* CRM-12623: Create CiviHR Report Template
  http://issues.civicrm.org/jira/browse/CRM-12623

11 years agoMerge pull request #1018 from eileenmcnaughton/CRM-12619
colemanw [Sat, 22 Jun 2013 13:42:52 +0000 (06:42 -0700)]
Merge pull request #1018 from eileenmcnaughton/CRM-12619

CRM-12619  fix relationship search start end dates to be separate & don'...

11 years agoCRM-12619 - per comment remove obsolete variables
eileen [Sat, 22 Jun 2013 07:22:28 +0000 (19:22 +1200)]
CRM-12619 - per comment remove obsolete variables

11 years agoCRM-12619 fix relationship search start end dates to be separate & don't require...
eileen [Tue, 28 May 2013 23:18:01 +0000 (11:18 +1200)]
CRM-12619  fix relationship search start end dates to be separate & don't require type

11 years agoMerge pull request #995 from dpradeep/CRM-10146-commit
Dave Greenberg [Fri, 21 Jun 2013 22:27:00 +0000 (15:27 -0700)]
Merge pull request #995 from dpradeep/CRM-10146-commit

-- fixed for CRM-10146, Restricted the creation of same membership and a...

Recreated bug, applied patch and tested ok. Also reviewed and ran the new web test.

11 years agoMerge pull request #1005 from GiantRobot/CRM-12804
Tim Otten [Fri, 21 Jun 2013 18:56:02 +0000 (11:56 -0700)]
Merge pull request #1005 from GiantRobot/CRM-12804

Correct params to CRM_Upgrade_Form::doIncrementalUpgradeFinish().

11 years agoMerge pull request #1044 from deepak-srivastava/CRM-12623
deepak-srivastava [Fri, 21 Jun 2013 10:20:00 +0000 (03:20 -0700)]
Merge pull request #1044 from deepak-srivastava/CRM-12623

CRM-12623

11 years agoCRM-12623, support setting accordion title with groupings
Deepak Srivastava [Fri, 21 Jun 2013 10:11:32 +0000 (15:41 +0530)]
CRM-12623, support setting accordion title with groupings

----------------------------------------
* CRM-12623:
  http://issues.civicrm.org/jira/browse/CRM-12623

11 years agoMerge pull request #1036 from yashodha/fixes
Dave Greenberg [Thu, 20 Jun 2013 20:04:05 +0000 (13:04 -0700)]
Merge pull request #1036 from yashodha/fixes

CRM-12864

11 years agoMerge pull request #1034 from totten/master-no-customgroups-warning
colemanw [Thu, 20 Jun 2013 17:23:08 +0000 (10:23 -0700)]
Merge pull request #1034 from totten/master-no-customgroups-warning

BAO_CustomGroup - Fix warning when displaying "Edit Contact" on a site w...

11 years agoMerge pull request #1037 from deepak-srivastava/logs
deepak-srivastava [Thu, 20 Jun 2013 12:31:55 +0000 (05:31 -0700)]
Merge pull request #1037 from deepak-srivastava/logs

CRM-12867

11 years agoCRM-12864
yashodha [Thu, 20 Jun 2013 12:07:45 +0000 (17:37 +0530)]
CRM-12864

11 years agoCRM-12867
Deepak Srivastava [Thu, 20 Jun 2013 12:07:27 +0000 (17:37 +0530)]
CRM-12867

----------------------------------------
* CRM-12867:  Changelog enhanced summary report: pagination erroneous count
  http://issues.civicrm.org/jira/browse/CRM-12867

11 years agoBAO_CustomGroup - Fix warning when displaying "Edit Contact" on a site with no (visib...
Tim Otten [Thu, 20 Jun 2013 11:44:34 +0000 (17:14 +0530)]
BAO_CustomGroup - Fix warning when displaying "Edit Contact" on a site with no (visible, well-defined, single-value) CustomGroups.

11 years agoCRM-12623, count_distinct stat
Deepak Srivastava [Thu, 20 Jun 2013 07:12:20 +0000 (12:42 +0530)]
CRM-12623, count_distinct stat

----------------------------------------
* CRM-12623: Create CiviHR Report Template
  http://issues.civicrm.org/jira/browse/CRM-12623

11 years agoMerge pull request #1030 from eileenmcnaughton/master
Tim Otten [Wed, 19 Jun 2013 14:27:02 +0000 (07:27 -0700)]
Merge pull request #1030 from eileenmcnaughton/master

fix api return bug highlighted by syntaxconformancetest

11 years agoMerge pull request #1031 from deepak-srivastava/hr
deepak-srivastava [Wed, 19 Jun 2013 11:27:01 +0000 (04:27 -0700)]
Merge pull request #1031 from deepak-srivastava/hr

CRM-12623

11 years agoCRM-12623
Deepak Srivastava [Wed, 19 Jun 2013 10:20:28 +0000 (15:50 +0530)]
CRM-12623

----------------------------------------
* CRM-12623: Create CiviHR Report Template
  http://issues.civicrm.org/jira/browse/CRM-12623

11 years agofix bug in handling unique fields as a return value highlighted by test
eileen [Wed, 19 Jun 2013 01:45:16 +0000 (13:45 +1200)]
fix bug in handling unique fields as a return value highlighted by test

11 years agoMerge pull request #1026 from yashodha/fixes
Kurund Jalmi [Tue, 18 Jun 2013 06:18:21 +0000 (23:18 -0700)]
Merge pull request #1026 from yashodha/fixes

fix custom group error

11 years agofix custom group error
yashodha [Tue, 18 Jun 2013 06:03:19 +0000 (11:33 +0530)]
fix custom group error

11 years agoMerge pull request #1020 from lcdservices/CRM-12814
Kurund Jalmi [Tue, 18 Jun 2013 05:36:19 +0000 (22:36 -0700)]
Merge pull request #1020 from lcdservices/CRM-12814

CRM-12814 optimize mailing tab clicks/opens calcualations

11 years agoMerge pull request #1023 from davecivicrm/CRM-9759
Kurund Jalmi [Tue, 18 Jun 2013 05:34:33 +0000 (22:34 -0700)]
Merge pull request #1023 from davecivicrm/CRM-9759

CRM-9759 clarifying Component dropdown labels for add/edit activity type...

11 years agoMerge pull request #1025 from eileenmcnaughton/master
Kurund Jalmi [Tue, 18 Jun 2013 05:32:59 +0000 (22:32 -0700)]
Merge pull request #1025 from eileenmcnaughton/master

tidy up of whitespace / fix white space regression

11 years agoremove new trailing spaces
eileen [Tue, 18 Jun 2013 01:55:43 +0000 (13:55 +1200)]
remove new trailing spaces

11 years agoremove trailing whitespaces
eileen [Tue, 18 Jun 2013 01:41:35 +0000 (13:41 +1200)]
remove trailing whitespaces

11 years agospace tabs for double spaces
eileen [Tue, 18 Jun 2013 01:39:52 +0000 (13:39 +1200)]
space tabs for double spaces

11 years agoremove newly added tabs (in favour of two spaces)
eileen [Tue, 18 Jun 2013 01:27:25 +0000 (13:27 +1200)]
remove newly added tabs (in favour of two spaces)

11 years agoremove trailing whitespaces en-masse
eileen [Tue, 18 Jun 2013 01:18:37 +0000 (13:18 +1200)]
remove trailing whitespaces en-masse

11 years agotidy up trailing whitespace, add field titles
eileen [Tue, 18 Jun 2013 01:11:39 +0000 (13:11 +1200)]
tidy up trailing whitespace, add field titles

11 years agoxml tidy up, trailing whitespace, missing titles
eileen [Tue, 18 Jun 2013 01:05:20 +0000 (13:05 +1200)]
xml tidy up, trailing whitespace, missing titles

11 years agoCode cleanup
Coleman Watts [Tue, 18 Jun 2013 00:30:34 +0000 (17:30 -0700)]
Code cleanup

11 years agoFix CustomGroupTest
Coleman Watts [Tue, 18 Jun 2013 00:30:23 +0000 (17:30 -0700)]
Fix CustomGroupTest

11 years agoMerge pull request #1024 from davecivicrm/CRM-12521
colemanw [Tue, 18 Jun 2013 00:02:33 +0000 (17:02 -0700)]
Merge pull request #1024 from davecivicrm/CRM-12521

CRM-12521 Adding first and last name fields to Your Registration Info pr...

11 years agoCRM-12521 Adding first and last name fields to Your Registration Info profile since...
Dave Greenberg [Mon, 17 Jun 2013 23:55:01 +0000 (16:55 -0700)]
CRM-12521 Adding first and last name fields to Your Registration Info profile since that is a better default for most use cases of event registration.

----------------------------------------
* CRM-12521: Your Registration Info default event profile should include First and Last Name
  http://issues.civicrm.org/jira/browse/CRM-12521

11 years agoCRM-9759 add missing ts.
Dave Greenberg [Mon, 17 Jun 2013 22:57:24 +0000 (15:57 -0700)]
CRM-9759 add missing ts.

----------------------------------------
* CRM-9759: Clarify Component field options when creating a new activity type
  http://issues.civicrm.org/jira/browse/CRM-9759

11 years agoCRM-9759 clarifying Component dropdown labels for add/edit activity type form.
Dave Greenberg [Mon, 17 Jun 2013 22:54:33 +0000 (15:54 -0700)]
CRM-9759 clarifying Component dropdown labels for add/edit activity type form.

----------------------------------------
* CRM-9759: Clarify Component field options when creating a new activity type
  http://issues.civicrm.org/jira/browse/CRM-9759

11 years agoFix SyntaxConformanceTest and EnumValues
Coleman Watts [Mon, 17 Jun 2013 22:43:27 +0000 (15:43 -0700)]
Fix SyntaxConformanceTest and EnumValues

11 years agoCRM-12814 optimize mailing tab opened/click calculations
Brian Shaughnessy [Mon, 17 Jun 2013 13:15:29 +0000 (09:15 -0400)]
CRM-12814 optimize mailing tab opened/click calculations

11 years agoMerge pull request #1015 from tttp/CRM-12826
Kurund Jalmi [Mon, 17 Jun 2013 06:05:10 +0000 (23:05 -0700)]
Merge pull request #1015 from tttp/CRM-12826

add message templates api

11 years agoMerge pull request #1013 from pratik-joshi/CRM-12791-minor-fixes
Kurund Jalmi [Mon, 17 Jun 2013 06:04:37 +0000 (23:04 -0700)]
Merge pull request #1013 from pratik-joshi/CRM-12791-minor-fixes

CRM-12791 : pseudoconstant replacement handling, and minor improvements

11 years agoMerge pull request #1017 from eileenmcnaughton/master
Kurund Jalmi [Mon, 17 Jun 2013 06:01:53 +0000 (23:01 -0700)]
Merge pull request #1017 from eileenmcnaughton/master

CRM-12835 Display relationship description on relationship tab

11 years agoMerge pull request #1016 from GiantRobot/CRM-12821
Kurund Jalmi [Mon, 17 Jun 2013 05:59:55 +0000 (22:59 -0700)]
Merge pull request #1016 from GiantRobot/CRM-12821

Crm 12821

11 years agoCRM-12835 Display relationship description on relationship tab
eileen [Mon, 17 Jun 2013 01:51:34 +0000 (13:51 +1200)]
CRM-12835 Display relationship description on relationship tab

11 years agoCRM-12821
Chris Burgess [Fri, 14 Jun 2013 22:53:12 +0000 (10:53 +1200)]
CRM-12821

Remove any incorrect entries in civicrm_dashboard_contact.

11 years agoMerge pull request #1014 from colemanw/importParser
colemanw [Sun, 16 Jun 2013 03:29:21 +0000 (20:29 -0700)]
Merge pull request #1014 from colemanw/importParser

Refactor import parser code to use parent classes

11 years agoadd message templates api
Xavier Dutoit [Sat, 15 Jun 2013 16:16:57 +0000 (18:16 +0200)]
add message templates api

11 years agoMerge pull request #999 from lcdservices/master
Kurund Jalmi [Sat, 15 Jun 2013 12:56:13 +0000 (05:56 -0700)]
Merge pull request #999 from lcdservices/master

CRM-12798 contact detail report date filter

11 years agoFix test
Coleman Watts [Sat, 15 Jun 2013 01:02:34 +0000 (18:02 -0700)]
Fix test

11 years agoFix tests
Coleman Watts [Sat, 15 Jun 2013 00:55:19 +0000 (17:55 -0700)]
Fix tests

11 years agoMass update tests to use callAPIFailure
Coleman Watts [Fri, 14 Jun 2013 23:09:41 +0000 (16:09 -0700)]
Mass update tests to use callAPIFailure

11 years agoCRM-12791 : pseudoconstant replacement handling, and minor improvements
Pratik Joshi [Fri, 14 Jun 2013 14:57:10 +0000 (20:27 +0530)]
CRM-12791 : pseudoconstant replacement handling, and minor improvements

11 years agoCRM-12809 - Determine is_addable on server-side
Tim Otten [Fri, 14 Jun 2013 14:49:01 +0000 (16:49 +0200)]
CRM-12809 - Determine is_addable on server-side

----------------------------------------
* CRM-12809: Reserved CustomGroups
  http://issues.civicrm.org/jira/browse/CRM-12809

11 years agoCRM-12809 - For public screens, use phrase "custom field-set"
Tim Otten [Fri, 14 Jun 2013 14:37:23 +0000 (16:37 +0200)]
CRM-12809 - For public screens, use phrase "custom field-set"

Per michaelmcandrew, "custom group" shouldn't appear in docs or web UI

----------------------------------------
* CRM-12809: Reserved CustomGroups
  http://issues.civicrm.org/jira/browse/CRM-12809

11 years ago-- CRM-12809 fix for point no 4
Ravish Nair [Fri, 14 Jun 2013 13:57:45 +0000 (19:27 +0530)]
-- CRM-12809 fix for point no 4

----------------------------------------
* CRM-12809: Reserved CustomGroups
  http://issues.civicrm.org/jira/browse/CRM-12809

11 years ago-- CRM-12809 #1, #2 and #3
Ravish Nair [Fri, 14 Jun 2013 13:01:53 +0000 (18:31 +0530)]
-- CRM-12809 #1, #2 and #3

----------------------------------------
* CRM-12809: Reserved CustomGroups
  http://issues.civicrm.org/jira/browse/CRM-12809

11 years agoFix ContributionTest
Coleman Watts [Thu, 13 Jun 2013 23:00:37 +0000 (16:00 -0700)]
Fix ContributionTest

11 years agoFix phone failure test
Coleman Watts [Thu, 13 Jun 2013 22:49:36 +0000 (15:49 -0700)]
Fix phone failure test

11 years agoMore caching fixes for tests
Coleman Watts [Thu, 13 Jun 2013 21:25:40 +0000 (14:25 -0700)]
More caching fixes for tests

11 years agoFix api_v3_LocBlockTest
Coleman Watts [Thu, 13 Jun 2013 18:35:35 +0000 (11:35 -0700)]
Fix api_v3_LocBlockTest

11 years agoTest cleanup
Coleman Watts [Thu, 13 Jun 2013 17:23:16 +0000 (10:23 -0700)]
Test cleanup

11 years agoMerge pull request #1009 from deepak-srivastava/hr
deepak-srivastava [Thu, 13 Jun 2013 12:29:21 +0000 (05:29 -0700)]
Merge pull request #1009 from deepak-srivastava/hr

CRM-12251

11 years agoCRM-12251
Deepak Srivastava [Thu, 13 Jun 2013 12:27:04 +0000 (17:57 +0530)]
CRM-12251

----------------------------------------
* CRM-12251: CiviMember Reports Improvements: Inner Join On Type vs Status and Add "Primary Member"
  http://issues.civicrm.org/jira/browse/CRM-12251

11 years agoMerge pull request #1007 from ravishnair/CRM-12653fix
pratik-joshi [Thu, 13 Jun 2013 09:43:11 +0000 (02:43 -0700)]
Merge pull request #1007 from ravishnair/CRM-12653fix

CRM-12653 soft credit amount field in batch entry grid

11 years ago-- CRM-12653 removed the batch copy link for soft credit
Ravish Nair [Thu, 13 Jun 2013 09:39:59 +0000 (15:09 +0530)]
-- CRM-12653 removed the batch copy link for soft credit

----------------------------------------
* CRM-12653: Add Soft Credit Amount Field to Batch Data Entry
  http://issues.civicrm.org/jira/browse/CRM-12653
* CRM-12653fix:
  http://issues.civicrm.org/jira/browse/CRM-12653fix

11 years ago-- CRM-12653 upgrade handling
Ravish Nair [Thu, 13 Jun 2013 05:47:26 +0000 (11:17 +0530)]
-- CRM-12653 upgrade handling

----------------------------------------
* CRM-12653: Add Soft Credit Amount Field to Batch Data Entry
  http://issues.civicrm.org/jira/browse/CRM-12653

11 years ago-- CRM-12653 some more fixes
Ravish Nair [Wed, 12 Jun 2013 14:43:49 +0000 (20:13 +0530)]
-- CRM-12653 some more fixes

----------------------------------------
* CRM-12653: Add Soft Credit Amount Field to Batch Data Entry
  http://issues.civicrm.org/jira/browse/CRM-12653

11 years ago-- Indentation fix
Ravish Nair [Wed, 12 Jun 2013 10:29:03 +0000 (15:59 +0530)]
-- Indentation fix

----------------------------------------
* CRM-12653: Add Soft Credit Amount Field to Batch Data Entry
  http://issues.civicrm.org/jira/browse/CRM-12653

11 years ago-- CRM-12653 soft credit amount field in batch entry grid
Ravish Nair [Wed, 12 Jun 2013 10:20:48 +0000 (15:50 +0530)]
-- CRM-12653 soft credit amount field in batch entry grid

----------------------------------------
* CRM-12653: Add Soft Credit Amount Field to Batch Data Entry
  http://issues.civicrm.org/jira/browse/CRM-12653

11 years agoFix api_v3_MembershipTest
Coleman Watts [Thu, 13 Jun 2013 04:42:46 +0000 (21:42 -0700)]
Fix api_v3_MembershipTest

11 years agoFix api_v3_UFFieldTest
Coleman Watts [Thu, 13 Jun 2013 04:32:47 +0000 (21:32 -0700)]
Fix api_v3_UFFieldTest

11 years agoFix testCreateBadTypeContact
Coleman Watts [Thu, 13 Jun 2013 03:59:39 +0000 (20:59 -0700)]
Fix testCreateBadTypeContact

11 years agoFix api constant test CRM-12464
Coleman Watts [Thu, 13 Jun 2013 03:54:27 +0000 (20:54 -0700)]
Fix api constant test CRM-12464

----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoCorrect params to CRM_Upgrade_Form::doIncrementalUpgradeFinish().
Chris Burgess [Thu, 13 Jun 2013 00:37:01 +0000 (12:37 +1200)]
Correct params to CRM_Upgrade_Form::doIncrementalUpgradeFinish().

11 years agoMerge pull request #1004 from eileenmcnaughton/apitests
colemanw [Wed, 12 Jun 2013 23:07:01 +0000 (16:07 -0700)]
Merge pull request #1004 from eileenmcnaughton/apitests

fix params on documentMe call

11 years agoTest fix - get rid of exta api.aliases
Coleman Watts [Wed, 12 Jun 2013 23:05:20 +0000 (16:05 -0700)]
Test fix - get rid of exta api.aliases

11 years agofix params on documentMe call
eileen [Wed, 12 Jun 2013 23:05:00 +0000 (11:05 +1200)]
fix params on documentMe call

11 years agoAdd test for option-value name matching
Coleman Watts [Wed, 12 Jun 2013 22:52:07 +0000 (15:52 -0700)]
Add test for option-value name matching

11 years agoMerge pull request #1003 from eileenmcnaughton/apitests
Tim Otten [Wed, 12 Jun 2013 23:02:22 +0000 (16:02 -0700)]
Merge pull request #1003 from eileenmcnaughton/apitests

add wrappers for calling api & checking success or failure in call

11 years agoadd wrappers for calling api & checking success or failure in call
eileen [Wed, 12 Jun 2013 23:00:18 +0000 (11:00 +1200)]
add wrappers for calling api & checking success or failure in call

11 years agoFix currency pseudoconstant CRM-12464
Coleman Watts [Wed, 12 Jun 2013 22:41:04 +0000 (15:41 -0700)]
Fix currency pseudoconstant CRM-12464

----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoMerge pull request #1002 from eileenmcnaughton/apitests
colemanw [Wed, 12 Jun 2013 22:39:25 +0000 (15:39 -0700)]
Merge pull request #1002 from eileenmcnaughton/apitests

use api success & api failure & apiSetup for cleaner tests

11 years agouse api success & api failure & apiSetup for cleaner tests
eileen [Wed, 12 Jun 2013 22:31:32 +0000 (10:31 +1200)]
use api success & api failure & apiSetup for cleaner tests

11 years agoMore thorough cache clearing CRM-12464
Coleman Watts [Wed, 12 Jun 2013 22:04:42 +0000 (15:04 -0700)]
More thorough cache clearing CRM-12464

----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoAdd 'name' field to pseudoconstant schema CRM-12464
Coleman Watts [Wed, 12 Jun 2013 20:46:46 +0000 (13:46 -0700)]
Add 'name' field to pseudoconstant schema CRM-12464

----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoCRM-12802 case report date display
Brian Shaughnessy [Wed, 12 Jun 2013 18:45:26 +0000 (14:45 -0400)]
CRM-12802 case report date display

11 years agoMerge pull request #1001 from pratik-joshi/CRM-12689-qa-fix
pratik-joshi [Wed, 12 Jun 2013 16:21:12 +0000 (09:21 -0700)]
Merge pull request #1001 from pratik-joshi/CRM-12689-qa-fix

CRM-12689-qa-fix : 'addition to' recepients not getting emails

11 years agoCRM-12689-qa-fix : 'addition to' recepients not getting emails
Pratik Joshi [Wed, 12 Jun 2013 16:11:26 +0000 (21:41 +0530)]
CRM-12689-qa-fix : 'addition to' recepients not getting emails

11 years agoCRM-12798 contact detail report date filter
Brian Shaughnessy [Wed, 12 Jun 2013 14:54:00 +0000 (10:54 -0400)]
CRM-12798 contact detail report date filter

11 years agoMerge pull request #997 from yashodha/crm-12689.4.4
pratik-joshi [Wed, 12 Jun 2013 10:46:36 +0000 (03:46 -0700)]
Merge pull request #997 from yashodha/crm-12689.4.4

CRM-12689

11 years agoCRM-12689
yashodha [Wed, 12 Jun 2013 09:42:33 +0000 (15:12 +0530)]
CRM-12689

11 years agoMerge pull request #994 from agh1/contrib-in-event-report
Kurund Jalmi [Wed, 12 Jun 2013 08:26:58 +0000 (01:26 -0700)]
Merge pull request #994 from agh1/contrib-in-event-report

Display contribution information in participant report - CRM-12791

11 years ago-- fixed for CRM-10146, Restricted the creation of same membership and activity again.
dpradeep [Wed, 12 Jun 2013 07:31:55 +0000 (13:01 +0530)]
-- fixed for CRM-10146, Restricted the creation of same membership and activity again.

11 years agoadded more filters
Andrew Hunt [Tue, 11 Jun 2013 22:37:06 +0000 (18:37 -0400)]
added more filters

11 years agoonly join contrib if needed
Andrew Hunt [Tue, 11 Jun 2013 22:32:02 +0000 (18:32 -0400)]
only join contrib if needed

11 years agoadd contrib fields to event participant report
Andrew Hunt [Tue, 11 Jun 2013 22:27:03 +0000 (18:27 -0400)]
add contrib fields to event participant report

11 years agoDevelop 'context' param in BAO and api CRM-12464
Coleman Watts [Tue, 11 Jun 2013 21:50:47 +0000 (14:50 -0700)]
Develop 'context' param in BAO and api CRM-12464

----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoMerge pull request #992 from deepak-srivastava/hr
deepak-srivastava [Tue, 11 Jun 2013 12:41:23 +0000 (05:41 -0700)]
Merge pull request #992 from deepak-srivastava/hr

CRM-12288

11 years agoCRM-12288
Deepak Srivastava [Tue, 11 Jun 2013 12:37:16 +0000 (18:07 +0530)]
CRM-12288

----------------------------------------
* CRM-12288: Improvements to SMS interactions when using mass SMS and Clickatell
  http://issues.civicrm.org/jira/browse/CRM-12288

11 years agoMerge pull request #814 from eileenmcnaughton/CRM-12642
colemanw [Tue, 11 Jun 2013 01:00:55 +0000 (18:00 -0700)]
Merge pull request #814 from eileenmcnaughton/CRM-12642

CRM-12642 add time to membership receive_date fields, move date_time han...