Merge pull request #6 from mrsimpson/assistify-knowledge-connector

Assistify knowledge connector

.docker/develop/Dockerfile

@@ -4,24 +4,27 @@ ENV RC_VERSION develop
 
 MAINTAINER buildmaster@rocket.chat
 
-VOLUME /app/uploads
-
 RUN set -x \
  && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/download" -o rocket.chat.tgz \
  && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \
+ && mkdir /app \
  && gpg --verify rocket.chat.tgz.asc \
  && tar -zxf rocket.chat.tgz -C /app \
  && rm rocket.chat.tgz rocket.chat.tgz.asc \
  && cd /app/bundle/programs/server \
  && npm install \
- && npm cache clear
+ && npm cache clear \
+ && chown rocketchat:rocketchat /app -R
 
 USER rocketchat
 
+VOLUME /app/uploads
+
 WORKDIR /app/bundle
 
 # needs a mongoinstance - defaults to container linking with alias 'mongo'
 ENV MONGO_URL=mongodb://mongo:27017/rocketchat \
+	MONGO_OPLOG_URL=mongodb://mongo:27017/local \
     HOME=/tmp \
     PORT=3000 \
     ROOT_URL=http://localhost:3000 \

.docker/latest/Dockerfile

@@ -4,20 +4,22 @@ ENV RC_VERSION latest
 
 MAINTAINER buildmaster@rocket.chat
 
-VOLUME /app/uploads
-
 RUN set -x \
  && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/download" -o rocket.chat.tgz \
  && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \
+ && mkdir /app \
  && gpg --verify rocket.chat.tgz.asc \
  && tar -zxf rocket.chat.tgz -C /app \
  && rm rocket.chat.tgz rocket.chat.tgz.asc \
  && cd /app/bundle/programs/server \
  && npm install \
- && npm cache clear
+ && npm cache clear \
+ && chown rocketchat:rocketchat /app -R
 
 USER rocketchat
 
+VOLUME /app/uploads
+
 WORKDIR /app/bundle
 
 # needs a mongoinstance - defaults to container linking with alias 'mongo'

.meteor/packages

@@ -4,39 +4,39 @@
 # but you can also edit it by hand.
 
 rocketchat:cors
-accounts-facebook
-accounts-github
-accounts-google
-accounts-meteor-developer
-accounts-password
-accounts-twitter
+accounts-facebook@1.0.11
+accounts-github@1.0.11
+accounts-google@1.0.11
+accounts-meteor-developer@1.0.11
+accounts-password@1.3.3
+accounts-twitter@1.1.12
 blaze-html-templates
-check
-coffeescript
-ddp-rate-limiter
-ecmascript
-ejson
-email
-fastclick
-http
-jquery
-less
-logging
-meteor-base
-mobile-experience
-mongo
-random
-rate-limit
-reactive-dict
-reactive-var
-reload
-service-configuration
-session
-shell-server
+check@1.2.4
+coffeescript@1.11.1_4
+ddp-rate-limiter@1.0.6
+ecmascript@0.6.1
+ejson@1.0.13
+email@1.1.18
+fastclick@1.0.13
+http@1.2.10
+jquery@1.11.10
+less@2.7.8
+logging@1.1.16
+meteor-base@1.0.4
+mobile-experience@1.0.4
+mongo@1.1.14
+random@1.0.10
+rate-limit@1.0.6
+reactive-dict@1.1.8
+reactive-var@1.0.11
+reload@1.1.11
+service-configuration@1.0.11
+session@1.1.7
+shell-server@0.2.1
 spacebars
-standard-minifier-css
-standard-minifier-js
-tracker
+standard-minifier-css@1.3.2
+standard-minifier-js@1.2.1
+tracker@1.1.1
 
 rocketchat:action-links
 rocketchat:api
@@ -50,6 +50,8 @@ rocketchat:channel-settings-mail-messages
 rocketchat:colors
 rocketchat:crowd
 rocketchat:custom-oauth
