civicrm-core.git
11 years agoMerge pull request #1449 from erawat/master
Dave Greenberg [Fri, 16 Aug 2013 20:28:13 +0000 (13:28 -0700)]
Merge pull request #1449 from erawat/master

CRM-12826 - MessageTemplatesTest and examples

11 years agoMerge pull request #1450 from davecivicrm/CRM-13218
Kurund Jalmi [Fri, 16 Aug 2013 18:52:17 +0000 (11:52 -0700)]
Merge pull request #1450 from davecivicrm/CRM-13218

CRM-13218 Total Fee on first page adjusts based on number of participant...

11 years agoremoved var_dump()
Erawat Chamanont [Fri, 16 Aug 2013 08:50:13 +0000 (09:50 +0100)]
removed var_dump()

11 years agoGet CRM.help working on non-civicrm pages
Coleman Watts [Thu, 15 Aug 2013 23:13:35 +0000 (16:13 -0700)]
Get CRM.help working on non-civicrm pages

11 years agoCRM-13218 Total Fee on first page adjusts based on number of participants selected.
Dave Greenberg [Thu, 15 Aug 2013 22:36:24 +0000 (15:36 -0700)]
CRM-13218 Total Fee on first page adjusts based on number of participants selected.

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

11 years agoUpdate contribution.sendconfirmation api
Coleman Watts [Thu, 15 Aug 2013 18:16:22 +0000 (11:16 -0700)]
Update contribution.sendconfirmation api

11 years agoCRM-12826 - Implement MessageTemplatesTest for testing MessageTemplates APIs
Erawat Chamanont [Thu, 15 Aug 2013 13:48:22 +0000 (14:48 +0100)]
CRM-12826 - Implement  MessageTemplatesTest for testing MessageTemplates APIs

11 years agoUpdate version to 4.4.alpha2
CiviCRM [Thu, 15 Aug 2013 00:34:14 +0000 (17:34 -0700)]
Update version to 4.4.alpha2

11 years agoUpdate version numbers to 4.4 and lint php
Coleman Watts [Thu, 15 Aug 2013 00:07:49 +0000 (17:07 -0700)]
Update version numbers to 4.4 and lint php

11 years agoFix undefined var
Coleman Watts [Wed, 14 Aug 2013 23:56:16 +0000 (16:56 -0700)]
Fix undefined var

11 years agoMerge pull request #1447 from colemanw/master
colemanw [Wed, 14 Aug 2013 20:42:56 +0000 (13:42 -0700)]
Merge pull request #1447 from colemanw/master

Add client-side money formatting

11 years agoAdd client-side money formatting
Coleman Watts [Wed, 14 Aug 2013 20:28:48 +0000 (13:28 -0700)]
Add client-side money formatting

11 years agoMerge pull request #1446 from colemanw/pcm
colemanw [Wed, 14 Aug 2013 17:30:38 +0000 (10:30 -0700)]
Merge pull request #1446 from colemanw/pcm

Fix api preferred_communication_method CRM-12548

11 years agoFix api preferred_communication_method CRM-12548
Coleman Watts [Wed, 14 Aug 2013 03:59:10 +0000 (20:59 -0700)]
Fix api preferred_communication_method CRM-12548

----------------------------------------
* CRM-12548: API not saving preferred_communication_method
  http://issues.civicrm.org/jira/browse/CRM-12548

11 years agoMerge pull request #1444 from deepak-srivastava/logrev
deepak-srivastava [Wed, 14 Aug 2013 12:20:30 +0000 (05:20 -0700)]
Merge pull request #1444 from deepak-srivastava/logrev

CRM-12910 - logDetail extension for job tables, via report hook query ob...

11 years agoMerge pull request #1443 from kurund/CRM-13223
Kurund Jalmi [Wed, 14 Aug 2013 12:06:51 +0000 (05:06 -0700)]
Merge pull request #1443 from kurund/CRM-13223

fixed CRM-13223

11 years agofixed CRM-13223
kurund [Wed, 14 Aug 2013 12:05:45 +0000 (17:35 +0530)]
fixed CRM-13223

----------------------------------------
* CRM-13223: Include phone entity fields in Contact get spec
  http://issues.civicrm.org/jira/browse/CRM-13223

