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
Coleman Watts [Mon, 12 Aug 2013 22:40:10 +0000 (15:40 -0700)]
Fix undefined function js error
Dave Greenberg [Mon, 12 Aug 2013 18:36:05 +0000 (11:36 -0700)]
Merge pull request #1395 from pradpnayak/CRM-13094
-- fixed for CRM-13094.
Ran upgrade from 4.2 and confirmed presence of UI_contribution_recur_payment_instrument_id constraint after upgrade.
Pratik Joshi [Mon, 12 Aug 2013 11:01:17 +0000 (16:31 +0530)]
CRM-13115 fix
Pradeep Nayak [Mon, 12 Aug 2013 10:45:21 +0000 (16:15 +0530)]
-- fixed for CRM-13094
----------------------------------------
* CRM-13094: civicrm_contribution_recur schema inconsistent in fresh installs vs upgrades
http://issues.civicrm.org/jira/browse/CRM-13094
Dave Greenberg [Mon, 12 Aug 2013 00:49:04 +0000 (17:49 -0700)]
Merge pull request #1386 from kurund/CRM-13170-fixes
CRM-13170, fixes for contribution search to respect batch criteria
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
kurund [Sat, 10 Aug 2013 12:18:53 +0000 (17:48 +0530)]
CRM-13170, fixed the query to respect batch criteria
----------------------------------------
* CRM-13170: Search Contribution by Batch no longer works since change to DB
http://issues.civicrm.org/jira/browse/CRM-13170
kurund [Sat, 10 Aug 2013 11:09:46 +0000 (16:39 +0530)]
CRM-13170, fixed select to show all batches
----------------------------------------
* CRM-13170: Search Contribution by Batch no longer works since change to DB
http://issues.civicrm.org/jira/browse/CRM-13170
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
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
Dave Greenberg [Thu, 8 Aug 2013 23:31:58 +0000 (16:31 -0700)]
CRM-12869 This is a temporary fix from Eileen which prevents the over-write. However it also prevents the billing address from being saved for the payee, and requires the user to know that they need to manually replace the billing field values with the payer data. In general I do not think this record payment from a differnet contact feature is production-ready (even though it is part of 4.3). Selecting a different payer should reload the the billing address fields with the payer info.
----------------------------------------
* CRM-12869: Record Payment from different contact causes email and address to be altered in contacts record
http://issues.civicrm.org/jira/browse/CRM-12869
Kurund Jalmi [Mon, 5 Aug 2013 18:05:26 +0000 (11:05 -0700)]
Merge pull request #1340 from kurund/CRM-13156
CRM-13156, fixed incorrect property name
kurund [Mon, 5 Aug 2013 18:03:51 +0000 (23:33 +0530)]
CRM-13156, fixed the wrong property
----------------------------------------
* CRM-13156: CRM_Core_BAO_EntityTag::getEntitiesByTag enumerates for incorrect field
http://issues.civicrm.org/jira/browse/CRM-13156
Kurund Jalmi [Mon, 5 Aug 2013 06:29:26 +0000 (23:29 -0700)]
Merge pull request #1336 from kurund/CRM-13096
CRM-13096, drop unwanted table civicrm_official_receipt
kurund [Mon, 5 Aug 2013 06:26:59 +0000 (11:56 +0530)]
CRM-13096, drop unwanted table civicrm_official_receipt
----------------------------------------
* CRM-13096: Table civicrm_official_receipt missing from upgrades
http://issues.civicrm.org/jira/browse/CRM-13096
Kurund Jalmi [Mon, 5 Aug 2013 05:13:56 +0000 (22:13 -0700)]
Merge pull request #1334 from kurund/CRM-13078
CRM-13078
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
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.
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
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
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
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
eileen [Wed, 31 Jul 2013 22:43:17 +0000 (10:43 +1200)]
CRM-13016 wrong version of this fn in 4.3
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)
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
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
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
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
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
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
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
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.
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
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
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
Kurund Jalmi [Sat, 27 Jul 2013 13:49:25 +0000 (06:49 -0700)]
Merge pull request #1247 from dlobo/CRM-13057
CRM-13057
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
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
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)
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
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
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.
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.
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.
Coleman Watts [Thu, 25 Jul 2013 04:47:10 +0000 (21:47 -0700)]
Refactor search builder js to better handle different operators CRM-13032
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.
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
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
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
yashodha [Wed, 24 Jul 2013 13:29:59 +0000 (18:59 +0530)]
CRM-13105
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
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
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
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
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
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
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
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
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
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.
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
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
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
CiviCRM [Tue, 23 Jul 2013 04:18:03 +0000 (09:48 +0530)]
notice fixes
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
yashodha [Mon, 22 Jul 2013 06:44:33 +0000 (12:14 +0530)]
CRM-12451
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
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
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
yashodha [Fri, 19 Jul 2013 13:03:03 +0000 (18:33 +0530)]
CRM-13046
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.
Mathieu Lutfy [Fri, 19 Jul 2013 03:32:31 +0000 (23:32 -0400)]
CRM-13082: avoid showing twice custom fields for Case Activity form.
Kurund Jalmi [Thu, 18 Jul 2013 08:12:19 +0000 (01:12 -0700)]
Merge pull request #1185 from monishdeb/CRM-13063
CRM-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
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
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
eileen [Fri, 12 Jul 2013 01:04:40 +0000 (13:04 +1200)]
CRM-13040 allow for possiblility geocoder sets postcode
Coleman Watts [Wed, 10 Jul 2013 17:13:31 +0000 (10:13 -0700)]
Restore comparison operators for search builder selects
Coleman Watts [Tue, 9 Jul 2013 03:18:47 +0000 (20:18 -0700)]
Fix typos in releaser script
CiviCRM [Tue, 9 Jul 2013 03:12:50 +0000 (20:12 -0700)]
Update version to 4.3.6
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
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
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
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
Pratik Joshi [Mon, 8 Jul 2013 15:01:22 +0000 (20:31 +0530)]
CRM-13011 : applied the patch
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
Pratik Joshi [Mon, 8 Jul 2013 08:08:17 +0000 (13:38 +0530)]
CRM-13007 fix
Chris Burgess [Sat, 6 Jul 2013 13:25:36 +0000 (01:25 +1200)]
Suppress E_NOTICE errors because we can end up with corrupted JSON from Drupal init.
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
Chris Burgess [Sat, 6 Jul 2013 05:15:55 +0000 (17:15 +1200)]
Update CRM_Utils_System_Drupal6::loadBootStrap() based on CRM_Utils_System_Drupal::loadBootStrap().
Chris Burgess [Sat, 6 Jul 2013 04:39:41 +0000 (16:39 +1200)]
Lang code restructure from
1c9f455c, applied to Drupal6.php
Chris Burgess [Sat, 6 Jul 2013 04:35:35 +0000 (16:35 +1200)]
Code style & docs.
eileen [Sat, 6 Jul 2013 03:18:11 +0000 (15:18 +1200)]
CRM-13016 update error code
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
eileen [Fri, 5 Jul 2013 22:46:52 +0000 (10:46 +1200)]
CRM-13014 support userLoginFinalize() for UF classes (fix civimobile)
eileen [Fri, 5 Jul 2013 07:29:30 +0000 (19:29 +1200)]
CRM-13016 add civicrm_api3 wrapper
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
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