kurund [Wed, 14 Aug 2013 06:01:32 +0000 (11:31 +0530)]
fixed timeouts WebTest_Profile_BatchUpdateTest
kurund [Wed, 14 Aug 2013 05:49:18 +0000 (11:19 +0530)]
whitespace fixes
kurund [Wed, 14 Aug 2013 05:40:33 +0000 (11:10 +0530)]
much cleaner fix --filter=testEventDashboard WebTest_Generic_GeneralClickAroundTest
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
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
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
Kurund Jalmi [Wed, 14 Aug 2013 05:30:05 +0000 (22:30 -0700)]
Merge pull request #1435 from davecivicrm/profileWebtestFixes
Profile web test fixes.
Dave Greenberg [Wed, 14 Aug 2013 04:45:20 +0000 (21:45 -0700)]
Profile web test fixes.
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
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
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
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
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.
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
Dave Greenberg [Tue, 13 Aug 2013 23:26:32 +0000 (16:26 -0700)]
Remove extraneous period in activity postProcess status msg
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
Kurund Jalmi [Tue, 13 Aug 2013 22:47:56 +0000 (15:47 -0700)]
Merge pull request #1431 from kurund/webtest-fixes
Webtest fixes
kurund [Tue, 13 Aug 2013 22:46:44 +0000 (04:16 +0530)]
notices fixes and whitespace fixes
kurund [Tue, 13 Aug 2013 22:42:11 +0000 (04:12 +0530)]
notice fixes
kurund [Tue, 13 Aug 2013 22:39:30 +0000 (04:09 +0530)]
fixes for WebTest_Event_PricesetMaxCountTest
kurund [Tue, 13 Aug 2013 22:28:40 +0000 (03:58 +0530)]
whitespace fixes
kurund [Tue, 13 Aug 2013 22:22:12 +0000 (03:52 +0530)]
fixes for WebTest_Event_ParticipantCountTest
kurund [Tue, 13 Aug 2013 22:02:08 +0000 (03:32 +0530)]
white space fixes
kurund [Tue, 13 Aug 2013 21:54:01 +0000 (03:24 +0530)]
fixes for WebTest_Event_MultiprofileEventTest
kurund [Tue, 13 Aug 2013 21:31:39 +0000 (03:01 +0530)]
whitespace fixes
kurund [Tue, 13 Aug 2013 21:30:30 +0000 (03:00 +0530)]
fixes for WebTest_Event_EventWaitListTest
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
kurund [Tue, 13 Aug 2013 20:44:07 +0000 (02:14 +0530)]
notice fixes
kurund [Tue, 13 Aug 2013 19:54:07 +0000 (01:24 +0530)]
whitespace fixes
Kurund Jalmi [Tue, 13 Aug 2013 19:45:58 +0000 (12:45 -0700)]
Merge pull request #1429 from kurund/webtest-fixes
Webtest fixes
kurund [Tue, 13 Aug 2013 19:42:30 +0000 (01:12 +0530)]
whitespace fixes
kurund [Tue, 13 Aug 2013 19:40:59 +0000 (01:10 +0530)]
more fixes --filter=testDeletePriceSetforEventTemplate WebTest_Event_AddPricesetTest
kurund [Tue, 13 Aug 2013 19:30:42 +0000 (01:00 +0530)]
fixes for --filter=testRegisterWithPriceSet WebTest_Event_AddPricesetTest
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.
kurund [Tue, 13 Aug 2013 19:04:59 +0000 (00:34 +0530)]
webtest fixes for --filter=testEventAddMultipleParticipant WebTest_Event_AddEventTest
kurund [Tue, 13 Aug 2013 18:16:39 +0000 (23:46 +0530)]
fixed failing webtests WebTest_Event_AddEventTest
kurund [Tue, 13 Aug 2013 17:59:24 +0000 (23:29 +0530)]
cleanup
kurund [Tue, 13 Aug 2013 17:35:45 +0000 (23:05 +0530)]
fixes for WebTest_Contribute_StandaloneAddTest
Kurund Jalmi [Tue, 13 Aug 2013 17:27:55 +0000 (10:27 -0700)]
Merge pull request #1428 from kurund/webtest-fixes
Webtest fixes
kurund [Tue, 13 Aug 2013 17:24:11 +0000 (22:54 +0530)]
webtest fixes for --filter=testSearchBuilderMembershipType WebTest_Contact_SearchBuilderTest
kurund [Tue, 13 Aug 2013 17:23:44 +0000 (22:53 +0530)]
fixed membership status select for search builder
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
Kurund Jalmi [Tue, 13 Aug 2013 15:19:29 +0000 (08:19 -0700)]
Merge pull request #1426 from yashodha/webtest-fixes
Webtest fixes
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
Deepak Srivastava [Tue, 13 Aug 2013 14:36:32 +0000 (20:06 +0530)]
CRM-12910, removed ajaxsuccess binding
yashodha [Tue, 13 Aug 2013 14:11:13 +0000 (19:41 +0530)]
fix contribution soft amount for pcp
Pratik Joshi [Tue, 13 Aug 2013 12:58:51 +0000 (18:28 +0530)]
CRM-13213 : updated joomla cms code for fetching UF locale
kurund [Tue, 13 Aug 2013 12:58:36 +0000 (18:28 +0530)]
fixes for --filter=testSearchBuilderContacts WebTest_Contact_SearchBuilderTest
Kurund Jalmi [Tue, 13 Aug 2013 12:56:02 +0000 (05:56 -0700)]
Merge pull request #1424 from monishdeb/WebTestFixes
Webtest Fixes
kurund [Tue, 13 Aug 2013 12:52:14 +0000 (18:22 +0530)]
whitespace fixes
monishdeb [Tue, 13 Aug 2013 12:51:07 +0000 (18:21 +0530)]
Webtest Fixes
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
Kurund Jalmi [Tue, 13 Aug 2013 12:47:46 +0000 (05:47 -0700)]
Merge pull request #1423 from kurund/webtest-fixes
Webtest 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
kurund [Tue, 13 Aug 2013 12:37:30 +0000 (18:07 +0530)]
fixed note to return subject or body based on search field
yashodha [Tue, 13 Aug 2013 12:07:26 +0000 (17:37 +0530)]
fix PCP webtest
kurund [Tue, 13 Aug 2013 12:02:19 +0000 (17:32 +0530)]
fixes for --filter=testContributeOfflineforSoftcreditwithApi WebTest_Contribute_AddPricesetTest
kurund [Tue, 13 Aug 2013 11:43:56 +0000 (17:13 +0530)]
whitespace fixes
kurund [Tue, 13 Aug 2013 11:36:32 +0000 (17:06 +0530)]
fixed smarty error
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
kurund [Tue, 13 Aug 2013 11:33:22 +0000 (17:03 +0530)]
notices fixes
monishdeb [Tue, 13 Aug 2013 11:32:05 +0000 (17:02 +0530)]
CRM-12689 related fix
----------------------------------------
* CRM-12689: Generalize Additional/limit recipients in Scheduled reminders
http://issues.civicrm.org/jira/browse/CRM-12689
Pratik Joshi [Tue, 13 Aug 2013 11:31:30 +0000 (17:01 +0530)]
minor test fix
pratik-joshi [Tue, 13 Aug 2013 11:28:13 +0000 (04:28 -0700)]
Merge pull request #1419 from kurund/CRM-13207
fix for CRM-13207
kurund [Tue, 13 Aug 2013 11:17:48 +0000 (16:47 +0530)]
fix for CRM-13207
----------------------------------------
* CRM-13207: Offline contribution in standalone mode is broken
http://issues.civicrm.org/jira/browse/CRM-13207
kurund [Tue, 13 Aug 2013 11:15:31 +0000 (16:45 +0530)]
fix for CRM-13207
----------------------------------------
* CRM-13207: Offline contribution in standalone mode is broken
http://issues.civicrm.org/jira/browse/CRM-13207
Kurund Jalmi [Tue, 13 Aug 2013 10:25:50 +0000 (03:25 -0700)]
Merge pull request #1418 from kurund/CRM-13214
CRM-13214, fixed export of gender, prefix and suffix for component export
kurund [Tue, 13 Aug 2013 10:23:13 +0000 (15:53 +0530)]
CRM-13214, fixed notices and now it also exports correct values
----------------------------------------
* CRM-13214: Activity Export : Primary Fields - notices on renamed pseudoconstants (gender, suffix, prefix)
http://issues.civicrm.org/jira/browse/CRM-13214
kurund [Tue, 13 Aug 2013 10:16:34 +0000 (15:46 +0530)]
notice fixes
Kurund Jalmi [Tue, 13 Aug 2013 10:02:41 +0000 (03:02 -0700)]
Merge pull request #1416 from kurund/membership-cleanup
cleaned up membership edit/view to show associated contributions and als...
Kurund Jalmi [Tue, 13 Aug 2013 10:01:41 +0000 (03:01 -0700)]
Merge pull request #1417 from yashodha/webtest-fixes
fix the webtest
yashodha [Tue, 13 Aug 2013 09:42:07 +0000 (15:12 +0530)]
fix pseudoconstant call reference to PCP form
yashodha [Tue, 13 Aug 2013 09:08:52 +0000 (14:38 +0530)]
fix the webtest
Kurund Jalmi [Tue, 13 Aug 2013 09:06:51 +0000 (02:06 -0700)]
Merge pull request #1413 from sfe-ev/4.3.6-upgrade_fix
Fix localisation error in DB upgrade script
Kurund Jalmi [Tue, 13 Aug 2013 09:01:04 +0000 (02:01 -0700)]
Merge pull request #1391 from eileenmcnaughton/CRM-13201
CRM-13201 add hook to alter tpl file in use
Kurund Jalmi [Tue, 13 Aug 2013 08:49:59 +0000 (01:49 -0700)]
Merge pull request #1396 from pratik-joshi/CRM-13115
CRM-13115 fix
kurund [Tue, 13 Aug 2013 08:42:56 +0000 (14:12 +0530)]
cleaned up membership edit/view to show associated contributions and also notices fixes
Pradeep Nayak [Tue, 13 Aug 2013 07:55:35 +0000 (13:25 +0530)]
-- added missed constraint, fixed for CRM-13088
----------------------------------------
* CRM-13088: civicrm_contribution_product schema inconsistent in fresh installs vs upgrades
http://issues.civicrm.org/jira/browse/CRM-13088
pratik-joshi [Tue, 13 Aug 2013 07:17:10 +0000 (00:17 -0700)]
Merge pull request #1415 from yashodha/CRM-13215
CRM-13215
pratik-joshi [Tue, 13 Aug 2013 07:03:27 +0000 (00:03 -0700)]
Merge pull request #1401 from yashodha/CRM-13203
CRM 13203
yashodha [Tue, 13 Aug 2013 05:58:04 +0000 (11:28 +0530)]
CRM-13215
Pradeep Nayak [Tue, 13 Aug 2013 05:27:17 +0000 (10:57 +0530)]
-- worked and fixed for CRM-13088
----------------------------------------
* CRM-13088: civicrm_contribution_product schema inconsistent in fresh installs vs upgrades
http://issues.civicrm.org/jira/browse/CRM-13088
Olaf Buddenhagen [Tue, 13 Aug 2013 04:05:26 +0000 (06:05 +0200)]
Fix localisation error in DB upgrade script
The upgrade script for 4.3.6 has a hard-coded lookup for the 'Credit
Card' payment_instrument, but uses the (default) `label` column for the
lookup, which is localised -- i.e. the upgrade fails fatally on any
setup where the 'Credit Card' label is translated.
Fix by using the non-localised `name` column instead.
Dave Greenberg [Tue, 13 Aug 2013 00:24:36 +0000 (17:24 -0700)]
Merge pull request #1412 from davecivicrm/CRM-13199
CRM-13199 typo fix.
Dave Greenberg [Tue, 13 Aug 2013 00:23:45 +0000 (17:23 -0700)]
CRM-13199 typo fix.
----------------------------------------
* CRM-13199: UI text wrong spelling?
http://issues.civicrm.org/jira/browse/CRM-13199
Dave Greenberg [Tue, 13 Aug 2013 00:19:31 +0000 (17:19 -0700)]
Merge pull request #1411 from davecivicrm/CRM-13159
CRM-13159 add missing period end of sentence and fix unrelated typo spel...
Dave Greenberg [Tue, 13 Aug 2013 00:18:29 +0000 (17:18 -0700)]
CRM-13159 add missing period end of sentence and fix unrelated typo spelling in Address.php
----------------------------------------
* CRM-13159: relationship.api to accept 'membership_type' as a param
http://issues.civicrm.org/jira/browse/CRM-13159
colemanw [Mon, 12 Aug 2013 23:45:38 +0000 (16:45 -0700)]
Merge pull request #1409 from davecivicrm/CRM-13177
CRM-13177 quick fix to add border on jQuery ui-dialog.
Dave Greenberg [Mon, 12 Aug 2013 23:44:29 +0000 (16:44 -0700)]
CRM-13177 Remove important! since it seems to work ok without that
----------------------------------------
* CRM-13177: Add border to popup dialogs
http://issues.civicrm.org/jira/browse/CRM-13177
Dave Greenberg [Mon, 12 Aug 2013 23:38:39 +0000 (16:38 -0700)]
Merge pull request #1382 from swati-karande/CRM-13146
Fixed for CRM-13146
Tested with one and two instances of double-quote and single-quote. Fixes the problem.
Dave Greenberg [Mon, 12 Aug 2013 23:25:26 +0000 (16:25 -0700)]
CRM-13177 quick fix to add border on jQuery ui-dialog.
----------------------------------------
* CRM-13177: Add border to popup dialogs
http://issues.civicrm.org/jira/browse/CRM-13177
Dave Greenberg [Mon, 12 Aug 2013 23:02:29 +0000 (16:02 -0700)]
Merge pull request #1408 from colemanw/master
Add pseudoconstant to ActivityContact.xml
Coleman Watts [Mon, 12 Aug 2013 22:40:10 +0000 (15:40 -0700)]
Fix undefined function js error
Coleman Watts [Mon, 12 Aug 2013 22:30:19 +0000 (15:30 -0700)]
Fix typo
Coleman Watts [Mon, 12 Aug 2013 22:24:11 +0000 (15:24 -0700)]
Add pseudoconstant to activityAssignment xml
colemanw [Mon, 12 Aug 2013 22:18:03 +0000 (15:18 -0700)]
Merge pull request #1405 from kurund/export-fixes
another break due to PseudoConstant changes
Dave Greenberg [Mon, 12 Aug 2013 22:15:28 +0000 (15:15 -0700)]
Merge pull request #1407 from kurund/webtest-fixes
Webtest fixes
kurund [Mon, 12 Aug 2013 22:09:48 +0000 (03:39 +0530)]
fixes for WebTest_Contribute_AddBatchesTest::testBatchAddMembership
kurund [Mon, 12 Aug 2013 22:03:33 +0000 (03:33 +0530)]
whitespace fixes
Kurund Jalmi [Mon, 12 Aug 2013 22:00:08 +0000 (15:00 -0700)]
Merge pull request #1406 from kurund/webtest-fixes
fixes for WebTest_Contribute_AddBatchesTest::testBatchAddContribution
projects / civicrm-core.git / log