civicrm-core.git
10 years agoCRM-13078, typo fixes
kurund [Mon, 5 Aug 2013 05:12:22 +0000 (10:42 +0530)]
CRM-13078, typo fixes

----------------------------------------
* CRM-13078: Batch Data Entry silently drops 'batch-valid' entries if no contact_id is associated with them
  http://issues.civicrm.org/jira/browse/CRM-13078

10 years agoMerge pull request #1294 from kurund/CRM-13078
Dave Greenberg [Fri, 2 Aug 2013 20:43:43 +0000 (13:43 -0700)]
Merge pull request #1294 from kurund/CRM-13078

CRM-13078, batch entry fixes
Tested the remaining exceptions. Form rule displays properly now and checkmark icon displayed when error condition is corrected.

10 years agoCRM-13078, fixed to show correct icon and to hide error messages
kurund [Fri, 2 Aug 2013 19:43:19 +0000 (01:13 +0530)]
CRM-13078, fixed to show correct icon and to hide error messages

----------------------------------------
* CRM-13078: Batch Data Entry silently drops 'batch-valid' entries if no contact_id is associated with them
  http://issues.civicrm.org/jira/browse/CRM-13078

10 years agoCRM-13078, fixed error message for contact autocomplete
kurund [Fri, 2 Aug 2013 12:09:59 +0000 (17:39 +0530)]
CRM-13078, fixed error message for contact autocomplete

----------------------------------------
* CRM-13078: Batch Data Entry silently drops 'batch-valid' entries if no contact_id is associated with them
  http://issues.civicrm.org/jira/browse/CRM-13078

10 years agoCRM-13078 fixed race condition and error alert
kurund [Fri, 2 Aug 2013 12:08:20 +0000 (17:38 +0530)]
CRM-13078 fixed race condition and error alert

----------------------------------------
* CRM-13078: Batch Data Entry silently drops 'batch-valid' entries if no contact_id is associated with them
  http://issues.civicrm.org/jira/browse/CRM-13078

10 years agoMerge pull request #1297 from eileenmcnaughton/4.3
Dave Greenberg [Wed, 31 Jul 2013 23:09:52 +0000 (16:09 -0700)]
Merge pull request #1297 from eileenmcnaughton/4.3

CRM-13016 wrong version of this fn in 4.3

10 years agoCRM-13016 wrong version of this fn in 4.3
eileen [Wed, 31 Jul 2013 22:43:17 +0000 (10:43 +1200)]
CRM-13016 wrong version of this fn in 4.3

10 years agoMerge pull request #1255 from mlutfy/4.3-crm12446
dlobo [Wed, 31 Jul 2013 20:58:41 +0000 (13:58 -0700)]
Merge pull request #1255 from mlutfy/4.3-crm12446

CRM-12446 : support for extension translation (with native gettext only, for now)

10 years agoMerge pull request #1245 from tttp/crm-13091
dlobo [Wed, 31 Jul 2013 20:56:49 +0000 (13:56 -0700)]
Merge pull request #1245 from tttp/crm-13091

Start the session on rest.php

10 years agoCRM-13078, optimization
kurund [Wed, 31 Jul 2013 15:51:54 +0000 (21:21 +0530)]
CRM-13078, optimization

----------------------------------------
* CRM-13078: Batch Data Entry silently drops 'batch-valid' entries if no contact_id is associated with them
  http://issues.civicrm.org/jira/browse/CRM-13078

10 years agoCRM-13078, fixed update of js icon
kurund [Wed, 31 Jul 2013 15:13:00 +0000 (20:43 +0530)]
CRM-13078, fixed update of js icon

----------------------------------------
* CRM-13078: Batch Data Entry silently drops 'batch-valid' entries if no contact_id is associated with them
  http://issues.civicrm.org/jira/browse/CRM-13078

10 years agoMerge pull request #1287 from pratik-joshi/CRM-13035-fix
Kurund Jalmi [Wed, 31 Jul 2013 10:06:39 +0000 (03:06 -0700)]
Merge pull request #1287 from pratik-joshi/CRM-13035-fix

