Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 22 Dec 2016 12:08:45 +0000 (13:08 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 22 Dec 2016 12:08:45 +0000 (13:08 +0100)
Change-Id: Id2478150229f6d8148683d1631e76a33ce67545e

1  2 
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Addressbook/Convert/Contact/VCard/Abstract.php
tine20/Felamimail/Controller/Message/Send.php
tine20/Tinebase/Controller.php
tine20/Tinebase/js/widgets/dialog/ImportDialog.js

Simple merge
@@@ -660,8 -660,12 +660,12 @@@ Tine.widgets.dialog.ImportDialog = Ext.
                      plugins: exceptionExpander,
                      columns: [
                          exceptionExpander,
 -                        { id: 'index', header: _('Index'), width: 60, sortable: false, dataIndex: 'index'},
 -                        { id: 'exception', header: _('Record'), width: 120, sortable: false, dataIndex: 'exception', renderer: function(exception) {
 +                        { id: 'index', header: i18n._('Index'), width: 60, sortable: false, dataIndex: 'index'},
++                        { id: 'exception', header: i18n._('Record'), width: 120, sortable: false, dataIndex: 'exception', renderer: function(exception) {
+                             // TODO find a way to show record more pretty
+                             return exception.clientRecord ? Ext.util.JSON.encode(exception.clientRecord) : '';
+                         }},
 -                        { id: 'failure', header: _('Failure'), width: 60, sortable: false, dataIndex: 'message'}
 +                        { id: 'failure', header: i18n._('Failure'), width: 60, sortable: false, dataIndex: 'message'}
                      ],
                      autoExpandColumn: 'failure'
                  }]