Merge branch 'staging' into serviceworker

2018-06-11 10:17:50 +02:00
parent 47dee664da 1775638d00
commit 996245ec3d
17 changed files with 571 additions and 159 deletions
--- a/www/common/outer/userObject.js
+++ b/www/common/outer/userObject.js
@@ -111,7 +111,7 @@ define([
                                // RPC may not be responding
                                // Send a report that can be handled manually
                                console.error(obj.error);
-                                Feedback.send('ERROR_DELETING_OWNED_PAD=' + channelId, true);
+                                Feedback.send('ERROR_DELETING_OWNED_PAD=' + channelId + '|' + obj.error, true);
                            }
                        });
                    }