CRM-13035-fix : initiating CRM_Contribute_BAO_Contribution instead of CRM_Contribute_DAO_Contribution

10 years agoMerge pull request #1283 from davecivicrm/CRM-13124
Kurund Jalmi [Wed, 31 Jul 2013 10:00:18 +0000 (03:00 -0700)]
Merge pull request #1283 from davecivicrm/CRM-13124

Crm -13124 Payment processor name missing from confirmation message

10 years agoCRM-13035-fix : initiating CRM_Contribute_BAO_Contribution instead of CRM_Contribute_...
Pratik Joshi [Wed, 31 Jul 2013 08:35:01 +0000 (14:05 +0530)]
CRM-13035-fix : initiating CRM_Contribute_BAO_Contribution instead of CRM_Contribute_DAO_Contribution

10 years agoCRM-13124 Smarty variable for processor name was no longer correct in templates/CRM...
Dave Greenberg [Wed, 31 Jul 2013 00:41:19 +0000 (17:41 -0700)]
CRM-13124 Smarty variable for processor name was no longer correct in templates/CRM/Contribute/Form/Contribution/Confirm.tpl

----------------------------------------
* CRM-13124: Payment processor name missing from confirmation message
  http://issues.civicrm.org/jira/browse/CRM-13124

10 years agoMerge pull request #1219 from kurund/CRM-13078
Dave Greenberg [Mon, 29 Jul 2013 18:51:41 +0000 (11:51 -0700)]
Merge pull request #1219 from kurund/CRM-13078

CRM-13078
These commits improve things - you can't submit w/ invalid contact ID. Still a problem w/ error icon updating when user fixes the 'invalid contact id' situation. Kurund will investigate and submit addtional fixes as needed.

10 years agoCRM-13078, whitespace fixes and template cleanup
kurund [Sat, 27 Jul 2013 17:24:41 +0000 (22:54 +0530)]
CRM-13078, whitespace fixes and template cleanup

----------------------------------------
* CRM-13078: Batch Data Entry silently drops 'batch-valid' entries if no contact_id is associated with them
  http://issues.civicrm.org/jira/browse/CRM-13078

10 years agoCRM-13078, help text fix
CiviCRM [Sat, 27 Jul 2013 16:15:26 +0000 (21:45 +0530)]
CRM-13078, help text fix

----------------------------------------
* CRM-13078: Batch Data Entry silently drops 'batch-valid' entries if no contact_id is associated with them
  http://issues.civicrm.org/jira/browse/CRM-13078

10 years agoCRM-13078, js fixes to show correct row icon
CiviCRM [Sat, 27 Jul 2013 16:02:34 +0000 (21:32 +0530)]
CRM-13078, js fixes to show correct row icon

----------------------------------------
* CRM-13078: Batch Data Entry silently drops 'batch-valid' entries if no contact_id is associated with them
  http://issues.civicrm.org/jira/browse/CRM-13078

10 years agoMerge pull request #1247 from dlobo/CRM-13057
Kurund Jalmi [Sat, 27 Jul 2013 13:49:25 +0000 (06:49 -0700)]
Merge pull request #1247 from dlobo/CRM-13057

CRM-13057

10 years agoMerge pull request #1235 from yashodha/4.3.CRM-13105
Kurund Jalmi [Sat, 27 Jul 2013 12:58:37 +0000 (05:58 -0700)]
Merge pull request #1235 from yashodha/4.3.CRM-13105

CRM-13105

10 years agoMerge pull request #1242 from colemanw/searchBuilderJs
colemanw [Fri, 26 Jul 2013 20:21:41 +0000 (13:21 -0700)]
Merge pull request #1242 from colemanw/searchBuilderJs

Refactor search builder js to better handle different operators

10 years agoCRM-12446 : support for extension translation (with native gettext only, for now)
Mathieu Lutfy [Fri, 26 Jul 2013 16:27:16 +0000 (12:27 -0400)]
CRM-12446 : support for extension translation (with native gettext only, for now)

