diff --git a/.circleci/config.yml b/.circleci/config.yml index ce37777d9418..72097f6d8d35 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -287,7 +287,6 @@ jobs: source .circleci/setdeploydir.sh bash .circleci/setupsig.sh bash .circleci/namefiles.sh - # echo ".circleci/sandstorm.sh" aws s3 cp $ROCKET_DEPLOY_DIR/ s3://download.rocket.chat/build/ --recursive diff --git a/.meteor/packages b/.meteor/packages index 0c4ee6e70a95..6e985dfac1d2 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -59,7 +59,6 @@ jparker:gravatar kadira:blaze-layout kadira:flow-router keepnox:perfect-scrollbar -kenton:accounts-sandstorm mizzao:autocomplete mizzao:timesync mrt:reactive-store @@ -101,4 +100,4 @@ templating webapp webapp-hashing rocketchat:oauth2-server -rocketchat:i18n \ No newline at end of file +rocketchat:i18n diff --git a/.meteor/versions b/.meteor/versions index a529c96306e4..89ee8528ed70 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -67,7 +67,6 @@ juliancwirko:postcss@2.0.3 kadira:blaze-layout@2.3.0 kadira:flow-router@2.12.1 keepnox:perfect-scrollbar@0.6.8 -kenton:accounts-sandstorm@0.7.0 konecty:change-case@2.3.0 konecty:delayed-task@1.0.0 konecty:mongo-counter@0.0.5_3 diff --git a/.sandstorm/.gitignore b/.sandstorm/.gitignore deleted file mode 100644 index 8000dd9db47c..000000000000 --- a/.sandstorm/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.vagrant diff --git a/.sandstorm/CHANGELOG.md b/.sandstorm/CHANGELOG.md deleted file mode 100644 index 8d14253d53f6..000000000000 --- a/.sandstorm/CHANGELOG.md +++ /dev/null @@ -1 +0,0 @@ -### FIRST Sandstorm VERSION of Rocket.Chat diff --git a/.sandstorm/README.md b/.sandstorm/README.md deleted file mode 100644 index 17e5bc5bc534..000000000000 --- a/.sandstorm/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# Publish commands - -``` -cd Rocket.Chat -vagrant-spk vm up && vagrant-spk dev -^C -vagrant-spk pack ../rocketchat.spk && vagrant-spk publish ../rocketchat.spk && vagrant-spk vm halt -``` - -# Reset commands - -``` -vagrant-spk vm halt && vagrant-spk vm destroy -``` diff --git a/.sandstorm/Vagrantfile b/.sandstorm/Vagrantfile deleted file mode 100644 index c7eee5ae79ea..000000000000 --- a/.sandstorm/Vagrantfile +++ /dev/null @@ -1,104 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -# Guess at a reasonable name for the VM based on the folder vagrant-spk is -# run from. The timestamp is there to avoid conflicts if you have multiple -# folders with the same name. -VM_NAME = File.basename(File.dirname(File.dirname(__FILE__))) + "_sandstorm_#{Time.now.utc.to_i}" - -# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! -VAGRANTFILE_API_VERSION = "2" - -# ugly hack to prevent hashicorp's bitrot. See https://github.com/hashicorp/vagrant/issues/9442 -# this setting is required for pre-2.0 vagrant, but causes an error as of 2.0.3, -# remove entirely when confident nobody uses vagrant 1.x for anything. -unless Vagrant::DEFAULT_SERVER_URL.frozen? - Vagrant::DEFAULT_SERVER_URL.replace('https://vagrantcloud.com') -end - -Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - # Base on the Sandstorm snapshots of the official Debian 9 (stretch) box with vboxsf support. - config.vm.box = "debian/contrib-stretch64" - config.vm.box_version = "9.3.0" - - if Vagrant.has_plugin?("vagrant-vbguest") then - # vagrant-vbguest is a Vagrant plugin that upgrades - # the version of VirtualBox Guest Additions within each - # guest. If you have the vagrant-vbguest plugin, then it - # needs to know how to compile kernel modules, etc., and so - # we give it this hint about operating system type. - config.vm.guest = "debian" - end - - # We forward port 6080, the Sandstorm web port, so that developers can - # visit their sandstorm app from their browser as local.sandstorm.io:6080 - # (aka 127.0.0.1:6080). - config.vm.network :forwarded_port, guest: 6080, host: 6080 - - # Use a shell script to "provision" the box. This installs Sandstorm using - # the bundled installer. - config.vm.provision "shell", inline: "sudo bash /opt/app/.sandstorm/global-setup.sh", keep_color: true - # Then, do stack-specific and app-specific setup. - config.vm.provision "shell", inline: "sudo bash /opt/app/.sandstorm/setup.sh", keep_color: true - - # Shared folders are configured per-provider since vboxsf can't handle >4096 open files, - # NFS requires privilege escalation every time you bring a VM up, - # and 9p is only available on libvirt. - - # Calculate the number of CPUs and the amount of RAM the system has, - # in a platform-dependent way; further logic below. - cpus = nil - total_kB_ram = nil - - host = RbConfig::CONFIG['host_os'] - if host =~ /darwin/ - cpus = `sysctl -n hw.ncpu`.to_i - total_kB_ram = `sysctl -n hw.memsize`.to_i / 1024 - elsif host =~ /linux/ - cpus = `nproc`.to_i - total_kB_ram = `grep MemTotal /proc/meminfo | awk '{print $2}'`.to_i - elsif host =~ /mingw/ - # powershell may not be available on Windows XP and Vista, so wrap this in a rescue block - begin - cpus = `powershell -Command "(Get-WmiObject Win32_Processor -Property NumberOfLogicalProcessors | Select-Object -Property NumberOfLogicalProcessors | Measure-Object NumberOfLogicalProcessors -Sum).Sum"`.to_i - total_kB_ram = `powershell -Command "Get-CimInstance -class cim_physicalmemory | % $_.Capacity}"`.to_i / 1024 - rescue - end - end - # Use the same number of CPUs within Vagrant as the system, with 1 - # as a default. - # - # Use at least 512MB of RAM, and if the system has more than 2GB of - # RAM, use 1/4 of the system RAM. This seems a reasonable compromise - # between having the Vagrant guest operating system not run out of - # RAM entirely (which it basically would if we went much lower than - # 512MB) and also allowing it to use up a healthily large amount of - # RAM so it can run faster on systems that can afford it. - if cpus.nil? or cpus.zero? - cpus = 1 - end - if total_kB_ram.nil? or total_kB_ram < 2048000 - assign_ram_mb = 512 - else - assign_ram_mb = (total_kB_ram / 1024 / 4) - end - # Actually apply these CPU/memory values to the providers. - config.vm.provider :virtualbox do |vb, override| - vb.cpus = cpus - vb.memory = assign_ram_mb - vb.name = VM_NAME - - override.vm.synced_folder "..", "/opt/app" - override.vm.synced_folder ENV["HOME"] + "/.sandstorm", "/host-dot-sandstorm" - override.vm.synced_folder "..", "/vagrant", disabled: true - end - config.vm.provider :libvirt do |libvirt, override| - libvirt.cpus = cpus - libvirt.memory = assign_ram_mb - libvirt.default_prefix = VM_NAME - - override.vm.synced_folder "..", "/opt/app", type: "9p", accessmode: "passthrough" - override.vm.synced_folder ENV["HOME"] + "/.sandstorm", "/host-dot-sandstorm", type: "9p", accessmode: "passthrough" - override.vm.synced_folder "..", "/vagrant", type: "9p", accessmode: "passthrough", disabled: true - end -end diff --git a/.sandstorm/build.sh b/.sandstorm/build.sh deleted file mode 100755 index c8a155a2a351..000000000000 --- a/.sandstorm/build.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -set -x -set -euvo pipefail - -# Make meteor bundle -sudo chown vagrant:vagrant /home/vagrant -R -cd /opt/app -meteor npm install capnp -meteor npm install -meteor build --directory /home/vagrant/ - -export NODE_ENV=production -# Use npm and node from the Meteor dev bundle to install the bundle's dependencies. -TOOL_VERSION=$(meteor show --ejson $(<.meteor/release) | grep '^ *"tool":' | - sed -re 's/^.*"(meteor-tool@[^"]*)".*$/\1/g') -TOOLDIR=$(echo $TOOL_VERSION | tr @ /) -PATH=$HOME/.meteor/packages/$TOOLDIR/mt-os.linux.x86_64/dev_bundle/bin:$PATH -cd /home/vagrant/bundle/programs/server -npm install --production - -# Copy our launcher script into the bundle so the grain can start up. -mkdir -p /home/vagrant/bundle/opt/app/.sandstorm/ -cp /opt/app/.sandstorm/launcher.sh /home/vagrant/bundle/opt/app/.sandstorm/ diff --git a/.sandstorm/description.md b/.sandstorm/description.md deleted file mode 100644 index 7001f7c09a4a..000000000000 --- a/.sandstorm/description.md +++ /dev/null @@ -1 +0,0 @@ -The Complete Open Source Chat Solution. Rocket.Chat is a Web Chat Server, developed in JavaScript. It is a great solution for communities and companies wanting to privately host their own chat service or for developers looking forward to build and evolve their own chat platforms. diff --git a/.sandstorm/global-setup.sh b/.sandstorm/global-setup.sh deleted file mode 100755 index af9d391aaac9..000000000000 --- a/.sandstorm/global-setup.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -set -x -set -euvo pipefail - -echo localhost > /etc/hostname -hostname localhost -# Install curl that is needed below. -apt-get update -apt-get install -y curl -curl https://install.sandstorm.io/ > /host-dot-sandstorm/caches/install.sh -SANDSTORM_CURRENT_VERSION=$(curl -fs "https://install.sandstorm.io/dev?from=0&type=install") -SANDSTORM_PACKAGE="sandstorm-$SANDSTORM_CURRENT_VERSION.tar.xz" -if [[ ! -f /host-dot-sandstorm/caches/$SANDSTORM_PACKAGE ]] ; then - curl --output "/host-dot-sandstorm/caches/$SANDSTORM_PACKAGE.partial" "https://dl.sandstorm.io/$SANDSTORM_PACKAGE" - mv "/host-dot-sandstorm/caches/$SANDSTORM_PACKAGE.partial" "/host-dot-sandstorm/caches/$SANDSTORM_PACKAGE" -fi -bash /host-dot-sandstorm/caches/install.sh -d -e "/host-dot-sandstorm/caches/$SANDSTORM_PACKAGE" -modprobe ip_tables -# Make the vagrant user part of the sandstorm group so that commands like -# `spk dev` work. -usermod -a -G 'sandstorm' 'vagrant' -# Bind to all addresses, so the vagrant port-forward works. -sudo sed --in-place='' --expression='s/^BIND_IP=.*/BIND_IP=0.0.0.0/' /opt/sandstorm/sandstorm.conf -# TODO: update sandstorm installer script to ask about dev accounts, and -# specify a value for this option in the default config? -if ! grep --quiet --no-messages ALLOW_DEV_ACCOUNTS=true /opt/sandstorm/sandstorm.conf ; then - echo "ALLOW_DEV_ACCOUNTS=true" | sudo tee -a /opt/sandstorm/sandstorm.conf - sudo service sandstorm restart -fi -# Enable apt-cacher-ng proxy to make things faster if one appears to be running on the gateway IP -GATEWAY_IP=$(ip route | grep ^default | cut -d ' ' -f 3) -if nc -z "$GATEWAY_IP" 3142 ; then - echo "Acquire::http::Proxy \"http://$GATEWAY_IP:3142\";" > /etc/apt/apt.conf.d/80httpproxy -fi diff --git a/.sandstorm/launcher.sh b/.sandstorm/launcher.sh deleted file mode 100755 index d63b973fdbd2..000000000000 --- a/.sandstorm/launcher.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -x -set -euvo pipefail - -export METEOR_SETTINGS='{"public": {"sandstorm": true}}' -export NODE_ENV=production -export SETTINGS_HIDDEN="Email,Email_Header,Email_Footer,SMTP_Host,SMTP_Port,SMTP_Username,SMTP_Password,From_Email,SMTP_Test_Button,Invitation_Customized,Invitation_Subject,Invitation_HTML,Accounts_Enrollment_Customized,Accounts_Enrollment_Email_Subject,Accounts_Enrollment_Email,Accounts_UserAddedEmail_Customized,Accounts_UserAddedEmailSubject,Accounts_UserAddedEmail,Forgot_Password_Customized,Forgot_Password_Email_Subject,Forgot_Password_Email,Verification_Customized,Verification_Email_Subject,Verification_Email" -exec node /start.js -p 8000 diff --git a/.sandstorm/pgp-keyring b/.sandstorm/pgp-keyring deleted file mode 100644 index ad9fabd67285..000000000000 Binary files a/.sandstorm/pgp-keyring and /dev/null differ diff --git a/.sandstorm/pgp-signature b/.sandstorm/pgp-signature deleted file mode 100644 index 8d8e2bbe62f4..000000000000 Binary files a/.sandstorm/pgp-signature and /dev/null differ diff --git a/.sandstorm/rocket.chat-128.svg b/.sandstorm/rocket.chat-128.svg deleted file mode 100644 index 06b1893ee1e7..000000000000 --- a/.sandstorm/rocket.chat-128.svg +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.sandstorm/rocket.chat-150.svg b/.sandstorm/rocket.chat-150.svg deleted file mode 100644 index c1e19551c19a..000000000000 --- a/.sandstorm/rocket.chat-150.svg +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.sandstorm/rocket.chat-24.svg b/.sandstorm/rocket.chat-24.svg deleted file mode 100644 index 31c373726528..000000000000 --- a/.sandstorm/rocket.chat-24.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp deleted file mode 100644 index f8153e317362..000000000000 --- a/.sandstorm/sandstorm-pkgdef.capnp +++ /dev/null @@ -1,115 +0,0 @@ -@0xbbbe049af795122e; - -using Spk = import "/sandstorm/package.capnp"; -# This imports: -# $SANDSTORM_HOME/latest/usr/include/sandstorm/package.capnp -# Check out that file to see the full, documented package definition format. - -const pkgdef :Spk.PackageDefinition = ( - # The package definition. Note that the spk tool looks specifically for the - # "pkgdef" constant. - - id = "vfnwptfn02ty21w715snyyczw0nqxkv3jvawcah10c6z7hj1hnu0", - # Your app ID is actually its public key. The private key was placed in - # your keyring. All updates must be signed with the same key. - - manifest = ( - # This manifest is included in your app package to tell Sandstorm - # about your app. - - appTitle = (defaultText = "Rocket.Chat"), - - appVersion = 129, # Increment this for every release. - - appMarketingVersion = (defaultText = "1.0.0-develop"), - # Human-readable representation of appVersion. Should match the way you - # identify versions of your app in documentation and marketing. - - actions = [ - # Define your "new document" handlers here. - ( title = (defaultText = "New Rocket.Chat"), - command = .myCommand - # The command to run when starting for the first time. (".myCommand" - # is just a constant defined at the bottom of the file.) - ) - ], - - continueCommand = .myCommand, - # This is the command called to start your app back up after it has been - # shut down for inactivity. Here we're using the same command as for - # starting a new instance, but you could use different commands for each - # case. - - metadata = ( - icons = ( - appGrid = (svg = embed "rocket.chat-128.svg"), - grain = (svg = embed "rocket.chat-24.svg"), - market = (svg = embed "rocket.chat-150.svg"), - ), - - website = "https://rocket.chat", - codeUrl = "https://github.com/RocketChat/Rocket.Chat", - license = (openSource = mit), - categories = [communications, productivity, office, social, developerTools], - - author = ( - contactEmail = "team@rocket.chat", - pgpSignature = embed "pgp-signature", - upstreamAuthor = "Rocket.Chat", - ), - pgpKeyring = embed "pgp-keyring", - - description = (defaultText = embed "description.md"), - shortDescription = (defaultText = "Chat app"), - - screenshots = [ - (width = 1024, height = 696, png = embed "screenshot1.png"), - (width = 1024, height = 696, png = embed "screenshot2.png"), - (width = 1024, height = 696, png = embed "screenshot3.png"), - (width = 1024, height = 696, png = embed "screenshot4.png") - ], - - changeLog = (defaultText = embed "CHANGELOG.md"), - ), - - ), - - sourceMap = ( - # The following directories will be copied into your package. - searchPath = [ - ( sourcePath = "/home/vagrant/bundle" ), - ( sourcePath = "/opt/meteor-spk/meteor-spk.deps" ) - ] - ), - - alwaysInclude = [ "." ], - # This says that we always want to include all files from the source map. - # (An alternative is to automatically detect dependencies by watching what - # the app opens while running in dev mode. To see what that looks like, - # run `spk init` without the -A option.) - - bridgeConfig = ( - viewInfo = ( - eventTypes = [ - (name = "message", verbPhrase = (defaultText = "sent message")), - (name = "privateMessage", verbPhrase = (defaultText = "sent private message"), requiredPermission = (explicitList = void)), - ] - ), - saveIdentityCaps = true, - ), -); - -const myCommand :Spk.Manifest.Command = ( - # Here we define the command used to start up your server. - argv = ["/sandstorm-http-bridge", "8000", "--", "/opt/app/.sandstorm/launcher.sh"], - environ = [ - # Note that this defines the *entire* environment seen by your app. - (key = "PATH", value = "/usr/local/bin:/usr/bin:/bin"), - (key = "SANDSTORM", value = "1"), - (key = "HOME", value = "/var"), - (key = "Statistics_reporting", value = "false"), - (key = "Accounts_AllowUserAvatarChange", value = "false"), - (key = "Accounts_AllowUserProfileChange", value = "false"), - (key = "BABEL_CACHE_DIR", value = "/var/babel_cache") - ] -); diff --git a/.sandstorm/screenshot1.png b/.sandstorm/screenshot1.png deleted file mode 100644 index ec123d99cd03..000000000000 Binary files a/.sandstorm/screenshot1.png and /dev/null differ diff --git a/.sandstorm/screenshot2.png b/.sandstorm/screenshot2.png deleted file mode 100644 index 30713297c2f2..000000000000 Binary files a/.sandstorm/screenshot2.png and /dev/null differ diff --git a/.sandstorm/screenshot3.png b/.sandstorm/screenshot3.png deleted file mode 100644 index d8e88683c4cf..000000000000 Binary files a/.sandstorm/screenshot3.png and /dev/null differ diff --git a/.sandstorm/screenshot4.png b/.sandstorm/screenshot4.png deleted file mode 100644 index 3955cc694a36..000000000000 Binary files a/.sandstorm/screenshot4.png and /dev/null differ diff --git a/.sandstorm/setup.sh b/.sandstorm/setup.sh deleted file mode 100755 index 6882afab185d..000000000000 --- a/.sandstorm/setup.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash -set -x -set -euvo pipefail - -apt-get update -apt-get install build-essential git -y - -cd /opt/ - -NODE_ENV=production -PACKAGE=meteor-spk-0.4.1 -PACKAGE_FILENAME="$PACKAGE.tar.xz" -CACHE_TARGET="/host-dot-sandstorm/caches/${PACKAGE_FILENAME}" - -# Fetch meteor-spk tarball if not cached -if [ ! -f "$CACHE_TARGET" ] ; then - curl https://dl.sandstorm.io/${PACKAGE_FILENAME} > "$CACHE_TARGET" -fi - -# Extract to /opt -tar xf "$CACHE_TARGET" - -# Create symlink so we can rely on the path /opt/meteor-spk -ln -s "${PACKAGE}" meteor-spk - -#This will install capnp, the Cap’n Proto command-line tool. -#It will also install libcapnp, libcapnpc, and libkj in /usr/local/lib and headers in /usr/local/include/capnp and /usr/local/include/kj. -curl -O https://capnproto.org/capnproto-c++-0.6.1.tar.gz -tar zxf capnproto-c++-0.6.1.tar.gz -cd capnproto-c++-0.6.1 -./configure -make -j6 check -sudo make install -# inlcude libcapnp and libkj library to dependencies. -cp .libs/* /opt/meteor-spk/meteor-spk.deps/lib/x86_64-linux-gnu/ - -# Add bash, and its dependencies, so they get mapped into the image. -# Bash runs the launcher script. -cp -a /bin/bash /opt/meteor-spk/meteor-spk.deps/bin/ -cp -a /lib/x86_64-linux-gnu/libncurses.so.* /opt/meteor-spk/meteor-spk.deps/lib/x86_64-linux-gnu/ -cp -a /lib/x86_64-linux-gnu/libtinfo.so.* /opt/meteor-spk/meteor-spk.deps/lib/x86_64-linux-gnu/ -# for npm in package.json sharp. -cp -a /lib/x86_64-linux-gnu/libresolv* /opt/meteor-spk/meteor-spk.deps/lib/x86_64-linux-gnu/ - - -# Unfortunately, Meteor does not explicitly make it easy to cache packages, but -# we know experimentally that the package is mostly directly extractable to a -# user's $HOME/.meteor directory. -METEOR_RELEASE=1.6.1.1 -METEOR_PLATFORM=os.linux.x86_64 -METEOR_TARBALL_FILENAME="meteor-bootstrap-${METEOR_PLATFORM}.tar.gz" -METEOR_TARBALL_URL="https://d3sqy0vbqsdhku.cloudfront.net/packages-bootstrap/${METEOR_RELEASE}/${METEOR_TARBALL_FILENAME}" -METEOR_CACHE_TARGET="/host-dot-sandstorm/caches/${METEOR_TARBALL_FILENAME}" - -# Fetch meteor tarball if not cached -if [ ! -f "$METEOR_CACHE_TARGET" ] ; then - curl "$METEOR_TARBALL_URL" > "${METEOR_CACHE_TARGET}.partial" - mv "${METEOR_CACHE_TARGET}"{.partial,} -fi - -# Extract as unprivileged user, which is the usual meteor setup -cd /home/vagrant/ -su -c "tar xf '${METEOR_CACHE_TARGET}'" vagrant -# Link into global PATH -ln -s /home/vagrant/.meteor/meteor /usr/bin/meteor -chown vagrant:vagrant /home/vagrant -R diff --git a/.sandstorm/stack b/.sandstorm/stack deleted file mode 100644 index f148e1141a45..000000000000 --- a/.sandstorm/stack +++ /dev/null @@ -1 +0,0 @@ -meteor diff --git a/.scripts/set-version.js b/.scripts/set-version.js index 27852ab15050..abd5f8a2719e 100644 --- a/.scripts/set-version.js +++ b/.scripts/set-version.js @@ -20,7 +20,6 @@ try { const files = [ './package.json', - './.sandstorm/sandstorm-pkgdef.capnp', './.travis/snap.sh', './.circleci/snap.sh', './.circleci/update-releases.sh', diff --git a/.travis.yml b/.travis.yml index b602c51213ae..31f618fadec9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,7 +71,6 @@ before_deploy: - source ".travis/setdeploydir.sh" - ".travis/setupsig.sh" - ".travis/namefiles.sh" -- echo ".travis/sandstorm.sh" deploy: - provider: s3 access_key_id: AKIAIKIA7H7D47KUHYCA diff --git a/.travis/sandstorm.sh b/.travis/sandstorm.sh deleted file mode 100755 index 72095e70e1e8..000000000000 --- a/.travis/sandstorm.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -set -x -set -euvo pipefail -IFS=$'\n\t' - -export SANDSTORM_VERSION=$(curl -f "https://install.sandstorm.io/dev?from=0&type=install") -export PATH=$PATH:/tmp/sandstorm-$SANDSTORM_VERSION/bin - -cd /tmp -curl https://dl.sandstorm.io/sandstorm-$SANDSTORM_VERSION.tar.xz | tar -xJf - - -mkdir -p ~/opt -cd ~/opt -curl https://dl.sandstorm.io/meteor-spk-0.1.8.tar.xz | tar -xJf - -ln -s meteor-spk-0.1.8 meteor-spk -cp -a /bin/bash ~/opt/meteor-spk/meteor-spk.deps/bin/ -cp -a /lib/x86_64-linux-gnu/libncurses.so.* ~/opt/meteor-spk/meteor-spk.deps/lib/x86_64-linux-gnu/ -cp -a /lib/x86_64-linux-gnu/libtinfo.so.* ~/opt/meteor-spk/meteor-spk.deps/lib/x86_64-linux-gnu/ -ln -s $TRAVIS_BUILD_DIR ~/opt/app - -cd /tmp -spk init -p3000 -- nothing -export SANDSTORM_ID="$(grep '\sid =' sandstorm-pkgdef.capnp)" - -cd $TRAVIS_BUILD_DIR -export METEOR_WAREHOUSE_DIR="${METEOR_WAREHOUSE_DIR:-$HOME/.meteor}" -export METEOR_DEV_BUNDLE=$(dirname $(readlink -f "$METEOR_WAREHOUSE_DIR/meteor"))/dev_bundle - -mkdir -p ~/vagrant -tar -zxf /tmp/build/Rocket.Chat.tar.gz --directory ~/vagrant/ -cd ~/vagrant/bundle/programs/server && "$METEOR_DEV_BUNDLE/bin/npm" install -cd $TRAVIS_BUILD_DIR/.sandstorm -sed -i "s/\sid = .*/$SANDSTORM_ID/" sandstorm-pkgdef.capnp -mkdir -p ~/vagrant/bundle/opt/app/.sandstorm/ -cp ~/opt/app/.sandstorm/launcher.sh ~/vagrant/bundle/opt/app/.sandstorm/ -sed -i "s/\spgp/#pgp/g" sandstorm-pkgdef.capnp -spk pack $ROCKET_DEPLOY_DIR/rocket.chat-$ARTIFACT_NAME.spk diff --git a/README.md b/README.md index 6c4a012d8682..30c64f57389a 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,6 @@ * [Snaps](#instant-server-installation-with-snaps) * [RocketChatLauncher](#rocketchatlauncher) * [Layershift](#layershift) - * [Sandstorm.io](#sandstormio) * [Yunohost.org](#yunohostorg) * [DPlatform](#dplatform) * [IndieHosters](#indiehosters) @@ -124,11 +123,6 @@ Instantly deploy your Rocket.Chat server for free on next generation auto-scalin Painless SSL. Automatically scale your server cluster based on usage demand. -## Sandstorm.io -Host your own Rocket.Chat server in four seconds flat. - -[![Rocket.Chat on Sandstorm.io](https://raw.githubusercontent.com/Sing-Li/bbug/master/images/sandstorm.jpg)](https://apps.sandstorm.io/app/vfnwptfn02ty21w715snyyczw0nqxkv3jvawcah10c6z7hj1hnu0) - ## Yunohost.org Host your own Rocket.Chat server in a few seconds. @@ -320,7 +314,6 @@ It is a great solution for communities and companies wanting to privately host t - Native Cross-Platform Desktop Application [Windows, macOS, or Linux](https://rocket.chat/) - Mobile app for iPhone, iPad, and iPod touch [Download on App Store](https://geo.itunes.apple.com/us/app/rocket-chat/id1148741252?mt=8) - Mobile app for Android phone, tablet, and TV stick [Available now on Google Play](https://play.google.com/store/apps/details?id=chat.rocket.android) -- Sandstorm.io instant Rocket.Chat server [Now on Sandstorm App Store](https://apps.sandstorm.io/app/vfnwptfn02ty21w715snyyczw0nqxkv3jvawcah10c6z7hj1hnu0) - Available on [Cloudron Store](https://cloudron.io/appstore.html#chat.rocket.cloudronapp) ## Roadmap diff --git a/app/file-upload/server/lib/requests.js b/app/file-upload/server/lib/requests.js index 8a6632b946a1..080db854dfe9 100644 --- a/app/file-upload/server/lib/requests.js +++ b/app/file-upload/server/lib/requests.js @@ -1,4 +1,3 @@ -import { Meteor } from 'meteor/meteor'; import { WebApp } from 'meteor/webapp'; import { Uploads } from '../../../models'; import { FileUpload } from './FileUpload'; @@ -11,7 +10,7 @@ WebApp.connectHandlers.use('/file-upload/', function(req, res, next) { const file = Uploads.findOneById(match[1]); if (file) { - if (!Meteor.settings.public.sandstorm && !FileUpload.requestCanAccessFiles(req)) { + if (!FileUpload.requestCanAccessFiles(req)) { res.writeHead(403); return res.end(); } diff --git a/app/lib/client/lib/settings.js b/app/lib/client/lib/settings.js index f3822e1e69a6..5ceef5efedc5 100644 --- a/app/lib/client/lib/settings.js +++ b/app/lib/client/lib/settings.js @@ -11,7 +11,7 @@ Meteor.startup(function() { if (!siteUrl || (Meteor.userId() == null)) { return; } - if (hasRole(Meteor.userId(), 'admin') === false || Meteor.settings.public.sandstorm) { + if (hasRole(Meteor.userId(), 'admin') === false) { return c.stop(); } Meteor.setTimeout(function() { diff --git a/app/lib/server/functions/getAvatarSuggestionForUser.js b/app/lib/server/functions/getAvatarSuggestionForUser.js index ded582085194..dd9cbaa4ab4a 100644 --- a/app/lib/server/functions/getAvatarSuggestionForUser.js +++ b/app/lib/server/functions/getAvatarSuggestionForUser.js @@ -1,4 +1,3 @@ -import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; import { HTTP } from 'meteor/http'; import { Gravatar } from 'meteor/jparker:gravatar'; @@ -51,13 +50,6 @@ export function getAvatarSuggestionForUser(user) { }); } - if (user.services.sandstorm && user.services.sandstorm.picture && Meteor.settings.public.sandstorm) { - avatars.push({ - service: 'sandstorm', - url: user.services.sandstorm.picture, - }); - } - if (user.services.blockstack && user.services.blockstack.image && settings.get('Blockstack_Enable')) { avatars.push({ service: 'blockstack', diff --git a/app/lib/server/functions/getUsernameSuggestion.js b/app/lib/server/functions/getUsernameSuggestion.js index b0752cf0decb..db9e53966a35 100644 --- a/app/lib/server/functions/getUsernameSuggestion.js +++ b/app/lib/server/functions/getUsernameSuggestion.js @@ -1,5 +1,4 @@ import limax from 'limax'; -import { Meteor } from 'meteor/meteor'; import { Users } from '../../../models'; import { settings } from '../../../settings'; @@ -25,10 +24,6 @@ const name = (username) => (settings.get('UTF8_Names_Slugify') ? slug(username) export function generateUsernameSuggestion(user) { let usernames = []; - if (Meteor.settings.public.sandstorm) { - usernames.push(user.services.sandstorm.preferredHandle); - } - if (user.name) { usernames.push(name(user.name)); diff --git a/app/lib/server/functions/insertMessage.js b/app/lib/server/functions/insertMessage.js index 55aa18a2f1f3..5c923af6c83e 100644 --- a/app/lib/server/functions/insertMessage.js +++ b/app/lib/server/functions/insertMessage.js @@ -127,13 +127,6 @@ export const insertMessage = function(user, message, room, upsert = false) { delete message.tokens; } - // Avoid saving sandstormSessionId to the database - let sandstormSessionId = null; - if (message.sandstormSessionId) { - sandstormSessionId = message.sandstormSessionId; - delete message.sandstormSessionId; - } - if (message._id && upsert) { const { _id } = message; delete message._id; @@ -146,6 +139,5 @@ export const insertMessage = function(user, message, room, upsert = false) { message._id = Messages.insert(message); } - message.sandstormSessionId = sandstormSessionId; return message; }; diff --git a/app/lib/server/functions/sendMessage.js b/app/lib/server/functions/sendMessage.js index ea14d9aef07f..403d5a233496 100644 --- a/app/lib/server/functions/sendMessage.js +++ b/app/lib/server/functions/sendMessage.js @@ -163,13 +163,6 @@ export const sendMessage = function(user, message, room, upsert = false) { message = callbacks.run('beforeSaveMessage', message, room); if (message) { - // Avoid saving sandstormSessionId to the database - let sandstormSessionId = null; - if (message.sandstormSessionId) { - sandstormSessionId = message.sandstormSessionId; - delete message.sandstormSessionId; - } - if (message._id && upsert) { const { _id } = message; delete message._id; @@ -191,11 +184,8 @@ export const sendMessage = function(user, message, room, upsert = false) { /* Defer other updates as their return is not interesting to the user */ - Meteor.defer(() => { - // Execute all callbacks - message.sandstormSessionId = sandstormSessionId; - return callbacks.run('afterSaveMessage', message, room, user._id); - }); + // Execute all callbacks + Meteor.defer(() => callbacks.run('afterSaveMessage', message, room, user._id)); return message; } }; diff --git a/app/lib/server/lib/sendNotificationsOnMessage.js b/app/lib/server/lib/sendNotificationsOnMessage.js index 482b02c829ba..b46a1399a87a 100644 --- a/app/lib/server/lib/sendNotificationsOnMessage.js +++ b/app/lib/server/lib/sendNotificationsOnMessage.js @@ -5,7 +5,6 @@ import { settings } from '../../../settings'; import { callbacks } from '../../../callbacks'; import { Subscriptions } from '../../../models'; import { roomTypes } from '../../../utils'; -import { Sandstorm } from '../../../sandstorm'; import { callJoinRoom, messageContainsHighlight, parseMessageTextPerUser, replaceMentionedUsernamesWithFullNames } from '../functions/notifications/'; import { sendEmail, shouldNotifyEmail } from '../functions/notifications/email'; import { sendSinglePush, shouldNotifyMobile } from '../functions/notifications/mobile'; @@ -55,8 +54,6 @@ const sendNotification = async({ emailNotifications, } = subscription; - let notificationSent = false; - // busy users don't receive audio notification if (shouldNotifyAudio({ disableAllMessageNotifications, @@ -84,7 +81,6 @@ const sendNotification = async({ hasMentionToUser, roomType, })) { - notificationSent = true; notifyDesktopUser({ notificationMessage, userId: subscription.u._id, @@ -104,8 +100,6 @@ const sendNotification = async({ statusConnection: receiver.statusConnection, roomType, })) { - notificationSent = true; - sendSinglePush({ notificationMessage, room, @@ -135,10 +129,6 @@ const sendNotification = async({ return false; }); } - - if (notificationSent) { - Sandstorm.notify(message, [subscription.u._id], `@${ sender.username }: ${ message.msg }`, room.t === 'p' ? 'privateMessage' : 'message'); - } }; const project = { diff --git a/app/lib/server/methods/sendMessage.js b/app/lib/server/methods/sendMessage.js index d298dc53644f..eece8bc79009 100644 --- a/app/lib/server/methods/sendMessage.js +++ b/app/lib/server/methods/sendMessage.js @@ -88,10 +88,6 @@ Meteor.methods({ message.alias = user.name; } - if (Meteor.settings.public.sandstorm) { - message.sandstormSessionId = this.connection.sandstormSessionId(); - } - metrics.messagesSent.inc(); // TODO This line needs to be moved to it's proper place. See the comments on: https://github.com/RocketChat/Rocket.Chat/pull/5736 return sendMessage(user, message, room); }, diff --git a/app/oembed/client/baseWidget.js b/app/oembed/client/baseWidget.js index 66263dcf5992..004169306bd6 100644 --- a/app/oembed/client/baseWidget.js +++ b/app/oembed/client/baseWidget.js @@ -22,9 +22,6 @@ Template.oembedBaseWidget.helpers({ if (this.meta && this.meta.oembedHtml) { return 'oembedFrameWidget'; } - if (this.meta && this.meta.sandstorm && this.meta.sandstorm.grain) { - return 'oembedSandstormGrain'; - } return 'oembedUrlWidget'; }, }); diff --git a/app/oembed/client/index.js b/app/oembed/client/index.js index 5d5a3248c526..c5b326243e89 100644 --- a/app/oembed/client/index.js +++ b/app/oembed/client/index.js @@ -12,5 +12,3 @@ import './oembedUrlWidget.html'; import './oembedUrlWidget'; import './oembedFrameWidget.html'; import './oembedFrameWidget'; -import './oembedSandstormGrain.html'; -import './oembedSandstormGrain'; diff --git a/app/oembed/client/oembedSandstormGrain.html b/app/oembed/client/oembedSandstormGrain.html deleted file mode 100644 index b5a2ac272b28..000000000000 --- a/app/oembed/client/oembedSandstormGrain.html +++ /dev/null @@ -1,11 +0,0 @@ - diff --git a/app/oembed/client/oembedSandstormGrain.js b/app/oembed/client/oembedSandstormGrain.js deleted file mode 100644 index bbb24b9503fb..000000000000 --- a/app/oembed/client/oembedSandstormGrain.js +++ /dev/null @@ -1,28 +0,0 @@ -import { Meteor } from 'meteor/meteor'; -import { Template } from 'meteor/templating'; - -Template.oembedSandstormGrain.helpers({ - token() { - return this.meta.sandstorm.grain.token; - }, - appTitle() { - return this.meta.sandstorm.grain.appTitle.defaultText; - }, - grainTitle() { - return this.meta.sandstorm.grain.grainTitle; - }, - appIconUrl() { - return this.meta.sandstorm.grain.appIconUrl; - }, - descriptor() { - return this.meta.sandstorm.grain.descriptor; - }, -}); - -window.sandstormOembed = function(e) { - e = e || window.event; - const src = e.target || e.srcElement; - const token = src.getAttribute('data-token'); - const descriptor = src.getAttribute('data-descriptor'); - return Meteor.call('sandstormOffer', token, descriptor); -}; diff --git a/app/oembed/server/server.js b/app/oembed/server/server.js index eb08cdca4ee9..570903ef6e41 100644 --- a/app/oembed/server/server.js +++ b/app/oembed/server/server.js @@ -254,15 +254,6 @@ OEmbed.rocketUrlParser = function(message) { if (item.ignoreParse === true) { return; } - if (item.url.startsWith('grain://')) { - changed = true; - item.meta = { - sandstorm: { - grain: item.sandstormViewInfo, - }, - }; - return; - } if (!/^https?:\/\//i.test(item.url)) { return; } diff --git a/app/sandstorm/client/index.js b/app/sandstorm/client/index.js deleted file mode 100644 index 11c6e2993767..000000000000 --- a/app/sandstorm/client/index.js +++ /dev/null @@ -1,6 +0,0 @@ -import { Sandstorm } from './powerboxListener'; -import './setPath'; - -export { - Sandstorm, -}; diff --git a/app/sandstorm/client/powerboxListener.js b/app/sandstorm/client/powerboxListener.js deleted file mode 100644 index 2bdef7411b05..000000000000 --- a/app/sandstorm/client/powerboxListener.js +++ /dev/null @@ -1,30 +0,0 @@ -import { Meteor } from 'meteor/meteor'; - -export const Sandstorm = {}; - -Sandstorm.request = function() {}; -if (Meteor.settings.public.sandstorm) { - const callbackMap = {}; - - const messageListener = function(event) { - if (event.data.rpcId) { - const cb = callbackMap[event.data.rpcId]; - - cb(event.data.error, event.data); - } - }; - window.addEventListener('message', messageListener); - - const interfaces = { - uiView: 'EAZQAQEAABEBF1EEAQH_5-Jn6pjXtNsAAAA', - }; - - Sandstorm.request = function(interfaceName, cb) { - const rpcId = Math.random().toString(); - callbackMap[rpcId] = cb; - window.parent.postMessage({ powerboxRequest: { - rpcId, - query: [interfaces[interfaceName]], - } }, '*'); - }; -} diff --git a/app/sandstorm/client/setPath.js b/app/sandstorm/client/setPath.js deleted file mode 100644 index 3a9868c7e6b4..000000000000 --- a/app/sandstorm/client/setPath.js +++ /dev/null @@ -1,15 +0,0 @@ -import { Meteor } from 'meteor/meteor'; -import { FlowRouter } from 'meteor/kadira:flow-router'; - -function updateSandstormMetaData(msg) { - return window.parent.postMessage(msg, '*'); -} - -if (Meteor.settings.public.sandstorm) { - // Set the path of the parent frame when the grain's path changes. - // See https://docs.sandstorm.io/en/latest/developing/path/ - - FlowRouter.triggers.enter([({ path }) => { - updateSandstormMetaData({ setPath: path }); - }]); -} diff --git a/app/sandstorm/index.js b/app/sandstorm/index.js deleted file mode 100644 index a67eca871efb..000000000000 --- a/app/sandstorm/index.js +++ /dev/null @@ -1,8 +0,0 @@ -import { Meteor } from 'meteor/meteor'; - -if (Meteor.isClient) { - module.exports = require('./client/index.js'); -} -if (Meteor.isServer) { - module.exports = require('./server/index.js'); -} diff --git a/app/sandstorm/server/events.js b/app/sandstorm/server/events.js deleted file mode 100644 index 1d40e7c6add4..000000000000 --- a/app/sandstorm/server/events.js +++ /dev/null @@ -1,42 +0,0 @@ -import { Meteor } from 'meteor/meteor'; -import { getHttpBridge, waitPromise } from './lib'; -import { Sandstorm } from './lib'; -import _ from 'underscore'; - -Sandstorm.notify = function() {}; - -if (process.env.SANDSTORM === '1') { - const ACTIVITY_TYPES = { - message: 0, - privateMessage: 1, - }; - - Sandstorm.notify = function(message, userIds, caption, type) { - const sessionId = message.sandstormSessionId; - if (!sessionId) { - return; - } - const httpBridge = getHttpBridge(); - const activity = {}; - - if (type) { - activity.type = ACTIVITY_TYPES[type]; - } - - if (caption) { - activity.notification = { caption: { defaultText: caption } }; - } - - if (userIds) { - activity.users = _.map(userIds, function(userId) { - const user = Meteor.users.findOne({ _id: userId }, { fields: { 'services.sandstorm.id': 1 } }); - return { - identity: waitPromise(httpBridge.getSavedIdentity(user.services.sandstorm.id)).identity, - mentioned: true, - }; - }); - } - - return waitPromise(httpBridge.getSessionContext(sessionId).context.activity(activity)); - }; -} diff --git a/app/sandstorm/server/index.js b/app/sandstorm/server/index.js deleted file mode 100644 index 21d3801e191f..000000000000 --- a/app/sandstorm/server/index.js +++ /dev/null @@ -1,7 +0,0 @@ -import { Sandstorm } from './lib'; -import './events'; -import './powerbox'; - -export { - Sandstorm, -}; diff --git a/app/sandstorm/server/lib.js b/app/sandstorm/server/lib.js deleted file mode 100644 index 41c9fec79e11..000000000000 --- a/app/sandstorm/server/lib.js +++ /dev/null @@ -1,39 +0,0 @@ -import Future from 'fibers/future'; -import { UploadFS } from 'meteor/jalik:ufs'; - -export const Sandstorm = {}; - -export let getHttpBridge; -export let waitPromise; - -if (process.env.SANDSTORM === '1') { - const Capnp = require('capnp'); - const { SandstormHttpBridge } = Capnp.importSystem('sandstorm/sandstorm-http-bridge.capnp'); - - let capnpConnection = null; - let httpBridge = null; - - getHttpBridge = function() { - if (!httpBridge) { - capnpConnection = Capnp.connect('unix:/tmp/sandstorm-api'); - httpBridge = capnpConnection.restore(null, SandstormHttpBridge); - } - return httpBridge; - }; - - const promiseToFuture = function(promise) { - const result = new Future(); - promise.then(result.return.bind(result), result.throw.bind(result)); - return result; - }; - - waitPromise = function(promise) { - return promiseToFuture(promise).wait(); - }; - - // This usual implementation of this method returns an absolute URL that is invalid - // under Sandstorm. - UploadFS.Store.prototype.getURL = function(path) { - return this.getRelativeURL(path); - }; -} diff --git a/app/sandstorm/server/powerbox.js b/app/sandstorm/server/powerbox.js deleted file mode 100644 index efa9f2d9f2d3..000000000000 --- a/app/sandstorm/server/powerbox.js +++ /dev/null @@ -1,50 +0,0 @@ -import { Meteor } from 'meteor/meteor'; -import { Sandstorm } from './lib'; -import { getHttpBridge, waitPromise } from './lib'; - -Sandstorm.offerUiView = function() {}; - -if (process.env.SANDSTORM === '1') { - const Capnp = require('capnp'); - const Powerbox = Capnp.importSystem('sandstorm/powerbox.capnp'); - const Grain = Capnp.importSystem('sandstorm/grain.capnp'); - - Sandstorm.offerUiView = function(token, serializedDescriptor, sessionId) { - const httpBridge = getHttpBridge(); - const session = httpBridge.getSessionContext(sessionId).context; - const { api } = httpBridge.getSandstormApi(sessionId); - const { cap } = waitPromise(api.restore(new Buffer(token, 'base64'))); - return waitPromise(session.offer(cap, undefined, { tags: [{ - id: '15831515641881813735', - value: new Buffer(serializedDescriptor, 'base64'), - }] })); - }; - - Meteor.methods({ - sandstormClaimRequest(token, serializedDescriptor) { - const descriptor = Capnp.parsePacked(Powerbox.PowerboxDescriptor, new Buffer(serializedDescriptor, 'base64')); - const grainTitle = Capnp.parse(Grain.UiView.PowerboxTag, descriptor.tags[0].value).title; - const sessionId = this.connection.sandstormSessionId(); - const httpBridge = getHttpBridge(); - const session = httpBridge.getSessionContext(sessionId).context; - const cap = waitPromise(session.claimRequest(token)).cap.castAs(Grain.UiView); - const { api } = httpBridge.getSandstormApi(sessionId); - const newToken = waitPromise(api.save(cap)).token.toString('base64'); - const viewInfo = waitPromise(cap.getViewInfo()); - const { appTitle } = viewInfo; - const asset = waitPromise(viewInfo.grainIcon.getUrl()); - const appIconUrl = `${ asset.protocol }://${ asset.hostPath }`; - return { - token: newToken, - appTitle, - appIconUrl, - grainTitle, - descriptor: descriptor.tags[0].value.toString('base64'), - }; - }, - sandstormOffer(token, serializedDescriptor) { - Sandstorm.offerUiView(token, serializedDescriptor, - this.connection.sandstormSessionId()); - }, - }); -} diff --git a/app/smarsh-connector/server/functions/generateEml.js b/app/smarsh-connector/server/functions/generateEml.js index 48f15325501b..105ec20b5b21 100644 --- a/app/smarsh-connector/server/functions/generateEml.js +++ b/app/smarsh-connector/server/functions/generateEml.js @@ -19,7 +19,7 @@ const closetd = ''; function _getLink(attachment) { const url = attachment.title_link.replace(/ /g, '%20'); - if (Meteor.settings.public.sandstorm || url.match(/^(https?:)?\/\//i)) { + if (url.match(/^(https?:)?\/\//i)) { return url; } else { return Meteor.absoluteUrl().replace(/\/$/, '') + __meteor_runtime_config__.ROOT_URL_PATH_PREFIX + url; diff --git a/app/theme/client/imports/general/base_old.css b/app/theme/client/imports/general/base_old.css index 4bdd83a8d166..40fb69d59820 100644 --- a/app/theme/client/imports/general/base_old.css +++ b/app/theme/client/imports/general/base_old.css @@ -2943,20 +2943,6 @@ rc-old select, line-height: 1em; } - & blockquote.sandstorm-grain { - & img { - width: 50px; - } - - & label { - cursor: pointer; - } - - & button { - display: block; - } - } - & ul, & ol { padding: 0 0 0 24px; diff --git a/app/ui-login/client/login/form.html b/app/ui-login/client/login/form.html index bf29397377db..e42b48918de3 100644 --- a/app/ui-login/client/login/form.html +++ b/app/ui-login/client/login/form.html @@ -1,156 +1,150 @@ diff --git a/app/ui-login/client/login/form.js b/app/ui-login/client/login/form.js index d1c7f8c584cf..b3f8e95b1c0d 100644 --- a/app/ui-login/client/login/form.js +++ b/app/ui-login/client/login/form.js @@ -183,9 +183,7 @@ Template.loginForm.onCreated(function() { return this.customFields.set(null); } }); - if (Meteor.settings.public.sandstorm) { - this.state = new ReactiveVar('sandstorm'); - } else if (Session.get('loginDefaultState')) { + if (Session.get('loginDefaultState')) { this.state = new ReactiveVar(Session.get('loginDefaultState')); } else { this.state = new ReactiveVar('login'); diff --git a/app/ui/client/lib/notification.js b/app/ui/client/lib/notification.js index 4dd68d851746..14efc9410519 100644 --- a/app/ui/client/lib/notification.js +++ b/app/ui/client/lib/notification.js @@ -19,7 +19,7 @@ export const KonchatNotification = { // notificacoes HTML5 getDesktopPermission() { - if (window.Notification && (Notification.permission !== 'granted') && !Meteor.settings.public.sandstorm) { + if (window.Notification && (Notification.permission !== 'granted')) { return Notification.requestPermission(function(status) { KonchatNotification.notificationStatus.set(status); if (Notification.permission !== status) { @@ -79,7 +79,7 @@ export const KonchatNotification = { return; } - if ((Meteor.user().status === 'busy') || (Meteor.settings.public.sandstorm != null)) { + if (Meteor.user().status === 'busy') { return; } diff --git a/client/importPackages.js b/client/importPackages.js index d376a181e724..1a90880a51e9 100644 --- a/client/importPackages.js +++ b/client/importPackages.js @@ -54,7 +54,6 @@ import '../app/oembed'; import '../app/otr'; import '../app/push-notifications'; import '../app/apps'; -import '../app/sandstorm'; import '../app/setup-wizard'; import '../app/slackbridge'; import '../app/slashcommands-archiveroom'; diff --git a/package.json b/package.json index 46311188b60c..bf7249e1f996 100644 --- a/package.json +++ b/package.json @@ -242,7 +242,6 @@ "houston": { "updateFiles": [ "package.json", - ".sandstorm/sandstorm-pkgdef.capnp", ".travis/snap.sh", ".circleci/snap.sh", ".circleci/update-releases.sh", diff --git a/packages/rocketchat-i18n/i18n/af.i18n.json b/packages/rocketchat-i18n/i18n/af.i18n.json index 82b5c69881ee..6ac9b7ad2ced 100644 --- a/packages/rocketchat-i18n/i18n/af.i18n.json +++ b/packages/rocketchat-i18n/i18n/af.i18n.json @@ -2220,7 +2220,6 @@ "SAML_Custom_Private_Key": "Privaat Sleutel Inhoud", "SAML_Custom_Provider": "Aangepaste Verskaffer", "SAML_Custom_Public_Cert": "Publieke Sertifisering", - "Sandstorm_Powerbox_Share": "Deel 'n Sandstorm graan", "Saturday": "Saterdag", "Save": "Save", "save-others-livechat-room-info": "Stoor ander Livechat-kamerinligting", @@ -2839,4 +2838,4 @@ "Your_push_was_sent_to_s_devices": "Jou druk is gestuur na%s toestelle", "Your_server_link": "Jou bediener skakel", "Your_workspace_is_ready": "Jou werkruimte is gereed om 🎉 te gebruik" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/ar.i18n.json b/packages/rocketchat-i18n/i18n/ar.i18n.json index ec606bcfad92..177dfd8e696d 100644 --- a/packages/rocketchat-i18n/i18n/ar.i18n.json +++ b/packages/rocketchat-i18n/i18n/ar.i18n.json @@ -2220,7 +2220,6 @@ "SAML_Custom_Private_Key": "محتويات المفتاح الخاص", "SAML_Custom_Provider": "مزود مخصص", "SAML_Custom_Public_Cert": "محتويات الشهادة العامة", - "Sandstorm_Powerbox_Share": "مشاركة عاصفة رملية", "Saturday": "السبت", "Save": "حفظ", "save-others-livechat-room-info": "حفظ معلومات غرف الدردشة المباشرة الأخرى", @@ -2839,4 +2838,4 @@ "Your_push_was_sent_to_s_devices": "وقد أرسلت دفعك إلى أجهزة٪ الصورة", "Your_server_link": "رابط الخادم الخاص بك", "Your_workspace_is_ready": "مساحة العمل الخاصة بك جاهزة لاستخدام 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/az.i18n.json b/packages/rocketchat-i18n/i18n/az.i18n.json index 4208ef5957d6..9e707c25241c 100644 --- a/packages/rocketchat-i18n/i18n/az.i18n.json +++ b/packages/rocketchat-i18n/i18n/az.i18n.json @@ -2220,7 +2220,6 @@ "SAML_Custom_Private_Key": "Şəxsi Açar İçindəkilər", "SAML_Custom_Provider": "Xüsusi təchizatçı", "SAML_Custom_Public_Cert": "İctimai Cert Contents", - "Sandstorm_Powerbox_Share": "Sandstorm taxıl paylaşın", "Saturday": "Şənbə", "Save": "Yadda saxla", "save-others-livechat-room-info": "Digərləri Saxla", @@ -2839,4 +2838,4 @@ "Your_push_was_sent_to_s_devices": "Sizin itəniz%s cihazlarına göndərildi", "Your_server_link": "Sizin server bağlantınız", "Your_workspace_is_ready": "İş yeriniz 🎉 istifadə etməyə hazırdır" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/be-BY.i18n.json b/packages/rocketchat-i18n/i18n/be-BY.i18n.json index 899062cee69b..2f006a20fe7a 100644 --- a/packages/rocketchat-i18n/i18n/be-BY.i18n.json +++ b/packages/rocketchat-i18n/i18n/be-BY.i18n.json @@ -2237,7 +2237,6 @@ "SAML_Custom_Private_Key": "Private Key Змест", "SAML_Custom_Provider": "прыстасаваныя Provider", "SAML_Custom_Public_Cert": "Грамадскія Змест Cert", - "Sandstorm_Powerbox_Share": "Дайце Sandstorm зерне", "Saturday": "субота", "Save": "захаваць", "save-others-livechat-room-info": "Захаваць Іншая Livechat нумар Інфармацыя", @@ -2856,4 +2855,4 @@ "Your_push_was_sent_to_s_devices": "Ваш штуршок быў адпраўлены ў%s прылад", "Your_server_link": "Ваша спасылка сервера", "Your_workspace_is_ready": "Ваша працоўная вобласць гатова да выкарыстання 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/bg.i18n.json b/packages/rocketchat-i18n/i18n/bg.i18n.json index 3892f83fbfaa..26b15bbffdc1 100644 --- a/packages/rocketchat-i18n/i18n/bg.i18n.json +++ b/packages/rocketchat-i18n/i18n/bg.i18n.json @@ -2220,7 +2220,6 @@ "SAML_Custom_Private_Key": "Съдържание на частния ключ", "SAML_Custom_Provider": "Потребителски доставчик", "SAML_Custom_Public_Cert": "Публично съдържание", - "Sandstorm_Powerbox_Share": "Споделете пясъчна змия", "Saturday": "събота", "Save": "Запази", "save-others-livechat-room-info": "Запазване на други данни за стая в Livechat", @@ -2839,4 +2838,4 @@ "Your_push_was_sent_to_s_devices": "Натискането ви бе изпратено на%s устройства", "Your_server_link": "Вашата сървърна връзка", "Your_workspace_is_ready": "Работното ви пространство е готово за използване 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/bs.i18n.json b/packages/rocketchat-i18n/i18n/bs.i18n.json index eceace847e67..149251841408 100644 --- a/packages/rocketchat-i18n/i18n/bs.i18n.json +++ b/packages/rocketchat-i18n/i18n/bs.i18n.json @@ -2218,7 +2218,6 @@ "SAML_Custom_Private_Key": "Sadržaj privatnog ključa", "SAML_Custom_Provider": "Prilagođeni Provider", "SAML_Custom_Public_Cert": "Sadržaj javnog cert", - "Sandstorm_Powerbox_Share": "Podijeli Sandstorm grain", "Saturday": "Subota", "Save": "Spremi", "save-others-livechat-room-info": "Spremi druge informacije Livechat Room", @@ -2837,4 +2836,4 @@ "Your_push_was_sent_to_s_devices": "Push obavijest je poslana %s uređaje", "Your_server_link": "Veza poslužitelja", "Your_workspace_is_ready": "Radni je prostor spreman za upotrebu 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/ca.i18n.json b/packages/rocketchat-i18n/i18n/ca.i18n.json index 35f6a27769aa..040112256516 100644 --- a/packages/rocketchat-i18n/i18n/ca.i18n.json +++ b/packages/rocketchat-i18n/i18n/ca.i18n.json @@ -2219,7 +2219,6 @@ "SAML_Custom_Private_Key": "Contingut de la clau privada", "SAML_Custom_Provider": "Proveïdor (provider) personalitzat", "SAML_Custom_Public_Cert": "Contingut del certificat públic", - "Sandstorm_Powerbox_Share": "Comparteix un gra de Sandstorm", "Saturday": "dissabte", "Save": "Desa", "save-others-livechat-room-info": "Guardar info altres xats en viu", @@ -2838,4 +2837,4 @@ "Your_push_was_sent_to_s_devices": "La notificació push s'ha enviat a %s dispositius", "Your_server_link": "Enllaç del servidor", "Your_workspace_is_ready": "El vostre espai de treball està a punt per utilitzar 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/cs.i18n.json b/packages/rocketchat-i18n/i18n/cs.i18n.json index aa90e0935e9c..cbdff31386e7 100644 --- a/packages/rocketchat-i18n/i18n/cs.i18n.json +++ b/packages/rocketchat-i18n/i18n/cs.i18n.json @@ -2224,7 +2224,6 @@ "SAML_Custom_Private_Key": "Obsah privátního klíče", "SAML_Custom_Provider": "Vlastní poskytovatel", "SAML_Custom_Public_Cert": "Obsah veřejného certifikátu", - "Sandstorm_Powerbox_Share": "Sdílet Sandstorm grain", "Saturday": "Sobota", "Save": "Uložit", "save-others-livechat-room-info": "Upravit informace LiveChat místnosti", @@ -2843,4 +2842,4 @@ "Your_push_was_sent_to_s_devices": "Vaše notifikace byla odeslána do %s zařízení", "Your_server_link": "Odkaz na Váš server", "Your_workspace_is_ready": "Váš prostředí je připraveno k použití 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/cy.i18n.json b/packages/rocketchat-i18n/i18n/cy.i18n.json index 3581f14d5d3e..15328706f4f4 100644 --- a/packages/rocketchat-i18n/i18n/cy.i18n.json +++ b/packages/rocketchat-i18n/i18n/cy.i18n.json @@ -2219,7 +2219,6 @@ "SAML_Custom_Private_Key": "Cynnwys Allweddol Preifat", "SAML_Custom_Provider": "Darparwr Arfaethedig", "SAML_Custom_Public_Cert": "Cynnwys Tystysgrif Gyhoeddus", - "Sandstorm_Powerbox_Share": "Rhannwch grawn Sandstorm", "Saturday": "Sadwrn", "Save": "Arbed", "save-others-livechat-room-info": "Cadw Gwybodaeth Ystafelloedd Livechat Eraill", @@ -2838,4 +2837,4 @@ "Your_push_was_sent_to_s_devices": "Anfonwyd eich gwthio i ddyfeisiau% s", "Your_server_link": "Dolen eich gweinydd", "Your_workspace_is_ready": "Mae'ch gweithle yn barod i ddefnyddio 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/da.i18n.json b/packages/rocketchat-i18n/i18n/da.i18n.json index 75b4e80ce21c..4e235c82ab0b 100644 --- a/packages/rocketchat-i18n/i18n/da.i18n.json +++ b/packages/rocketchat-i18n/i18n/da.i18n.json @@ -2338,7 +2338,6 @@ "SAML_Custom_Private_Key": "Privat nøgleindhold", "SAML_Custom_Provider": "Tilpasset udbyder", "SAML_Custom_Public_Cert": "Offentligt certificeret indhold", - "Sandstorm_Powerbox_Share": "Del en Sandstorm korn", "Saturday": "lørdag", "Save": "Gem", "save-others-livechat-room-info": "Gem andre Livechat Room Info", @@ -2957,4 +2956,4 @@ "Your_push_was_sent_to_s_devices": "Dit skub blev sendt til%s-enheder", "Your_server_link": "Din server link", "Your_workspace_is_ready": "Dit arbejdsområde er klar til brug 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/de-AT.i18n.json b/packages/rocketchat-i18n/i18n/de-AT.i18n.json index 42b83060f9a2..2b3b0bc3d9d2 100644 --- a/packages/rocketchat-i18n/i18n/de-AT.i18n.json +++ b/packages/rocketchat-i18n/i18n/de-AT.i18n.json @@ -2221,7 +2221,6 @@ "SAML_Custom_Private_Key": "Privater Schlüssel Inhalt", "SAML_Custom_Provider": "Benutzerdefinierter Provider", "SAML_Custom_Public_Cert": "Öffentliche Cert-Inhalte", - "Sandstorm_Powerbox_Share": "Teile ein Sandsturmkorn", "Saturday": "Samstag", "Save": "Speichern", "save-others-livechat-room-info": "Rette andere Livechat Zimmer Info", @@ -2840,4 +2839,4 @@ "Your_push_was_sent_to_s_devices": "Die Push-Nachricht wurde an %s Geräte gesendet.", "Your_server_link": "Ihre Serververbindung", "Your_workspace_is_ready": "Ihr Arbeitsbereich ist einsatzbereit 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/de-IN.i18n.json b/packages/rocketchat-i18n/i18n/de-IN.i18n.json index 20ab08ea7952..606a3c20c048 100644 --- a/packages/rocketchat-i18n/i18n/de-IN.i18n.json +++ b/packages/rocketchat-i18n/i18n/de-IN.i18n.json @@ -2243,7 +2243,6 @@ "SAML_Custom_Provider": "Benutzerdefinierter Provider", "SAML_Custom_Public_Cert": "Öffentliches Zertifikat", "SAML": "SAML", - "Sandstorm_Powerbox_Share": "Als Sandstorm Grain teilen", "Saturday": "Samstag", "Save_changes": "Änderungen speichern", "Save_Mobile_Bandwidth": "Mobiles Datenvolumen sparen", diff --git a/packages/rocketchat-i18n/i18n/de.i18n.json b/packages/rocketchat-i18n/i18n/de.i18n.json index 1f76602b6a2a..348269950d3a 100644 --- a/packages/rocketchat-i18n/i18n/de.i18n.json +++ b/packages/rocketchat-i18n/i18n/de.i18n.json @@ -2429,7 +2429,6 @@ "SAML_Custom_Private_Key": "Privater Schlüssel", "SAML_Custom_Provider": "Benutzerdefinierter Provider", "SAML_Custom_Public_Cert": "Öffentliches Zertifikat", - "Sandstorm_Powerbox_Share": "Als Sandstorm Grain teilen", "Saturday": "Samstag", "Save": "Speichern", "save-others-livechat-room-info": "Livechat-Informationen anderer Chats speichern", diff --git a/packages/rocketchat-i18n/i18n/el.i18n.json b/packages/rocketchat-i18n/i18n/el.i18n.json index ca9419d2f9a2..d835a3d8b49f 100644 --- a/packages/rocketchat-i18n/i18n/el.i18n.json +++ b/packages/rocketchat-i18n/i18n/el.i18n.json @@ -2220,7 +2220,6 @@ "SAML_Custom_Private_Key": "Περιεχόμενα ιδιωτικού κλειδιού", "SAML_Custom_Provider": "Προσαρμοσμένη Provider", "SAML_Custom_Public_Cert": "Δημόσια Περιεχόμενο Cert", - "Sandstorm_Powerbox_Share": "Μοιραστείτε ένα αμμοθύελλα", "Saturday": "Σάββατο", "Save": "Αποθήκευση", "save-others-livechat-room-info": "Αποθήκευση άλλων πληροφοριών δωματίων Livechat", @@ -2839,4 +2838,4 @@ "Your_push_was_sent_to_s_devices": "ώθηση σας στάλθηκε σε συσκευές %s", "Your_server_link": "Σύνδεσμος διακομιστή σας", "Your_workspace_is_ready": "Ο χώρος εργασίας σας είναι έτοιμος για χρήση 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index e7c5fd65d8a9..256ccbb34f16 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -2473,7 +2473,6 @@ "SAML_Custom_Private_Key": "Private Key Contents", "SAML_Custom_Provider": "Custom Provider", "SAML_Custom_Public_Cert": "Public Cert Contents", - "Sandstorm_Powerbox_Share": "Share a Sandstorm grain", "Saturday": "Saturday", "Save": "Save", "save-others-livechat-room-info": "Save Others Livechat Room Info", diff --git a/packages/rocketchat-i18n/i18n/eo.i18n.json b/packages/rocketchat-i18n/i18n/eo.i18n.json index 1f8066d73aa5..9e77d9a28209 100644 --- a/packages/rocketchat-i18n/i18n/eo.i18n.json +++ b/packages/rocketchat-i18n/i18n/eo.i18n.json @@ -2220,7 +2220,6 @@ "SAML_Custom_Private_Key": "Privata Ŝlosila Enhavo", "SAML_Custom_Provider": "Propra Provizanto", "SAML_Custom_Public_Cert": "Publika Certa Enhavo", - "Sandstorm_Powerbox_Share": "Konigi Sandstorm-grajnon", "Saturday": "Sabato", "Save": "Savi", "save-others-livechat-room-info": "Konservu aliajn salutnajn ĉambrojn", @@ -2839,4 +2838,4 @@ "Your_push_was_sent_to_s_devices": "Via push estis sendita al%s aparatoj", "Your_server_link": "Via servilo-ligilo", "Your_workspace_is_ready": "Via labora spaco pretas uzi 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/es.i18n.json b/packages/rocketchat-i18n/i18n/es.i18n.json index 93b04dcca4ac..13b7daabe817 100644 --- a/packages/rocketchat-i18n/i18n/es.i18n.json +++ b/packages/rocketchat-i18n/i18n/es.i18n.json @@ -2233,7 +2233,6 @@ "SAML_Custom_Private_Key": "Contenido de clave privada", "SAML_Custom_Provider": "Proveedor Personalizado", "SAML_Custom_Public_Cert": "Contenido del certificado público", - "Sandstorm_Powerbox_Share": "Comparte un grano Sandstorm", "Saturday": "Sábado", "Save": "Guardar", "save-others-livechat-room-info": "Guardar otros Livechat Información de la habitación", @@ -2852,4 +2851,4 @@ "Your_push_was_sent_to_s_devices": "Su push fue enviado a los dispositivos %s", "Your_server_link": "Su enlace de servidor", "Your_workspace_is_ready": "Su espacio de trabajo está listo para usar 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/fa.i18n.json b/packages/rocketchat-i18n/i18n/fa.i18n.json index 285eec2eee71..ade80db03051 100644 --- a/packages/rocketchat-i18n/i18n/fa.i18n.json +++ b/packages/rocketchat-i18n/i18n/fa.i18n.json @@ -2227,7 +2227,6 @@ "SAML_Custom_Private_Key": "محتویات کلید خصوصی", "SAML_Custom_Provider": "ارائه دهنده سفارشی", "SAML_Custom_Public_Cert": "مطالب عمومی Cert", - "Sandstorm_Powerbox_Share": "دانه شن و ماسه را به اشتراک بگذارید", "Saturday": "شنبه", "Save": "ذخیره", "save-others-livechat-room-info": "سایر اطلاعات Livechat را ذخیره کنید", @@ -2846,4 +2845,4 @@ "Your_push_was_sent_to_s_devices": "فشار خود را به دستگاه %s را ارسال شد", "Your_server_link": "لینک سرور شما", "Your_workspace_is_ready": "فضای کاری شما آماده استفاده است" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/fi.i18n.json b/packages/rocketchat-i18n/i18n/fi.i18n.json index 124febc87ac6..36137bc2cc51 100644 --- a/packages/rocketchat-i18n/i18n/fi.i18n.json +++ b/packages/rocketchat-i18n/i18n/fi.i18n.json @@ -2220,7 +2220,6 @@ "SAML_Custom_Private_Key": "Yksityisen avaimen sisältö", "SAML_Custom_Provider": "Custom Provider", "SAML_Custom_Public_Cert": "Julkisen sisällön sisältö", - "Sandstorm_Powerbox_Share": "Jaa hiekkamyrsky", "Saturday": "Lauantai", "Save": "Tallenna", "save-others-livechat-room-info": "Tallenna muut Livechat-huoneilmoitukset", @@ -2839,4 +2838,4 @@ "Your_push_was_sent_to_s_devices": "Push-viestisi lähetettiin %s laitteeseen", "Your_server_link": "Palvelimesi linkki", "Your_workspace_is_ready": "Työtila on valmis käyttämään 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/fr.i18n.json b/packages/rocketchat-i18n/i18n/fr.i18n.json index d3bc242f3896..d912a68012ee 100644 --- a/packages/rocketchat-i18n/i18n/fr.i18n.json +++ b/packages/rocketchat-i18n/i18n/fr.i18n.json @@ -2221,7 +2221,6 @@ "SAML_Custom_Private_Key": "Contenu de la clé privée", "SAML_Custom_Provider": "Fournisseur personnalisé", "SAML_Custom_Public_Cert": "Contenu du certificat public", - "Sandstorm_Powerbox_Share": "Partager une graine Sandstorm", "Saturday": "Samedi", "Save": "Enregistrer", "save-others-livechat-room-info": "Enregistrer les autres Livechat Room Info", @@ -2840,4 +2839,4 @@ "Your_push_was_sent_to_s_devices": "Votre notification a été envoyée à %s appareils", "Your_server_link": "Le lien de votre serveur", "Your_workspace_is_ready": "Votre espace de travail est prêt à l'emploi 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/hr.i18n.json b/packages/rocketchat-i18n/i18n/hr.i18n.json index 225e46b11467..b983f25cb10a 100644 --- a/packages/rocketchat-i18n/i18n/hr.i18n.json +++ b/packages/rocketchat-i18n/i18n/hr.i18n.json @@ -2220,7 +2220,6 @@ "SAML_Custom_Private_Key": "Sadržaj privatnog ključa", "SAML_Custom_Provider": "Prilagođeni Provider", "SAML_Custom_Public_Cert": "Sadržaj javnog cert", - "Sandstorm_Powerbox_Share": "Podijeli Sandstorm grain", "Saturday": "Subota", "Save": "Spremi", "save-others-livechat-room-info": "Spremi druge informacije Livechat Room", @@ -2839,4 +2838,4 @@ "Your_push_was_sent_to_s_devices": "Push obavijest je poslana %s uređaje", "Your_server_link": "Veza poslužitelja", "Your_workspace_is_ready": "Radni je prostor spreman za upotrebu 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/hu.i18n.json b/packages/rocketchat-i18n/i18n/hu.i18n.json index aa82341657ce..3a657e2e5bd7 100644 --- a/packages/rocketchat-i18n/i18n/hu.i18n.json +++ b/packages/rocketchat-i18n/i18n/hu.i18n.json @@ -2220,7 +2220,6 @@ "SAML_Custom_Private_Key": "Privát kulcs tartalma", "SAML_Custom_Provider": "Egyedi Szolgáltató", "SAML_Custom_Public_Cert": "Nyilvános Cert tartalom", - "Sandstorm_Powerbox_Share": "Ossza meg a homokviharot", "Saturday": "szombat", "Save": "Mentés", "save-others-livechat-room-info": "Mások mentése a Livechat szobapiacon", @@ -2839,4 +2838,4 @@ "Your_push_was_sent_to_s_devices": "Push küldték %s eszközök", "Your_server_link": "A szerver linkje", "Your_workspace_is_ready": "A munkaterület készen áll a 🎉 használatára" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/id.i18n.json b/packages/rocketchat-i18n/i18n/id.i18n.json index 512f80dc17d0..8ace8f8cf61a 100644 --- a/packages/rocketchat-i18n/i18n/id.i18n.json +++ b/packages/rocketchat-i18n/i18n/id.i18n.json @@ -2220,7 +2220,6 @@ "SAML_Custom_Private_Key": "Isi Kunci Pribadi", "SAML_Custom_Provider": "Custom Provider", "SAML_Custom_Public_Cert": "Isi Cert Publik", - "Sandstorm_Powerbox_Share": "Bagikan butiran pasir pasir", "Saturday": "Sabtu", "Save": "Simpan", "save-others-livechat-room-info": "Simpan Informasi Kamar Livechat Lainnya", @@ -2839,4 +2838,4 @@ "Your_push_was_sent_to_s_devices": "push dikirim ke%s perangkat", "Your_server_link": "Tautan server Anda", "Your_workspace_is_ready": "Ruang kerja Anda siap digunakan 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/it.i18n.json b/packages/rocketchat-i18n/i18n/it.i18n.json index 2d5696fc02e7..66c96dad5fd6 100644 --- a/packages/rocketchat-i18n/i18n/it.i18n.json +++ b/packages/rocketchat-i18n/i18n/it.i18n.json @@ -2211,7 +2211,6 @@ "SAML_Custom_Private_Key": "Contenuto chiave privata", "SAML_Custom_Provider": "Custom Provider", "SAML_Custom_Public_Cert": "Public cert contents", - "Sandstorm_Powerbox_Share": "Condividi un Sandstorm grain", "Saturday": "Sabato", "Save": "Salva", "save-others-livechat-room-info": "Salva gli altri Livechat Room Info", @@ -2830,4 +2829,4 @@ "Your_push_was_sent_to_s_devices": "La tua richiesta è stata inviata ai %s dispositivi.", "Your_server_link": "Il tuo collegamento al server", "Your_workspace_is_ready": "Il tuo spazio di lavoro è pronto per l'uso 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/ja.i18n.json b/packages/rocketchat-i18n/i18n/ja.i18n.json index f570caba43ca..73c6bfb57613 100644 --- a/packages/rocketchat-i18n/i18n/ja.i18n.json +++ b/packages/rocketchat-i18n/i18n/ja.i18n.json @@ -2448,7 +2448,6 @@ "SAML_Custom_Private_Key": "秘密鍵の内容", "SAML_Custom_Provider": "カスタム プロバイダー", "SAML_Custom_Public_Cert": "公開証明書の内容", - "Sandstorm_Powerbox_Share": "砂嵐の穀物を共有する", "Saturday": "土曜日", "Save": "保存", "save-others-livechat-room-info": "ライブチャットルーム情報", @@ -3121,4 +3120,4 @@ "Your_push_was_sent_to_s_devices": "プッシュ通知が %s 台のデバイスへ送信されました", "Your_server_link": "サーバーのURLはこちら", "Your_workspace_is_ready": "ワークスペースの準備ができました🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/km.i18n.json b/packages/rocketchat-i18n/i18n/km.i18n.json index 80818f7e37cd..198b96b84be8 100644 --- a/packages/rocketchat-i18n/i18n/km.i18n.json +++ b/packages/rocketchat-i18n/i18n/km.i18n.json @@ -2373,7 +2373,6 @@ "SAML_Custom_Private_Key": "មាតិកាកូនសោឯកជន", "SAML_Custom_Provider": "ក្រុមហ៊ុនផ្ដល់ផ្ទាល់ខ្លួន", "SAML_Custom_Public_Cert": "មាតិកាសាធារណៈសាធារណៈ", - "Sandstorm_Powerbox_Share": "ចែករំលែកគ្រាប់ធញ្ញជាតិ Sandstorm មួយ", "Saturday": "ថ្ងៃសៅរ៍", "Save": "រក្សាទុក", "save-others-livechat-room-info": "រក្សាទុកព័ត៌មានផ្សេងទៀតរបស់ Livechat បន្ទប់", @@ -3030,4 +3029,4 @@ "Your_push_was_sent_to_s_devices": "ការជំរុញរបស់អ្នកត្រូវបានបញ្ជូនទៅកាន់ឧបករណ៍ %s បាន", "Your_server_link": "តំណភ្ជាប់ម៉ាស៊ីនមេរបស់អ្នក", "Your_workspace_is_ready": "កន្លែងធ្វើការរបស់អ្នករួចរាល់ដើម្បីប្រើ🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/ko.i18n.json b/packages/rocketchat-i18n/i18n/ko.i18n.json index 28698c5e63e3..34bde72b2c4d 100644 --- a/packages/rocketchat-i18n/i18n/ko.i18n.json +++ b/packages/rocketchat-i18n/i18n/ko.i18n.json @@ -2363,7 +2363,6 @@ "SAML_Custom_Private_Key": "사용자 정의 개인 키", "SAML_Custom_Provider": "사용자 정의 제공자", "SAML_Custom_Public_Cert": "사용자 정의 공개 인증서", - "Sandstorm_Powerbox_Share": "Sandstorm Powerbox 공유", "Saturday": "토요일", "Save": "저장", "save-others-livechat-room-info": "다른 사용자의 Livechat 대화방 정보 저장", @@ -3028,4 +3027,4 @@ "Your_push_was_sent_to_s_devices": "%개의 기기에 전송했습니다.", "Your_server_link": "서버 링크", "Your_workspace_is_ready": "Rocket.Chat을 사용할 준비가 되었습니다." -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/ku.i18n.json b/packages/rocketchat-i18n/i18n/ku.i18n.json index 90ae2f3db037..29425417a1fc 100644 --- a/packages/rocketchat-i18n/i18n/ku.i18n.json +++ b/packages/rocketchat-i18n/i18n/ku.i18n.json @@ -2219,7 +2219,6 @@ "SAML_Custom_Private_Key": "Contains Key Keys", "SAML_Custom_Provider": "Provider Custom", "SAML_Custom_Public_Cert": "Contents of Certificate of Public", - "Sandstorm_Powerbox_Share": "Share a Sandstorm", "Saturday": "Şemî", "Save": "پاشەکەوت", "save-others-livechat-room-info": "Hinek Dinştin Kûrek Kişandin Livechat", @@ -2838,4 +2837,4 @@ "Your_push_was_sent_to_s_devices": "push xwe ji bo cîhazên %s hate şandin", "Your_server_link": "Girêdana serverê", "Your_workspace_is_ready": "Karên te yên amadekar e amade ye" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/lo.i18n.json b/packages/rocketchat-i18n/i18n/lo.i18n.json index 823162387f1c..0a5959bcb030 100644 --- a/packages/rocketchat-i18n/i18n/lo.i18n.json +++ b/packages/rocketchat-i18n/i18n/lo.i18n.json @@ -2220,7 +2220,6 @@ "SAML_Custom_Private_Key": "ເນື້ອຫາທີ່ສໍາຄັນຂອງເອກະຊົນ", "SAML_Custom_Provider": "ຜູ້ໃຫ້ບໍລິການລູກຄ້າ", "SAML_Custom_Public_Cert": "Contents Public Cert", - "Sandstorm_Powerbox_Share": "ແບ່ງປັນເມັດ Sandstorm", "Saturday": "ວັນເສົາ", "Save": "ບັນທຶກ", "save-others-livechat-room-info": "ບັນທຶກຂໍ້ມູນອື່ນ ໆ Livechat Room Info", @@ -2839,4 +2838,4 @@ "Your_push_was_sent_to_s_devices": "ການຊຸກຍູ້ຂອງທ່ານໄດ້ຖືກສົ່ງໄປອຸປະກອນ %s", "Your_server_link": "ເຊື່ອມຕໍ່ເຊີຟເວີຂອງທ່ານ", "Your_workspace_is_ready": "ພື້ນທີ່ເຮັດວຽກຂອງທ່ານແມ່ນພ້ອມທີ່ຈະໃຊ້🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/lt.i18n.json b/packages/rocketchat-i18n/i18n/lt.i18n.json index af886a115d9e..3b413644e05c 100644 --- a/packages/rocketchat-i18n/i18n/lt.i18n.json +++ b/packages/rocketchat-i18n/i18n/lt.i18n.json @@ -2220,7 +2220,6 @@ "SAML_Custom_Private_Key": "Privataus raktų turinys", "SAML_Custom_Provider": "Tinkintas teikėjas", "SAML_Custom_Public_Cert": "Viešojo rašto turinys", - "Sandstorm_Powerbox_Share": "Pasidalykite smėlio akmens grūdais", "Saturday": "Šeštadienis", "Save": "Sutaupyti", "save-others-livechat-room-info": "Išsaugokite kitus \"Livechat\" kambario duomenis", @@ -2839,4 +2838,4 @@ "Your_push_was_sent_to_s_devices": "Jūsų paspaudimas buvo išsiųstas į%s įrenginius", "Your_server_link": "Jūsų serverio nuoroda", "Your_workspace_is_ready": "Jūsų darbo vieta yra paruošta naudoti 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/lv.i18n.json b/packages/rocketchat-i18n/i18n/lv.i18n.json index 56b45a3ac526..5706673d43ad 100644 --- a/packages/rocketchat-i18n/i18n/lv.i18n.json +++ b/packages/rocketchat-i18n/i18n/lv.i18n.json @@ -2219,7 +2219,6 @@ "SAML_Custom_Private_Key": "Privātās atslēgas saturs", "SAML_Custom_Provider": "Pielāgots pakalpojuma sniedzējs", "SAML_Custom_Public_Cert": "Publiskā sertifikāta saturs", - "Sandstorm_Powerbox_Share": "Dalies ar Sandstorm grain", "Saturday": "Sestdiena", "Save": "Saglabāt", "save-others-livechat-room-info": "Saglabāt citiem Livechat istabas informāciju", @@ -2838,4 +2837,4 @@ "Your_push_was_sent_to_s_devices": "Jūsu push tika nosūtīts uz %s ierīcēm", "Your_server_link": "Jūsu servera saite", "Your_workspace_is_ready": "Jūsu darbastacija ir gatava lietošanai 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/mn.i18n.json b/packages/rocketchat-i18n/i18n/mn.i18n.json index 35d9d5323037..60509cdc7fcf 100644 --- a/packages/rocketchat-i18n/i18n/mn.i18n.json +++ b/packages/rocketchat-i18n/i18n/mn.i18n.json @@ -2220,7 +2220,6 @@ "SAML_Custom_Private_Key": "Хувийн түлхүүр агуулга", "SAML_Custom_Provider": "Гаалийн байгууллага", "SAML_Custom_Public_Cert": "Нийтийн гэрчилгээний агуулга", - "Sandstorm_Powerbox_Share": "Элс элсний үрийг хуваалц", "Saturday": "Бямба", "Save": "Хадгалах", "save-others-livechat-room-info": "Бусад Livechat Өрөөний мэдээллийг ав", @@ -2839,4 +2838,4 @@ "Your_push_was_sent_to_s_devices": "Таны түлхэлт%s төхөөрөмж рүү илгээгдсэн", "Your_server_link": "Таны серверийн холбоос", "Your_workspace_is_ready": "Таны ажлын талбарыг ашиглахад бэлэн байна" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/ms-MY.i18n.json b/packages/rocketchat-i18n/i18n/ms-MY.i18n.json index b76e8fa29586..e99e6181d335 100644 --- a/packages/rocketchat-i18n/i18n/ms-MY.i18n.json +++ b/packages/rocketchat-i18n/i18n/ms-MY.i18n.json @@ -2220,7 +2220,6 @@ "SAML_Custom_Private_Key": "Kandungan Utama Peribadi", "SAML_Custom_Provider": "Pembekal Custom", "SAML_Custom_Public_Cert": "Kandungan Sijil Awam", - "Sandstorm_Powerbox_Share": "Berkongsi gandum pasir", "Saturday": "Sabtu", "Save": "Simpan", "save-others-livechat-room-info": "Simpan Lain-lain Maklumat Bilik Livechat", @@ -2839,4 +2838,4 @@ "Your_push_was_sent_to_s_devices": "push anda telah dihantar ke peranti %s", "Your_server_link": "Pautan pelayan anda", "Your_workspace_is_ready": "Ruang kerja anda sedia untuk menggunakan 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/nl.i18n.json b/packages/rocketchat-i18n/i18n/nl.i18n.json index 829ae9e20a29..5bb99684f7c4 100644 --- a/packages/rocketchat-i18n/i18n/nl.i18n.json +++ b/packages/rocketchat-i18n/i18n/nl.i18n.json @@ -2323,7 +2323,6 @@ "SAML_Custom_Private_Key": "Private Key Inhoud", "SAML_Custom_Provider": "Custom Provider", "SAML_Custom_Public_Cert": "Public Cert Contents", - "Sandstorm_Powerbox_Share": "Deel een zandstormkorrel", "Saturday": "Zaterdag", "Save": "Bewaren", "save-others-livechat-room-info": "Sla anderen op Livechat Room Info", @@ -2987,4 +2986,4 @@ "Your_push_was_sent_to_s_devices": "Je push werd verzonden naar %s apparaten", "Your_server_link": "Uw serverlink", "Your_workspace_is_ready": "Uw werkruimte is klaar voor gebruik 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/no.i18n.json b/packages/rocketchat-i18n/i18n/no.i18n.json index be17fbd8e848..af5b32e57840 100644 --- a/packages/rocketchat-i18n/i18n/no.i18n.json +++ b/packages/rocketchat-i18n/i18n/no.i18n.json @@ -2221,7 +2221,6 @@ "SAML_Custom_Private_Key": "Privat nøkkelinnhold", "SAML_Custom_Provider": "Tilpasset leverandør", "SAML_Custom_Public_Cert": "Offentlig sertifisering", - "Sandstorm_Powerbox_Share": "Del en sandstorm korn", "Saturday": "lørdag", "Save": "Lagre", "save-others-livechat-room-info": "Lagre andre Livechat Room Info", @@ -2840,4 +2839,4 @@ "Your_push_was_sent_to_s_devices": "Din push ble sendt til%s-enheter", "Your_server_link": "Din serverkobling", "Your_workspace_is_ready": "Ditt arbeidsområde er klar til bruk 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/pl.i18n.json b/packages/rocketchat-i18n/i18n/pl.i18n.json index 49fb3c0b060e..585f43d3bf33 100644 --- a/packages/rocketchat-i18n/i18n/pl.i18n.json +++ b/packages/rocketchat-i18n/i18n/pl.i18n.json @@ -2448,7 +2448,6 @@ "SAML_Custom_Private_Key": "Zawartość klucza prywatnego", "SAML_Custom_Provider": "Własny dostawca (provider)", "SAML_Custom_Public_Cert": "Public Cert Contents", - "Sandstorm_Powerbox_Share": "Udostępnij ziarno burzy piaskowej", "Saturday": "Sobota", "Save": "Zapisz", "save-others-livechat-room-info": "Zapisz inne informacje o pokoju Livechat", @@ -3121,4 +3120,4 @@ "Your_push_was_sent_to_s_devices": "Twój push została wysłany do urządzeń: %s", "Your_server_link": "Twój link do serwera", "Your_workspace_is_ready": "Twój obszar roboczy jest gotowy do użycia 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json index ac66b085e709..83288c21ee98 100644 --- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json +++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json @@ -2448,7 +2448,6 @@ "SAML_Custom_Private_Key": "Conteúdo chave privado", "SAML_Custom_Provider": "Provedor Personalizado", "SAML_Custom_Public_Cert": "Conteúdo do Círculo Público", - "Sandstorm_Powerbox_Share": "Compartilhe um grão de tempestade de areia", "Saturday": "sábado", "Save": "Salvar", "save-others-livechat-room-info": "Salve outras informações de Sala de Livechat", diff --git a/packages/rocketchat-i18n/i18n/pt.i18n.json b/packages/rocketchat-i18n/i18n/pt.i18n.json index e2d7da25bacf..9a263cfb32c6 100644 --- a/packages/rocketchat-i18n/i18n/pt.i18n.json +++ b/packages/rocketchat-i18n/i18n/pt.i18n.json @@ -2448,7 +2448,6 @@ "SAML_Custom_Private_Key": "Conteúdo chave privado", "SAML_Custom_Provider": "Provedor Personalizado", "SAML_Custom_Public_Cert": "Conteúdo do Círculo Público", - "Sandstorm_Powerbox_Share": "Compartilhe um grão de tempestade de areia", "Saturday": "Sábado", "Save": "Salvar", "save-others-livechat-room-info": "Salve outros serviços Livechat Room", @@ -3121,4 +3120,4 @@ "Your_push_was_sent_to_s_devices": "A sua notificação foi enviada para %s dispositivos", "Your_server_link": "O link do seu servidor", "Your_workspace_is_ready": "O seu espaço de trabalho está pronto a usar 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/ro.i18n.json b/packages/rocketchat-i18n/i18n/ro.i18n.json index 3be8758335ad..4e63b11fe8d2 100644 --- a/packages/rocketchat-i18n/i18n/ro.i18n.json +++ b/packages/rocketchat-i18n/i18n/ro.i18n.json @@ -2220,7 +2220,6 @@ "SAML_Custom_Private_Key": "Conținut cheie privat", "SAML_Custom_Provider": "Custom Provider", "SAML_Custom_Public_Cert": "Conținut public", - "Sandstorm_Powerbox_Share": "Distribuiți o granulă de nisip", "Saturday": "Sâmbătă", "Save": "Salvează", "save-others-livechat-room-info": "Salvează alte informații livechat despre cameră", @@ -2839,4 +2838,4 @@ "Your_push_was_sent_to_s_devices": "Mesajul Push a fost trimis la %s dispozitive", "Your_server_link": "Linkul dvs. de server", "Your_workspace_is_ready": "Spațiul dvs. de lucru este gata de utilizare 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/ru.i18n.json b/packages/rocketchat-i18n/i18n/ru.i18n.json index 2308b777c360..ba00b01ce741 100644 --- a/packages/rocketchat-i18n/i18n/ru.i18n.json +++ b/packages/rocketchat-i18n/i18n/ru.i18n.json @@ -2394,7 +2394,6 @@ "SAML_Custom_Private_Key": "Закрытый ключ содержит", "SAML_Custom_Provider": "Пользовательский поставщик", "SAML_Custom_Public_Cert": "Публичный ключ содержит", - "Sandstorm_Powerbox_Share": "Share a Sandstorm grain", "Saturday": "Суббота", "Save": "Сохранить", "save-others-livechat-room-info": "Сохранить информацию о других комнатах Livechat", @@ -3055,4 +3054,4 @@ "Your_push_was_sent_to_s_devices": "Оповещение было отправлено на %s устройств.", "Your_server_link": "Ссылка на ваш сервер", "Your_workspace_is_ready": "Ваше рабочее пространство готово к работе 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/sk-SK.i18n.json b/packages/rocketchat-i18n/i18n/sk-SK.i18n.json index 892850c08368..b0261d0d29b3 100644 --- a/packages/rocketchat-i18n/i18n/sk-SK.i18n.json +++ b/packages/rocketchat-i18n/i18n/sk-SK.i18n.json @@ -2219,7 +2219,6 @@ "SAML_Custom_Private_Key": "Obsah súkromného kľúča", "SAML_Custom_Provider": "Vlastný poskytovateľ", "SAML_Custom_Public_Cert": "Obsah verejného obsahu", - "Sandstorm_Powerbox_Share": "Zdieľajte zrno piesku", "Saturday": "sobota", "Save": "uložiť", "save-others-livechat-room-info": "Uložiť ostatné Informácie o miestnosti v miestnosti Livechat", @@ -2838,4 +2837,4 @@ "Your_push_was_sent_to_s_devices": "Posun bol odoslaný na zariadenia%s", "Your_server_link": "Váš odkaz na server", "Your_workspace_is_ready": "Váš pracovný priestor je pripravený na použitie 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/sl-SI.i18n.json b/packages/rocketchat-i18n/i18n/sl-SI.i18n.json index 8111da4ae48a..7d6d1d146327 100644 --- a/packages/rocketchat-i18n/i18n/sl-SI.i18n.json +++ b/packages/rocketchat-i18n/i18n/sl-SI.i18n.json @@ -2218,7 +2218,6 @@ "SAML_Custom_Private_Key": "Vsebina zasebnega ključa", "SAML_Custom_Provider": "Ponudnik po meri", "SAML_Custom_Public_Cert": "Javni ključ", - "Sandstorm_Powerbox_Share": "Delite vsebino iz Sandstorma", "Saturday": "Sobota", "Save": "Shrani", "save-others-livechat-room-info": "Shrani druge informacije Livechat sobe", @@ -2837,4 +2836,4 @@ "Your_push_was_sent_to_s_devices": "Vaš potisk je bil poslan v naprave %s", "Your_server_link": "Povezava strežnika", "Your_workspace_is_ready": "Vaš delovni prostor je pripravljen za uporabo 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/sq.i18n.json b/packages/rocketchat-i18n/i18n/sq.i18n.json index a3eff4f02087..2d2228d3d572 100644 --- a/packages/rocketchat-i18n/i18n/sq.i18n.json +++ b/packages/rocketchat-i18n/i18n/sq.i18n.json @@ -2220,7 +2220,6 @@ "SAML_Custom_Private_Key": "Përmbajtja kryesore private", "SAML_Custom_Provider": "Custom Provider", "SAML_Custom_Public_Cert": "Përmbajtja e Cert Publik", - "Sandstorm_Powerbox_Share": "Ndani një kokërr Sandstorm", "Saturday": "e shtunë", "Save": "Ruaj", "save-others-livechat-room-info": "Ruaj të tjerët Info Livechat Room", @@ -2839,4 +2838,4 @@ "Your_push_was_sent_to_s_devices": "shtytje juaj u dërgua në pajisjet %s", "Your_server_link": "Lidhjet e serverit tuaj", "Your_workspace_is_ready": "Hapësira e punës tënde është e gatshme të përdorë 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/sr.i18n.json b/packages/rocketchat-i18n/i18n/sr.i18n.json index 18422517b7a5..bde5a689491a 100644 --- a/packages/rocketchat-i18n/i18n/sr.i18n.json +++ b/packages/rocketchat-i18n/i18n/sr.i18n.json @@ -2220,7 +2220,6 @@ "SAML_Custom_Private_Key": "Садржај приватног кључа", "SAML_Custom_Provider": "цустом провајдера", "SAML_Custom_Public_Cert": "Публиц Церт Цонтентс", - "Sandstorm_Powerbox_Share": "Поделите зрну печурке", "Saturday": "Субота", "Save": "Сачувај", "save-others-livechat-room-info": "Сачувај друге Ливецхат Роом Инфо", @@ -2839,4 +2838,4 @@ "Your_push_was_sent_to_s_devices": "Ваш притиском је послат на% с уређајима", "Your_server_link": "Веза са сервером", "Your_workspace_is_ready": "Ваш радни простор је спреман за кориштење 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/sv.i18n.json b/packages/rocketchat-i18n/i18n/sv.i18n.json index 9a51d7f1262b..91f463b06cf5 100644 --- a/packages/rocketchat-i18n/i18n/sv.i18n.json +++ b/packages/rocketchat-i18n/i18n/sv.i18n.json @@ -2278,7 +2278,6 @@ "SAML_Custom_Private_Key": "Privat nyckelinnehåll", "SAML_Custom_Provider": "anpassade Provider", "SAML_Custom_Public_Cert": "Certifikat för allmän certifiering", - "Sandstorm_Powerbox_Share": "Dela en sandstormkorn", "Saturday": "lördag", "Save": "Spara", "save-others-livechat-room-info": "Spara andra Livechat Room Info", @@ -2903,4 +2902,4 @@ "Your_push_was_sent_to_s_devices": "Din push skickades till %s enheter", "Your_server_link": "Din serverlänk", "Your_workspace_is_ready": "Din arbetsyta är redo att använda 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/ta-IN.i18n.json b/packages/rocketchat-i18n/i18n/ta-IN.i18n.json index e857d4241e54..2bc7f0a816f6 100644 --- a/packages/rocketchat-i18n/i18n/ta-IN.i18n.json +++ b/packages/rocketchat-i18n/i18n/ta-IN.i18n.json @@ -2220,7 +2220,6 @@ "SAML_Custom_Private_Key": "தனிப்பட்ட விசை பொருளடக்கம்", "SAML_Custom_Provider": "விருப்ப வழங்குநர்", "SAML_Custom_Public_Cert": "பொது சான்றிதழ்", - "Sandstorm_Powerbox_Share": "ஒரு மணற்புயல் தானியத்தைப் பகிர்ந்து கொள்ளுங்கள்", "Saturday": "சனிக்கிழமை", "Save": "சேமி", "save-others-livechat-room-info": "மற்றவர்கள் Livechat அறை தகவல் சேமிக்க", @@ -2839,4 +2838,4 @@ "Your_push_was_sent_to_s_devices": "உங்கள் மிகுதி% கள் சாதனங்கள் அனுப்பப்பட்டது", "Your_server_link": "உங்கள் சர்வர் இணைப்பு", "Your_workspace_is_ready": "உங்கள் பணியிடம் use பயன்படுத்த தயாராக உள்ளது" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/th-TH.i18n.json b/packages/rocketchat-i18n/i18n/th-TH.i18n.json index 55b0ba4ab528..6411bfa02e16 100644 --- a/packages/rocketchat-i18n/i18n/th-TH.i18n.json +++ b/packages/rocketchat-i18n/i18n/th-TH.i18n.json @@ -2219,7 +2219,6 @@ "SAML_Custom_Private_Key": "เนื้อหาสำคัญของภาคเอกชน", "SAML_Custom_Provider": "ผู้ให้บริการแบบกำหนดเอง", "SAML_Custom_Public_Cert": "เนื้อหาของใบรับรองสาธารณะ", - "Sandstorm_Powerbox_Share": "แชร์แซนด์สตอร์ม", "Saturday": "วันเสาร์", "Save": "ประหยัด", "save-others-livechat-room-info": "บันทึกข้อมูลอื่น ๆ ของ Livechat", @@ -2838,4 +2837,4 @@ "Your_push_was_sent_to_s_devices": "การกดของคุณถูกส่งไปยังอุปกรณ์%s", "Your_server_link": "ลิงค์เซิร์ฟเวอร์ของคุณ", "Your_workspace_is_ready": "พื้นที่ทำงานของคุณพร้อมใช้งานแล้ว🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/tr.i18n.json b/packages/rocketchat-i18n/i18n/tr.i18n.json index 4b3ed72ee6f4..a4f88b9ff547 100644 --- a/packages/rocketchat-i18n/i18n/tr.i18n.json +++ b/packages/rocketchat-i18n/i18n/tr.i18n.json @@ -2426,7 +2426,6 @@ "SAML_Custom_Private_Key": "Özel Anahtar İçeriği", "SAML_Custom_Provider": "Özel Sağlayıcı", "SAML_Custom_Public_Cert": "Genel Sertifika İçeriği", - "Sandstorm_Powerbox_Share": "Kum fırtınası tahıl paylaşın", "Saturday": "Cumartesi", "Save": "Kaydet", "save-others-livechat-room-info": "Diğerlerini Kaydedin Livechat Oda Bilgileri", @@ -3097,4 +3096,4 @@ "Your_push_was_sent_to_s_devices": "Bildiriminiz %s aygıtlara gönderildi", "Your_server_link": "Sunucu bağlantınız", "Your_workspace_is_ready": "Çalışma alanınız kullanılmaya hazır 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/uk.i18n.json b/packages/rocketchat-i18n/i18n/uk.i18n.json index 02cec9377520..4f64dc358353 100644 --- a/packages/rocketchat-i18n/i18n/uk.i18n.json +++ b/packages/rocketchat-i18n/i18n/uk.i18n.json @@ -2220,7 +2220,6 @@ "SAML_Custom_Private_Key": "Зміст приватного ключа", "SAML_Custom_Provider": "Призначений для користувача постачальник", "SAML_Custom_Public_Cert": "Публічний зміст курсу", - "Sandstorm_Powerbox_Share": "Поділіться піщаним зерном", "Saturday": "субота", "Save": "Зберегти", "save-others-livechat-room-info": "Зберегти іншу інформацію про номер Livechat", @@ -2839,4 +2838,4 @@ "Your_push_was_sent_to_s_devices": "Ваш поштовх був відправлений в %s пристроїв", "Your_server_link": "Ваш серверний зв'язок", "Your_workspace_is_ready": "Ваша робоча область готова до використання 🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/vi-VN.i18n.json b/packages/rocketchat-i18n/i18n/vi-VN.i18n.json index ee4830f1bcdf..5d61b3d34141 100644 --- a/packages/rocketchat-i18n/i18n/vi-VN.i18n.json +++ b/packages/rocketchat-i18n/i18n/vi-VN.i18n.json @@ -2211,7 +2211,6 @@ "SAML_Custom_Private_Key": "Nội dung Private Key", "SAML_Custom_Provider": "Tùy chỉnh Provider", "SAML_Custom_Public_Cert": "Nội dung Cert Contents", - "Sandstorm_Powerbox_Share": "Chia sẻ một hạt Sandstorm", "Saturday": "ngày thứ bảy", "Save": "Lưu", "save-others-livechat-room-info": "Lưu thông tin khác Livechat Thông tin về phòng", @@ -2830,4 +2829,4 @@ "Your_push_was_sent_to_s_devices": "Đã được gửi tới % thiết bị", "Your_server_link": "Đường dẫn máy chủ của bạn", "Your_workspace_is_ready": "Workspace của bạn đã sẵn sàng" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/zh-HK.i18n.json b/packages/rocketchat-i18n/i18n/zh-HK.i18n.json index cdb430616a37..3417a187b5b3 100644 --- a/packages/rocketchat-i18n/i18n/zh-HK.i18n.json +++ b/packages/rocketchat-i18n/i18n/zh-HK.i18n.json @@ -2224,7 +2224,6 @@ "SAML_Custom_Private_Key": "私钥内容", "SAML_Custom_Provider": "定制提供商", "SAML_Custom_Public_Cert": "公共证书内容", - "Sandstorm_Powerbox_Share": "分享沙尘颗粒", "Saturday": "星期六", "Save": "保存", "save-others-livechat-room-info": "保存其他实时聊天室信息", @@ -2843,4 +2842,4 @@ "Your_push_was_sent_to_s_devices": "您的推送已发送到％s设备", "Your_server_link": "您的服务器链接", "Your_workspace_is_ready": "您的工作区已准备好使用🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/zh-TW.i18n.json b/packages/rocketchat-i18n/i18n/zh-TW.i18n.json index c63f74708de3..b6ce132d2099 100644 --- a/packages/rocketchat-i18n/i18n/zh-TW.i18n.json +++ b/packages/rocketchat-i18n/i18n/zh-TW.i18n.json @@ -2225,7 +2225,6 @@ "SAML_Custom_Private_Key": "私鑰內容", "SAML_Custom_Provider": "自訂提供者", "SAML_Custom_Public_Cert": "公共證書內容", - "Sandstorm_Powerbox_Share": "分享沙塵顆粒", "Saturday": "星期六", "Save": "儲存", "save-others-livechat-room-info": "保存其他實時聊天室信息", @@ -2844,4 +2843,4 @@ "Your_push_was_sent_to_s_devices": "您的推播已發送到 %s 裝置", "Your_server_link": "您的服務器鏈接", "Your_workspace_is_ready": "您的工作區已準備好使用🎉" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/zh.i18n.json b/packages/rocketchat-i18n/i18n/zh.i18n.json index b0e2a9df7d1f..ebd7dbba7a21 100644 --- a/packages/rocketchat-i18n/i18n/zh.i18n.json +++ b/packages/rocketchat-i18n/i18n/zh.i18n.json @@ -2448,7 +2448,6 @@ "SAML_Custom_Private_Key": "Private Key", "SAML_Custom_Provider": "自定义供应商", "SAML_Custom_Public_Cert": "Public Cert", - "Sandstorm_Powerbox_Share": "分享 Sandstorm grain", "Saturday": "星期六", "Save": "保存", "save-others-livechat-room-info": "保存其他即时聊天室信息", @@ -3121,4 +3120,4 @@ "Your_push_was_sent_to_s_devices": "您的推送已被送到 %s 台设备", "Your_server_link": "您的服务器链接", "Your_workspace_is_ready": "您的工作区已准备好使用🎉" -} \ No newline at end of file +} diff --git a/server/configuration/accounts_meld.js b/server/configuration/accounts_meld.js index ebd316b1f4b5..d53b8dfa8bfd 100644 --- a/server/configuration/accounts_meld.js +++ b/server/configuration/accounts_meld.js @@ -13,7 +13,6 @@ Accounts.updateOrCreateUserFromExternalService = function(serviceName, serviceDa 'meteor-developer', 'linkedin', 'twitter', - 'sandstorm', ]; if (services.includes(serviceName) === false && serviceData._OAuthCustom !== true) { diff --git a/server/importPackages.js b/server/importPackages.js index cba8f2be1737..314d0ff406d6 100644 --- a/server/importPackages.js +++ b/server/importPackages.js @@ -66,7 +66,6 @@ import '../app/otr'; import '../app/push-notifications'; import '../app/retention-policy'; import '../app/apps'; -import '../app/sandstorm'; import '../app/setup-wizard'; import '../app/slackbridge'; import '../app/slashcommands-archiveroom'; diff --git a/server/startup/avatar.js b/server/startup/avatar.js index 254a98dfc6e3..8237f39754dd 100644 --- a/server/startup/avatar.js +++ b/server/startup/avatar.js @@ -67,15 +67,6 @@ Meteor.startup(function() { username = username.replace(/\.jpg$/, ''); if (username[0] !== '@') { - if (Meteor.settings && Meteor.settings.public && Meteor.settings.public.sandstorm) { - const user = Users.findOneByUsername(username); - if (user && user.services && user.services.sandstorm && user.services.sandstorm.picture) { - res.setHeader('Location', user.services.sandstorm.picture); - res.writeHead(302); - res.end(); - return; - } - } file = Avatars.findOneByName(username); }