11 years agoMerge pull request #1442 from kurund/CRM-13221
Kurund Jalmi [Wed, 14 Aug 2013 12:00:16 +0000 (05:00 -0700)]
Merge pull request #1442 from kurund/CRM-13221

fixes for CRM-13221

11 years agoCRM-12910 - logDetail extension for job tables, via report hook query objects
Deepak Srivastava [Wed, 14 Aug 2013 12:00:02 +0000 (17:30 +0530)]
CRM-12910 - logDetail extension for job tables, via report hook query objects

11 years agofixes for CRM-13221
kurund [Wed, 14 Aug 2013 11:59:40 +0000 (17:29 +0530)]
fixes for CRM-13221

----------------------------------------
* CRM-13221: postProcess hook doesn't fire when creating an event
  http://issues.civicrm.org/jira/browse/CRM-13221

11 years agoMerge pull request #1441 from pratik-joshi/test-fixes-v44
Kurund Jalmi [Wed, 14 Aug 2013 11:01:12 +0000 (04:01 -0700)]
Merge pull request #1441 from pratik-joshi/test-fixes-v44

minor bug fix : when we edit a membership and change its membership type...

11 years agominor bug fix : when we edit a membership and change its membership type - instead...
Pratik Joshi [Wed, 14 Aug 2013 10:34:43 +0000 (16:04 +0530)]
minor bug fix : when we edit a membership and change its membership type - instead of 'change membership type' activity, 'change membership status' activity was getting recorded

11 years agoMerge pull request #1439 from yashodha/webtest-fixes
Kurund Jalmi [Wed, 14 Aug 2013 08:55:02 +0000 (01:55 -0700)]
Merge pull request #1439 from yashodha/webtest-fixes

fix Contribution Aggregate by Relationship report

11 years agoMerge pull request #1440 from kurund/webtest-fixes
Kurund Jalmi [Wed, 14 Aug 2013 08:54:30 +0000 (01:54 -0700)]
Merge pull request #1440 from kurund/webtest-fixes

Webtest fixes

11 years agofix Contribution Aggregate by Relationship report
yashodha [Wed, 14 Aug 2013 08:39:21 +0000 (14:09 +0530)]
fix Contribution Aggregate by Relationship report

11 years agoMerge pull request #1437 from yashodha/webtest-fixes
Kurund Jalmi [Wed, 14 Aug 2013 08:30:53 +0000 (01:30 -0700)]
Merge pull request #1437 from yashodha/webtest-fixes

fixed contribute PCP webtest

11 years agonotice fixes and whitespace cleanup
kurund [Wed, 14 Aug 2013 08:20:56 +0000 (13:50 +0530)]
notice fixes and whitespace cleanup

11 years agofixed --filter=testBatchAddMembership WebTest_Contribute_AddBatchesTest
kurund [Wed, 14 Aug 2013 08:07:38 +0000 (13:37 +0530)]
fixed --filter=testBatchAddMembership WebTest_Contribute_AddBatchesTest

11 years agonotice fixes
kurund [Wed, 14 Aug 2013 08:04:29 +0000 (13:34 +0530)]
notice fixes

11 years agonotice fixes
kurund [Wed, 14 Aug 2013 08:03:07 +0000 (13:33 +0530)]
notice fixes

11 years agofixed --filter=testCreateCampaign WebTest_Campaign_OnlineEventRegistrationTest
kurund [Wed, 14 Aug 2013 07:59:02 +0000 (13:29 +0530)]
fixed --filter=testCreateCampaign WebTest_Campaign_OnlineEventRegistrationTest

11 years agoMerge pull request #1438 from pratik-joshi/test-fixes-v44
Kurund Jalmi [Wed, 14 Aug 2013 07:46:02 +0000 (00:46 -0700)]
Merge pull request #1438 from pratik-joshi/test-fixes-v44

WebTest_Profile_MultiRecordProfileAddTest webtest fix

11 years agofixes for --filter=testContributionPageSeparatePaymentPayLater WebTest_Contribute_Con...
kurund [Wed, 14 Aug 2013 07:44:19 +0000 (13:14 +0530)]
fixes for --filter=testContributionPageSeparatePaymentPayLater WebTest_Contribute_ContributionPageAddTest