10 years agoMerge branch 'CRM-13014' of git://github.com/eileenmcnaughton/civicrm-core into pull...
Tim Otten [Fri, 26 Jul 2013 03:01:19 +0000 (20:01 -0700)]
Merge branch 'CRM-13014' of git://github.com/eileenmcnaughton/civicrm-core into pull-request-1139

Conflicts:
CRM/Utils/System/Base.php
CRM/Utils/System/Drupal.php
CRM/Utils/System/Drupal6.php

Also: Update comments

----------------------------------------
* CRM-13014: CiviMobile fatal on non-d7 -Need a UF function for login authenticate
  http://issues.civicrm.org/jira/browse/CRM-13014

10 years agoCRM-13057
Donald A. Lobo [Thu, 25 Jul 2013 22:29:36 +0000 (15:29 -0700)]
CRM-13057

----------------------------------------
* CRM-13057: Replies to mailings processed through SOAP are failing
  http://issues.civicrm.org/jira/browse/CRM-13057

10 years agoMerge pull request #1244 from mlutfy/4.3-ts
Tim Otten [Thu, 25 Jul 2013 20:17:43 +0000 (13:17 -0700)]
Merge pull request #1244 from mlutfy/4.3-ts

Semi-fix {ts} usage: the mix of js/smarty here isn't very practical.

10 years agoSemi-fix {ts} usage: the mix of js/smarty here isn't very practical. Will be fixed...
Mathieu Lutfy [Thu, 25 Jul 2013 18:45:16 +0000 (14:45 -0400)]
Semi-fix {ts} usage: the mix of js/smarty here isn't very practical. Will be fixed when the js is split out in a separate file eventually.

10 years agoStart the session on rest.php, so it avoids impossible to find side effects. Trust...
Xavier Dutoit [Thu, 25 Jul 2013 12:25:06 +0000 (14:25 +0200)]
Start the session on rest.php, so it avoids impossible to find side effects. Trust me, I lost hours on that one: civi needs a session.

10 years agoRefactor search builder js to better handle different operators CRM-13032
Coleman Watts [Thu, 25 Jul 2013 04:47:10 +0000 (21:47 -0700)]
Refactor search builder js to better handle different operators CRM-13032

10 years agoMerge pull request #1233 from pradpnayak/CRM-13060
Dave Greenberg [Wed, 24 Jul 2013 22:36:42 +0000 (15:36 -0700)]
Merge pull request #1233 from pradpnayak/CRM-13060

--worked on CRM-13060
Patched and tested - price_set.financial_type_id is now also set when creating and updating financial type under Manage Events.

10 years agoMerge pull request #1237 from totten/4.3-find-files
Tim Otten [Wed, 24 Jul 2013 18:00:06 +0000 (11:00 -0700)]
Merge pull request #1237 from totten/4.3-find-files

CRM-13108 - CRM_Utils_File - Fix warning

10 years agoCRM-13108 - CRM_Utils_File - Performance fix
Tim Otten [Wed, 24 Jul 2013 17:57:33 +0000 (10:57 -0700)]
CRM-13108 - CRM_Utils_File - Performance fix

----------------------------------------
* CRM-13108: Warnings when extensions is installed
  http://issues.civicrm.org/jira/browse/CRM-13108

10 years agoCRM-13108 - Fix warning in CRM_Utils_File::findFiles (from rubofvil)
Tim Otten [Wed, 24 Jul 2013 17:41:23 +0000 (10:41 -0700)]
CRM-13108 - Fix warning in CRM_Utils_File::findFiles (from rubofvil)

Note: According to http://php.net/glob, the return result varies by
platform; sometimes it returns array(), and sometimes it returns FALSE.
The patch should work with either case.

----------------------------------------
* CRM-13108: Warnings when extensions is installed
  http://issues.civicrm.org/jira/browse/CRM-13108

10 years agoCRM-13105
yashodha [Wed, 24 Jul 2013 13:29:59 +0000 (18:59 +0530)]
CRM-13105

