Merged from sub repository (updated ckeditor, filters - step 2)

This commit is contained in:
RainLoop Team 2014-12-01 21:34:21 +04:00
parent a57dc3720e
commit ec7324b061
427 changed files with 10909 additions and 3336 deletions

View file

@ -51,7 +51,7 @@
'Gravatar': 'GRAVATAR',
'Themes': 'THEMES',
'UserBackground': 'USER_BACKGROUND',
'Filters': 'FILTERS',
'Sieve': 'SIEVE',
'AdditionalAccounts': 'ADDITIONAL_ACCOUNTS',
'AdditionalIdentities': 'ADDITIONAL_IDENTITIES'
};
@ -291,7 +291,6 @@
*/
Enums.FilterConditionField = {
'From': 'From',
'To': 'To',
'Recipient': 'Recipient',
'Subject': 'Subject'
};
@ -320,8 +319,8 @@
* @enum {string}
*/
Enums.FilterRulesType = {
'And': 'And',
'Or': 'Or'
'All': 'All',
'Any': 'Any'
};
/**