Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed missing identity section (Closes #456)

Browse source
This commit is contained in:
RainLoop Team 2015-02-16 17:46:22 +04:00
parent 5c00815d31
commit 7807138b7b
6 changed files with 95 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dev/Screen/User/Settings.js
View file

@ -53,11 +53,9 @@
'SettingsContacts', 'SETTINGS_LABELS/LABEL_CONTACTS_NAME', 'contacts');
}
if (Settings.capa(Enums.Capa.AdditionalAccounts))
{
kn.addSettingsViewModel(require('Settings/User/Accounts'),
'SettingsAccounts', 'SETTINGS_LABELS/LABEL_ACCOUNTS_NAME', 'accounts');
}
kn.addSettingsViewModel(require('Settings/User/Accounts'), 'SettingsAccounts',
Settings.capa(Enums.Capa.AdditionalAccounts) ?
'SETTINGS_LABELS/LABEL_ACCOUNTS_NAME' : 'SETTINGS_LABELS/LABEL_IDENTITIES_NAME', 'accounts');
if (Settings.capa(Enums.Capa.Sieve))
{

4
dev/Settings/User/Accounts.js
View file

@ -14,6 +14,7 @@
AccountStore = require('Stores/User/Account'),
IdentityStore = require('Stores/User/Identity'),
Settings = require('Storage/Settings'),
Remote = require('Storage/User/Remote')
;
@ -22,6 +23,9 @@
*/
function AccountsUserSettings()
{
this.allowAdditionalAccount = Settings.capa(Enums.Capa.AdditionalAccounts);
this.allowIdentities = true;
this.accounts = AccountStore.accounts;
this.identities = IdentityStore.identities;

1
dev/View/Admin/Settings/Menu.js
View file

@ -6,7 +6,6 @@
var
_ = require('_'),
Enums = require('Common/Enums'),
Globals = require('Common/Globals'),
kn = require('Knoin/Knoin'),

3
dev/View/Popup/Contacts.js
View file

@ -242,8 +242,7 @@
aC = this.contactsCheckedOrSelected(),
aToEmails = null,
aCcEmails = null,
aBccEmails = null,
aReplyToEmails = null
aBccEmails = null
;
if (Utils.isNonEmptyArray(aC))

4
package.json
View file

@ -2,7 +2,7 @@
"name": "RainLoop",
"title": "RainLoop Webmail",
"version": "1.8.1",
"release": "259",
"release": "260",
"description": "Simple, modern & fast web-based email client",
"homepage": "http://rainloop.net",
"main": "gulpfile.js",
@ -36,7 +36,7 @@
"plugins"
],
"readmeFilename": "README.md",
"ownCloudPackageVersion": "3.0",
"ownCloudPackageVersion": "3.1",
"engines": {
"node": ">= 0.10.0"
},

4
rainloop/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
View file

@ -1,4 +1,5 @@
<div class="b-settings-accounts g-ui-user-select-none">
<div data-bind="visible: allowAdditionalAccount">
<div class="form-horizontal">
<div class="legend">
<span class="i18n" data-i18n-text="SETTINGS_ACCOUNTS/LEGEND_ACCOUNTS"></span>
@ -42,6 +43,8 @@
</tr>
</tbody>
</table>
</div>
<div data-bind="visible: allowIdentities">
<br />
<div class="form-horizontal">
<div class="legend">
@ -85,3 +88,4 @@
</tbody>
</table>
</div>
</div>