dlobo [Wed, 13 Nov 2013 16:03:36 +0000 (08:03 -0800)]
Merge pull request #1950 from pratik-joshi/CRM-13735
CRM-13735
dlobo [Wed, 13 Nov 2013 16:02:40 +0000 (08:02 -0800)]
Merge pull request #1973 from kurund/CRM-13587
CRM-13587, fixes trigger issue while updating custom group - contact subtypes
Kurund Jalmi [Wed, 13 Nov 2013 14:01:28 +0000 (06:01 -0800)]
Merge pull request #1968 from davecivicrm/CRM-13742
CRM-13742 conditional display of invite to create your own PCP after com...
kurund [Wed, 13 Nov 2013 13:46:27 +0000 (19:16 +0530)]
fixes for CRM-13587, due to mysql limitations drop and rebuild trigger
----------------------------------------
* CRM-13587: Can't update table 'civicrm_contact' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
http://issues.civicrm.org/jira/browse/CRM-13587
kurund [Wed, 13 Nov 2013 10:43:15 +0000 (16:13 +0530)]
notice fixes
Kurund Jalmi [Wed, 13 Nov 2013 07:01:06 +0000 (23:01 -0800)]
Merge pull request #1969 from totten/4.4-gencode
GenCode, etal - WordPress fixes
Tim Otten [Wed, 13 Nov 2013 01:53:19 +0000 (17:53 -0800)]
setup.sh - Add support for WordPress
Tim Otten [Wed, 13 Nov 2013 01:05:01 +0000 (17:05 -0800)]
distmaker - WordPress - Read civicrm.config.php from WordPress repo
Tim Otten [Wed, 13 Nov 2013 00:54:33 +0000 (16:54 -0800)]
GenCode - Allow generating on WordPress without Drupal around. Use more constructor injection.
Tim Otten [Wed, 13 Nov 2013 00:45:12 +0000 (16:45 -0800)]
distmaker - drupal7 - Attempt to detect GNU or BSD sed
Dave Greenberg [Wed, 13 Nov 2013 00:50:45 +0000 (16:50 -0800)]
CRM-13742 conditional display of invite to create your own PCP after completing a contribution or event registration as a supporter.
----------------------------------------
* CRM-13742: PCP message should not always promise ability to create your own PCP
http://issues.civicrm.org/jira/browse/CRM-13742
dlobo [Tue, 12 Nov 2013 17:16:59 +0000 (09:16 -0800)]
Merge pull request #1964 from dlobo/CRM-13746
CRM-13746 - Enable delete hooks for Mailings
Donald A. Lobo [Tue, 12 Nov 2013 17:16:16 +0000 (09:16 -0800)]
CRM-13746 - Enable delete hooks for Mailings
http://issues.civicrm.org/jira/browse/CRM-13746
Kurund Jalmi [Tue, 12 Nov 2013 15:39:12 +0000 (07:39 -0800)]
Merge pull request #1962 from dlobo/CRM-13745
CRM-13745 - fix mysql exception
Donald A. Lobo [Tue, 12 Nov 2013 14:56:13 +0000 (06:56 -0800)]
CRM-13745 - fix mysql exception
----------------------------------------
* CRM-13745: CRM_Contact_Form_Search_Custom_FullText: broken links from search results
http://issues.civicrm.org/jira/browse/CRM-13745
pratik-joshi [Tue, 12 Nov 2013 14:16:04 +0000 (06:16 -0800)]
Merge pull request #1960 from pratik-joshi/CRM-13730
crm-13730
Kurund Jalmi [Tue, 12 Nov 2013 14:08:19 +0000 (06:08 -0800)]
Merge pull request #1959 from vivekarora/CRM-13719-4.4
Coding correction for handling of CiviCase CustomGroups
Kurund Jalmi [Tue, 12 Nov 2013 14:03:41 +0000 (06:03 -0800)]
Merge pull request #1954 from davecivicrm/CRM-13720
CRM-13720 - Add address fields to TopDonor report. Using getAddressColum...
Kurund Jalmi [Tue, 12 Nov 2013 14:02:53 +0000 (06:02 -0800)]
Merge pull request #1958 from sadashivdalvi/4.4
Fix for Undefined index: 1151 in CRM_Core_Config_Variables->countryLimit...
Pratik Joshi [Tue, 12 Nov 2013 13:35:02 +0000 (19:05 +0530)]
crm-13730
vivekarora [Tue, 12 Nov 2013 11:32:21 +0000 (17:02 +0530)]
coding correction
Sadashiv Dalvi [Tue, 12 Nov 2013 11:18:56 +0000 (16:48 +0530)]
Fix for Undefined index: 1151 in CRM_Core_Config_Variables->countryLimit()
Dave Greenberg [Mon, 11 Nov 2013 20:11:28 +0000 (12:11 -0800)]
CRM-13720 - Add address fields to TopDonor report. Using getAddressColumns() instead of deprecated addAddressFields. Fixed notice in line 234 due to type not always set in $field array.
----------------------------------------
* CRM-13720: Add address fields to Top Donors report
http://issues.civicrm.org/jira/browse/CRM-13720
Dave Greenberg [Mon, 11 Nov 2013 19:38:37 +0000 (11:38 -0800)]
Merge pull request #1947 from dlobo/CRM-13699
CRM-13699 - Marking "Not a Duplicate" should return user to list of contacts to merge
Pratik Joshi [Mon, 11 Nov 2013 14:03:31 +0000 (19:33 +0530)]
CRM-13735
Pratik Joshi [Mon, 11 Nov 2013 13:56:33 +0000 (19:26 +0530)]
CRM-13735
Kurund Jalmi [Mon, 11 Nov 2013 11:12:33 +0000 (03:12 -0800)]
Merge pull request #1945 from dlobo/CRM-13729
CRM-13729 - Full-text search results broken for Contacts
Kurund Jalmi [Mon, 11 Nov 2013 11:10:56 +0000 (03:10 -0800)]
Merge pull request #1948 from dlobo/CRM-13133
CRM-13133 - also fix some notices and pass-by reference warnings
Kurund Jalmi [Mon, 11 Nov 2013 11:09:46 +0000 (03:09 -0800)]
Merge pull request #1949 from deepak-srivastava/batch-delete-broken
CRM-13066 - batch delete broken - fix
Deepak Srivastava [Mon, 11 Nov 2013 07:07:51 +0000 (12:37 +0530)]
batch delete broken - fix
kurund [Mon, 11 Nov 2013 05:18:07 +0000 (10:48 +0530)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-11-11-10-44-51
Conflicts:
sql/civicrm_generated.mysql
xml/version.xml
Donald A. Lobo [Mon, 11 Nov 2013 03:53:35 +0000 (19:53 -0800)]
CRM-13133 - also fix some notices and pass-by reference warnings
----------------------------------------
* CRM-13133: Advanced Search is incorrectly including contacts removed from a group
http://issues.civicrm.org/jira/browse/CRM-13133
Donald A. Lobo [Sat, 9 Nov 2013 00:44:17 +0000 (16:44 -0800)]
CRM-13699 - Marking "Not a Duplicate" should return user to list of contacts to merge
http://issues.civicrm.org/jira/browse/CRM-13699
dlobo [Sat, 9 Nov 2013 00:33:25 +0000 (16:33 -0800)]
Merge pull request #1946 from dlobo/CRM-13731
CRM-13731 - ManageEvents - after editing event template (w/no start date) error is generated
Donald A. Lobo [Sat, 9 Nov 2013 00:32:31 +0000 (16:32 -0800)]
CRM-13731 - ManageEvents - after editing event template (w/no start date) error is generated
http://issues.civicrm.org/jira/browse/CRM-13731
Tim Otten [Fri, 8 Nov 2013 21:57:36 +0000 (13:57 -0800)]
Merge pull request #1943 from dlobo/CRM-13714
CRM-13714 - Display fatal error for Joomla 3.x
Donald A. Lobo [Fri, 8 Nov 2013 20:13:03 +0000 (12:13 -0800)]
CRM-13729 - Full-text search results broken for Contacts
http://issues.civicrm.org/jira/browse/CRM-13729
dlobo [Fri, 8 Nov 2013 20:08:15 +0000 (12:08 -0800)]
Merge pull request #1944 from dlobo/CRM-13715
CRM-13715 - fix bug when included in report columns
Donald A. Lobo [Fri, 8 Nov 2013 20:07:22 +0000 (12:07 -0800)]
CRM-13715 - fix bug when included in report columns
----------------------------------------
* CRM-13715: Add custom field column to Contribution Details report crashes
http://issues.civicrm.org/jira/browse/CRM-13715
Donald A. Lobo [Fri, 8 Nov 2013 16:24:57 +0000 (08:24 -0800)]
CRM-13714 - Display fatal error for Joomla 3.x
http://issues.civicrm.org/jira/browse/CRM-13714
dlobo [Fri, 8 Nov 2013 14:59:21 +0000 (06:59 -0800)]
Merge pull request #1932 from mlutfy/4.4-crm13713-fix
CRM-13354: fix bad patch for locale detection in Drupal based on domain/suffix
Kurund Jalmi [Fri, 8 Nov 2013 13:19:34 +0000 (05:19 -0800)]
Merge pull request #1939 from kurund/CRM-13327
added unit for units, CRM-13327
kurund [Fri, 8 Nov 2013 13:18:55 +0000 (18:48 +0530)]
added unit for units, CRM-13327
----------------------------------------
* CRM-13327: Add support for 3 additional event badge formats AND remove Name Badge labels from Label Formats admin
http://issues.civicrm.org/jira/browse/CRM-13327
Kurund Jalmi [Fri, 8 Nov 2013 12:35:52 +0000 (04:35 -0800)]
Merge pull request #1935 from vivekarora/CRM-13719-4.4
Handling of CiviCase CustomGroups
Kurund Jalmi [Fri, 8 Nov 2013 12:35:24 +0000 (04:35 -0800)]
Merge pull request #1936 from johanv/4.4
CRM-13722 Fixes description of country_id in contact API.
Kurund Jalmi [Fri, 8 Nov 2013 12:34:31 +0000 (04:34 -0800)]
Merge pull request #1938 from pratik-joshi/CRM-13718
Crm 13718
Pratik Joshi [Fri, 8 Nov 2013 11:20:25 +0000 (16:50 +0530)]
CRM-13718
Pratik Joshi [Fri, 8 Nov 2013 11:15:37 +0000 (16:45 +0530)]
cRM-13718
vivekarora [Fri, 8 Nov 2013 05:56:19 +0000 (11:26 +0530)]
Handling of CiviCase CustomGroups
Johan Vervloet [Thu, 7 Nov 2013 13:30:18 +0000 (14:30 +0100)]
CRM-13722 Fixes description of country_id in contact API.
http://issues.civicrm.org/jira/browse/CRM-13722
----------------------------------------
* CRM-13722: Contact API shows wrong title of field country_id
http://issues.civicrm.org/jira/browse/CRM-13722
Mathieu Lutfy [Thu, 7 Nov 2013 19:00:47 +0000 (14:00 -0500)]
CRM-13354: fix bad patch for locale detection in Drupal based on domain/suffix
CiviCRM [Wed, 6 Nov 2013 23:13:35 +0000 (15:13 -0800)]
Update version to 4.4.2
CiviCRM [Wed, 6 Nov 2013 23:07:04 +0000 (15:07 -0800)]
Update version to 4.3.9
dlobo [Wed, 6 Nov 2013 22:56:27 +0000 (14:56 -0800)]
Merge pull request #1927 from dlobo/CRM-13716
CRM-13716 - MailingJob still uses civicrm_activity_target (for multiple bulk emails)
Donald A. Lobo [Wed, 6 Nov 2013 22:54:43 +0000 (14:54 -0800)]
CRM-13716 - MailingJob still uses civicrm_activity_target (for multiple bulk emails)
http://issues.civicrm.org/jira/browse/CRM-13716
colemanw [Wed, 6 Nov 2013 22:52:06 +0000 (14:52 -0800)]
Merge pull request #1926 from davecivicrm/CRM-13698b
CRM-13698 - Rebuild generated with corrected option_value.name for No-sh...
Dave Greenberg [Wed, 6 Nov 2013 22:49:45 +0000 (14:49 -0800)]
CRM-13698 - Rebuild generated with corrected option_value.name for No-show row
----------------------------------------
* CRM-13698: Notice error due to missing ActivityStatus of 7
http://issues.civicrm.org/jira/browse/CRM-13698
dlobo [Wed, 6 Nov 2013 22:43:47 +0000 (14:43 -0800)]
Merge pull request #1925 from dlobo/CRM-13716
CRM-13716 - MailingJob still uses civicrm_activity_target (for multiple bulk emails)
Donald A. Lobo [Wed, 6 Nov 2013 22:32:27 +0000 (14:32 -0800)]
CRM-13716 - MailingJob still uses civicrm_activity_target (for multiple bulk emails)
http://issues.civicrm.org/jira/browse/CRM-13716
Dave Greenberg [Wed, 6 Nov 2013 22:28:29 +0000 (14:28 -0800)]
Merge pull request #1924 from colemanw/4.4
CRM-13698 - Fix option_value.name to match civivolunteer
Coleman Watts [Wed, 6 Nov 2013 22:02:54 +0000 (14:02 -0800)]
CRM-13698 - Fix option_value.name to match civivolunteer
colemanw [Wed, 6 Nov 2013 21:30:18 +0000 (13:30 -0800)]
Merge pull request #1923 from civicrm/4.3
Merge branch 4.3 into 4.4
dlobo [Wed, 6 Nov 2013 21:24:34 +0000 (13:24 -0800)]
Merge pull request #1922 from dlobo/CRM-13715
CRM-13715 - Add custom field column to Contribution Details report crashes
Donald A. Lobo [Wed, 6 Nov 2013 21:23:37 +0000 (13:23 -0800)]
CRM-13715 - Add custom field column to Contribution Details report crashes
http://issues.civicrm.org/jira/browse/CRM-13715
dlobo [Wed, 6 Nov 2013 17:14:09 +0000 (09:14 -0800)]
Merge pull request #1920 from mlutfy/4.3-crm13713
CRM-13713: localize the display of the country/province name for custom fields.
dlobo [Wed, 6 Nov 2013 17:13:55 +0000 (09:13 -0800)]
Merge pull request #1919 from mlutfy/4.4-crm13713
CRM-13713: localize the display of the country/province name for custom fields
dlobo [Wed, 6 Nov 2013 17:08:52 +0000 (09:08 -0800)]
Merge pull request #1921 from dlobo/CRM-13714
CRM-13714 - Display fatal error for Joomla 3.x
Donald A. Lobo [Wed, 6 Nov 2013 17:07:35 +0000 (09:07 -0800)]
CRM-13714 - Display fatal error for Joomla 3.x
http://issues.civicrm.org/jira/browse/CRM-13714
Mathieu Lutfy [Wed, 6 Nov 2013 16:26:59 +0000 (11:26 -0500)]
CRM-13713: localize the display of the country/province name for custom fields.
Mathieu Lutfy [Wed, 6 Nov 2013 16:23:58 +0000 (11:23 -0500)]
CRM-13713: localize the display of the country/province name for custom fields.
Kurund Jalmi [Wed, 6 Nov 2013 11:32:50 +0000 (03:32 -0800)]
Merge pull request #1914 from pratik-joshi/CRM-13698-fix
CRM-13698-fix
Pratik Joshi [Wed, 6 Nov 2013 08:12:27 +0000 (13:42 +0530)]
CRM-13698-fix
----------------------------------------
* CRM-13698-fix:
http://issues.civicrm.org/jira/browse/CRM-13698-fix
Kurund Jalmi [Wed, 6 Nov 2013 07:36:06 +0000 (23:36 -0800)]
Merge pull request #1911 from totten/4.4-optiongroup-warnings
CRM_Admin_*_OptionValue - Fix warnings
Kurund Jalmi [Wed, 6 Nov 2013 07:33:22 +0000 (23:33 -0800)]
Merge pull request #1896 from pratik-joshi/CRM-13684
CRM-13684 fix
colemanw [Wed, 6 Nov 2013 03:19:13 +0000 (19:19 -0800)]
Merge pull request #1912 from colemanw/4.4
Locale Settings - Use CRM.alert instead of window.alert
Coleman Watts [Wed, 6 Nov 2013 03:17:15 +0000 (19:17 -0800)]
Locale Settings - Use CRM.alert instead of window.alert
Tim Otten [Wed, 6 Nov 2013 01:57:52 +0000 (17:57 -0800)]
CRM_Admin_*_OptionValue - Fix warnings
colemanw [Wed, 6 Nov 2013 00:39:51 +0000 (16:39 -0800)]
Merge pull request #1910 from colemanw/4.4
CRM-13705 - Add defaultContactCountry setting metadata
Coleman Watts [Wed, 6 Nov 2013 00:38:39 +0000 (16:38 -0800)]
CRM-13705 - Add defaultContactCountry setting metadata
colemanw [Tue, 5 Nov 2013 22:40:56 +0000 (14:40 -0800)]
Merge pull request #1908 from colemanw/4.3
Case API - Fix undefined index
Coleman Watts [Tue, 5 Nov 2013 21:57:19 +0000 (13:57 -0800)]
Case API - Fix undefined index
Dave Greenberg [Tue, 5 Nov 2013 21:14:16 +0000 (13:14 -0800)]
Merge pull request #1907 from davecivicrm/fixGenerated
Rebuild generated to fix missing elements.
Dave Greenberg [Tue, 5 Nov 2013 21:13:22 +0000 (13:13 -0800)]
Rebuild generated to fix missing elements.
dlobo [Tue, 5 Nov 2013 17:58:44 +0000 (09:58 -0800)]
Merge pull request #1906 from dlobo/CRM-13704
CRM-13704 - Fatal error prevents deletion of options from custom fields
Donald A. Lobo [Tue, 5 Nov 2013 17:57:10 +0000 (09:57 -0800)]
CRM-13704 - Fatal error prevents deletion of options from custom fields
http://issues.civicrm.org/jira/browse/CRM-13704
dlobo [Tue, 5 Nov 2013 15:06:18 +0000 (07:06 -0800)]
Merge pull request #1897 from davecivicrm/CRM-13696
CRM-13696 - Add missing </div> and fix tab indent to 2 spaces standard.
dlobo [Tue, 5 Nov 2013 15:05:49 +0000 (07:05 -0800)]
Merge pull request #1902 from lcdservices/CRM-13703
CRM-13703 force column rebuild during upgrade
dlobo [Tue, 5 Nov 2013 15:04:38 +0000 (07:04 -0800)]
Merge pull request #1901 from lcdservices/CRM-13702
CRM-13702 specify log table
dlobo [Tue, 5 Nov 2013 15:03:27 +0000 (07:03 -0800)]
Merge pull request #1905 from dlobo/CRM-13644
CRM-13644 - Revert changes made for this issue since it requires a more complete fix.
Donald A. Lobo [Tue, 5 Nov 2013 14:59:43 +0000 (06:59 -0800)]
CRM-13644 - Revert changes made for this issue since it requires a more complete fix
----------------------------------------
* CRM-13644: ACL does not protect mailing groups in civiMail in Joomla
http://issues.civicrm.org/jira/browse/CRM-13644
Pratik Joshi [Tue, 5 Nov 2013 06:42:53 +0000 (12:12 +0530)]
CRM-13684 : added webtest case which covers the fix
----------------------------------------
* CRM-13684: Profile Search using Country, State fails
http://issues.civicrm.org/jira/browse/CRM-13684
Brian Shaughnessy [Tue, 5 Nov 2013 05:17:09 +0000 (00:17 -0500)]
CRM-13703
Pratik Joshi [Mon, 4 Nov 2013 13:46:04 +0000 (19:16 +0530)]
CRM-13684 fix
----------------------------------------
* CRM-13684: Profile Search using
http://issues.civicrm.org/jira/browse/CRM-13684
Brian Shaughnessy [Tue, 5 Nov 2013 03:52:27 +0000 (22:52 -0500)]
CRM-13702 specify log table
colemanw [Tue, 5 Nov 2013 00:36:11 +0000 (16:36 -0800)]
Merge pull request #1900 from colemanw/CRM-13701
CRM-13701 - Date settings - fix config->timeInputFormat
Coleman Watts [Tue, 5 Nov 2013 00:28:11 +0000 (16:28 -0800)]
CRM-13701 - Date settings - fix config->timeInputFormat
dlobo [Tue, 5 Nov 2013 00:01:14 +0000 (16:01 -0800)]
Merge pull request #1899 from dlobo/CRM-13697
CRM-13697 - Avoid php warning
Donald A. Lobo [Tue, 5 Nov 2013 00:00:33 +0000 (16:00 -0800)]
CRM-13697 - Avoid php warning
http://issues.civicrm.org/jira/browse/CRM-13697
dlobo [Mon, 4 Nov 2013 23:57:44 +0000 (15:57 -0800)]
Merge pull request #1898 from dlobo/NoticeFixes
fix notices
Donald A. Lobo [Mon, 4 Nov 2013 23:56:42 +0000 (15:56 -0800)]
fix notices
projects / civicrm-core.git / log