Added q.min file

dev/Screen/User/Settings.js

@@ -13,6 +13,7 @@
 		Plugins = require('Common/Plugins'),
 
 		AppStore = require('Stores/User/App'),
+		AccountStore = require('Stores/User/Account'),
 		Settings = require('Storage/Settings'),
 
 		kn = require('Knoin/Knoin'),
@@ -71,7 +72,8 @@
 				'SettingsSecurity', 'SETTINGS_LABELS/LABEL_SECURITY_NAME', 'security');
 		}
 
-		if ((Settings.settingsGet('AllowGoogleSocial') && Settings.settingsGet('AllowGoogleSocialAuth')) ||
+		if (AccountStore.isRootAccount() &&
+			(Settings.settingsGet('AllowGoogleSocial') && Settings.settingsGet('AllowGoogleSocialAuth')) ||
 			Settings.settingsGet('AllowFacebookSocial') ||
 			Settings.settingsGet('AllowTwitterSocial'))
 		{

dev/Stores/User/Account.js

@@ -16,6 +16,7 @@
 	function AccountUserStore()
 	{
 		this.email = ko.observable('');
+		this.parentEmail = ko.observable('');
 //		this.incLogin = ko.observable('');
 //		this.outLogin = ko.observable('');
 
@@ -54,6 +55,15 @@
 	AccountUserStore.prototype.populate = function ()
 	{
 		this.email(Settings.settingsGet('Email'));
+		this.parentEmail(Settings.settingsGet('ParentEmail'));
+	};
+
+	/**
+	 * @returns {boolean}
+	 */
+	AccountUserStore.prototype.isRootAccount = function ()
+	{
+		return '' === this.parentEmail();
 	};
 
 	module.exports = new AccountUserStore();

dev/View/Popup/Compose.js

@@ -476,7 +476,7 @@
 							self.addDropboxAttachment(aFiles[0]);
 						}
 					},
-					'linkType': "direct",
+					'linkType': 'direct',
 					'multiselect': false
 				});
 			}

rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php

@@ -1636,15 +1636,6 @@ class Actions
 			$aResult['ParentEmail'] = $oAccount->ParentEmail();
 		}
 
-		if (0 < \strlen($aResult['ParentEmail']))
-		{
-			$aResult['AllowGoogleSocial'] = false;
-			$aResult['AllowGoogleSocialAuth'] = false;
-			$aResult['AllowGoogleSocialDrive'] = false;
-			$aResult['AllowFacebookSocial'] = false;
-			$aResult['AllowTwitterSocial'] = false;
-		}
-
 		$sStaticCache = \md5(APP_VERSION.$this->Plugins()->Hash());
 
 		$sTheme = $this->ValidateTheme($sTheme);

rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html

@@ -179,9 +179,9 @@
 									</div>
 									<div class="pull-right" style="margin-right: 4px;">
 										<div class="btn-group pull-right">
-											<a class="btn btn-thin first" data-tooltip-placement="top"
+											<a class="btn first" data-tooltip-placement="top"
 												data-bind="visible: addAttachmentEnabled(), initDom: composeUploaderButton, tooltip: 'COMPOSE/ATTACH_FILES'">
-												<b>+</b>&nbsp;<i class="icon-attachment"></i>
+												<sup style="font-weight: bold; font-size: 100%; top: -0.3em;">+</sup><i class="icon-attachment"></i>
 											</a>
 											<a class="btn" data-tooltip-placement="top"
 												data-bind="visible: dropboxEnabled, command: dropboxCommand, tooltip: 'COMPOSE/DROPBOX', css: {'first': !addAttachmentEnabled(), 'last': !driveEnabled()}">

vendors/Q/.gitignore

@@ -1,14 +0,0 @@
-node_modules
-npm-debug.log
-CHANGES.html
-README.html
-.tmp
-q.min.js
-
-.coverage_data/
-.coverage_debug/
-cover_html/
-
-# IntelliJ IDEA project files
-.idea
-*.iml