10 years agoMerge pull request #1232 from pradpnayak/CRM-12844
Dave Greenberg [Wed, 24 Jul 2013 13:24:03 +0000 (06:24 -0700)]
Merge pull request #1232 from pradpnayak/CRM-12844

-- worked on CRM-12844

10 years ago--worked on CRM-13060
Pradeep Nayak [Wed, 24 Jul 2013 10:34:18 +0000 (16:04 +0530)]
--worked on CRM-13060

----------------------------------------
* CRM-13060: Changing the Financial Type for Contribution pages and Events does not update the Financial Type selected for Price Sets and Price Field values
  http://issues.civicrm.org/jira/browse/CRM-13060

10 years ago-- worked on CRM-12844
Pradeep Nayak [Wed, 24 Jul 2013 07:39:35 +0000 (13:09 +0530)]
-- worked on CRM-12844

----------------------------------------
* CRM-12844: Automated recurring contribution "civicrm_line_item" records have wrong financial type id
  http://issues.civicrm.org/jira/browse/CRM-12844

10 years agoMerge pull request #1228 from totten/4.3-hook-reentrancy
Tim Otten [Tue, 23 Jul 2013 23:44:41 +0000 (16:44 -0700)]
Merge pull request #1228 from totten/4.3-hook-reentrancy

CRM-13103 - Fix hook re-entrancy

10 years agoCRM-13103 - Fix reentrant hook invocations
Tim Otten [Tue, 23 Jul 2013 23:05:43 +0000 (16:05 -0700)]
CRM-13103 - Fix reentrant hook invocations

----------------------------------------
* CRM-13103: Hook execution terminates prematurely
  http://issues.civicrm.org/jira/browse/CRM-13103

10 years agoCRM-13103 - CRM_Utils_HookTest
Tim Otten [Tue, 23 Jul 2013 22:23:50 +0000 (15:23 -0700)]
CRM-13103 - CRM_Utils_HookTest

Add unit test in which one hook calls another. Note that this unit-test
doesn't actually reproduce the issue for me (eg it incorrectly shows the
test as passing on code that doesn't work for me in real situations), but
it's still valuable in that it gives us better test coverage.

----------------------------------------
* CRM-13103: Hook execution terminates prematurely
  http://issues.civicrm.org/jira/browse/CRM-13103

10 years agoMerge pull request #1101 from totten/4.3-CRM-11160-msg
Dave Greenberg [Tue, 23 Jul 2013 23:13:50 +0000 (16:13 -0700)]
Merge pull request #1101 from totten/4.3-CRM-11160-msg

CRM-11160 - verifySSL - Display warning next to this config option

10 years agoMerge pull request #1213 from yashodha/4.3.CRM-12451
Kurund Jalmi [Tue, 23 Jul 2013 18:22:45 +0000 (11:22 -0700)]
Merge pull request #1213 from yashodha/4.3.CRM-12451

CRM-12451

10 years agoMerge pull request #1210 from pradpnayak/CRM-13065
Dave Greenberg [Tue, 23 Jul 2013 17:59:55 +0000 (10:59 -0700)]
Merge pull request #1210 from pradpnayak/CRM-13065

-- fixed for CRM-13065

10 years agoMerge pull request #1223 from davecivicrm/CRM-13101
Tim Otten [Tue, 23 Jul 2013 17:31:37 +0000 (10:31 -0700)]
Merge pull request #1223 from davecivicrm/CRM-13101

CRM-13101 fix typo in widget css.

10 years agoCRM-13101 fix typo in widget css.
Dave Greenberg [Tue, 23 Jul 2013 16:42:08 +0000 (09:42 -0700)]
CRM-13101 fix typo in widget css.

----------------------------------------
* CRM-13101: Typo in contribution widget generated css for .crm-amounts
  http://issues.civicrm.org/jira/browse/CRM-13101

10 years agoCRM-13078, added a check to validate the contact id if value is set for that particul...
CiviCRM [Tue, 23 Jul 2013 04:44:05 +0000 (10:14 +0530)]
CRM-13078, added a check to validate the contact id if value is set for that particular row

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