+rocketchat:custom-sounds
+rocketchat:dolphin
 rocketchat:emoji
 rocketchat:emoji-custom
 rocketchat:emoji-emojione
@@ -164,3 +166,6 @@ underscorestring:underscore.string
 yasaricli:slugify
 yasinuslu:blaze-meta
 deepwell:bootstrap-datepicker2
+
+dbs:common
+dbs:ai

.meteor/release

@@ -1 +1 @@
-METEOR@1.4.2.3
+METEOR@1.4.2.6

.meteor/versions

@@ -24,6 +24,8 @@ cfs:http-methods@0.0.32
 check@1.2.4
 coffeescript@1.11.1_4
 dandv:caret-position@2.1.1
+dbs:ai@0.0.1
+dbs:common@0.0.1
 ddp@1.2.5
 ddp-client@1.3.2
 ddp-common@1.2.8
@@ -50,7 +52,7 @@ html-tools@1.0.11
 htmljs@1.0.11
 http@1.2.10
 id-map@1.0.9
-jalik:ufs@0.7.1_1
+jalik:ufs@0.7.3
 jalik:ufs-gridfs@0.1.4
 jalik:ufs-local@0.2.8
 jparker:crypto-core@0.1.0
@@ -67,7 +69,7 @@ konecty:multiple-instances-status@1.0.6_1
 konecty:nrr@2.0.2
 konecty:user-presence@1.2.9
 launch-screen@1.1.0
-less@2.7.8
+less@2.7.9
 livedata@1.0.18
 localstorage@1.0.12
 logging@1.1.16
@@ -78,8 +80,8 @@ meteor-base@1.0.4
 meteor-developer@1.1.10
 meteorhacks:inject-initial@1.0.4
 meteorspark:util@0.2.0
-minifier-css@1.2.15
-minifier-js@1.2.15
+minifier-css@1.2.16
+minifier-js@1.2.17
 minimongo@1.0.19
 mizzao:autocomplete@0.5.1
 mizzao:timesync@0.3.4
@@ -132,6 +134,8 @@ rocketchat:colors@0.0.1
 rocketchat:cors@0.0.1
 rocketchat:crowd@1.0.0
 rocketchat:custom-oauth@1.0.0
+rocketchat:custom-sounds@1.0.0
+rocketchat:dolphin@0.0.2
 rocketchat:emoji@1.0.0
 rocketchat:emoji-custom@1.0.0
 rocketchat:emoji-emojione@0.0.1
@@ -224,8 +228,8 @@ smoral:sweetalert@1.1.1
 spacebars@1.0.13
 spacebars-compiler@1.1.0
 srp@1.0.10
-standard-minifier-css@1.3.2
-standard-minifier-js@1.2.1
+standard-minifier-css@1.3.3
+standard-minifier-js@1.2.2
 steffo:meteor-accounts-saml@0.0.1
 tap:i18n@1.8.2
 templating@1.3.0

.sandstorm/sandstorm-pkgdef.capnp

@@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appTitle = (defaultText = "Rocket.Chat"),
 