11 years agoWebTest_Profile_MultiRecordProfileAddTest webtest fix
Pratik Joshi [Wed, 14 Aug 2013 07:40:23 +0000 (13:10 +0530)]
WebTest_Profile_MultiRecordProfileAddTest webtest fix

11 years agofixed contribute PCP webtest
yashodha [Wed, 14 Aug 2013 07:32:37 +0000 (13:02 +0530)]
fixed contribute PCP webtest

11 years agofixes WebTest_Profile_ProfileGroupSubscriptionTest
kurund [Wed, 14 Aug 2013 07:07:52 +0000 (12:37 +0530)]
fixes WebTest_Profile_ProfileGroupSubscriptionTest

11 years agonotice fixes
kurund [Wed, 14 Aug 2013 07:01:37 +0000 (12:31 +0530)]
notice fixes

11 years agofixed --filter=testCheckDescAndCreatedIdFields WebTest_Profile_ProfileAddTest
kurund [Wed, 14 Aug 2013 06:36:10 +0000 (12:06 +0530)]
fixed --filter=testCheckDescAndCreatedIdFields WebTest_Profile_ProfileAddTest

11 years agoMerge pull request #1399 from ravishnair/CRM-12845
deepak-srivastava [Wed, 14 Aug 2013 06:23:44 +0000 (23:23 -0700)]
Merge pull request #1399 from ravishnair/CRM-12845

CRM-12845 CRM_Utils_Migrate - Handle CustomGroup subtypes

11 years agofixed timeouts WebTest_Profile_BatchUpdateTest
kurund [Wed, 14 Aug 2013 06:01:32 +0000 (11:31 +0530)]
fixed timeouts WebTest_Profile_BatchUpdateTest

11 years agowhitespace fixes
kurund [Wed, 14 Aug 2013 05:49:18 +0000 (11:19 +0530)]
whitespace fixes

11 years agomuch cleaner fix --filter=testEventDashboard WebTest_Generic_GeneralClickAroundTest
kurund [Wed, 14 Aug 2013 05:40:33 +0000 (11:10 +0530)]
much cleaner fix --filter=testEventDashboard WebTest_Generic_GeneralClickAroundTest

11 years agoMerge pull request #1436 from kurund/CRM-13201
Kurund Jalmi [Wed, 14 Aug 2013 06:13:07 +0000 (23:13 -0700)]
Merge pull request #1436 from kurund/CRM-13201

CRM-13201, fixed profile search

11 years agoCRM-13201, fixed profile search
kurund [Wed, 14 Aug 2013 06:12:14 +0000 (11:42 +0530)]
CRM-13201, fixed profile search

----------------------------------------
* CRM-13201: Add alterTemplateFile hook
  http://issues.civicrm.org/jira/browse/CRM-13201

11 years agoMerge pull request #1434 from totten/master-tabs-warning
Kurund Jalmi [Wed, 14 Aug 2013 05:30:58 +0000 (22:30 -0700)]
Merge pull request #1434 from totten/master-tabs-warning

CRM_Event_Page_ManageEvent - Fix static warning

11 years agoMerge pull request #1435 from davecivicrm/profileWebtestFixes
Kurund Jalmi [Wed, 14 Aug 2013 05:30:05 +0000 (22:30 -0700)]
Merge pull request #1435 from davecivicrm/profileWebtestFixes

Profile web test fixes.

11 years agoProfile web test fixes.
Dave Greenberg [Wed, 14 Aug 2013 04:45:20 +0000 (21:45 -0700)]
Profile web test fixes.

11 years agoCRM_Event_Page_ManageEvent - Fix static warning
Tim Otten [Wed, 14 Aug 2013 01:29:25 +0000 (18:29 -0700)]
CRM_Event_Page_ManageEvent - Fix static warning

Also: Preventively fix bad cache logic

11 years agoMerge pull request #1433 from totten/master-validate-messages
colemanw [Tue, 13 Aug 2013 23:54:54 +0000 (16:54 -0700)]
Merge pull request #1433 from totten/master-validate-messages

CRM-12892 - CRM/Form/validate.tpl - Clarify error about date formatting