10 years agoremoved unwanted db call CRM-13078
CiviCRM [Tue, 23 Jul 2013 04:23:38 +0000 (09:53 +0530)]
removed unwanted db call CRM-13078

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

10 years agonotice fixes
CiviCRM [Tue, 23 Jul 2013 04:18:03 +0000 (09:48 +0530)]
notice fixes

10 years agoMerge pull request #1208 from pradpnayak/CRM-13060
Dave Greenberg [Mon, 22 Jul 2013 17:04:43 +0000 (10:04 -0700)]
Merge pull request #1208 from pradpnayak/CRM-13060

--fixed for CRM-13060

10 years agoCRM-12451
yashodha [Mon, 22 Jul 2013 06:44:33 +0000 (12:14 +0530)]
CRM-12451

10 years ago-- fixed for CRM-13065
Pradeep Nayak [Sat, 20 Jul 2013 20:33:02 +0000 (02:03 +0530)]
-- fixed for CRM-13065

----------------------------------------
* CRM-13065: Upgrade error
  http://issues.civicrm.org/jira/browse/CRM-13065

10 years ago--fixed for CRM-13060
Pradeep Nayak [Sat, 20 Jul 2013 18:56:59 +0000 (00:26 +0530)]
--fixed for CRM-13060

----------------------------------------
* CRM-13060: Changing the Financial Type for Contribution pages and Events does not update the Financial Type selected for Price Sets and Price Field values
  http://issues.civicrm.org/jira/browse/CRM-13060

10 years agoMerge pull request #1196 from yashodha/4.3.CRM-13046
Kurund Jalmi [Fri, 19 Jul 2013 13:47:38 +0000 (06:47 -0700)]
Merge pull request #1196 from yashodha/4.3.CRM-13046

CRM-13046

10 years agoCRM-13046
yashodha [Fri, 19 Jul 2013 13:03:03 +0000 (18:33 +0530)]
CRM-13046

10 years agoMerge pull request #1193 from mlutfy/4.3-crm13082
colemanw [Fri, 19 Jul 2013 04:32:49 +0000 (21:32 -0700)]
Merge pull request #1193 from mlutfy/4.3-crm13082

CRM-13082: avoid showing twice custom fields for Case Activity form.

10 years agoCRM-13082: avoid showing twice custom fields for Case Activity form.
Mathieu Lutfy [Fri, 19 Jul 2013 03:32:31 +0000 (23:32 -0400)]
CRM-13082: avoid showing twice custom fields for Case Activity form.

10 years agoMerge pull request #1185 from monishdeb/CRM-13063
Kurund Jalmi [Thu, 18 Jul 2013 08:12:19 +0000 (01:12 -0700)]
Merge pull request #1185 from monishdeb/CRM-13063

CRM-13063 fix

10 years agoCRM-13063 fix
monishdeb [Thu, 18 Jul 2013 07:59:05 +0000 (13:29 +0530)]
CRM-13063 fix

----------------------------------------
* CRM-13063: Date is incorrect/misformatted in membership receipt email
  http://issues.civicrm.org/jira/browse/CRM-13063

10 years agoMerge pull request #1145 from colemanw/searchOps
Kurund Jalmi [Fri, 12 Jul 2013 17:52:02 +0000 (10:52 -0700)]
Merge pull request #1145 from colemanw/searchOps

Restore comparison operators for search builder selects

10 years agoMerge pull request #1150 from eileenmcnaughton/CRM-13040
Kurund Jalmi [Fri, 12 Jul 2013 17:50:38 +0000 (10:50 -0700)]
Merge pull request #1150 from eileenmcnaughton/CRM-13040

CRM-13040 allow for possiblility geocoder sets postcode

10 years agoCRM-13040 allow for possiblility geocoder sets postcode
eileen [Fri, 12 Jul 2013 01:04:40 +0000 (13:04 +1200)]
CRM-13040 allow for possiblility geocoder sets postcode

10 years agoRestore comparison operators for search builder selects
Coleman Watts [Wed, 10 Jul 2013 17:13:31 +0000 (10:13 -0700)]
Restore comparison operators for search builder selects

