Nileema [Thu, 14 Nov 2013 13:39:28 +0000 (19:09 +0530)]
-- CRM-13747 CiviCase label and title simplification to increase adaptability
----------------------------------------
* CRM-13747: CiviCase label and title simplification to increase adaptability
http://issues.civicrm.org/jira/browse/CRM-13747
Kurund Jalmi [Thu, 14 Nov 2013 11:28:30 +0000 (03:28 -0800)]
Merge pull request #1931 from monishdeb/CRM-10225
CRM-10225 fix - New Price Set Error
Yashodha Chaku [Wed, 13 Nov 2013 11:20:43 +0000 (03:20 -0800)]
Merge pull request #1972 from NileemaJadhav/CRM-13617webtest
-- CRM-13617 Webtest modification
Nileema [Wed, 13 Nov 2013 10:29:31 +0000 (15:59 +0530)]
-- CRM-13617 Webtest modification
----------------------------------------
* CRM-13617: Link Country and state province widget for custom data
http://issues.civicrm.org/jira/browse/CRM-13617
Yashodha Chaku [Wed, 13 Nov 2013 06:48:33 +0000 (22:48 -0800)]
Merge pull request #1961 from vivekarora/CRM-13615-Api
Code review for schedule reminders
Yashodha Chaku [Wed, 13 Nov 2013 06:31:06 +0000 (22:31 -0800)]
Merge pull request #1971 from yashodha/CRM-13617
CRM-13617 - fix linking state province and country in multi-value custom fields
yashodha [Wed, 13 Nov 2013 04:44:51 +0000 (10:14 +0530)]
CRM-13617 - fix linking state province and country in multi-value custom fields
colemanw [Tue, 12 Nov 2013 21:43:24 +0000 (13:43 -0800)]
Merge pull request #1967 from colemanw/master
CRM-12578 - Remove extras.css
Coleman Watts [Tue, 12 Nov 2013 21:37:43 +0000 (13:37 -0800)]
CRM-12578 - Remove extras.css
dlobo [Tue, 12 Nov 2013 15:00:00 +0000 (07:00 -0800)]
Merge pull request #1955 from totten/master-smarty-perm
Smarty - Export $crmPermissions object for use in all templates
vivekarora [Tue, 12 Nov 2013 13:56:20 +0000 (19:26 +0530)]
Code review for schedule reminders
Tim Otten [Mon, 11 Nov 2013 22:49:37 +0000 (14:49 -0800)]
Smarty - Export $crmPermissions object for use in all templates
kurund [Mon, 11 Nov 2013 05:27:27 +0000 (10:57 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-11-10-56-09
Conflicts:
sql/civicrm_generated.mysql
xml/version.xml
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
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
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:46:33 +0000 (05:46 -0800)]
Merge pull request #1940 from monishdeb/CRM-13711
CRM-13711 fix - Price-set validation break in noAmount and noLabel case for non Text type price field
Yashodha Chaku [Fri, 8 Nov 2013 13:34:53 +0000 (05:34 -0800)]
Merge pull request #1928 from NileemaJadhav/CRM-13624new
-- CRM-13624 Added notation for parameters of paperIconAttachment function
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
monishdeb [Fri, 8 Nov 2013 13:18:50 +0000 (18:48 +0530)]
CRM-13711 fix - Price-set validation break in noAmount and noLabel case for non Text type price field
http://issues.civicrm.org/jira/browse/CRM-13711
Yashodha Chaku [Fri, 8 Nov 2013 13:12:44 +0000 (05:12 -0800)]
Merge pull request #1915 from yashodha/CRM-13617
CRM-13617 - link custom data for country to state/province drop downs
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
Yashodha Chaku [Fri, 8 Nov 2013 07:41:28 +0000 (23:41 -0800)]
Merge pull request #1937 from NileemaJadhav/CRM-testqa
-- CRM-13617 - Webtest for link of custom data for country to state/province drop downs
Nileema [Fri, 8 Nov 2013 07:23:57 +0000 (12:53 +0530)]
-- CRM-13617 - Webtest for link of custom data for country to state/province drop downs
----------------------------------------
* CRM-13617: Link Country and state province widget for custom data
http://issues.civicrm.org/jira/browse/CRM-13617
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
dlobo [Thu, 7 Nov 2013 23:59:00 +0000 (15:59 -0800)]
Merge pull request #1929 from monishdeb/CRM-13712
CRM-13712 fix - DB Error on creating Smart Group with Is Empty and/or Not Empty operators via search builder
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
monishdeb [Thu, 7 Nov 2013 13:26:42 +0000 (18:56 +0530)]
CRM-10225 fix - New Price Set Error
http://issues.civicrm.org/jira/browse/CRM-10225
monishdeb [Thu, 7 Nov 2013 10:20:44 +0000 (15:50 +0530)]
CRM-13712 fix - DB Error on creating Smart Group with Is Empty and/or Not Empty operators via search builder
http://issues.civicrm.org/jira/browse/CRM-13712
Kurund Jalmi [Thu, 7 Nov 2013 05:25:12 +0000 (21:25 -0800)]
Merge pull request #1917 from monishdeb/CRM-11881
CRM-11881 fix - State/Province required-ness fix if Country doesn't contain it on CiviProfile
Kurund Jalmi [Thu, 7 Nov 2013 05:24:37 +0000 (21:24 -0800)]
Merge pull request #1918 from monishdeb/CRM-13709
CRM-13709 fix - World Region filter doesn't work on Advance Search
Nileema [Thu, 7 Nov 2013 05:16:04 +0000 (10:46 +0530)]
-- CRM-13624 Added notation for parameters of paperIconAttachment function
----------------------------------------
* CRM-13624: All Tabs - Paperclip Icon
http://issues.civicrm.org/jira/browse/CRM-13624
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.
monishdeb [Wed, 6 Nov 2013 14:30:14 +0000 (20:00 +0530)]
CRM-13709 fix - World Region filter doesn't work on Advance Search
http://issues.civicrm.org/jira/browse/CRM-13709
Yashodha Chaku [Wed, 6 Nov 2013 14:06:15 +0000 (06:06 -0800)]
Merge pull request #1913 from NileemaJadhav/CRM-13624new
-- CRM-13624 Display paper clip icon for file attachments for Note and CiviHR profiles
monishdeb [Wed, 6 Nov 2013 14:05:06 +0000 (19:35 +0530)]
Ommit initialization as it is done in later part
monishdeb [Wed, 6 Nov 2013 13:46:25 +0000 (19:16 +0530)]
Camel casing fix for
monishdeb [Wed, 6 Nov 2013 13:04:33 +0000 (18:34 +0530)]
State/Province required-ness fix if Country doesn't contain it on CiviProfile
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
yashodha [Wed, 6 Nov 2013 09:47:29 +0000 (15:17 +0530)]
CRM-13617 - link custom data for country to state/province drop downs
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
deepak-srivastava [Wed, 6 Nov 2013 08:06:50 +0000 (00:06 -0800)]
Merge pull request #1881 from agh1/pagebreak-reports
CRM-13682 option for page breaks before report section headers
Nileema [Wed, 6 Nov 2013 07:55:21 +0000 (13:25 +0530)]
-- CRM-13624 Display paper clip icon for file attachments for Note and CiviHR profiles
----------------------------------------
* CRM-13624: All Tabs - Paperclip Icon
http://issues.civicrm.org/jira/browse/CRM-13624
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
dlobo [Tue, 5 Nov 2013 23:40:11 +0000 (15:40 -0800)]
Merge pull request #1909 from kenwest/CRM-13690-unittest
CRM-13690 added unit test for html2text and token
Ken West [Tue, 5 Nov 2013 23:30:20 +0000 (10:30 +1100)]
CRM-13690 added unit test for html2text and token
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
projects / civicrm-core.git / log