@@ -49,7 +49,7 @@

 %global tmpdir /var/lib/roundcubemail

 %global rc_version 1.4

-%global rc_rel_suffix beta86

+%global rc_rel_suffix beta95

 %global dot_rel_suffix %{?rc_rel_suffix:.%{rc_rel_suffix}}

 %global dash_rel_suffix %{?rc_rel_suffix:-%{rc_rel_suffix}}

@@ -3347,8 +3347,8 @@

 %defattr(-,root,root,-)

 %changelog

-* Fri Oct 26 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-50.beta86

-- Check in 86 revisions ahead of the beta release

+* Mon Oct 29 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-50.beta95

+- Check in 95 revisions ahead of the beta release

 * Tue Sep 18 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-49.beta36

 - Check in 36 revisions ahead of beta release

​

@@ -1,8 +1,8 @@

-roundcubemail (1.4-0~kolab52) unstable; urgency=low

+roundcubemail (1.4-0~kolab53) unstable; urgency=low

-  * Check in 86 revisions ahead of upstream 1.4-beta release

+  * Check in 95 revisions ahead of upstream 1.4-beta release

- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 26 Oct 2018 11:11:11 +0200

+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 29 Oct 2018 11:11:11 +0200

 roundcubemail (1.4.0~kolab51) unstable; urgency=low

​

@@ -17,7 +17,9 @@

 - Elastic: Support new-line char as a separator for pasted recipients (#6460)

 - Elastic: Improved UX of search dialogs (#6416)

 - Elastic: Fix unwanted thread expanding when selecting a collapsed thread in non-mobile mode (#6445)

+- Elastic: Add "status bar" for mobile in mail composer

 - Log errors caused by low pcre.backtrack_limit when sending a mail message (#6433)

+- Fix malformed message saved into Sent folder when using big attachments and low memory limit (#6498)

 - Fix incorrect IMAP SASL GSSAPI negotiation (#6308)

 - Fix so unicode in local part of the email address is also supported in recipient inputs (#6490)

 - Fix bug where autocomplete list could be displayed out of screen (#6469)

​

@@ -60,12 +60,20 @@

             });

             $('a.button.enigma').prop('tabindex', $('#messagetoolbar > a:first').prop('tabindex'));

-        }

-        $.each('encrypt', 'sign', function() {

-            if (rcmail.env'enigma_force_' + this)

-                $('name="_enigma_' + this + '"').prop('checked', true);

-        });

+            $.each('encrypt', 'sign', function() {

+                var opt = this, input = $('#enigma' + opt + 'opt');

+

+                if (rcmail.env'enigma_force_' + opt) {

+                    input.prop('checked', true);

+                }

+

+                // Compose status bar in Elastic

+                if (window.UI && UI.compose_status) {

+                    input.on('change', function() { UI.compose_status(opt, this.checked); }).trigger('change');

+                }

+            });

+        }

         if (rcmail.env.enigma_password_request) {

             rcmail.enigma_password_request(rcmail.env.enigma_password_request);

​

@@ -47,7 +47,7 @@

   this.group2expand = {};

   this.http_request_jobs = {};

   this.menu_stack = ;

-  this.menu_buttons = ;

+  this.menu_buttons = {};

   this.entity_selectors = ;

   this.image_style = {};

@@ -125,21 +125,25 @@

   // register a button with popup menu, to set its state according to the state of all commands in the menu

   this.register_menu_button = function(button, menu_id)

   {

-    var commands = ;

-

-    $('#' + menu_id).find('a').each(function() {

-      var command, link = $(this), onclick = link.attr('onclick');

-

-      if (onclick && String(onclick).match(/rcmail\.command\(\'(^'+)/))

-        command = RegExp.$1;

-      else

-        command = function() { return link.is('.active'); };

-

-      commands.push(command);

-    });

-

-    if (commands.length)

-      this.menu_buttons.push(button, commands);

+    if (this.menu_buttonsmenu_id) {

+      this.menu_buttonsmenu_id0.push(button);

+    }

+    else {

+      var commands = ;

+      $('#' + menu_id).find('a').each(function() {

+        var command, link = $(this), onclick = link.attr('onclick');

+

+        if (onclick && String(onclick).match(/rcmail\.command\(\'(^'+)/))

+          command = RegExp.$1;

+        else

+          command = function() { return link.is('.active'); };

+

+        commands.push(command);

+      });

+

+      if (commands.length)

+        this.menu_buttonsmenu_id = button, commands;

+    }

     this.set_menu_buttons();

   };

​

@@ -1716,7 +1716,10 @@

             $this->smtp->disconnect();

         }

-        $message->headers($headers, true);

+        // Add Bcc header back

+        if (!empty($headers'Bcc')) {

+            $message->headers(array('Bcc' => $headers'Bcc'), true);

+        }

         return $sent;

     }

​

@@ -138,6 +138,12 @@

     &.insert.recipient:before {

         content: @fa-var-user-plus;

     }

+    &.encrypt:before {

+        content: @fa-var-lock;

+    }

+    &.sign:before {

+        content: @fa-var-signature;

+    }

 }

 a.btn,

​

@@ -312,3 +312,14 @@

 #compose-attachments {

     margin: .5rem .5rem 0 .5rem;

 }

+

+#composestatusbar {

+    position: absolute;

+    height: 2.5rem;

+    padding-top: .25rem;

+    opacity: .3;

+

+    @media screen and (min-width: (@screen-width-small + 1px)) {

+        display: none;

+    }

+}