10 years agoFix typos in releaser script
Coleman Watts [Tue, 9 Jul 2013 03:18:47 +0000 (20:18 -0700)]
Fix typos in releaser script

10 years agoUpdate version to 4.3.6
CiviCRM [Tue, 9 Jul 2013 03:12:50 +0000 (20:12 -0700)]
Update version to 4.3.6

10 years agoCRM-13014 support userLoginFinalize() for UF classes (fix civimobile)
eileen [Tue, 9 Jul 2013 00:02:52 +0000 (12:02 +1200)]
CRM-13014 support userLoginFinalize() for UF classes (fix civimobile)

Conflicts:

CRM/Utils/System/Base.php

10 years agoMerge pull request #1138 from pratik-joshi/CRM-13011
Kurund Jalmi [Mon, 8 Jul 2013 18:15:16 +0000 (11:15 -0700)]
Merge pull request #1138 from pratik-joshi/CRM-13011

CRM-13011 : applied the patch

10 years agoMerge pull request #1137 from totten/4.3-userLoginFinalize
Tim Otten [Mon, 8 Jul 2013 17:25:39 +0000 (10:25 -0700)]
Merge pull request #1137 from totten/4.3-userLoginFinalize

CRM-13014 - CRM_Utils_System::userLoginFinalize - Disable due to syntax errors

10 years agoCRM-13014 - CRM_Utils_System::userLoginFinalize - Disable due to syntax errors
Tim Otten [Mon, 8 Jul 2013 17:12:54 +0000 (10:12 -0700)]
CRM-13014 - CRM_Utils_System::userLoginFinalize - Disable due to syntax errors

----------------------------------------
* CRM-13014: CiviMobile fatal on non-d7 -Need a UF function for login authenticate
  http://issues.civicrm.org/jira/browse/CRM-13014

10 years agoCRM-13011 : applied the patch
Pratik Joshi [Mon, 8 Jul 2013 15:01:22 +0000 (20:31 +0530)]
CRM-13011 : applied the patch

10 years agoMerge pull request #1133 from pratik-joshi/CRM-13007
Kurund Jalmi [Mon, 8 Jul 2013 11:17:20 +0000 (04:17 -0700)]
Merge pull request #1133 from pratik-joshi/CRM-13007

CRM-13007 fix

10 years agoCRM-13007 fix
Pratik Joshi [Mon, 8 Jul 2013 08:08:17 +0000 (13:38 +0530)]
CRM-13007 fix

11 years agoMerge pull request #1130 from eileenmcnaughton/4.3
Tim Otten [Sat, 6 Jul 2013 13:04:45 +0000 (06:04 -0700)]
Merge pull request #1130 from eileenmcnaughton/4.3

CRM-13016 update error code - test fix

11 years agoCRM-13016 update error code
eileen [Sat, 6 Jul 2013 03:18:11 +0000 (15:18 +1200)]
CRM-13016 update error code

11 years agoMerge pull request #1127 from eileenmcnaughton/4.3
Tim Otten [Sat, 6 Jul 2013 02:30:30 +0000 (19:30 -0700)]
Merge pull request #1127 from eileenmcnaughton/4.3

4.3 developer support, apiv3 wrapper, uf level functions to support civimobile/other extensions

11 years agoCRM-13014 support userLoginFinalize() for UF classes (fix civimobile)
eileen [Fri, 5 Jul 2013 22:46:52 +0000 (10:46 +1200)]
CRM-13014 support userLoginFinalize() for UF classes (fix civimobile)

11 years agoCRM-13016 add civicrm_api3 wrapper
eileen [Fri, 5 Jul 2013 07:29:30 +0000 (19:29 +1200)]
CRM-13016 add civicrm_api3 wrapper

11 years agoMerge pull request #1112 from pratik-joshi/CRM-12972_fix
Kurund Jalmi [Thu, 4 Jul 2013 17:49:28 +0000 (10:49 -0700)]
Merge pull request #1112 from pratik-joshi/CRM-12972_fix

CRM-12972 fix