11 years agoCRM-12892 - CRM/Form/validate.tpl - Don't put messages in CRM.validate defaults
Tim Otten [Tue, 13 Aug 2013 23:51:10 +0000 (16:51 -0700)]
CRM-12892 - CRM/Form/validate.tpl - Don't put messages in CRM.validate defaults

----------------------------------------
* CRM-12892: CiviHR - Entity - Job Positions & Roles
  http://issues.civicrm.org/jira/browse/CRM-12892

11 years agoCRM-12892 - CRM/Form/validate.tpl - Clarify error about date formatting
Tim Otten [Tue, 13 Aug 2013 23:45:30 +0000 (16:45 -0700)]
CRM-12892 - CRM/Form/validate.tpl - Clarify error about date formatting

Also: Fix loading of custom error messages

----------------------------------------
* CRM-12892: CiviHR - Entity - Job Positions & Roles
  http://issues.civicrm.org/jira/browse/CRM-12892

11 years agoMerge pull request #1430 from kurund/event-ical-fixes
Dave Greenberg [Tue, 13 Aug 2013 23:36:23 +0000 (16:36 -0700)]
Merge pull request #1430 from kurund/event-ical-fixes

CRM-13220, event were not listed in ical/html feed due to ACL caching bug

Tested HTML, rss and ical listings including w/ event type filter (type=N). Note that I did NOT test if the functionality implemented by Adam Wight which caused this regression is affected by these changes.

11 years agoMerge pull request #1432 from davecivicrm/extraPeriod
Dave Greenberg [Tue, 13 Aug 2013 23:28:29 +0000 (16:28 -0700)]
Merge pull request #1432 from davecivicrm/extraPeriod

Remove extraneous period in activity postProcess status msg

11 years agoRemove extraneous period in activity postProcess status msg
Dave Greenberg [Tue, 13 Aug 2013 23:26:32 +0000 (16:26 -0700)]
Remove extraneous period in activity postProcess status msg

