Merge branch 'staging' into oo2

www/common/sframe-protocol.js

@@ -74,6 +74,12 @@ define({
     // Get the user's pin limit, usage and plan
     'Q_PIN_GET_USAGE': true,
 
+    // Write/update the login block when the account password is changed
+    'Q_WRITE_LOGIN_BLOCK': true,
+
+    // Remove login blocks
+    'Q_REMOVE_LOGIN_BLOCK': true,
+
     // Check the pin limit to determine if we can store the pad in the drive or if we should.
     // display a warning
     'Q_GET_PIN_LIMIT_STATUS': true,
@@ -84,6 +90,7 @@ define({
     // Request the full history from the server when the users clicks on the history button.
     // Callback is called when the FULL_HISTORY_END message is received in the outside.
     'Q_GET_FULL_HISTORY': true,
+    'Q_GET_HISTORY_RANGE': true,
     // When a (full) history message is received from the server.
     'EV_RT_HIST_MESSAGE': true,
 
@@ -107,6 +114,10 @@ define({
     'Q_GET_PAD_ATTRIBUTE': true,
     'Q_SET_PAD_ATTRIBUTE': true,
 
+    // Check if a pad is only in a shared folder or (also) in the main drive.
+    // This allows us to change the behavior of some buttons (trash icon...)
+    'Q_IS_ONLY_IN_SHARED_FOLDER': true,
+
     // Open/close the File picker (sent from the iframe to the outside)
     'EV_FILE_PICKER_OPEN': true,
     'EV_FILE_PICKER_CLOSE': true,
@@ -165,10 +176,6 @@ define({
     // Put one entry in the parent sessionStorage
     'Q_SESSIONSTORAGE_PUT': true,
 
-    // Set and get the tags using the tag prompt button
-    'Q_TAGS_GET': true,
-    'EV_TAGS_SET': true,
-
     // Merge the anonymous drive (FS_hash) into the current logged in user's drive, to keep the pads
     // in the drive at registration.
     'Q_MERGE_ANON_DRIVE': true,
@@ -200,10 +207,10 @@ define({
 
     // Anonymous users can empty their drive and remove FS_hash from localStorage
     'EV_BURN_ANON_DRIVE': true,
-
     // Inner drive needs to send command and receive updates from the async store
     'Q_DRIVE_USEROBJECT': true,
     'Q_DRIVE_GETOBJECT': true,
+    'Q_DRIVE_RESTORE': true,
     // Get the pads deleted from the server by other users to remove them from the drive
     'Q_DRIVE_GETDELETED': true,
     // Store's userObject need to send log messages to inner to display them in the UI
@@ -218,6 +225,8 @@ define({
     // Notifications about connection and disconnection from the network
     'EV_NETWORK_DISCONNECT': true,
     'EV_NETWORK_RECONNECT': true,
+    // Reload on new version
+    'EV_NEW_VERSION': true,
 
     // Pad creation screen: create a pad with the selected attributes (owned, expire)
     'Q_CREATE_PAD': true,
@@ -230,4 +239,32 @@ define({
 
     // OnlyOffice: save a new version
     'Q_OO_SAVE': true,
+
+    // Ask for the pad password when a pad is protected
+    'EV_PAD_PASSWORD': true,
+    'Q_PAD_PASSWORD_VALUE': true,
+    // Change pad password
+    'Q_PAD_PASSWORD_CHANGE': true,
+
+    // Migrate drive to owned drive
+    'Q_CHANGE_USER_PASSWORD': true,
+
+    // Loading events to display in the loading screen
+    'EV_LOADING_INFO': true,
+    // Critical error outside the iframe during loading screen
+    'EV_LOADING_ERROR': true,
+
+    // Chrome 68 bug...
+    'EV_CHROME_68': true,
+
+    // Get all existing tags
+    'Q_GET_ALL_TAGS': true,
+
+    // Store pads in the drive
+    'EV_AUTOSTORE_DISPLAY_POPUP': true,
+    'Q_AUTOSTORE_STORE': true,
+    'Q_IS_PAD_STORED': true,
+
+    // Import mediatag from a pad
+    'Q_IMPORT_MEDIATAG': true
 });