11 years agoMerge pull request #1092 from ravishnair/CRM-11737
Kurund Jalmi [Thu, 4 Jul 2013 17:45:00 +0000 (10:45 -0700)]
Merge pull request #1092 from ravishnair/CRM-11737

-- CRM-11737 fix for anonymous user

11 years agoMerge pull request #1117 from ravishnair/CRM-13002
Kurund Jalmi [Thu, 4 Jul 2013 17:43:40 +0000 (10:43 -0700)]
Merge pull request #1117 from ravishnair/CRM-13002

-- fix for CRM-13002

11 years agoMerge pull request #1103 from totten/4.3-https-backend
colemanw [Thu, 4 Jul 2013 16:56:19 +0000 (09:56 -0700)]
Merge pull request #1103 from totten/4.3-https-backend

CRM-12783 - Get content via HTTPS

11 years ago-- fix for CRM-13002
Ravish Nair [Thu, 4 Jul 2013 16:45:00 +0000 (22:15 +0530)]
-- fix for CRM-13002

----------------------------------------
* CRM-13002: Cron Jobs in Joomla 2.5.11 Do not Run
  http://issues.civicrm.org/jira/browse/CRM-13002

11 years agoMerge pull request #1098 from totten/4.3-CRM-11160
colemanw [Thu, 4 Jul 2013 16:30:06 +0000 (09:30 -0700)]
Merge pull request #1098 from totten/4.3-CRM-11160

CRM-11160 - Set CURLOPT_SSL_VERIFYHOST based the system's general "verifySSL" option

11 years agoMerge pull request #1108 from pradpnayak/CRM-12929
Dave Greenberg [Thu, 4 Jul 2013 15:47:19 +0000 (08:47 -0700)]
Merge pull request #1108 from pradpnayak/CRM-12929

-- fixed for CRM-12929

11 years agoMerge pull request #1109 from eileenmcnaughton/4.3
Kurund Jalmi [Thu, 4 Jul 2013 11:56:43 +0000 (04:56 -0700)]
Merge pull request #1109 from eileenmcnaughton/4.3

CRM-12984 looks like last commit affected these tests - change to test s...

11 years agoMerge pull request #1111 from pratik-joshi/crm-12976-fix
Kurund Jalmi [Thu, 4 Jul 2013 11:56:16 +0000 (04:56 -0700)]
Merge pull request #1111 from pratik-joshi/crm-12976-fix

 crm-12976-fix : using 'strtr' while placeholder replacement mechanism

11 years ago crm-12976-fix : using 'strstr' while placeholder replacement mechanism
Pratik Joshi [Thu, 4 Jul 2013 11:40:21 +0000 (17:10 +0530)]
 crm-12976-fix : using 'strstr' while placeholder replacement mechanism

11 years agoCRM-12984 looks like last commit affected these tests - change to test setup function
eileen [Thu, 4 Jul 2013 08:23:47 +0000 (20:23 +1200)]
CRM-12984 looks like last commit affected these tests - change to test setup function

11 years ago-- fixed for CRM-12929
Pradeep Nayak [Thu, 4 Jul 2013 07:43:34 +0000 (13:13 +0530)]
-- fixed for CRM-12929

----------------------------------------
* CRM-12929: Do not allow Permanent Delete for contacts who are linked to live financial transactions
  http://issues.civicrm.org/jira/browse/CRM-12929

11 years agoMerge pull request #1088 from eileenmcnaughton/4.3
Tim Otten [Thu, 4 Jul 2013 01:28:39 +0000 (18:28 -0700)]
Merge pull request #1088 from eileenmcnaughton/4.3

CRM-12984  Create api.completetransaction

11 years agoMerge pull request #1091 from GiantRobot/4.3-CRM-12997
Dave Greenberg [Wed, 3 Jul 2013 23:40:57 +0000 (16:40 -0700)]
Merge pull request #1091 from GiantRobot/4.3-CRM-12997

CRM-12997. Set id on all line items, not just the first.
Recreated bug, downloaded patch, retested. Looks good.