-		appVersion = 56,  # Increment this for every release.
+		appVersion = 57,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.51.0"),
+		appMarketingVersion = (defaultText = "0.52.0"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 

.snapcraft/edge/snapcraft.yaml

@@ -7,7 +7,7 @@
 # 5.  `snapcraft snap`
 
 name: rocketchat-server
-version: 0.51.0
+version: 0.52.0
 summary: Rocket.Chat server
 description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
 confinement: strict
@@ -32,7 +32,7 @@ apps:
 parts:
     node:
         plugin: nodejs
-        node-engine: 4.7.1
+        node-engine: 4.7.3
         node-packages:
             - promise
             - fibers

.snapcraft/stable/snapcraft.yaml

@@ -7,7 +7,7 @@
 # 5.  `snapcraft snap`
 
 name: rocketchat-server
-version: 0.51.0
+version: 0.52.0
 summary: Rocket.Chat server
 description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
 confinement: strict
@@ -32,7 +32,7 @@ apps:
 parts:
     node:
         plugin: nodejs
-        node-engine: 4.7.1
+        node-engine: 4.7.3
         node-packages:
             - promise
             - fibers

.travis.yml

@@ -47,25 +47,25 @@ before_script:
   echo "  replSetName: \"rs0\"" | sudo tee -a /etc/mongod.conf
 - sudo service mongod restart
 - mkdir /tmp/build
-- travis_retry npm install
+- travis_retry meteor npm install
 - |-
   mongo --eval 'rs.initiate({_id:"rs0", members: [{"_id":1, "host":"localhost:27017"}]})'
-- npm run lint
-- npm run stylelint
+- meteor npm run lint
+- meteor npm run stylelint
 - travis_retry meteor build --headless /tmp/build
 - mkdir /tmp/build-test
 - tar -xf /tmp/build/Rocket.Chat.tar.gz -C /tmp/build-test/
 - cd /tmp/build-test/bundle/programs/server
-- npm install -g node-gyp node-pre-gyp
-- npm install
+- meteor npm install -g node-gyp node-pre-gyp
+- meteor npm install
 - cd -
 - mongo --eval 'rs.status()'
 - mongo meteor --eval 'db.getCollectionNames()'
 script:
-- travis_retry npm test
+- travis_retry meteor npm test
 - mongo meteor --eval 'db.dropDatabase()'
 - unset MONGO_OPLOG_URL
-- travis_retry npm test
+- travis_retry meteor npm test
 before_deploy:
 - source ".travis/setartname.sh"
 - source ".travis/setdeploydir.sh"

HISTORY.md

@@ -1,5 +1,37 @@
 # History
 
+## 0.52.0 - 2017-Fev-14
+
+### Meteor update to 1.4.2.6
+
+- Add admin section for managing sounds
+- Add appName as topic to push gateway
+- Add audio notification choices to subscriptions
+- Add Boonex Dolphin Oauth
+- Add date for attachments
+- Add detection mime-types for upload files
+- Add MONGO_OPLOG_URL to Dockerfile
+- Add open sidenav on cmd + p
+- Add REST API method to list online users in a room
+- Add user preferences for default new message sound
+- Allow empty description for roles
+- Allow pass inline image (base64) on attachments
+- Change npm module from mime-types to mime-type and mime-db
+- Change room "Code" label to "Password"
+- Fix admin info page selectable again
+- Fix clear toolbar search input on enter
+- Fix error when activating new users
+- Fix getLoggedInUser to get user by token
+- Fix message action menu on cordova
+- Fix oAuth buttons
+- Fix reset to default
+- Fix setting empty custom css
+- Fix sidenav logo position
+- Get user by token AND user id, make /api/info match expected properties
+- Remove build property from default info API; update tests to reflect removal
+- Remove the rate limiter for testing enviroment
+- Return user’s _id and username for `groups/channels.online`
+
 ## 0.51.0 - 2017-Fev-07
 
 ### Converted several Coffee Script files to JS

client/notifications/notification.js

@@ -27,12 +27,12 @@ Meteor.startup(function() {
 				if (RocketChat.Layout.isEmbedded()) {
 					if (!hasFocus && messageIsInOpenedRoom) {
 						// Play a sound and show a notification.
-						KonchatNotification.newMessage();
+						KonchatNotification.newMessage(notification.payload.rid);
 						KonchatNotification.showDesktop(notification);
 					}
 				} else if (!(hasFocus && messageIsInOpenedRoom)) {
 					// Play a sound and show a notification.
-					KonchatNotification.newMessage();
+					KonchatNotification.newMessage(notification.payload.rid);
 					KonchatNotification.showDesktop(notification);
 				}
 			});