Kurund Jalmi [Thu, 4 Jul 2013 23:04:01 +0000 (16:04 -0700)]
Merge pull request #1123 from kurund/CRM-12966
CRM-12966
Kurund Jalmi [Thu, 4 Jul 2013 23:02:37 +0000 (04:32 +0530)]
CRM-12966, minor typo
Kurund Jalmi [Thu, 4 Jul 2013 23:00:49 +0000 (04:30 +0530)]
CRM-12966, add clear link
Kurund Jalmi [Thu, 4 Jul 2013 22:39:53 +0000 (15:39 -0700)]
Merge pull request #1122 from kurund/CRM-12966
clean and notice fixes CRM-12966
Kurund Jalmi [Thu, 4 Jul 2013 22:37:58 +0000 (04:07 +0530)]
clean and notice fixes CRM-12966
Kurund Jalmi [Thu, 4 Jul 2013 22:14:26 +0000 (15:14 -0700)]
Merge pull request #1121 from kurund/CRM-12964
CRM-12964, fixes for generated data
Kurund Jalmi [Thu, 4 Jul 2013 22:13:23 +0000 (03:43 +0530)]
CRM-12964, fixes for generated data
Kurund Jalmi [Thu, 4 Jul 2013 22:00:14 +0000 (15:00 -0700)]
Merge pull request #1120 from kurund/CRM-12966
CRM-12966
Kurund Jalmi [Thu, 4 Jul 2013 21:58:48 +0000 (03:28 +0530)]
more cleanup CRM-12966
Kurund Jalmi [Thu, 4 Jul 2013 21:52:35 +0000 (03:22 +0530)]
more cleanup CRM-12966
Kurund Jalmi [Thu, 4 Jul 2013 21:43:09 +0000 (03:13 +0530)]
more cleanup CRM-12966
Kurund Jalmi [Thu, 4 Jul 2013 21:30:47 +0000 (03:00 +0530)]
more fixes CRM-12966
Kurund Jalmi [Thu, 4 Jul 2013 20:57:50 +0000 (13:57 -0700)]
Merge pull request #1119 from kurund/CRM-12966
CRM-12966
Kurund Jalmi [Thu, 4 Jul 2013 20:53:06 +0000 (02:23 +0530)]
CRM-12966, more fixes and cleanup for badges
Kurund Jalmi [Thu, 4 Jul 2013 20:18:55 +0000 (01:48 +0530)]
CRM-12966, added missing files
Kurund Jalmi [Thu, 4 Jul 2013 20:18:09 +0000 (01:48 +0530)]
CRM-12966, more work on name badge workflow, now you can print labels :)
Tim Otten [Thu, 4 Jul 2013 18:47:28 +0000 (11:47 -0700)]
CRM_Core_DAO_AllCoreTables - Modify list with hook_civicrm_entityTypes
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:47:17 +0000 (10:47 -0700)]
Merge pull request #1114 from monishdeb/CRM-12520-fixes
CRM-12520 fixes
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
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
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
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
Tim Otten [Thu, 4 Jul 2013 16:03:57 +0000 (09:03 -0700)]
api/v3 - _civicrm_api3_basic_create - Define fallback if BAO::create() is missing
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
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
monishdeb [Wed, 3 Jul 2013 12:26:38 +0000 (17:56 +0530)]
CRM-12520 fixes
----------------------------------------
* CRM-12520: Add 24 and 36 month searching to relative date filter drop downs
http://issues.civicrm.org/jira/browse/CRM-12520
deepak-srivastava [Thu, 4 Jul 2013 15:04:28 +0000 (08:04 -0700)]
Merge pull request #1113 from deepak-srivastava/reportsapi
CRM-12877, making report-instance api thinner
Deepak Srivastava [Thu, 4 Jul 2013 13:16:30 +0000 (18:46 +0530)]
CRM-12877, making report-instance thinner
----------------------------------------
* CRM-12877:
http://issues.civicrm.org/jira/browse/CRM-12877
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...
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
Pratik Joshi [Thu, 4 Jul 2013 11:40:21 +0000 (17:10 +0530)]
crm-12976-fix : using 'strstr' while placeholder replacement mechanism
Kurund Jalmi [Thu, 4 Jul 2013 10:29:30 +0000 (03:29 -0700)]
Merge pull request #1110 from kurund/CRM-12965
CRM-12965
Kurund Jalmi [Thu, 4 Jul 2013 10:27:38 +0000 (15:57 +0530)]
more work on form building, added images, CRM-12965
Kurund Jalmi [Thu, 4 Jul 2013 09:28:23 +0000 (14:58 +0530)]
added event tokens, CRM-12965
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
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
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
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.
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
Dave Greenberg [Wed, 3 Jul 2013 19:01:56 +0000 (12:01 -0700)]
Merge pull request #1107 from lcdservices/CRM-12998
CRM-12998 remove add to group from email summary report
Brian Shaughnessy [Wed, 3 Jul 2013 18:23:39 +0000 (14:23 -0400)]
CRM-12998 remove add to group from email summary report
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
Tim Otten [Wed, 3 Jul 2013 16:34:55 +0000 (09:34 -0700)]
Merge pull request #1099 from ravishnair/CiviHR
-- CRM-12941, CRM-12863 & CRM-12824 changes made as per the comments
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
Tim Otten [Wed, 3 Jul 2013 14:47:56 +0000 (07:47 -0700)]
CRM_Utils_HttpClient - Fix timeout
Tim Otten [Wed, 3 Jul 2013 14:07:47 +0000 (07:07 -0700)]
CRM_Extension_Container_Basic - Remove debug code
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
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
Ravish Nair [Wed, 3 Jul 2013 07:48:59 +0000 (13:18 +0530)]
-- CRM-12941 handled for the point " If the onPopupClose is unspecified or is "redirectToProfile", then use the normal/old redirect URL"
----------------------------------------
* CRM-12941: Redirect to proper contact tab after saving profile
http://issues.civicrm.org/jira/browse/CRM-12941
Ravish Nair [Wed, 3 Jul 2013 07:20:32 +0000 (12:50 +0530)]
-- CRM-12941, CRM-12863 & CRM-12824 changes made as per the comments
----------------------------------------
* CRM-12941: Redirect to proper contact tab after saving profile
http://issues.civicrm.org/jira/browse/CRM-12941
* CRM-12863: Hide profile titles in HR tabs
http://issues.civicrm.org/jira/browse/CRM-12863
* CRM-12824: Override message for empty tabs
http://issues.civicrm.org/jira/browse/CRM-12824
colemanw [Wed, 3 Jul 2013 04:14:15 +0000 (21:14 -0700)]
Merge pull request #1097 from davecivicrm/CRM-12634-2
CRM-12634 Simplified fix using crmURL.
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
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,
Dave Greenberg [Tue, 2 Jul 2013 23:54:28 +0000 (16:54 -0700)]
CRM-12634 Simplified fix using crmURL.
----------------------------------------
* CRM-12634: Return to home page link on upgrade finish page doesn't need to rebuild menus
http://issues.civicrm.org/jira/browse/CRM-12634
Kurund Jalmi [Tue, 2 Jul 2013 20:00:50 +0000 (13:00 -0700)]
Merge pull request #1095 from kurund/CRM-12964
worked on CRM-12964, more schema changes / data fixes
Kurund Jalmi [Tue, 2 Jul 2013 19:55:01 +0000 (01:25 +0530)]
worked on CRM-12964, more schema changes / data fixes
Kurund Jalmi [Tue, 2 Jul 2013 18:36:37 +0000 (11:36 -0700)]
Merge pull request #1094 from kurund/CRM-12976
CRM-12976
Kurund Jalmi [Tue, 2 Jul 2013 18:30:43 +0000 (00:00 +0530)]
notice fixes / indentation
Kurund Jalmi [Tue, 2 Jul 2013 16:28:26 +0000 (21:58 +0530)]
code indentation fixes
deepak-srivastava [Tue, 2 Jul 2013 13:04:36 +0000 (06:04 -0700)]
Merge pull request #1032 from ravishnair/CRM-12823
-- CRM-12823 created a popup for "Add New Record"
deepak-srivastava [Tue, 2 Jul 2013 13:02:56 +0000 (06:02 -0700)]
Merge pull request #1085 from ravishnair/CiviHR
-- fixes for CRM-12941, CRM-12863 & CRM-12824
Pradeep Nayak [Tue, 2 Jul 2013 11:00:22 +0000 (16:30 +0530)]
-- worked on CRM-12156
----------------------------------------
* CRM-12156: Cannot permanently delete a contact for whom a contribution has been created
http://issues.civicrm.org/jira/browse/CRM-12156
Kurund Jalmi [Tue, 2 Jul 2013 07:48:35 +0000 (00:48 -0700)]
Merge pull request #1074 from kurund/CRM-12916
worked on CRM-12916, setting state defaults
Kurund Jalmi [Tue, 2 Jul 2013 07:43:36 +0000 (00:43 -0700)]
Merge pull request #1086 from davecivicrm/CRM-12271
Crm 12271
Kurund Jalmi [Tue, 2 Jul 2013 07:40:25 +0000 (00:40 -0700)]
Merge pull request #1089 from eileenmcnaughton/e-notice
enotice fix
Chris Burgess [Tue, 2 Jul 2013 05:11:30 +0000 (17:11 +1200)]
CRM-12997. Set id on all line items, not just the first.
eileen [Tue, 2 Jul 2013 04:05:11 +0000 (16:05 +1200)]
enotice fix
eileen [Tue, 2 Jul 2013 03:59:08 +0000 (15:59 +1200)]
CRM-12984 add contribution.completetransaction api
eileen [Tue, 2 Jul 2013 03:57:56 +0000 (15:57 +1200)]
CRM-12984 backport of 4.4 test helper functions so tests will run
colemanw [Mon, 1 Jul 2013 22:52:45 +0000 (15:52 -0700)]
Merge pull request #1059 from pratik-joshi/CRM-12942
CRM-12942 fix
colemanw [Mon, 1 Jul 2013 22:14:55 +0000 (15:14 -0700)]
Merge pull request #1082 from eileenmcnaughton/CRM-12990
CRM-12990 Hook substitution not made on mailing label where there are no...
Dave Greenberg [Mon, 1 Jul 2013 21:26:43 +0000 (14:26 -0700)]
CRM-12271 webtest (new file)
----------------------------------------
* CRM-12271: Changing a contribution status from "completed" to "Cancelled" or "Refunded" breaks Pledge payments
http://issues.civicrm.org/jira/browse/CRM-12271
Dave Greenberg [Mon, 1 Jul 2013 21:25:22 +0000 (14:25 -0700)]
CRM-12271 BAO fix and webtest. Have not been able to run the webtest due to incompatibility between our current version of Selenium (2.21) and latest version of Firefox (22). Selenium problem is sched to be fixed in their next release - 2.34.
----------------------------------------
* CRM-12271: Changing a contribution status from "completed" to "Cancelled" or "Refunded" breaks Pledge payments
http://issues.civicrm.org/jira/browse/CRM-12271
colemanw [Mon, 1 Jul 2013 19:41:58 +0000 (12:41 -0700)]
Merge pull request #1081 from eileenmcnaughton/CRM-12988
CRM-12988 - OptionGroup.create doesn't update
Dave Greenberg [Mon, 1 Jul 2013 17:39:23 +0000 (10:39 -0700)]
Merge pull request #1072 from kurund/CRM-12976
fixed CRM-12976, problem was regex characters were not escaped
Tested locally and this fixes the problem.
Ravish Nair [Mon, 1 Jul 2013 14:25:00 +0000 (19:55 +0530)]
-- fixes for CRM-12941, CRM-12863 & CRM-12824
----------------------------------------
* CRM-12941: Redirect to proper contact tab after saving profile
http://issues.civicrm.org/jira/browse/CRM-12941
* CRM-12863: Hide profile titles in HR tabs
http://issues.civicrm.org/jira/browse/CRM-12863
* CRM-12824: Override message for empty tabs
http://issues.civicrm.org/jira/browse/CRM-12824
Ravish Nair [Mon, 1 Jul 2013 14:08:06 +0000 (19:38 +0530)]
-- CRM-12823 included validate.tpl for validation purpose
----------------------------------------
* CRM-12823: "Add" should use same popup as "Edit" in multi-row custom data tables
http://issues.civicrm.org/jira/browse/CRM-12823
deepak-srivastava [Mon, 1 Jul 2013 12:27:26 +0000 (05:27 -0700)]
Merge pull request #1084 from deepak-srivastava/reportsapi
CRM-12877
Deepak Srivastava [Mon, 1 Jul 2013 12:20:52 +0000 (17:50 +0530)]
CRM-12877
----------------------------------------
* CRM-12877: Provide api for creating report instances
http://issues.civicrm.org/jira/browse/CRM-12877
Pratik Joshi [Mon, 1 Jul 2013 12:19:12 +0000 (17:49 +0530)]
CRM-12972 fix
deepak-srivastava [Mon, 1 Jul 2013 06:53:18 +0000 (23:53 -0700)]
Merge pull request #1083 from deepak-srivastava/reportsapi
CRM-12877, towards report instance api
eileen [Mon, 1 Jul 2013 05:55:25 +0000 (17:55 +1200)]
CRM-12990 Hook substitution not made on mailing label where there are no other tokens
eileen [Mon, 1 Jul 2013 03:19:28 +0000 (15:19 +1200)]
CRM-12988 updated examples - debug patch pulled
eileen [Mon, 1 Jul 2013 02:10:03 +0000 (14:10 +1200)]
CRM-12988 - OptionGroup.create doesn't update
colemanw [Sun, 30 Jun 2013 20:19:37 +0000 (13:19 -0700)]
Merge pull request #1080 from davecivicrm/eventPermissionNoticeFix
Fix array_search notice from null array in CRM_Core_Permission::event
Dave Greenberg [Sun, 30 Jun 2013 18:00:14 +0000 (11:00 -0700)]
Fix array_search notice from null array in CRM_Core_Permission::event
Kurund Jalmi [Sun, 30 Jun 2013 15:43:27 +0000 (08:43 -0700)]
Merge pull request #1079 from kurund/CRM-12965
CRM-12965
colemanw [Sun, 30 Jun 2013 15:41:31 +0000 (08:41 -0700)]
Merge pull request #1046 from colemanw/showHide
Remove show/hide functions from install template CRM-10773
colemanw [Sun, 30 Jun 2013 15:40:33 +0000 (08:40 -0700)]
Merge pull request #1073 from kurund/CRM-12879
CRM-12879, fixed formatting of amount on Fee's tab for event configuration
Kurund Jalmi [Sun, 30 Jun 2013 14:37:16 +0000 (20:07 +0530)]
CRM-12965, worked on form building and postprocess
Kurund Jalmi [Sun, 30 Jun 2013 11:15:35 +0000 (16:45 +0530)]
CRM-12965 more cleanup and fixes
Kurund Jalmi [Sun, 30 Jun 2013 08:48:58 +0000 (01:48 -0700)]
Merge pull request #1078 from eileenmcnaughton/CRM-12986
CRM-12986 fix schema so required fields are required / not null
eileen [Sun, 30 Jun 2013 08:33:50 +0000 (20:33 +1200)]
CRM-12986 fix schema so required fields are required / not null
Kurund Jalmi [Sun, 30 Jun 2013 05:52:09 +0000 (22:52 -0700)]
Merge pull request #1075 from eileenmcnaughton/master
Various tidy ups in preparation for CRM-12984
Kurund Jalmi [Sun, 30 Jun 2013 05:49:44 +0000 (22:49 -0700)]
Merge pull request #1076 from yashodha/new-hook
CRM-12864
Kurund Jalmi [Sun, 30 Jun 2013 05:49:09 +0000 (22:49 -0700)]
Merge pull request #1077 from kurund/CRM-12974
CRM-12974, currency formatting fixes
Kurund Jalmi [Sun, 30 Jun 2013 05:47:32 +0000 (11:17 +0530)]
CRM-12974, currency formatting fixes
yashodha [Sun, 30 Jun 2013 05:31:38 +0000 (11:01 +0530)]
CRM-12864
eileen [Sun, 30 Jun 2013 05:23:41 +0000 (17:23 +1200)]
remove BaseIPN::createContact function as all references to this function are commented out