{{_ "Sorry_page_you_requested_does_not_exists_or_was_deleted"}}
+ diff --git a/client/routes/router.js b/client/routes/router.js index 1167e8384d88c..2f0ad84ee1f17 100644 --- a/client/routes/router.js +++ b/client/routes/router.js @@ -69,6 +69,17 @@ FlowRouter.route('/home', { } }); +FlowRouter.route('/directory', { + name: 'directory', + + action() { + BlazeLayout.render('main', {center: 'directory'}); + }, + triggersExit: [function() { + $('.main-content').addClass('rc-old'); + }] +}); + FlowRouter.route('/account/:group?', { name: 'account', @@ -84,19 +95,6 @@ FlowRouter.route('/account/:group?', { }] }); -FlowRouter.route('/history/private', { - name: 'privateHistory', - - subscriptions(/*params, queryParams*/) { - this.register('privateHistory', Meteor.subscribe('privateHistory')); - }, - - action() { - Session.setDefault('historyFilter', ''); - BlazeLayout.render('main', {center: 'privateHistory'}); - } -}); - FlowRouter.route('/terms-of-service', { name: 'terms-of-service', @@ -150,3 +148,26 @@ FlowRouter.route('/register/:hash', { // BlazeLayout.render 'logoLayout', { render: 'invalidSecretURL' } } }); + +FlowRouter.route('/setup-wizard', { + name: 'setup-wizard', + + action() { + BlazeLayout.render('setupWizard'); + } +}); + +FlowRouter.route('/setup-wizard/final', { + name: 'setup-wizard-final', + + action() { + BlazeLayout.render('setupWizardFinal'); + } +}); + +FlowRouter.notFound = { + action() { + BlazeLayout.render('pageNotFound'); + } +}; + diff --git a/client/startup/startup.js b/client/startup/startup.js index 8279db3373a5e..4a92434be37c8 100644 --- a/client/startup/startup.js +++ b/client/startup/startup.js @@ -91,17 +91,17 @@ Meteor.startup(function() { } }; - const defaultIdleTimeLimit = 300000; + const defaultIdleTimeLimit = 300; Meteor.subscribe('userData', function() { const user = Meteor.user(); const userLanguage = user && user.language ? user.language : window.defaultUserLanguage(); if (!userHasPreferences(user)) { - UserPresence.awayTime = defaultIdleTimeLimit; + UserPresence.awayTime = defaultIdleTimeLimit * 1000; UserPresence.start(); } else { - UserPresence.awayTime = user.settings.preferences.idleTimeLimit || defaultIdleTimeLimit; + UserPresence.awayTime = (user.settings.preferences.idleTimeLimit || defaultIdleTimeLimit) * 1000; if (user.settings.preferences.hasOwnProperty('enableAutoAway')) { user.settings.preferences.enableAutoAway && UserPresence.start(); diff --git a/client/startup/userSetUtcOffset.js b/client/startup/userSetUtcOffset.js index d41f644fe67fb..14542fede1c22 100644 --- a/client/startup/userSetUtcOffset.js +++ b/client/startup/userSetUtcOffset.js @@ -2,7 +2,7 @@ import moment from 'moment'; Meteor.startup(function() { Tracker.autorun(function() { - const user = Meteor.user(); + const user = RocketChat.models.Users.findOne({_id: Meteor.userId()}, {fields: {statusConnection: 1, utcOffset: 1}}); if (user && user.statusConnection === 'online') { const utcOffset = moment().utcOffset() / 60; if (user.utcOffset !== utcOffset) { diff --git a/docker-compose.yml b/docker-compose.yml index d1cfa596080c4..430214bc32633 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,7 +28,7 @@ services: volumes: - ./data/db:/data/db #- ./data/dump:/dump - command: mongod --smallfiles --oplogSize 128 --replSet rs0 + command: mongod --smallfiles --oplogSize 128 --replSet rs0 --storageEngine=mmapv1 labels: - "traefik.enable=false" diff --git a/example-build-run.sh b/example-build-run.sh index fc57c8632d6ab..8e5f66f1c0202 100755 --- a/example-build-run.sh +++ b/example-build-run.sh @@ -10,6 +10,7 @@ DEPLOY_DIR=/var/www/rocket.chat ### BUILD meteor npm install +meteor npm run postinstall # on the very first build, meteor build command should fail due to a bug on emojione package (related to phantomjs installation) # the command below forces the error to happen before build command (not needed on subsequent builds) diff --git a/imports/message-read-receipt/client/index.js b/imports/message-read-receipt/client/index.js new file mode 100644 index 0000000000000..f8ffac5fbb313 --- /dev/null +++ b/imports/message-read-receipt/client/index.js @@ -0,0 +1,4 @@ +import './main'; +import './message'; +import './readReceipts'; +import './room'; diff --git a/imports/message-read-receipt/client/main.js b/imports/message-read-receipt/client/main.js new file mode 100644 index 0000000000000..c2711f6663dd7 --- /dev/null +++ b/imports/message-read-receipt/client/main.js @@ -0,0 +1,7 @@ +Template.main.helpers({ + readReceiptsEnabled() { + if (RocketChat.settings.get('Message_Read_Receipt_Store_Users')) { + return 'read-receipts-enabled'; + } + } +}); diff --git a/imports/message-read-receipt/client/message.js b/imports/message-read-receipt/client/message.js new file mode 100644 index 0000000000000..9a89d937b6c49 --- /dev/null +++ b/imports/message-read-receipt/client/message.js @@ -0,0 +1,13 @@ +import { Template } from 'meteor/templating'; + +Template.message.helpers({ + readReceipt() { + if (!RocketChat.settings.get('Message_Read_Receipt_Enabled')) { + return; + } + + return { + readByEveryone: (!this.unread && 'read') || 'color-component-color' + }; + } +}); diff --git a/imports/message-read-receipt/client/readReceipts.css b/imports/message-read-receipt/client/readReceipts.css new file mode 100644 index 0000000000000..22788f6916652 --- /dev/null +++ b/imports/message-read-receipt/client/readReceipts.css @@ -0,0 +1,51 @@ +.read-receipt { + position: absolute; + top: 2px; + right: 0.5rem; +} + +.read-receipt .rc-icon { + height: 0.8em; + width: 0.8em; +} + +.message:hover .read-receipt, .message.active .read-receipt { + display: none; +} + +.read-receipts-enabled .read-receipt { + cursor: pointer; +} + +.read-receipt.read { + color: #1d74f5; + color: var(--rc-color-button-primary); + font-style: normal; +} + +.message.temp .read-receipt { + opacity: 0.4; +} + +.read-receipts__user { + display: flex; + padding: 8px 8px; + align-items: center; +} + +.read-receipts__name { + flex: 1 1 auto; + margin: 0 10px; + font-size: 16px; +} + +.read-receipts__time { + font-size: 80%; +} + +.read-receipts__user > .avatar { + width: 36px; + width: var(--sidebar-account-thumb-size); + height: 36px; + height: var(--sidebar-account-thumb-size); +} diff --git a/imports/message-read-receipt/client/readReceipts.html b/imports/message-read-receipt/client/readReceipts.html new file mode 100644 index 0000000000000..3a81ee9cdcdfd --- /dev/null +++ b/imports/message-read-receipt/client/readReceipts.html @@ -0,0 +1,16 @@ + + {{#if isLoading}} + {{> loading class="loading-animation--primary"}} + {{else}} +{{_ "Read_by"}}:
+{{_ "You_are_not_authorized_to_view_this_page"}}
+ {{else}} +{{{_ "Chatpal_Get_more_information_about_chatpal_on_our_website"}}}
+ + {{#if apiKey}} +Please copy the key and insert it in the key field of the Chatpal Provider in the Search Admin Page.
++ {{_ "Chatpal_Welcome"}} +
+ {{/unless}} + {{#if $eq resultType "All"}} + {{#if result.user.docs}} +{{{ jsonStringify entry.args }}}Sadly, an error has occured while loading this page.
+Sadly, an error has occured while loading this page.
+| {{_ "Name"}} | +{{_ "Version"}} | +{{_ "Status"}} | ++ |
|
+
+
+
+
+
+ {{name}}
+
+ {{#if description}}
+ {{description}}
+ {{/if}}
+
+ |
+ {{version}} | ++ {{parseStatus status}} + | ++ + | +
| + {{_ "There_are_no_applications_installed"}} + | +
{{{_ provider.description}}}
+
+
+ {{_ "Setup_Wizard"}}
+ {{_ "Setup_Wizard_Info"}}
+To receive free Rocket.Chat supplied features you need to register your server.
+ +