11 years agoMerge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-08-14-04-44-13
kurund [Tue, 13 Aug 2013 23:21:40 +0000 (04:51 +0530)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-08-14-04-44-13

Conflicts:
CRM/Contribute/PseudoConstant.php
CRM/Upgrade/Incremental/php/FourThree.php

11 years agoMerge pull request #1431 from kurund/webtest-fixes
Kurund Jalmi [Tue, 13 Aug 2013 22:47:56 +0000 (15:47 -0700)]
Merge pull request #1431 from kurund/webtest-fixes

Webtest fixes

11 years agonotices fixes and whitespace fixes
kurund [Tue, 13 Aug 2013 22:46:44 +0000 (04:16 +0530)]
notices fixes and whitespace fixes

11 years agonotice fixes
kurund [Tue, 13 Aug 2013 22:42:11 +0000 (04:12 +0530)]
notice fixes

11 years agofixes for WebTest_Event_PricesetMaxCountTest
kurund [Tue, 13 Aug 2013 22:39:30 +0000 (04:09 +0530)]
fixes for WebTest_Event_PricesetMaxCountTest

11 years agowhitespace fixes
kurund [Tue, 13 Aug 2013 22:28:40 +0000 (03:58 +0530)]
whitespace fixes

11 years agofixes for WebTest_Event_ParticipantCountTest
kurund [Tue, 13 Aug 2013 22:22:12 +0000 (03:52 +0530)]
fixes for WebTest_Event_ParticipantCountTest

11 years agowhite space fixes
kurund [Tue, 13 Aug 2013 22:02:08 +0000 (03:32 +0530)]
white space fixes

11 years agofixes for WebTest_Event_MultiprofileEventTest
kurund [Tue, 13 Aug 2013 21:54:01 +0000 (03:24 +0530)]
fixes for WebTest_Event_MultiprofileEventTest

11 years agowhitespace fixes
kurund [Tue, 13 Aug 2013 21:31:39 +0000 (03:01 +0530)]
whitespace fixes

11 years agofixes for WebTest_Event_EventWaitListTest
kurund [Tue, 13 Aug 2013 21:30:30 +0000 (03:00 +0530)]
fixes for WebTest_Event_EventWaitListTest

11 years agofixes for CRM-13220
kurund [Tue, 13 Aug 2013 21:16:50 +0000 (02:46 +0530)]
fixes for CRM-13220

----------------------------------------
* CRM-13220: Events listing ( html ) is broken
  http://issues.civicrm.org/jira/browse/CRM-13220

11 years agonotice fixes
kurund [Tue, 13 Aug 2013 20:44:07 +0000 (02:14 +0530)]
notice fixes

11 years agowhitespace fixes
kurund [Tue, 13 Aug 2013 19:54:07 +0000 (01:24 +0530)]
whitespace fixes

11 years agoMerge pull request #1429 from kurund/webtest-fixes
Kurund Jalmi [Tue, 13 Aug 2013 19:45:58 +0000 (12:45 -0700)]
Merge pull request #1429 from kurund/webtest-fixes

Webtest fixes

11 years agowhitespace fixes
kurund [Tue, 13 Aug 2013 19:42:30 +0000 (01:12 +0530)]
whitespace fixes

11 years agomore fixes --filter=testDeletePriceSetforEventTemplate WebTest_Event_AddPricesetTest
kurund [Tue, 13 Aug 2013 19:40:59 +0000 (01:10 +0530)]
more fixes --filter=testDeletePriceSetforEventTemplate WebTest_Event_AddPricesetTest

11 years agofixes for --filter=testRegisterWithPriceSet WebTest_Event_AddPricesetTest
kurund [Tue, 13 Aug 2013 19:30:42 +0000 (01:00 +0530)]
fixes for --filter=testRegisterWithPriceSet WebTest_Event_AddPricesetTest

11 years agoMerge pull request #1414 from pradpnayak/CRM-13088
Dave Greenberg [Tue, 13 Aug 2013 19:08:12 +0000 (12:08 -0700)]
Merge pull request #1414 from pradpnayak/CRM-13088

-- worked and fixed for CRM-13088
Tested 4.2.9 -> 4.3.6 upgrade. Constraint is present.

11 years agowebtest fixes for --filter=testEventAddMultipleParticipant WebTest_Event_AddEventTest
kurund [Tue, 13 Aug 2013 19:04:59 +0000 (00:34 +0530)]
webtest fixes for --filter=testEventAddMultipleParticipant WebTest_Event_AddEventTest

11 years agofixed failing webtests WebTest_Event_AddEventTest
kurund [Tue, 13 Aug 2013 18:16:39 +0000 (23:46 +0530)]
fixed failing webtests WebTest_Event_AddEventTest

11 years agocleanup
kurund [Tue, 13 Aug 2013 17:59:24 +0000 (23:29 +0530)]
cleanup

11 years agofixes for WebTest_Contribute_StandaloneAddTest
kurund [Tue, 13 Aug 2013 17:35:45 +0000 (23:05 +0530)]
fixes for WebTest_Contribute_StandaloneAddTest

11 years agoMerge pull request #1428 from kurund/webtest-fixes
Kurund Jalmi [Tue, 13 Aug 2013 17:27:55 +0000 (10:27 -0700)]
Merge pull request #1428 from kurund/webtest-fixes

Webtest fixes

11 years agowebtest fixes for --filter=testSearchBuilderMembershipType WebTest_Contact_SearchBuil...
kurund [Tue, 13 Aug 2013 17:24:11 +0000 (22:54 +0530)]
webtest fixes for --filter=testSearchBuilderMembershipType WebTest_Contact_SearchBuilderTest

11 years agofixed membership status select for search builder
kurund [Tue, 13 Aug 2013 17:23:44 +0000 (22:53 +0530)]
fixed membership status select for search builder

11 years agoMerge pull request #1425 from pratik-joshi/CRM-13213
Kurund Jalmi [Tue, 13 Aug 2013 15:31:02 +0000 (08:31 -0700)]
Merge pull request #1425 from pratik-joshi/CRM-13213

CRM-13213 : updated joomla cms code for fetching UF locale

11 years agoMerge pull request #1426 from yashodha/webtest-fixes
Kurund Jalmi [Tue, 13 Aug 2013 15:19:29 +0000 (08:19 -0700)]
Merge pull request #1426 from yashodha/webtest-fixes

Webtest fixes

11 years agoMerge pull request #1427 from deepak-srivastava/logrev
deepak-srivastava [Tue, 13 Aug 2013 14:37:51 +0000 (07:37 -0700)]
Merge pull request #1427 from deepak-srivastava/logrev

CRM-12910, removed ajaxsuccess binding

11 years agoCRM-12910, removed ajaxsuccess binding
Deepak Srivastava [Tue, 13 Aug 2013 14:36:32 +0000 (20:06 +0530)]
CRM-12910, removed ajaxsuccess binding

11 years agofix contribution soft amount for pcp
yashodha [Tue, 13 Aug 2013 14:11:13 +0000 (19:41 +0530)]
fix contribution soft amount for pcp

11 years agoCRM-13213 : updated joomla cms code for fetching UF locale
Pratik Joshi [Tue, 13 Aug 2013 12:58:51 +0000 (18:28 +0530)]
CRM-13213 : updated joomla cms code for fetching UF locale

11 years agofixes for --filter=testSearchBuilderContacts WebTest_Contact_SearchBuilderTest
kurund [Tue, 13 Aug 2013 12:58:36 +0000 (18:28 +0530)]
fixes for --filter=testSearchBuilderContacts WebTest_Contact_SearchBuilderTest

11 years agoMerge pull request #1424 from monishdeb/WebTestFixes
Kurund Jalmi [Tue, 13 Aug 2013 12:56:02 +0000 (05:56 -0700)]
Merge pull request #1424 from monishdeb/WebTestFixes

Webtest Fixes

11 years agowhitespace fixes
kurund [Tue, 13 Aug 2013 12:52:14 +0000 (18:22 +0530)]
whitespace fixes

11 years agoWebtest Fixes
monishdeb [Tue, 13 Aug 2013 12:51:07 +0000 (18:21 +0530)]
Webtest Fixes

11 years agoMerge pull request #1420 from pratik-joshi/test-fixes-v44
Kurund Jalmi [Tue, 13 Aug 2013 12:48:27 +0000 (05:48 -0700)]
Merge pull request #1420 from pratik-joshi/test-fixes-v44

minor test fix

11 years agoMerge pull request #1423 from kurund/webtest-fixes
Kurund Jalmi [Tue, 13 Aug 2013 12:47:46 +0000 (05:47 -0700)]
Merge pull request #1423 from kurund/webtest-fixes

Webtest fixes

11 years agoMerge pull request #1422 from kurund/note-fixes
Kurund Jalmi [Tue, 13 Aug 2013 12:46:43 +0000 (05:46 -0700)]
Merge pull request #1422 from kurund/note-fixes

fixed note to return subject or body based on search field

11 years agofixed note to return subject or body based on search field
kurund [Tue, 13 Aug 2013 12:37:30 +0000 (18:07 +0530)]
fixed note to return subject or body based on search field

11 years agofix PCP webtest
yashodha [Tue, 13 Aug 2013 12:07:26 +0000 (17:37 +0530)]
fix PCP webtest

11 years agofixes for --filter=testContributeOfflineforSoftcreditwithApi WebTest_Contribute_AddPr...
kurund [Tue, 13 Aug 2013 12:02:19 +0000 (17:32 +0530)]
fixes for --filter=testContributeOfflineforSoftcreditwithApi WebTest_Contribute_AddPricesetTest

11 years agowhitespace fixes
kurund [Tue, 13 Aug 2013 11:43:56 +0000 (17:13 +0530)]
whitespace fixes

11 years agofixed smarty error
kurund [Tue, 13 Aug 2013 11:36:32 +0000 (17:06 +0530)]
fixed smarty error

11 years agoMerge pull request #1421 from monishdeb/CRM-12689-QA-fix
Kurund Jalmi [Tue, 13 Aug 2013 11:36:15 +0000 (04:36 -0700)]
Merge pull request #1421 from monishdeb/CRM-12689-QA-fix

CRM-12689 related fix: Participant Role was not populating on Schedule Reminder Form

11 years agonotices fixes
kurund [Tue, 13 Aug 2013 11:33:22 +0000 (17:03 +0530)]
notices fixes