Merge pull request #14356 from civicrm/5.14

5.14

CRM/Core/xml/Menu/Activity.xml

@@ -7,7 +7,7 @@
      <page_callback>CRM_Activity_Form_Activity</page_callback>
      <access_arguments>access CiviCRM</access_arguments>
      <page_arguments>attachUpload=1</page_arguments>
-     <path_arguments>action=add,context=standalone</path_arguments>
+     <path_arguments>action=add&amp;context=standalone</path_arguments>
   </item>
   <item>
      <path>civicrm/activity/view</path>

CRM/Upgrade/Incremental/sql/5.14.beta1.mysql.tpl

 {* file to handle db changes in 5.14.beta1 during upgrade *}
+
+SELECT @option_group_id_sfe            := max(id) from civicrm_option_group where name = 'safe_file_extension';
+
+INSERT INTO `civicrm_option_value` (`option_group_id`,  {localize field='label'}label{/localize}, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`,  {localize field='description'}description{/localize}, `is_optgroup`, `is_reserved`, `is_active`, `component_id`, `visibility_id`, `icon`)
+VALUES  (@option_group_id_sfe, {localize}'ics'{/localize},  15, 'ics',   NULL, 0, 0, 15, {localize}NULL{/localize}, 0, 0, 1, NULL, NULL, NULL);
+

js/crm.drupal8.js

@@ -5,7 +5,7 @@ localStorage.setItem('Drupal.toolbar.activeTabID', JSON.stringify('toolbar-item-
 
 (function($) {
   function adjustToggle() {
-    if ($(window).width() < 768) {
+    if ($(window).width() < 768 && $('#toolbar-item-civicrm').length) {
       $('#civicrm-menu-nav .crm-menubar-toggle-btn').css({
         left: '' + $('#toolbar-item-civicrm').offset().left + 'px',
         width: '' + $('#toolbar-item-civicrm').innerWidth() + 'px'

xml/templates/civicrm_data.tpl

@@ -674,6 +674,7 @@ VALUES
   (@option_group_id_sfe, 'docx', 12, 'docx',  NULL, 0, 0, 12, NULL, 0, 0, 1, NULL, NULL, NULL),
   (@option_group_id_sfe, 'xlsx', 13, 'xlsx',  NULL, 0, 0, 13, NULL, 0, 0, 1, NULL, NULL, NULL),
   (@option_group_id_sfe, 'odt',  14, 'odt',   NULL, 0, 0, 14, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_sfe, 'ics',  15, 'ics',   NULL, 0, 0, 15, NULL, 0, 0, 1, NULL, NULL, NULL),
 
   (@option_group_id_we, '{ts escape="sql"}Textarea{/ts}', 1, 'Textarea', NULL, 0, NULL, 1, NULL, 0, 1, 1, NULL, NULL, NULL),
   (@option_group_id_we, 'CKEditor', 2, 'CKEditor', NULL, 0, NULL, 2, NULL, 0, 1, 1, NULL, NULL, NULL),