11 years agoMerge pull request #1106 from totten/4.3-composequery-test
Kurund Jalmi [Wed, 3 Jul 2013 19:24:07 +0000 (12:24 -0700)]
Merge pull request #1106 from totten/4.3-composequery-test

CRM-12976 - CRM_Core_DAOTest - Add tests for composeQuery bugs

11 years agoCRM-12976 - CRM_Core_DAOTest - Add tests for composeQuery bugs
Tim Otten [Wed, 3 Jul 2013 18:08:14 +0000 (11:08 -0700)]
CRM-12976 - CRM_Core_DAOTest - Add tests for composeQuery bugs

----------------------------------------
* CRM-12976: In field of type Notes - TextArea, data Input of a $  (dollar sign) followed by one or two digits between 1 and 9 will result in deletion of the numbers.
  http://issues.civicrm.org/jira/browse/CRM-12976

11 years agoCRM-12783 - CRM_Dashlet_Page_Blog - Get content via HTTPS
Tim Otten [Wed, 3 Jul 2013 14:48:06 +0000 (07:48 -0700)]
CRM-12783 - CRM_Dashlet_Page_Blog - Get content via HTTPS

Note: I did a simulation with enable_ssl=false, and it degraded well.

----------------------------------------
* CRM-12783: As of 4.3, civicrm pulls in content by default from non-authenticated web site (http instead of https)
  http://issues.civicrm.org/jira/browse/CRM-12783

11 years agoCRM_Utils_HttpClient - Fix timeout
Tim Otten [Wed, 3 Jul 2013 14:47:56 +0000 (07:47 -0700)]
CRM_Utils_HttpClient - Fix timeout

11 years agoCRM_Extension_Container_Basic - Remove debug code
Tim Otten [Wed, 3 Jul 2013 14:07:47 +0000 (07:07 -0700)]
CRM_Extension_Container_Basic - Remove debug code

11 years agoCRM-12783 - CRM_Extension_Browser - Get content via HTTPS
Tim Otten [Wed, 3 Jul 2013 13:52:32 +0000 (06:52 -0700)]
CRM-12783 - CRM_Extension_Browser - Get content via HTTPS

Note: I did a simulation with enable_ssl=false, and it degraded well.

----------------------------------------
* CRM-12783: As of 4.3, civicrm pulls in content by default from non-authenticated web site (http instead of https)
  http://issues.civicrm.org/jira/browse/CRM-12783

11 years agoCRM-12783 - CRM_Core_CommunityMessages - Get content via HTTPS
Tim Otten [Wed, 3 Jul 2013 13:19:48 +0000 (06:19 -0700)]
CRM-12783 - CRM_Core_CommunityMessages - Get content via HTTPS

Note: I did a simulation with enable_ssl=false, and it degraded well.

----------------------------------------
* CRM-12783: As of 4.3, civicrm pulls in content by default from non-authenticated web site (http instead of https)
  http://issues.civicrm.org/jira/browse/CRM-12783

11 years agoCRM-11160 - verifySSL - Display warning next to this config option
Tim Otten [Wed, 3 Jul 2013 12:36:51 +0000 (05:36 -0700)]
CRM-11160 - verifySSL - Display warning next to this config option

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

11 years agoCRM-11160 - Set CURLOPT_SSL_VERIFYHOST based the system's general "verifySSL" option
Tim Otten [Wed, 3 Jul 2013 00:45:56 +0000 (17:45 -0700)]
CRM-11160 - Set CURLOPT_SSL_VERIFYHOST based the system's general "verifySSL" option

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

11 years agoMerge pull request #1093 from pradpnayak/CRM-12156
Dave Greenberg [Wed, 3 Jul 2013 00:26:28 +0000 (17:26 -0700)]
Merge pull request #1093 from pradpnayak/CRM-12156

-- worked on CRM-12156
Patched my local codebase and did upgrades 4.3.4 -> 4.3.5 as well as 4.2.9 -> 4.3.5 with expected results.

Upgraded 4.2.9 DB now has CONSTRAINT `FK_civicrm_financial_item_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact` (`id`) ON DELETE CASCADE,