pull/6117/head
Kiran Rao 9 years ago
parent 544d224ceb
commit 0b554bbe30
  1. 1
      .eslintrc
  2. 2
      packages/rocketchat-emoji/keyboardFix.js
  3. 2
      packages/rocketchat-file-upload/lib/FileUpload.js
  4. 2
      packages/rocketchat-i18n/package.js
  5. 2
      packages/rocketchat-livechat/client/collections/livechatOfficeHour.js
  6. 2
      packages/rocketchat-livechat/server/lib/OfficeClock.js
  7. 2
      packages/rocketchat-livechat/server/methods/saveOfficeHours.js
  8. 2
      packages/rocketchat-livechat/server/publications/livechatOfficeHours.js
  9. 2
      packages/rocketchat-slashcommands-inviteall/client.js
  10. 2
      server/methods/OEmbedCacheCleanup.js
  11. 2
      tests/data/channel.js
  12. 2
      tests/data/interactions.js
  13. 2
      tests/end-to-end/ui/11-admin.js
  14. 2
      tests/pageobjects/global.js
  15. 2
      tests/pageobjects/preferences-main-content.page.js

@ -55,6 +55,7 @@
"space-before-function-paren": [2, "never"],
"space-before-blocks": [2, "always"],
"indent": [2, "tab", {"SwitchCase": 1}],
"eol-last": [2, "always"],
"comma-dangle": [2, "never"],
"keyword-spacing": 2,
"block-spacing": 2,

@ -11,4 +11,4 @@ if (Meteor.isCordova) {
RocketChat.EmojiPicker.setPosition();
}
});
}
}

@ -57,4 +57,4 @@ FileUpload = {
RocketChat.settings.get('FileUpload_MaxFileSize', function(key, value) {
maxFileSize = value;
});
});

@ -17,4 +17,4 @@ Package.onUse(function(api) {
});
api.use('tap:i18n@1.8.2');
});
});

@ -1 +1 @@
this.LivechatOfficeHour = new Mongo.Collection('rocketchat_livechat_office_hour');
this.LivechatOfficeHour = new Mongo.Collection('rocketchat_livechat_office_hour');

@ -7,4 +7,4 @@ Meteor.setInterval(function() {
RocketChat.models.Users.closeOffice();
}
}
}, 60000);
}, 60000);

@ -2,4 +2,4 @@ Meteor.methods({
'livechat:saveOfficeHours'(day, start, finish, open) {
RocketChat.models.LivechatOfficeHour.updateHours(day, start, finish, open);
}
});
});

@ -4,4 +4,4 @@ Meteor.publish('livechat:officeHour', function() {
}
return RocketChat.models.LivechatOfficeHour.find();
});
});

@ -5,4 +5,4 @@ RocketChat.slashCommands.add('invite-all-to', undefined, {
RocketChat.slashCommands.add('invite-all-from', undefined, {
description: 'Invite_user_to_join_channel_all_from',
params: '#room'
});
});

@ -14,4 +14,4 @@ Meteor.methods({
message: 'cache_cleared'
};
}
});
});

@ -1,2 +1,2 @@
export const publicChannelName = 'channel-test-'+Date.now();
export const privateChannelName = 'private-channel-test-'+Date.now();
export const privateChannelName = 'private-channel-test-'+Date.now();

@ -1,2 +1,2 @@
export const targetUser = 'rocket.cat';
export const imgURL = './public/images/logo/1024x1024.png';
export const imgURL = './public/images/logo/1024x1024.png';

@ -679,4 +679,4 @@ describe('Admin Login', () => {
});
});
});
});
});

@ -13,4 +13,4 @@ class Global {
}
}
module.exports = new Global();
module.exports = new Global();

@ -39,4 +39,4 @@ class PreferencesMainContent extends Page {
module.exports = new PreferencesMainContent();
module.exports = new PreferencesMainContent();

Loading…
Cancel
Save