​

@@ -214,6 +214,7 @@

        <div id="composebodycontainer">

            <label for="composebody" class="voice"><roundcube:label name="arialabelmessagebody" /></label>

            <roundcube:object name="composeBody" id="composebody" form="form" cols="70" rows="20" class="form-control" tabindex="1" />

+           <div id="composestatusbar"></div>

        </div>

        </form>

        <div class="formbuttons">

​

@@ -65,6 +65,7 @@

     this.searchmenu = searchmenu;

     this.headersmenu = headersmenu;

     this.header_reset = header_reset;

+    this.compose_status = compose_status;

     this.attachmentmenu = attachmentmenu;

     this.mailtomenu = mailtomenu;

     this.recipient_selector = recipient_selector;

@@ -678,6 +679,16 @@

                         rcmail.display_message(rcmail.gettext('nocontactselected'), 'warning');

                     }

                 });

+

+                // Update compose status bar on attachments list update

+                if (window.MutationObserver) {

+                    var observer, list = $('#attachment-list'),

+                        status_callback = function() { compose_status('attach', list.children().length > 0); };

+

+                    observer = new MutationObserver(status_callback);

+                    observer.observe(list0, {childList: true});

+                    status_callback();

+                }

             }

             // Append contact menu to all mailto: links

@@ -1399,7 +1410,7 @@

             case 'compose-encrypted':

                 // show the toolbar button for Mailvelope

                 if (args.status) {

-                    $('a.button.encrypt').parent().show();

+                    $('a.button.encrypt:not(.icon)').parent().show();

                 }

                 break;

@@ -1407,11 +1418,6 @@

                 // enable selector for encrypt and sign

                 $('#encryption-menu-button').show();

                 break;

-

-            case 'mark':

-                // show the toolbar button for Mailvelope

-                $('a.button.markmessage')args.status ? 'removeClass' : 'addClass'('disabled');

-                break;

             }

         }

     };

@@ -2707,6 +2713,23 @@

     };

     /**

+     * Add/remove item to/from compose options status bar

+     */

+    function compose_status(id, status)

+    {

+        var bar = $('#composestatusbar'), ico = bar.find('a.button.icon.' + id);

+

+        if (!status) {

+            ico.remove();

+        }

+        else if (!ico.length) {

+            $('<a>').attr('class', 'button icon ' + id)

+                .on('click', function() { show_sidebar(); })

+                .appendTo(bar);

+        }

+    };

+

+    /**

      * Attachment menu

      */

     function attachmentmenu(obj, button, event)

​

@@ -2,7 +2,7 @@

 Source: roundcubemail

 Binary: roundcubemail

 Architecture: all

-Version: 1:1.4-0~kolab52

+Version: 1:1.4-0~kolab53

 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>

 Uploaders: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>

 Homepage: http://www.roundcube.net/

@@ -14,5 +14,5 @@

  roundcubemail deb web extra

  roundcubemail-core deb web extra

 Files:

- 00000000000000000000000000000000 0 roundcubemail-1.4-beta86.tar.gz

+ 00000000000000000000000000000000 0 roundcubemail-1.4-beta95.tar.gz

  00000000000000000000000000000000 0 debian.tar.gz

​