';
diff --git a/packages/rocketchat-smarsh-connector/server/settings.js b/packages/rocketchat-smarsh-connector/server/settings.js
index 5a910e0a62d..e3c4286fe12 100644
--- a/packages/rocketchat-smarsh-connector/server/settings.js
+++ b/packages/rocketchat-smarsh-connector/server/settings.js
@@ -1,3 +1,6 @@
+import moment from 'moment';
+import 'moment-timezone';
+
RocketChat.settings.addGroup('Smarsh', function addSettings() {
this.add('Smarsh_Enabled', false, {
type: 'boolean',
diff --git a/packages/rocketchat-spotify/package.js b/packages/rocketchat-spotify/package.js
index 03961bdb7e9..bdbffa02c70 100644
--- a/packages/rocketchat-spotify/package.js
+++ b/packages/rocketchat-spotify/package.js
@@ -8,6 +8,7 @@ Package.describe({
Package.onUse(function(api) {
api.use([
'coffeescript',
+ 'ecmascript',
'templating',
'underscore',
'rocketchat:oembed',
diff --git a/packages/rocketchat-statistics/package.js b/packages/rocketchat-statistics/package.js
index ce51ca5fe0f..9e862ada23d 100644
--- a/packages/rocketchat-statistics/package.js
+++ b/packages/rocketchat-statistics/package.js
@@ -7,6 +7,7 @@ Package.describe({
Package.onUse(function(api) {
api.use([
+ 'ecmascript',
'coffeescript',
'rocketchat:lib'
]);
diff --git a/packages/rocketchat-theme/assets/stylesheets/base.less b/packages/rocketchat-theme/assets/stylesheets/base.less
index da66eb31f7a..40845dda529 100644
--- a/packages/rocketchat-theme/assets/stylesheets/base.less
+++ b/packages/rocketchat-theme/assets/stylesheets/base.less
@@ -493,6 +493,7 @@ input[type='time'] {
position: relative;
width: 100%;
outline: none;
+ border-style: solid;
}
input.input-forward {
@@ -595,7 +596,7 @@ label.required:after {
&:extend(.unselectable);
display: inline-block;
padding: 9px 12px;
- font-weight: 600;
+ font-weight: 500;
font-size: 14px;
text-align: center;
text-transform: uppercase;
diff --git a/packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less b/packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less
index d77e10f5011..cac3ad22cd8 100755
--- a/packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less
+++ b/packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less
@@ -3,7 +3,9 @@
*/
@primary-action-color: @action-buttons-color;
-@secondary-action-color: @primary-font-color;
+@secondary-action-color: lighten(@primary-action-color, 25%);
+@default-action-color: darken(@secondary-background-color, 15%);
+@default-action-contrast: contrast(@default-action-color, #444);
@success-color: rgba(53, 172, 25, 1.0);
@error-color: rgba(188, 32, 49, 1.0);
@pending-color: #fcb316;
@@ -229,7 +231,7 @@ label.required:after {
// new layout buttons
.button {
- .buttonColors(@secondary-action-contrast, @secondary-action-color);
+ .buttonColors(@default-action-contrast, @default-action-color);
&.primary {
.buttonColors(@primary-action-contrast, @primary-action-color);
}
diff --git a/packages/rocketchat-theme/client/minicolors/jquery.minicolors.js b/packages/rocketchat-theme/client/minicolors/jquery.minicolors.js
index 1a68fe1151b..671eb78e2e8 100644
--- a/packages/rocketchat-theme/client/minicolors/jquery.minicolors.js
+++ b/packages/rocketchat-theme/client/minicolors/jquery.minicolors.js
@@ -10,16 +10,8 @@
*/
(function (factory) {
/* jshint ignore:start */
- if (typeof define === 'function' && define.amd) {
- // AMD. Register as an anonymous module.
- define(['jquery'], factory);
- } else if (typeof exports === 'object') {
- // Node/CommonJS
- module.exports = factory(require('jquery'));
- } else {
// Browser globals
- factory(jQuery);
- }
+ factory(jQuery);
/* jshint ignore:end */
}(function ($) {
diff --git a/packages/rocketchat-theme/package.js b/packages/rocketchat-theme/package.js
index b1df8c6af0d..594e04f00f3 100644
--- a/packages/rocketchat-theme/package.js
+++ b/packages/rocketchat-theme/package.js
@@ -10,6 +10,7 @@ Package.onUse(function(api) {
api.use('rocketchat:logger');
api.use('rocketchat:assets');
api.use('coffeescript');
+ api.use('ecmascript');
api.use('underscore');
api.use('webapp');
api.use('webapp-hashing');
diff --git a/packages/rocketchat-theme/server/server.coffee b/packages/rocketchat-theme/server/server.coffee
index 73b334ec3fe..062339faf80 100644
--- a/packages/rocketchat-theme/server/server.coffee
+++ b/packages/rocketchat-theme/server/server.coffee
@@ -8,17 +8,23 @@ logger = new Logger 'rocketchat:theme',
type: 'info'
+WebApp.rawConnectHandlers.use (req, res, next) ->
+ path = req.url.split("?")[0]
+ if (path == '/__cordova/theme.css' || path == '/theme.css')
+ css = RocketChat.theme.getCss()
+ hash = crypto.createHash('sha1').update(css).digest('hex')
+ res.setHeader('Content-Type', 'text/css; charset=UTF-8')
+ res.setHeader('ETag', '"' + hash + '"')
+ res.write(css)
+ res.end()
+ else
+ next()
+
calculateClientHash = WebAppHashing.calculateClientHash
WebAppHashing.calculateClientHash = (manifest, includeFilter, runtimeConfigOverride) ->
css = RocketChat.theme.getCss()
if css.trim() isnt ''
- WebAppInternals.staticFiles['/__cordova/theme.css'] = WebAppInternals.staticFiles['/theme.css'] =
- cacheable: true
- sourceMapUrl: undefined
- type: 'css'
- content: css
-
hash = crypto.createHash('sha1').update(css).digest('hex')
themeManifestItem = _.find manifest, (item) -> return item.path is 'app/theme.css'
diff --git a/packages/rocketchat-tutum/package.js b/packages/rocketchat-tutum/package.js
index 0e6c0b825ee..02baa7d5543 100644
--- a/packages/rocketchat-tutum/package.js
+++ b/packages/rocketchat-tutum/package.js
@@ -5,6 +5,7 @@ Package.describe({
});
Package.onUse(function(api) {
+ api.use('ecmascript');
api.use('coffeescript');
api.use('rocketchat:lib');
diff --git a/packages/rocketchat-ui-account/account/accountPreferences.coffee b/packages/rocketchat-ui-account/account/accountPreferences.coffee
index 9b1ff3c984e..5f245ac5496 100644
--- a/packages/rocketchat-ui-account/account/accountPreferences.coffee
+++ b/packages/rocketchat-ui-account/account/accountPreferences.coffee
@@ -1,3 +1,4 @@
+import toastr from 'toastr'
Template.accountPreferences.helpers
languages: ->
languages = TAPi18n.getLanguages()
diff --git a/packages/rocketchat-ui-account/account/accountProfile.coffee b/packages/rocketchat-ui-account/account/accountProfile.coffee
index be1190b8db7..3f191d2b811 100644
--- a/packages/rocketchat-ui-account/account/accountProfile.coffee
+++ b/packages/rocketchat-ui-account/account/accountProfile.coffee
@@ -1,3 +1,4 @@
+import toastr from 'toastr'
Template.accountProfile.helpers
allowDeleteOwnAccount: ->
return RocketChat.settings.get('Accounts_AllowDeleteOwnAccount')
diff --git a/packages/rocketchat-ui-account/account/avatar/prompt.coffee b/packages/rocketchat-ui-account/account/avatar/prompt.coffee
index 2f7c1d158fe..50f3d8838fd 100644
--- a/packages/rocketchat-ui-account/account/avatar/prompt.coffee
+++ b/packages/rocketchat-ui-account/account/avatar/prompt.coffee
@@ -1,3 +1,4 @@
+import toastr from 'toastr'
Template.avatarPrompt.onCreated ->
self = this
self.suggestions = new ReactiveVar
diff --git a/packages/rocketchat-ui-admin/admin/admin.coffee b/packages/rocketchat-ui-admin/admin/admin.coffee
index 78a725e2295..9bd63b67ab2 100644
--- a/packages/rocketchat-ui-admin/admin/admin.coffee
+++ b/packages/rocketchat-ui-admin/admin/admin.coffee
@@ -1,3 +1,4 @@
+import toastr from 'toastr'
TempSettings = new Meteor.Collection null
Template.admin.onCreated ->
if not RocketChat.settings.cachedCollectionPrivate?
diff --git a/packages/rocketchat-ui-admin/admin/adminInfo.coffee b/packages/rocketchat-ui-admin/admin/adminInfo.coffee
index 08d2e3a717c..51cea015114 100644
--- a/packages/rocketchat-ui-admin/admin/adminInfo.coffee
+++ b/packages/rocketchat-ui-admin/admin/adminInfo.coffee
@@ -1,3 +1,5 @@
+import moment from 'moment'
+
Template.adminInfo.helpers
isReady: ->
return Template.instance().ready.get()
diff --git a/packages/rocketchat-ui-admin/admin/rooms/adminRoomInfo.coffee b/packages/rocketchat-ui-admin/admin/rooms/adminRoomInfo.coffee
index 063582c8e77..d3c34704c9b 100644
--- a/packages/rocketchat-ui-admin/admin/rooms/adminRoomInfo.coffee
+++ b/packages/rocketchat-ui-admin/admin/rooms/adminRoomInfo.coffee
@@ -1,3 +1,4 @@
+import toastr from 'toastr'
Template.adminRoomInfo.helpers
selectedRoom: ->
return Session.get 'adminRoomsSelected'
@@ -36,7 +37,7 @@ Template.adminRoomInfo.helpers
room = ChatRoom.findOne(@rid, { fields: { ro: 1 }})
return room?.ro
readOnlyDescription: ->
- room = ChatRoom.findOne(@rid, { fields: { ro: 1 }})
+ room = ChatRoom.findOne(@rid, { fields: { ro: 1 }})
readOnly = room?.ro
if readOnly is true
return t('True')
diff --git a/packages/rocketchat-ui-admin/admin/rooms/channelSettingsDefault.js b/packages/rocketchat-ui-admin/admin/rooms/channelSettingsDefault.js
index 5bd6491425b..b17d5e1aa27 100644
--- a/packages/rocketchat-ui-admin/admin/rooms/channelSettingsDefault.js
+++ b/packages/rocketchat-ui-admin/admin/rooms/channelSettingsDefault.js
@@ -1,3 +1,4 @@
+import toastr from 'toastr';
/* globals ChatRoom */
Template.channelSettingsDefault.helpers({
diff --git a/packages/rocketchat-ui-admin/admin/users/adminInviteUser.coffee b/packages/rocketchat-ui-admin/admin/users/adminInviteUser.coffee
index a41f0e6153b..6c469259d44 100644
--- a/packages/rocketchat-ui-admin/admin/users/adminInviteUser.coffee
+++ b/packages/rocketchat-ui-admin/admin/users/adminInviteUser.coffee
@@ -1,3 +1,4 @@
+import toastr from 'toastr'
Template.adminInviteUser.helpers
isAdmin: ->
return RocketChat.authz.hasRole(Meteor.userId(), 'admin')
diff --git a/packages/rocketchat-ui-flextab/flex-tab/tabs/userEdit.coffee b/packages/rocketchat-ui-flextab/flex-tab/tabs/userEdit.coffee
index 80a70ef3481..0da7b00fe74 100644
--- a/packages/rocketchat-ui-flextab/flex-tab/tabs/userEdit.coffee
+++ b/packages/rocketchat-ui-flextab/flex-tab/tabs/userEdit.coffee
@@ -1,3 +1,4 @@
+import toastr from 'toastr'
Template.userEdit.helpers
canEditOrAdd: ->
return (Template.instance().user and RocketChat.authz.hasAtLeastOnePermission('edit-other-user-info')) or (not Template.instance().user and RocketChat.authz.hasAtLeastOnePermission('create-user'))
diff --git a/packages/rocketchat-ui-flextab/flex-tab/tabs/userEdit.html b/packages/rocketchat-ui-flextab/flex-tab/tabs/userEdit.html
index 8aeb4fab0dd..7fd15324403 100644
--- a/packages/rocketchat-ui-flextab/flex-tab/tabs/userEdit.html
+++ b/packages/rocketchat-ui-flextab/flex-tab/tabs/userEdit.html
@@ -31,7 +31,7 @@
-
+
{{/if}}
+
{{#if showSandstorm}}
diff --git a/packages/rocketchat-ui/lib/accounts.coffee b/packages/rocketchat-ui/lib/accounts.coffee
index 63fec76c4a0..3ebeb179ac4 100644
--- a/packages/rocketchat-ui/lib/accounts.coffee
+++ b/packages/rocketchat-ui/lib/accounts.coffee
@@ -1,5 +1,6 @@
+import toastr from 'toastr'
Accounts.onEmailVerificationLink (token, done) ->
Accounts.verifyEmail token, (error) ->
if not error?
toastr.success t('Email_verified')
- done()
\ No newline at end of file
+ done()
diff --git a/packages/rocketchat-ui/lib/chatMessages.coffee b/packages/rocketchat-ui/lib/chatMessages.coffee
index 81747794d0f..f944ac27d0e 100644
--- a/packages/rocketchat-ui/lib/chatMessages.coffee
+++ b/packages/rocketchat-ui/lib/chatMessages.coffee
@@ -1,3 +1,6 @@
+import moment from 'moment'
+import toastr from 'toastr'
+
class @ChatMessages
init: (node) ->
this.editing = {}
diff --git a/packages/rocketchat-ui/views/app/privateHistory.coffee b/packages/rocketchat-ui/views/app/privateHistory.coffee
index b59fdc7c23e..55fcc377ad5 100644
--- a/packages/rocketchat-ui/views/app/privateHistory.coffee
+++ b/packages/rocketchat-ui/views/app/privateHistory.coffee
@@ -1,3 +1,5 @@
+import moment from 'moment'
+
Template.privateHistory.helpers
history: ->
items = ChatSubscription.find { name: { $regex: Session.get('historyFilter'), $options: 'i' }, t: { $in: ['d', 'c', 'p'] }, archived: { $ne: true } }, {'sort': { 'ts': -1 } }
diff --git a/packages/rocketchat-ui/views/app/room.coffee b/packages/rocketchat-ui/views/app/room.coffee
index 035afb4bcb7..ebe6aaf589a 100644
--- a/packages/rocketchat-ui/views/app/room.coffee
+++ b/packages/rocketchat-ui/views/app/room.coffee
@@ -1,3 +1,5 @@
+import moment from 'moment'
+
socialSharing = (options = {}) ->
window.plugins.socialsharing.share(options.message, options.subject, options.file, options.link)
diff --git a/packages/rocketchat-videobridge/client/actionLink.js b/packages/rocketchat-videobridge/client/actionLink.js
index bff8c6f9bb4..92cca148d87 100644
--- a/packages/rocketchat-videobridge/client/actionLink.js
+++ b/packages/rocketchat-videobridge/client/actionLink.js
@@ -1,3 +1,4 @@
+import toastr from 'toastr';
RocketChat.actionLinks.register('joinJitsiCall', function(/*message, params*/) {
if (Session.get('openedRoom')) {
let rid = Session.get('openedRoom');
diff --git a/packages/rocketchat-webrtc/package.js b/packages/rocketchat-webrtc/package.js
index ae99d467b3a..53d56d1cde7 100644
--- a/packages/rocketchat-webrtc/package.js
+++ b/packages/rocketchat-webrtc/package.js
@@ -8,6 +8,7 @@ Package.describe({
Package.onUse(function(api) {
api.use('rocketchat:lib');
api.use('coffeescript');
+ api.use('ecmascript');
api.use('templating', 'client');
diff --git a/packages/rocketchat-wordpress/package.js b/packages/rocketchat-wordpress/package.js
index 1761a955cd0..6b389d41900 100644
--- a/packages/rocketchat-wordpress/package.js
+++ b/packages/rocketchat-wordpress/package.js
@@ -5,6 +5,7 @@ Package.describe({
});
Package.onUse(function(api) {
+ api.use('ecmascript');
api.use('coffeescript');
api.use('rocketchat:lib');
api.use('rocketchat:custom-oauth');
diff --git a/server/methods/OEmbedCacheCleanup.js b/server/methods/OEmbedCacheCleanup.js
new file mode 100644
index 00000000000..82d0fb68cf0
--- /dev/null
+++ b/server/methods/OEmbedCacheCleanup.js
@@ -0,0 +1,17 @@
+Meteor.methods({
+ OEmbedCacheCleanup: function() {
+ if (Meteor.userId() && !RocketChat.authz.hasRole(Meteor.userId(), 'admin')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', {
+ method: 'OEmbedCacheCleanup'
+ });
+ }
+
+ var date = new Date();
+ var expirationDays = RocketChat.settings.get('API_EmbedCacheExpirationDays');
+ date.setDate(date.getDate() - expirationDays);
+ RocketChat.models.OEmbedCache.removeAfterDate(date);
+ return {
+ message: 'cache_cleared'
+ };
+ }
+});
\ No newline at end of file
diff --git a/server/startup/cron.coffee b/server/startup/cron.coffee
index dee6a59e444..41abfda37be 100644
--- a/server/startup/cron.coffee
+++ b/server/startup/cron.coffee
@@ -17,6 +17,9 @@ generateStatistics = ->
logger.warn('Failed to send usage report')
return
+cleanupOEmbedCache = ->
+ Meteor.call('OEmbedCacheCleanup')
+
Meteor.startup ->
Meteor.defer ->
generateStatistics()
@@ -28,4 +31,11 @@ Meteor.startup ->
return parser.cron new Date().getMinutes() + ' * * * *'
job: generateStatistics
+ SyncedCron.add
+ name: 'Cleanup OEmbed cache'
+ schedule: (parser) ->
+ now = new Date()
+ return parser.cron now.getMinutes() + ' ' + now.getHours() + ' * * *'
+ job: cleanupOEmbedCache
+
SyncedCron.start()