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: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 [Tue, 13 Aug 2013 08:42:56 +0000 (14:12 +0530)]
cleaned up membership edit/view to show associated contributions and also notices fixes
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
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: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
kurund [Mon, 12 Aug 2013 21:53:17 +0000 (03:23 +0530)]
another break due to PseudoConstant changes
kurund [Mon, 12 Aug 2013 21:39:39 +0000 (03:09 +0530)]
fixes for WebTest_Contribute_AddBatchesTest::testBatchAddContribution
Kurund Jalmi [Mon, 12 Aug 2013 21:09:24 +0000 (14:09 -0700)]
Merge pull request #1404 from kurund/webtest-fixes
fixes for WebTest_Contact_GroupAddTest
kurund [Mon, 12 Aug 2013 20:58:07 +0000 (02:28 +0530)]
fixes for WebTest_Contact_GroupAddTest
colemanw [Mon, 12 Aug 2013 20:57:20 +0000 (13:57 -0700)]
Merge pull request #1393 from colemanw/transactApi
CRM-13086 Api improvements to support webform_civicrm 4
Kurund Jalmi [Mon, 12 Aug 2013 20:37:34 +0000 (13:37 -0700)]
Merge pull request #1403 from kurund/test-fixes
few more webtest fixes
kurund [Mon, 12 Aug 2013 20:34:20 +0000 (02:04 +0530)]
fixes for WebTest_Case_ActivityToCaseTest
kurund [Mon, 12 Aug 2013 20:21:51 +0000 (01:51 +0530)]
fix for WebTest_Contact_AddTest
kurund [Mon, 12 Aug 2013 20:06:57 +0000 (01:36 +0530)]
whitespace fixes
Kurund Jalmi [Mon, 12 Aug 2013 19:14:50 +0000 (12:14 -0700)]
Merge pull request #1402 from kurund/test-fixes
more webtest fixes and also notices
kurund [Mon, 12 Aug 2013 19:12:27 +0000 (00:42 +0530)]
soft credit fixes for WebTest_Contribute_UpdatePendingContributionTest
kurund [Mon, 12 Aug 2013 19:10:30 +0000 (00:40 +0530)]
soft credit fixes for WebTest_Contribute_StandaloneAddTest
kurund [Mon, 12 Aug 2013 19:06:03 +0000 (00:36 +0530)]
test fixes for WebTest_Contribute_OfflineContributionTest::testDeductibleAmount
kurund [Mon, 12 Aug 2013 18:01:59 +0000 (23:31 +0530)]
test fixes WebTest_Contribute_OfflineContributionTest::testStandaloneContributeAdd
kurund [Mon, 12 Aug 2013 17:55:36 +0000 (23:25 +0530)]
notice fixes
kurund [Mon, 12 Aug 2013 17:26:22 +0000 (22:56 +0530)]
code cleanup
kurund [Mon, 12 Aug 2013 17:16:12 +0000 (22:46 +0530)]
notice fixes
kurund [Mon, 12 Aug 2013 17:11:04 +0000 (22:41 +0530)]
add classes for soft credit listing and fixed WebTest_Contribute_ContactContextAddTest
kurund [Mon, 12 Aug 2013 16:34:57 +0000 (22:04 +0530)]
soft credit fixes for WebTest_Contribute_ContactContextAddTest
kurund [Mon, 12 Aug 2013 16:29:19 +0000 (21:59 +0530)]
soft credit fixes for WebTest_Contribute_AddPricesetTest
Kurund Jalmi [Mon, 12 Aug 2013 14:58:27 +0000 (07:58 -0700)]
Merge pull request #1398 from kurund/test-fixes
fixes for failing Webtests
yashodha [Mon, 12 Aug 2013 14:53:44 +0000 (20:23 +0530)]
fix the sending copy of email to assignee(CRM-13203)
Kurund Jalmi [Mon, 12 Aug 2013 14:26:34 +0000 (07:26 -0700)]
Merge pull request #1400 from pratik-joshi/test-fixes-v44
Test fixes v44 also filled 2 civicrm issues
Pratik Joshi [Mon, 12 Aug 2013 14:06:44 +0000 (19:36 +0530)]
this fixes most of contribution webtests
Pratik Joshi [Mon, 12 Aug 2013 12:35:37 +0000 (18:05 +0530)]
minor test fix
yashodha [Mon, 12 Aug 2013 13:12:46 +0000 (18:42 +0530)]
clean up
yashodha [Mon, 12 Aug 2013 12:58:49 +0000 (18:28 +0530)]
worked on CRM-13203
kurund [Mon, 12 Aug 2013 12:37:29 +0000 (18:07 +0530)]
whitespace fixes
kurund [Mon, 12 Aug 2013 12:32:51 +0000 (18:02 +0530)]
indentation fixes
kurund [Mon, 12 Aug 2013 12:20:57 +0000 (17:50 +0530)]
removed non-working screenshot capture
kurund [Mon, 12 Aug 2013 12:16:19 +0000 (17:46 +0530)]
notice fixes for WebTest_Campaign_OnlineEventRegistrationTest
kurund [Mon, 12 Aug 2013 12:10:39 +0000 (17:40 +0530)]
fixed setting of soft credit for WebTest_Campaign_OfflineContributionTest
deepak-srivastava [Mon, 12 Aug 2013 11:52:20 +0000 (04:52 -0700)]
Merge pull request #1397 from deepak-srivastava/logrev
CRM-12910, fixes to also consider ajax calls and do re-binding when call...
kurund [Mon, 12 Aug 2013 11:51:18 +0000 (17:21 +0530)]
fixes for WebTest_Campaign_OfflineContributionTest
Deepak Srivastava [Mon, 12 Aug 2013 11:40:13 +0000 (17:10 +0530)]
CRM-12910, fixes to also consider ajax calls and do re-binding when calling crmRevisionLink
kurund [Mon, 12 Aug 2013 11:22:02 +0000 (16:52 +0530)]
webtest fixes for WebTest_Campaign_ActivityTest
kurund [Mon, 12 Aug 2013 10:06:34 +0000 (15:36 +0530)]
whitespace fixes
kurund [Mon, 12 Aug 2013 09:45:00 +0000 (15:15 +0530)]
whitespace fixes
kurund [Mon, 12 Aug 2013 09:40:37 +0000 (15:10 +0530)]
fixes for WebTest_Activity_ContactContextAddTest::testContactContextActivityAdd
deepak-srivastava [Mon, 12 Aug 2013 07:25:47 +0000 (00:25 -0700)]
Merge pull request #1387 from deepak-srivastava/logrev
CRM-12910, extend log reports to support injected job tables, via report...
Tim Otten [Mon, 12 Aug 2013 06:49:42 +0000 (23:49 -0700)]
Merge pull request #1394 from totten/master-hrjob-validation
CRM-13165 - Facilitate validation fixes in CiviHR
Tim Otten [Mon, 12 Aug 2013 06:47:01 +0000 (23:47 -0700)]
CRM-13165 - CRM/Form/validate.tpl - Make it easier to include in CiviHR
----------------------------------------
* CRM-13165: hrjob: Re-save produces blocking error, "X is not a valid amount"
http://issues.civicrm.org/jira/browse/CRM-13165
Tim Otten [Mon, 12 Aug 2013 05:34:05 +0000 (22:34 -0700)]
CRM-13165 - api/v3/utils - Don't mandate that all "MONEY" fields be non-null
----------------------------------------
* CRM-13165: hrjob: Re-save produces blocking error, "X is not a valid amount"
http://issues.civicrm.org/jira/browse/CRM-13165
Coleman Watts [Mon, 12 Aug 2013 03:22:56 +0000 (20:22 -0700)]
CRM-13086 Api improvements to support webform_civicrm 4
----------------------------------------
* CRM-13086: Support payments via Drupal Webforms
http://issues.civicrm.org/jira/browse/CRM-13086
Dave Greenberg [Mon, 12 Aug 2013 00:43:52 +0000 (17:43 -0700)]
Merge pull request #1392 from davecivicrm/CRM-13144
Fix sort order for currency multi-select
Dave Greenberg [Mon, 12 Aug 2013 00:43:13 +0000 (17:43 -0700)]
Fix sort order for currency multi-select
Dave Greenberg [Mon, 12 Aug 2013 00:40:26 +0000 (17:40 -0700)]
Merge pull request #1385 from colemanw/symbols
Fix currency symbols CRM-13144
Will do a further commit since orderColumn param needs to be TRUE so that currency multi-select is sorted alphabetically.
eileen [Sun, 11 Aug 2013 22:55:15 +0000 (10:55 +1200)]
CRM-13201 add hook to alter tpl file in use
Kurund Jalmi [Sun, 11 Aug 2013 18:56:27 +0000 (11:56 -0700)]
Merge pull request #1390 from kurund/merge-fixes
fixed the regression caused due to rename of FieldValue to PriceFieldVal...
kurund [Sun, 11 Aug 2013 18:55:25 +0000 (00:25 +0530)]
fixed the regression caused due to rename of FieldValue to PriceFieldValue
Kurund Jalmi [Sun, 11 Aug 2013 18:34:34 +0000 (11:34 -0700)]
Merge pull request #1389 from kurund/merge-fixes
test fixes
kurund [Sun, 11 Aug 2013 18:33:53 +0000 (00:03 +0530)]
test fixes
Kurund Jalmi [Sun, 11 Aug 2013 17:16:52 +0000 (10:16 -0700)]
Merge pull request #1388 from dlobo/CRM-13064
CRM-13064
Donald A. Lobo [Fri, 2 Aug 2013 21:31:56 +0000 (14:31 -0700)]
CRM-13064
----------------------------------------
* CRM-13064: Localization is broken
http://issues.civicrm.org/jira/browse/CRM-13064
Deepak Srivastava [Sun, 11 Aug 2013 07:40:13 +0000 (13:10 +0530)]
CRM-12910, extend log reports to support injected job tables, via report query-hook-objects
kurund [Sat, 10 Aug 2013 13:13:53 +0000 (18:43 +0530)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-08-10-18-35-58
Conflicts:
sql/civicrm_generated.mysql
xml/schema/Financial/OfficialReceipt.xml
xml/schema/Financial/files.xml
Kurund Jalmi [Sat, 10 Aug 2013 12:57:35 +0000 (05:57 -0700)]
Merge pull request #1131 from GiantRobot/4.3-CRM-13017
CRM-13017
Coleman Watts [Sat, 10 Aug 2013 03:56:17 +0000 (20:56 -0700)]
Fix currency symbols CRM-13144
----------------------------------------
* CRM-13144: Currency display is messed up
http://issues.civicrm.org/jira/browse/CRM-13144
Tim Otten [Sat, 10 Aug 2013 00:22:21 +0000 (17:22 -0700)]
Merge pull request #1229 from totten/master-exttesthook
CRM_Utils_Hook_UnitTests - When running tests from an extension...
Tim Otten [Fri, 9 Aug 2013 22:36:19 +0000 (15:36 -0700)]
CRM-13089 - Add unit test for a creating field with a specific "name"
----------------------------------------
* CRM-13089: CRM_Core_BAO_CustomField::create overrides user-defined name parameter values
http://issues.civicrm.org/jira/browse/CRM-13089
Tim Otten [Fri, 9 Aug 2013 22:31:02 +0000 (15:31 -0700)]
CRM-13089 - Restore numeric suffix for new (default) column names
----------------------------------------
* CRM-13089: CRM_Core_BAO_CustomField::create overrides user-defined name parameter values
http://issues.civicrm.org/jira/browse/CRM-13089
Tim Otten [Fri, 9 Aug 2013 22:39:15 +0000 (15:39 -0700)]
Merge branch 'crm-13089-CRM_Core_BAO_CustomField_overrides_name' of git://github.com/mmikitka/civicrm-core into pull-request-1206
colemanw [Fri, 9 Aug 2013 22:01:39 +0000 (15:01 -0700)]
Merge pull request #1381 from colemanw/ccJs
Abstract payment js to work in webform context
Kurund Jalmi [Fri, 9 Aug 2013 17:45:59 +0000 (10:45 -0700)]
Merge pull request #1378 from davecivicrm/CRM-12869
CRM-12869 This is a temporary fix from Eileen which prevents the over-writing of email address
Kurund Jalmi [Fri, 9 Aug 2013 16:44:55 +0000 (09:44 -0700)]
Merge pull request #1384 from yashodha/4.4.CRM-10138
fix notice for failing test(CRM-10138)
Dave Greenberg [Fri, 9 Aug 2013 16:40:50 +0000 (09:40 -0700)]
Merge pull request #1367 from agh1/past3months-events
3 months of events & don't default to sending receipt for past events (CRM-13189)
Thx Andrew. I think the last change you made is quite helpful and works nicely.
Dave Greenberg [Fri, 9 Aug 2013 16:36:22 +0000 (09:36 -0700)]
Merge pull request #1383 from pratik-joshi/CRM-13143-fix
CRM-13143 contact reference field issue fix : the referencing for customIdObj was incorrect i.e. it was refering to corrupt element object, thus 'id' value was not getting stored in the correct element object so the formRule error was thrown of 'Invalid C
Pratik Joshi [Fri, 9 Aug 2013 14:23:12 +0000 (19:53 +0530)]
CRM-13143 contact reference field issue fix : the referencing for customIdObj was incorrect i.e. it was refering to corrupt element object, thus 'id' value was not getting stored in the correct element object so the formRule error was thrown of 'Invalid Contact ...' as the submission required numeric id
swati-karande [Fri, 9 Aug 2013 06:16:45 +0000 (11:46 +0530)]
Fixed for CRM-13146
mmikitka [Fri, 9 Aug 2013 04:00:48 +0000 (00:00 -0400)]
Fixed bug https://github.com/civicrm/civicrm-core/pull/1206#issuecomment-
21285959
Coleman Watts [Fri, 9 Aug 2013 03:26:12 +0000 (20:26 -0700)]
Abstract payment js to work in webform context
Andrew Hunt [Fri, 9 Aug 2013 01:52:06 +0000 (21:52 -0400)]
allow toggle back to current/future events
Tim Otten [Fri, 9 Aug 2013 00:30:02 +0000 (17:30 -0700)]
Merge pull request #1380 from totten/master-reapply-1371
CRM-12930 Always use Smarty security for string templates
Neil Drumm [Thu, 8 Aug 2013 05:55:56 +0000 (05:55 +0000)]
CRM-12930 Always use Smarty security for string templates
projects / civicrm-core.git / log