Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 14 Jun 2016 09:14:42 +0000 (11:14 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 14 Jun 2016 09:14:42 +0000 (11:14 +0200)
Conflicts:
tine20/Felamimail/js/MessageEditDialog.js
tine20/Tinebase/js/MainMenu.js
tine20/Tinebase/js/widgets/grid/FilterToolbar.js

Change-Id: I97ba4a6a9aab47e3dc1efc0cc0f7890be7b256f4

1  2 
tine20/Addressbook/Config.php
tine20/Calendar/Model/Event.php
tine20/Felamimail/js/MessageEditDialog.js
tine20/Sales/js/InvoiceEditDialog.js
tine20/Tinebase/Record/Abstract.php
tine20/Tinebase/js/MainMenu.js
tine20/Tinebase/js/widgets/grid/FilterToolbar.js
tine20/Tinebase/translations/de.po

Simple merge
Simple merge
@@@ -926,12 -789,13 +926,18 @@@ Tine.Felamimail.MessageEditDialog = Ext
              title = title + ' ' + this.record.get('subject');
          }
          this.window.setTitle(title);
 -        
 +
 +        if (! this.button_toggleEncrypt.pressed) {
 +            editor.setValue(this.record.get('body'));
 +            this.bodyCards.layout.setActiveItem(editor);
 +        }
 +
++        // to make sure we have all recipients (for example when composing from addressbook with "all pages" filter)
+         var ticketFn = this.onAfterRecordLoad.deferByTickets(this),
+         wrapTicket = ticketFn();
 -        
+         this.fireEvent('load', this, this.record, ticketFn);
+         wrapTicket();
+         
          this.getForm().loadRecord(this.record);
          this.attachmentGrid.loadRecord(this.record);
          
Simple merge
Simple merge
@@@ -169,8 -169,8 +169,8 @@@ Tine.Tinebase.MainMenu = Ext.extend(Ext
          });
  
          this.action_editProfile = new Ext.Action({
 -            text: _('Edit Profile'),
 +            text: i18n._('Edit Profile'),
-             disabled: false,
+             disabled: ! Tine.Tinebase.common.hasRight('manage_own_profile', 'Tinebase'),
              handler: this.onEditProfile,
              iconCls: 'tinebase-accounttype-user'
          });
Simple merge