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
deepak-srivastava [Wed, 19 Jun 2013 11:27:01 +0000 (04:27 -0700)]
Merge pull request #1031 from deepak-srivastava/hr
CRM-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
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
Kurund Jalmi [Tue, 18 Jun 2013 06:18:21 +0000 (23:18 -0700)]
Merge pull request #1026 from yashodha/fixes
fix custom group error
yashodha [Tue, 18 Jun 2013 06:03:19 +0000 (11:33 +0530)]
fix custom group error
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
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...
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
eileen [Tue, 18 Jun 2013 01:55:43 +0000 (13:55 +1200)]
remove new trailing spaces
eileen [Tue, 18 Jun 2013 01:41:35 +0000 (13:41 +1200)]
remove trailing whitespaces
eileen [Tue, 18 Jun 2013 01:39:52 +0000 (13:39 +1200)]
space tabs for double spaces
eileen [Tue, 18 Jun 2013 01:27:25 +0000 (13:27 +1200)]
remove newly added tabs (in favour of two spaces)
eileen [Tue, 18 Jun 2013 01:18:37 +0000 (13:18 +1200)]
remove trailing whitespaces en-masse
eileen [Tue, 18 Jun 2013 01:11:39 +0000 (13:11 +1200)]
tidy up trailing whitespace, add field titles
eileen [Tue, 18 Jun 2013 01:05:20 +0000 (13:05 +1200)]
xml tidy up, trailing whitespace, missing titles
Coleman Watts [Tue, 18 Jun 2013 00:30:34 +0000 (17:30 -0700)]
Code cleanup
Coleman Watts [Tue, 18 Jun 2013 00:30:23 +0000 (17:30 -0700)]
Fix CustomGroupTest
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...
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
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
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
Coleman Watts [Mon, 17 Jun 2013 22:43:27 +0000 (15:43 -0700)]
Fix SyntaxConformanceTest and EnumValues
Brian Shaughnessy [Mon, 17 Jun 2013 13:15:29 +0000 (09:15 -0400)]
CRM-12814 optimize mailing tab opened/click calculations
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
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
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
Kurund Jalmi [Mon, 17 Jun 2013 05:59:55 +0000 (22:59 -0700)]
Merge pull request #1016 from GiantRobot/CRM-12821
Crm 12821
eileen [Mon, 17 Jun 2013 01:51:34 +0000 (13:51 +1200)]
CRM-12835 Display relationship description on relationship tab
Chris Burgess [Fri, 14 Jun 2013 22:53:12 +0000 (10:53 +1200)]
CRM-12821
Remove any incorrect entries in civicrm_dashboard_contact.
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
Xavier Dutoit [Sat, 15 Jun 2013 16:16:57 +0000 (18:16 +0200)]
add message templates api
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
Coleman Watts [Sat, 15 Jun 2013 01:02:34 +0000 (18:02 -0700)]
Fix test
Coleman Watts [Sat, 15 Jun 2013 00:55:19 +0000 (17:55 -0700)]
Fix tests
Coleman Watts [Fri, 14 Jun 2013 23:09:41 +0000 (16:09 -0700)]
Mass update tests to use callAPIFailure
Pratik Joshi [Fri, 14 Jun 2013 14:57:10 +0000 (20:27 +0530)]
CRM-12791 : pseudoconstant replacement handling, and minor improvements
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
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
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
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
Coleman Watts [Thu, 13 Jun 2013 23:00:37 +0000 (16:00 -0700)]
Fix ContributionTest
Coleman Watts [Thu, 13 Jun 2013 22:49:36 +0000 (15:49 -0700)]
Fix phone failure test
Coleman Watts [Thu, 13 Jun 2013 21:25:40 +0000 (14:25 -0700)]
More caching fixes for tests
Coleman Watts [Thu, 13 Jun 2013 18:35:35 +0000 (11:35 -0700)]
Fix api_v3_LocBlockTest
Coleman Watts [Thu, 13 Jun 2013 17:23:16 +0000 (10:23 -0700)]
Test cleanup
deepak-srivastava [Thu, 13 Jun 2013 12:29:21 +0000 (05:29 -0700)]
Merge pull request #1009 from deepak-srivastava/hr
CRM-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
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
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
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
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
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
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
Coleman Watts [Thu, 13 Jun 2013 04:42:46 +0000 (21:42 -0700)]
Fix api_v3_MembershipTest
Coleman Watts [Thu, 13 Jun 2013 04:32:47 +0000 (21:32 -0700)]
Fix api_v3_UFFieldTest
Coleman Watts [Thu, 13 Jun 2013 03:59:39 +0000 (20:59 -0700)]
Fix testCreateBadTypeContact
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
colemanw [Wed, 12 Jun 2013 23:07:01 +0000 (16:07 -0700)]
Merge pull request #1004 from eileenmcnaughton/apitests
fix params on documentMe call
Coleman Watts [Wed, 12 Jun 2013 23:05:20 +0000 (16:05 -0700)]
Test fix - get rid of exta api.aliases
eileen [Wed, 12 Jun 2013 23:05:00 +0000 (11:05 +1200)]
fix params on documentMe call
Coleman Watts [Wed, 12 Jun 2013 22:52:07 +0000 (15:52 -0700)]
Add test for option-value name matching
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
eileen [Wed, 12 Jun 2013 23:00:18 +0000 (11:00 +1200)]
add wrappers for calling api & checking success or failure in call
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
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
eileen [Wed, 12 Jun 2013 22:31:32 +0000 (10:31 +1200)]
use api success & api failure & apiSetup for cleaner tests
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
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
Brian Shaughnessy [Wed, 12 Jun 2013 18:45:26 +0000 (14:45 -0400)]
CRM-12802 case report date display
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
Pratik Joshi [Wed, 12 Jun 2013 16:11:26 +0000 (21:41 +0530)]
CRM-12689-qa-fix : 'addition to' recepients not getting emails
Brian Shaughnessy [Wed, 12 Jun 2013 14:54:00 +0000 (10:54 -0400)]
CRM-12798 contact detail report date filter
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
yashodha [Wed, 12 Jun 2013 09:42:33 +0000 (15:12 +0530)]
CRM-12689
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
Andrew Hunt [Tue, 11 Jun 2013 22:37:06 +0000 (18:37 -0400)]
added more filters
Andrew Hunt [Tue, 11 Jun 2013 22:32:02 +0000 (18:32 -0400)]
only join contrib if needed
Andrew Hunt [Tue, 11 Jun 2013 22:27:03 +0000 (18:27 -0400)]
add contrib fields to event participant report
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
deepak-srivastava [Tue, 11 Jun 2013 12:41:23 +0000 (05:41 -0700)]
Merge pull request #992 from deepak-srivastava/hr
CRM-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
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...
colemanw [Tue, 11 Jun 2013 01:00:28 +0000 (18:00 -0700)]
Merge pull request #990 from eileenmcnaughton/CRM-12715
Crm 12715 fix custom date rendering for is_multiple custom groups
eileen [Thu, 30 May 2013 05:19:59 +0000 (17:19 +1200)]
CRM-12715 refactor CRM_Core_BAO_CustomGroup::getTree to generate acceptable queries for multi-record sets
eileen [Thu, 30 May 2013 05:06:56 +0000 (17:06 +1200)]
CRM-12715 e-notice observed on merge page
Coleman Watts [Mon, 10 Jun 2013 23:42:43 +0000 (16:42 -0700)]
Fix custom group test
Coleman Watts [Mon, 10 Jun 2013 23:06:23 +0000 (16:06 -0700)]
Fix mistake in GenCode
Coleman Watts [Mon, 10 Jun 2013 22:04:00 +0000 (15:04 -0700)]
Fix billing_mode field handling CRM-12464
----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
http://issues.civicrm.org/jira/browse/CRM-12464
colemanw [Mon, 10 Jun 2013 21:43:11 +0000 (14:43 -0700)]
Merge pull request #988 from eileenmcnaughton/apitests
use apisuccess & failure to clarify errors
eileen [Mon, 10 Jun 2013 21:18:11 +0000 (09:18 +1200)]
use apisuccess & failure to clarify errors
Coleman Watts [Mon, 10 Jun 2013 19:32:21 +0000 (12:32 -0700)]
Fix cache flushing
Kurund Jalmi [Mon, 10 Jun 2013 11:44:15 +0000 (04:44 -0700)]
Merge pull request #983 from eileenmcnaughton/apitests
Apitests tidy ups
eileen [Mon, 10 Jun 2013 10:57:58 +0000 (22:57 +1200)]
add test that pinpoints caching problem
Kurund Jalmi [Mon, 10 Jun 2013 08:57:46 +0000 (01:57 -0700)]
Merge pull request #980 from colemanw/soap
Clean up soap CRM-12343
eileen [Mon, 10 Jun 2013 08:25:38 +0000 (20:25 +1200)]
test tidy up, use apiSuccess & fail assertions, add assertion to highlight cause of failure
eileen [Mon, 10 Jun 2013 07:59:43 +0000 (19:59 +1200)]
tidy up paymentProcessor test to use apiSuccess & failure assertions. remove failure test which is in syntaxconformance
Kurund Jalmi [Mon, 10 Jun 2013 07:09:15 +0000 (00:09 -0700)]
Merge pull request #981 from colemanw/creditCard
Spiff up credit card icons CRM-12515
Kurund Jalmi [Mon, 10 Jun 2013 07:08:09 +0000 (00:08 -0700)]
Merge pull request #982 from eileenmcnaughton/apitests
cleanup activity tests, examples, api
eileen [Mon, 10 Jun 2013 05:55:40 +0000 (17:55 +1200)]
cleanup activity tests, examples, api
fix includes removing 'activity_status_id' from _spec & adding testing that api alias mechanism works without that, removing pointless tests, using assertAPIFailure & assertAPISuccess and removing trailing spaces from generated tests (now the template no longer has them, API test class passes after this although it does not address prob when class is run as part of suite