Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Rocket.Chat to 3.12.1 - last merged state including Smarti #685

Draft
wants to merge 612 commits into
base: master
Choose a base branch
from
Draft

Update Rocket.Chat to 3.12.1 - last merged state including Smarti #685

wants to merge 612 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on May 7, 2019

  1. Merge branch 'fix/RocketChat#14027-edit-discussion-rooms' into merge/1.0

    @mrsimpson
    mrsimpson committed May 7, 2019
    Configuration menu
    Copy the full SHA
    1523a25 View commit details
    Browse the repository at this point in the history

  2. adjust migrations

    @vickyokrm
    vickyokrm committed May 7, 2019
    Configuration menu
    Copy the full SHA
    600cd0d View commit details
    Browse the repository at this point in the history

  3. fix the prev migration issue for team chat

    @vickyokrm
    vickyokrm committed May 7, 2019
    Configuration menu
    Copy the full SHA
    addbbc0 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2019

  1. Adapt migration to discussions: Always create a quoted message

    @mrsimpson
    mrsimpson committed May 8, 2019
    Configuration menu
    Copy the full SHA
    24e587a View commit details
    Browse the repository at this point in the history

  2. remove intermediate fix for migration of team chat

    @mrsimpson
    mrsimpson committed May 8, 2019
    Configuration menu
    Copy the full SHA
    74dd7d9 View commit details
    Browse the repository at this point in the history

  3. Migration of threads: Fix message_link

    @mrsimpson
    mrsimpson committed May 8, 2019
    Configuration menu
    Copy the full SHA
    78ecf7a View commit details
    Browse the repository at this point in the history

Commits on May 13, 2019

  1. Merge tag '1.0.3' into merge/1.0

    @mrsimpson
    mrsimpson committed May 13, 2019
    Configuration menu
    Copy the full SHA
    48d5f1a View commit details
    Browse the repository at this point in the history

  2. update timestamp on quote

    @vickyokrm
    vickyokrm committed May 13, 2019
    Configuration menu
    Copy the full SHA
    e79525c View commit details
    Browse the repository at this point in the history

Commits on May 27, 2019

  1. Re-merge tag '1.0.3' into HEAD

    @mrsimpson
    mrsimpson committed May 27, 2019
    Configuration menu
    Copy the full SHA
    d96dfa5 View commit details
    Browse the repository at this point in the history

  2. Fix MongoURL in CircleCI

    @mrsimpson
    mrsimpson committed May 27, 2019
    Configuration menu
    Copy the full SHA
    94b150c View commit details
    Browse the repository at this point in the history

  3. Remove DBS autotranslate

    @mrsimpson
    mrsimpson committed May 27, 2019
    Configuration menu
    Copy the full SHA
    bf4caf2 View commit details
    Browse the repository at this point in the history

  4. Install dependencies

    @mrsimpson
    mrsimpson committed May 27, 2019
    Configuration menu
    Copy the full SHA
    5d48ee5 View commit details
    Browse the repository at this point in the history

  5. Re-add MONGO_URL in CircleCI

    @mrsimpson
    mrsimpson committed May 27, 2019
    Configuration menu
    Copy the full SHA
    476ffda View commit details
    Browse the repository at this point in the history

  6. Migration: Set timestamp for quoted messages 

    Manual cherry-pick of e79525c
    @mrsimpson
    mrsimpson committed May 27, 2019
    Configuration menu
    Copy the full SHA
    d1eb992 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #603 from assistify/merge/1.0 

    Update Rocket.Chat to version 1.0.3
    @mrsimpson
    mrsimpson authored May 27, 2019
    Configuration menu
    Copy the full SHA
    b449ffd View commit details
    Browse the repository at this point in the history

Commits on May 31, 2019

  1. Merge tag '1.1.1' into merge/1.1

    @mrsimpson
    mrsimpson committed May 31, 2019
    Configuration menu
    Copy the full SHA
    fd9404f View commit details
    Browse the repository at this point in the history

  2. Add missing german translations

    @mrsimpson
    mrsimpson committed May 31, 2019
    Configuration menu
    Copy the full SHA
    4531d58 View commit details
    Browse the repository at this point in the history

  3. Two headers in one page: Try to add spacing

    @mrsimpson
    mrsimpson committed May 31, 2019
    Configuration menu
    Copy the full SHA
    73b7ee9 View commit details
    Browse the repository at this point in the history

  4. Adhere to new linting rules in Assistify-packages

    @mrsimpson
    mrsimpson committed May 31, 2019
    Configuration menu
    Copy the full SHA
    16c27a5 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/develop' into merge/1.1

    @mrsimpson
    mrsimpson committed May 31, 2019
    Configuration menu
    Copy the full SHA
    6ea2717 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2019

  1. Drop an obsolete index on livechat subscriptions 

    This index should have been dropped ealier (v122)
In some scenarios, this didn't work
    @mrsimpson
    mrsimpson committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    b9057ca View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2019

  1. Add missing German Translations

    @vickyokrm
    vickyokrm committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    beb36fa View commit details
    Browse the repository at this point in the history

  2. Import Assistify logo for livechat

    @vickyokrm
    vickyokrm committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    f92a8a6 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #609 from assistify/fix/#608-Fix-LiveChat-Issues 

    Fix/#608 fix live chat issues
    @mrsimpson
    mrsimpson authored Jun 4, 2019
    Configuration menu
    Copy the full SHA
    55e8831 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #607 from assistify/fix/drop-obsolete-livechat-index 

    Drop an obsolete index on livechat subscriptions
    @vickyokrm
    vickyokrm authored Jun 4, 2019
    Configuration menu
    Copy the full SHA
    2652fa3 View commit details
    Browse the repository at this point in the history

  5. update packages

    @mrsimpson
    mrsimpson committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    735c82d View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2019

  1. Update deployed version of node.js

    @mrsimpson
    mrsimpson committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    39ee85f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #610 from assistify/release/1.0.3-0.9.9 

    Update deployed version of node.js
    @vickyokrm
    vickyokrm authored Jun 5, 2019
    Configuration menu
    Copy the full SHA
    fa1a581 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2019

  1. Merge pull request #611 from assistify/release/1.0.3-0.9.9 

    Release 1.0.3 0.9.9
    @ruKurz
    ruKurz authored Jun 6, 2019
    Configuration menu
    Copy the full SHA
    e092b4f View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2019

  1. Use logger module for logging

    @vickyokrm
    vickyokrm committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    64b419b View commit details
    Browse the repository at this point in the history

  2. Add sections for each provider

    @vickyokrm
    vickyokrm committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    90aeb72 View commit details
    Browse the repository at this point in the history

  3. Show provide info on the log

    @vickyokrm
    vickyokrm committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    acaadfd View commit details
    Browse the repository at this point in the history

  4. Fix translation issue from the context menu

    @vickyokrm
    vickyokrm committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    53ea101 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #615 from assistify/hotfix/#614-autotranslate-exce… 

    …ptions

Hotfix/#614 autotranslate exceptions
    @jschirrmacher
    jschirrmacher authored Jun 19, 2019
    Configuration menu
    Copy the full SHA
    b001d62 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2019

  1. Pass the message text correctly

    @vickyokrm
    vickyokrm committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    097b01d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #617 from assistify/hotfix/#616-copy-not-working 

    Fix copy message issue
    @jschirrmacher
    jschirrmacher authored Jun 24, 2019
    Configuration menu
    Copy the full SHA
    467fa9d View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2019

  1. invalidate msg cache after 500ms

    @vickyokrm
    vickyokrm committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    7e7467d View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/hotfix/#614-autotranslate-except… 

    …ions' into fix/#618-reduce-msg-render-time
    @vickyokrm
    vickyokrm committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    ce31532 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #619 from assistify/fix/#618-reduce-msg-render-time 

    Invalidate Message render cache time after 500ms
    @jschirrmacher
    jschirrmacher authored Jun 25, 2019
    Configuration menu
    Copy the full SHA
    0b3ce8e View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2019

  1. Merge tag '1.1.3' into merge/1.1

    @mrsimpson
    mrsimpson committed Jul 8, 2019
    Configuration menu
    Copy the full SHA
    639d1f7 View commit details
    Browse the repository at this point in the history

  2. Grant more time for info table to appear in test

    @mrsimpson
    mrsimpson committed Jul 8, 2019
    Configuration menu
    Copy the full SHA
    44de29f View commit details
    Browse the repository at this point in the history

  3. Fix tests (DOM selectors)

    @mrsimpson
    mrsimpson committed Jul 8, 2019
    Configuration menu
    Copy the full SHA
    5bf2c7b View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2019

  1. Make usage statistics configurable

    @mrsimpson
    mrsimpson committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    072b83f View commit details
    Browse the repository at this point in the history

  2. Fix test manual user activation: Wait for userlist

    @mrsimpson
    mrsimpson committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    6e0dd15 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2019

  1. Merge branch 'develop' into merge/1.1

    @mrsimpson
    mrsimpson committed Jul 12, 2019
    Configuration menu
    Copy the full SHA
    bab3eb5 View commit details
    Browse the repository at this point in the history

  2. Adhere to latest linting-rules

    @mrsimpson
    mrsimpson committed Jul 12, 2019
    Configuration menu
    Copy the full SHA
    052f631 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2019

  1. Unblock loading of Smarti UI widget

    @mrsimpson
    mrsimpson committed Jul 15, 2019
    Configuration menu
    Copy the full SHA
    7eb12d1 View commit details
    Browse the repository at this point in the history

  2. Fix Smarti Adapter: Always pass roomId instead of room object

    @mrsimpson
    mrsimpson committed Jul 15, 2019
    Configuration menu
    Copy the full SHA
    ea8e9a7 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2019

  1. Fix Smarti re-sync and reading cached mapping

    @mrsimpson
    mrsimpson committed Jul 16, 2019
    Configuration menu
    Copy the full SHA
    7f3d3f1 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2019

  1. Blank lines

    @mrsimpson
    mrsimpson committed Jul 17, 2019
    Configuration menu
    Copy the full SHA
    6320de3 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2019

  1. Merge pull request #606 from assistify/merge/1.1 

    Merge Rocket.Chat 1.1
    @mrsimpson
    mrsimpson authored Jul 19, 2019
    Configuration menu
    Copy the full SHA
    2f8d69d View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2019

  1. Merge remote-tracking branch 'origin/develop' into resolve-unneccessa… 

    …ry-diff
    @vickyokrm
    vickyokrm committed Jul 23, 2019
    Configuration menu
    Copy the full SHA
    b1d7bce View commit details
    Browse the repository at this point in the history

  2. Adjust package.json

    @vickyokrm
    vickyokrm committed Jul 23, 2019
    Configuration menu
    Copy the full SHA
    82d75ad View commit details
    Browse the repository at this point in the history

  3. remove package.json from Assistifyai

    @vickyokrm
    vickyokrm committed Jul 23, 2019
    Configuration menu
    Copy the full SHA
    78366c7 View commit details
    Browse the repository at this point in the history

  4. Adjust import order

    @vickyokrm
    vickyokrm committed Jul 23, 2019
    Configuration menu
    Copy the full SHA
    4a4418a View commit details
    Browse the repository at this point in the history

  5. Add hasha into Package.json to be used by statistics

    @vickyokrm
    vickyokrm committed Jul 23, 2019
    Configuration menu
    Copy the full SHA
    97765ed View commit details
    Browse the repository at this point in the history

  6. remove unused assistify ai files

    @vickyokrm
    vickyokrm committed Jul 23, 2019
    Configuration menu
    Copy the full SHA
    cb07102 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2019

  1. Merge remote-tracking branch 'origin/master' into release/1.1.3-0.9.10

    @mrsimpson
    mrsimpson committed Jul 24, 2019
    Configuration menu
    Copy the full SHA
    d9a6128 View commit details
    Browse the repository at this point in the history

  2. Bump version to 1.1.3-0.9.10

    @mrsimpson
    mrsimpson committed Jul 24, 2019
    Configuration menu
    Copy the full SHA
    5f02681 View commit details
    Browse the repository at this point in the history

  3. Re-add assistify specific configuration 

    e. g. roles and permissions
    @mrsimpson
    mrsimpson committed Jul 24, 2019
    Configuration menu
    Copy the full SHA
    7c4561b View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2019

  1. Merge pull request #622 from assistify/release/1.1.3-0.9.10 

    Release 1.1.3 0.9.10
    @vickyokrm
    vickyokrm authored Jul 25, 2019
    Configuration menu
    Copy the full SHA
    dff63c8 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2019

  1. Allow manager to assign roles

    @vickyokrm
    vickyokrm committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    6551936 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2019

  1. Merge pull request #625 from assistify/fix/manager-assign-roles 

    Allow manager to assign roles
    @jschirrmacher
    jschirrmacher authored Jul 29, 2019
    Configuration menu
    Copy the full SHA
    133529f View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2019

  1. Limit resynched messages to last 10 messages

    @mrsimpson
    mrsimpson committed Aug 14, 2019
    Configuration menu
    Copy the full SHA
    f9ebf80 View commit details
    Browse the repository at this point in the history

  2. Disable implicit resync to Smarti onMessage

    @mrsimpson
    mrsimpson committed Aug 14, 2019
    Configuration menu
    Copy the full SHA
    d66ebad View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into develop

    @mrsimpson
    mrsimpson committed Aug 14, 2019
    Configuration menu
    Copy the full SHA
    1d74418 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into fix/smarti-resync-performance-impact

    @mrsimpson
    mrsimpson committed Aug 14, 2019
    Configuration menu
    Copy the full SHA
    cc732ec View commit details
    Browse the repository at this point in the history

  5. Bump version to 1.1.3- 

    0.9.11
    @mrsimpson
    mrsimpson committed Aug 14, 2019
    Configuration menu
    Copy the full SHA
    ae7f039 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2019

  1. Merge pull request #628 from assistify/release/1.1.3-0.9.11 

    Fix smarti resync performance impact
    @ruKurz
    ruKurz authored Aug 16, 2019
    Configuration menu
    Copy the full SHA
    d39bdd6 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2019

  1. Fix deployment script - remove version dependency

    @mrsimpson
    mrsimpson committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    630372d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #629 from assistify/release/1.1.3-0.9.11 

    Release 1.1.3 0.9.11
    @mrsimpson
    mrsimpson authored Aug 23, 2019
    Configuration menu
    Copy the full SHA
    db3d052 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2019

  1. Merge tag '1.3.2' into merge/1.3 

    This is still WIP, setting permissions are not working
    @mrsimpson
    mrsimpson committed Aug 27, 2019
    Configuration menu
    Copy the full SHA
    1516599 View commit details
    Browse the repository at this point in the history

  2. [NEW] RocketChat#8771 - fine granular settings permissions (RocketCha… 

    …t#8942)
    @mrsimpson
    mrsimpson committed Aug 27, 2019
    Configuration menu
    Copy the full SHA
    3233371 View commit details
    Browse the repository at this point in the history

  3. [NEW] Integrate DEEPL translation service to RC core (RocketChat#12174) 

    * service extension for deepl

* Add translations

* Add lint-fix-command

* Adhere to new linting rules

* Hard code service enpoint URLs of providers
Having it as a setting increases complexity (user has to enter the URL by himself) without significant benefit.
If the URL changes, the code has to be adapted anyway

* Fix translation of attachment descriptions by DeepL

* Fix getSupportedLanguages by Google

* move renameSetting to Settings model

* Add migrations for rename settings

* update package.json

* Fix formatting to make consistent with the other code

* Add additional comments

* Use active provider for context menu translations

* Add invidual key for each providers

* Nothing to migrate

* Fix spelling in comment

* Replace TAPi18n library with rocketchat:tapi18n

* Use correct setting
    @vickyokrm @mrsimpson
    vickyokrm authored and mrsimpson committed Aug 27, 2019
    Configuration menu
    Copy the full SHA
    1ff545c View commit details
    Browse the repository at this point in the history

  4. Fix typo in permissions tab

    @mrsimpson
    mrsimpson committed Aug 27, 2019
    Configuration menu
    Copy the full SHA
    54995bb View commit details
    Browse the repository at this point in the history

  5. Allow managers to view statistics 

    This change allows managers to view statistics about users, rooms and messages.
    @mrsimpson
    mrsimpson committed Aug 27, 2019
    Configuration menu
    Copy the full SHA
    f50a8ea View commit details
    Browse the repository at this point in the history

  6. Remove dependency to rocketchat:tapi18n … 

    This exists only as of release 2.0 and was introduced
with the cherry-pick of the deepl-translation
    @mrsimpson
    mrsimpson committed Aug 27, 2019
    Configuration menu
    Copy the full SHA
    8b34348 View commit details
    Browse the repository at this point in the history

  7. Fix assignment of permissions

    @mrsimpson
    mrsimpson committed Aug 27, 2019
    Configuration menu
    Copy the full SHA
    d8723bb View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'upstream/develop' into merge/2.0

    @mrsimpson
    mrsimpson committed Aug 27, 2019
    Configuration menu
    Copy the full SHA
    7ce062d View commit details
    Browse the repository at this point in the history

  9. Merge pull request #631 from assistify/manager-view-statistics 

    Allow managers to view statistics
    @mrsimpson
    mrsimpson authored Aug 27, 2019
    Configuration menu
    Copy the full SHA
    fbe9230 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2019

  1. Merge remote-tracking branch 'upstream/develop' into merge/2.0

    @mrsimpson
    mrsimpson committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    0d7cb92 View commit details
    Browse the repository at this point in the history

  2. Add trigger for ECS-infrastructure to deployment

    @mrsimpson
    mrsimpson committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    fb9ebf4 View commit details
    Browse the repository at this point in the history

  3. Fix indention in deployment script

    @mrsimpson
    mrsimpson committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    3209fb9 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #634 from assistify/deployment-ecs 

    Add trigger for ECS-infrastructure to deployment
    @mrsimpson
    mrsimpson authored Aug 28, 2019
    Configuration menu
    Copy the full SHA
    8a97f65 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into fix-deployment-script

    @mrsimpson
    mrsimpson committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    1241704 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #630 from assistify/fix-deployment-script 

    Fix deployment script - remove version dependency
    @jschirrmacher
    jschirrmacher authored Aug 28, 2019
    Configuration menu
    Copy the full SHA
    4c34cb5 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #632 from assistify/merge/1.3 

    Merge Rocket.Chat 1.3
    @mrsimpson
    mrsimpson authored Aug 28, 2019
    Configuration menu
    Copy the full SHA
    8cadb79 View commit details
    Browse the repository at this point in the history

  8. Don't skip CircleCI if it's a PR 

    Eventually, all merges are PRs, so skipping the
deployment for PRs will never ever deploy
    @mrsimpson
    mrsimpson committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    dc16403 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #635 from assistify/fix-circleci-skip-deploy 

    Don't skip CircleCI if it's a PR
    @mrsimpson
    mrsimpson authored Aug 28, 2019
    Configuration menu
    Copy the full SHA
    08268f1 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2019

  1. CircleCI: Hold before deploy only on master branch

    @mrsimpson
    mrsimpson committed Aug 29, 2019
    Configuration menu
    Copy the full SHA
    ee38c92 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2019

  1. Merge remote-tracking branch 'upstream/develop' into merge/2.0

    @mrsimpson
    mrsimpson committed Sep 2, 2019
    Configuration menu
    Copy the full SHA
    c486fb2 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2019

  1. Docker: Determine INSTANCE_IP if not injected (#637) 

    * Docker: Determine INSTANCE_IP if not injected
* Docker on ECS: use metadata-API as fallback
* Build PR-docker images
* Print environment on startup
    @mrsimpson @jschirrmacher
    mrsimpson authored and jschirrmacher committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    1a73ec4 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2019

  1. Merge branch 'master' of https://github.com/assistify/Rocket.Chat int… 

    …o release/1.3.2-0.9.12
    @vickyokrm
    vickyokrm committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    5fb00ff View commit details
    Browse the repository at this point in the history

  2. bump version to v1.3.2-0.9.12

    @vickyokrm
    vickyokrm committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    f1abaf5 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #638 from assistify/release/1.3.2-0.9.12 

    Release/1.3.2 0.9.12
    @ruKurz
    ruKurz authored Sep 10, 2019
    Configuration menu
    Copy the full SHA
    493dd25 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2019

  1. Merge pull request #639 from assistify/master 

    Merge Assistify 1.3.2-0.9.12 to develop
    @mrsimpson
    mrsimpson authored Sep 11, 2019
    Configuration menu
    Copy the full SHA
    0ce0c98 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2019

  1. Update DeepL to version 2 

    As per the [DeepL documentation](https://www.deepl.com/de/docs-api.html?part=accessing)

> Please note that:
> 
> Version 1 (v1) of the DeepL API is not supported by the DeepL API plan available from October 2018. Please use version 2 for all new products other than CAT tool integrations.
> Version 2 (v2) of the DeepL API is not compatible with CAT tools and is not included in DeepL plans for CAT tool users. If you intend to integrate DeepL Pro into a CAT tool or another tool assisting translation, please contact [email protected]
    @mrsimpson
    mrsimpson authored Sep 13, 2019
    Configuration menu
    Copy the full SHA
    0fbaf12 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #640 from assistify/deepl-v2 

    Update DeepL to version 2
    @vickyokrm
    vickyokrm authored Sep 13, 2019
    Configuration menu
    Copy the full SHA
    04b87a7 View commit details
    Browse the repository at this point in the history

  3. Add migrations for Auto translate

    @vickyokrm
    vickyokrm committed Sep 13, 2019
    Configuration menu
    Copy the full SHA
    f70380f View commit details
    Browse the repository at this point in the history

  4. Fix logging

    @vickyokrm
    vickyokrm committed Sep 13, 2019
    Configuration menu
    Copy the full SHA
    c9bc966 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2019

  1. Merge pull request #641 from assistify/fix/auto-translate-migrations 

    Fix/auto translate migrations
    @vickyokrm
    vickyokrm authored Sep 16, 2019
    Configuration menu
    Copy the full SHA
    91532c0 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2019

  1. Fix docker image build for non-PRs 

    Also bumped the version in order to generate a new release
    @mrsimpson
    mrsimpson committed Sep 19, 2019
    Configuration menu
    Copy the full SHA
    e9678ab View commit details
    Browse the repository at this point in the history

  2. Merge tag '2.0.0' into merge/2.0

    @mrsimpson
    mrsimpson committed Sep 19, 2019
    Configuration menu
    Copy the full SHA
    633ee4c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #642 from assistify/fix-docker-image-build 

    Fix docker image build for non-PRs
    @mrsimpson
    mrsimpson authored Sep 19, 2019
    Configuration menu
    Copy the full SHA
    e4d2e64 View commit details
    Browse the repository at this point in the history

  4. CHeery-Pick of a0d8658 

    Update Meteor to 1.8.1 (RocketChat#15358)

* Meteor update to 1.8.1

meteor update
meteor update --all-packages

* Remove deprecated rocketchat:monitoring package

* Fix calling WebAppInternals.staticFilesMiddleware new signature

* Update Node version to 8.15

* Clear main files to cache some build files

* Meteor npm install
    @sampaiodiego @mrsimpson
    sampaiodiego authored and mrsimpson committed Sep 19, 2019
    Configuration menu
    Copy the full SHA
    d0f350b View commit details
    Browse the repository at this point in the history

  5. Try to make CircleCI build docker image on develop

    @mrsimpson
    mrsimpson committed Sep 19, 2019
    Configuration menu
    Copy the full SHA
    dda39a6 View commit details
    Browse the repository at this point in the history

  6. Remove graphql 

    Not completely (including dependencies) in order to avoid merge conflict
when merging 2.0 lateron (which also removes GraphQL)
    @mrsimpson
    mrsimpson committed Sep 19, 2019
    Configuration menu
    Copy the full SHA
    c6941e7 View commit details
    Browse the repository at this point in the history

  7. No GraphlQL, no GraphQL tests

    @mrsimpson
    mrsimpson committed Sep 19, 2019
    Configuration menu
    Copy the full SHA
    477b601 View commit details
    Browse the repository at this point in the history

  8. Fix admin page in tests since GraphQL was removed

    @mrsimpson
    mrsimpson committed Sep 19, 2019
    Configuration menu
    Copy the full SHA
    ca29d5b View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2019

  1. Merge pull request #643 from assistify/update-meteor-1.8.1 

    Update meteor to 1.8.1
    @mrsimpson
    mrsimpson authored Sep 20, 2019
    Configuration menu
    Copy the full SHA
    73f0ca9 View commit details
    Browse the repository at this point in the history

  2. Fix CircleCI dependency for image build on develop

    @mrsimpson
    mrsimpson committed Sep 20, 2019
    Configuration menu
    Copy the full SHA
    49bb317 View commit details
    Browse the repository at this point in the history

  3. Provide release notes

    @mrsimpson
    mrsimpson committed Sep 20, 2019
    Configuration menu
    Copy the full SHA
    22d9f95 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/master' into develop

    @mrsimpson
    mrsimpson committed Sep 20, 2019
    Configuration menu
    Copy the full SHA
    88cb24e View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2019

  1. Merge pull request #647 from assistify/release/1.1.3-0.9.13 

    Release 1.1.3 0.9.13
    @vickyokrm
    vickyokrm authored Oct 31, 2019
    Configuration menu
    Copy the full SHA
    80911c8 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2019

  1. CircleCI: Re-add image-build-prod-step

    @vickyokrm
    vickyokrm committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    ae93635 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2019

  1. Microsoft translate (#648) 

    * CircleCI: Re-add image-build-prod-step

* Update packages

* Add translations

* Extend Logger for microsoft translation

* Extend settings for microsoft config

* Rename the settings with ms to microsoft

* Include in the startup

* Build adapter for microsoft translation

* Rename the api key settings
    @vickyokrm @jschirrmacher
    vickyokrm authored and jschirrmacher committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    1c715ce View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2019

  1. Microsoft translate fixes (#649) 

    * Remove blank line

* Use own logger for more informative logging

* Translate attachment description

* Fix the error message text

* Show the translation provide info on the client

* Add language for support languages
    @vickyokrm @jschirrmacher
    vickyokrm authored and jschirrmacher committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    a0f969b View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2019

  1. Add MD5 hash to packages

    @vickyokrm
    vickyokrm committed Nov 12, 2019
    Configuration menu
    Copy the full SHA
    ca48ece View commit details
    Browse the repository at this point in the history

  2. Hash the message to be used as key

    @vickyokrm
    vickyokrm committed Nov 12, 2019
    Configuration menu
    Copy the full SHA
    c065bc1 View commit details
    Browse the repository at this point in the history

  3. Clear cache on translation language change

    @vickyokrm
    vickyokrm committed Nov 12, 2019
    Configuration menu
    Copy the full SHA
    5aa16a8 View commit details
    Browse the repository at this point in the history

  4. remove unwanted packages

    @vickyokrm
    vickyokrm committed Nov 12, 2019
    Configuration menu
    Copy the full SHA
    2f7bfd0 View commit details
    Browse the repository at this point in the history

  5. Check subscription to avoid undefined exception

    @vickyokrm
    vickyokrm committed Nov 12, 2019
    Configuration menu
    Copy the full SHA
    b2849d9 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #650 from assistify/fix/hash-message-cache-key 

    Use hashed-message as the cache key
    @ruKurz
    ruKurz authored Nov 12, 2019
    Configuration menu
    Copy the full SHA
    29ee08c View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2019

  1. Make sure that config-experts can manage apps

    @jschirrmacher
    jschirrmacher committed Nov 14, 2019
    Configuration menu
    Copy the full SHA
    be1bcf0 View commit details
    Browse the repository at this point in the history

  2. Set verfication status for users invited by a manager

    @jschirrmacher
    jschirrmacher committed Nov 14, 2019
    Configuration menu
    Copy the full SHA
    6e68e7c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #653 from assistify/fix/add-users-verified 

    Set verfication status for users added by a manager
    @ruKurz
    ruKurz authored Nov 14, 2019
    Configuration menu
    Copy the full SHA
    3e35a04 View commit details
    Browse the repository at this point in the history

  4. Provide release notes

    @ruKurz
    ruKurz committed Nov 14, 2019
    Configuration menu
    Copy the full SHA
    0a7435d View commit details
    Browse the repository at this point in the history

  5. Fixed typo in release notes

    @ruKurz
    ruKurz committed Nov 14, 2019
    Configuration menu
    Copy the full SHA
    077b9f9 View commit details
    Browse the repository at this point in the history

  6. bump version

    @mrsimpson
    mrsimpson committed Nov 14, 2019
    Configuration menu
    Copy the full SHA
    973666d View commit details
    Browse the repository at this point in the history

  7. Merge pull request #654 from assistify/release/1.3.2-0.9.14 

    Release 1.3.2 0.9.14
    @mrsimpson
    mrsimpson authored Nov 14, 2019
    Configuration menu
    Copy the full SHA
    e5a5b40 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2019

  1. Merge pull request #652 from assistify/feature/config-experts-can-man… 

    …age-apps

[NEW] config experts can manage apps
    @ruKurz
    ruKurz authored Nov 20, 2019
    Configuration menu
    Copy the full SHA
    3bffb5b View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2019

  1. Merge tag '2.1.2' into merge/2.1.2

    @mrsimpson
    mrsimpson committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    025d2a9 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into merge/2.1.2

    @mrsimpson
    mrsimpson committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    39e90a2 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2019

  1. Fix merge issues

    @mrsimpson
    mrsimpson committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    3641323 View commit details
    Browse the repository at this point in the history

  2. Harmonize CircleCI with Upstream

    @mrsimpson
    mrsimpson committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    972b17c View commit details
    Browse the repository at this point in the history

  3. on't use startup script anymore

    @mrsimpson
    mrsimpson committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    bad3fa8 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2020

  1. make tests more robust

    @mrsimpson
    mrsimpson committed Jan 4, 2020
    Configuration menu
    Copy the full SHA
    e7cab6f View commit details
    Browse the repository at this point in the history

  2. Merge tag '2.3.2' into merge/2.3

    @mrsimpson
    mrsimpson committed Jan 4, 2020
    Configuration menu
    Copy the full SHA
    d1a5f69 View commit details
    Browse the repository at this point in the history

  3. linting

    @mrsimpson
    mrsimpson committed Jan 4, 2020
    Configuration menu
    Copy the full SHA
    0517939 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2020

  1. Merge remote-tracking branch 'origin/develop' into merge/2.3

    @mrsimpson
    mrsimpson committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    ad76e68 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #658 from assistify/merge/2.3 

    Merge Rocket.Chat 2.3
    @jschirrmacher
    jschirrmacher authored Jan 6, 2020
    Configuration menu
    Copy the full SHA
    a1a39dd View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2020

  1. bump version

    @mrsimpson
    mrsimpson committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    524cd72 View commit details
    Browse the repository at this point in the history

  2. Fix CircleCI build of tagged commits

    @mrsimpson
    mrsimpson committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    50502bb View commit details
    Browse the repository at this point in the history

  3. Use local Dockerfile for building the image

    @mrsimpson
    mrsimpson committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    e39612d View commit details
    Browse the repository at this point in the history

  4. Fix local Dockerfile

    @mrsimpson
    mrsimpson committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    f4743b4 View commit details
    Browse the repository at this point in the history

  5. Docker build: Fix permissions in meteor folder

    @mrsimpson
    mrsimpson committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    f71be21 View commit details
    Browse the repository at this point in the history

  6. CircleCI: Remove steps for image tags

    @mrsimpson
    mrsimpson committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    7e9a11b View commit details
    Browse the repository at this point in the history

  7. Docker local build: Reuse cache from build

    @mrsimpson
    mrsimpson committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    3a4ff8a View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2020

  1. New API route to log out from other sessions

    @jschirrmacher
    jschirrmacher committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    d86b66a View commit details
    Browse the repository at this point in the history

  2. Execute api tests too

    @jschirrmacher
    jschirrmacher committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    19d5a01 View commit details
    Browse the repository at this point in the history

  3. Saving working version, only tests doesn't work yet

    @jschirrmacher
    jschirrmacher committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    98a7968 View commit details
    Browse the repository at this point in the history

  4. Removed unwanted changes in 'versions'

    @jschirrmacher
    jschirrmacher committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    1cad7c4 View commit details
    Browse the repository at this point in the history

  5. Commit of current state

    @jschirrmacher
    jschirrmacher committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    981dc4b View commit details
    Browse the repository at this point in the history

  6. Adapted test to retry up to 20 times until timing out

    @jschirrmacher
    jschirrmacher committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    deab242 View commit details
    Browse the repository at this point in the history

  7. Test for token removal: Fewer promises

    @mrsimpson
    mrsimpson committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    87905f6 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2020

  1. Merge pull request #661 from assistify/feature/api-to-logout-from-oth… 

    …er-locations-fewer-promises

Test for token removal: Fewer promises
    @jschirrmacher
    jschirrmacher authored Jan 10, 2020
    Configuration menu
    Copy the full SHA
    6ce4df3 View commit details
    Browse the repository at this point in the history

  2. Rewritten again for explicit timeout

    @jschirrmacher
    jschirrmacher committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    a413b75 View commit details
    Browse the repository at this point in the history

  3. Reduced interval to 1s, fixed message

    @jschirrmacher
    jschirrmacher committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    a76a8fd View commit details
    Browse the repository at this point in the history

  4. Merge pull request #659 from assistify/release/2.3.2-0.9.14 

    Release 2.3.2-0.9.14
    @jschirrmacher
    jschirrmacher authored Jan 10, 2020
    Configuration menu
    Copy the full SHA
    3f15893 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #660 from assistify/feature/api-to-logout-from-oth… 

    …er-locations

[NEW] API route to log out from other sessions
    @jschirrmacher
    jschirrmacher authored Jan 10, 2020
    Configuration menu
    Copy the full SHA
    7146b51 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2020

  1. Remove obsolete css

    @mrsimpson
    mrsimpson authored Jan 28, 2020
    Configuration menu
    Copy the full SHA
    a9f3559 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into resolve-unneccessa… 

    …ry-diff
    @mrsimpson
    mrsimpson committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    c2bea3a View commit details
    Browse the repository at this point in the history

  3. remove minor changes (blank lines etc.)

    @mrsimpson
    mrsimpson committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    18b7cae View commit details
    Browse the repository at this point in the history

  4. remove unused startup script in image

    @mrsimpson
    mrsimpson committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    b5a9bda View commit details
    Browse the repository at this point in the history

  5. remove unused setting rename function

    @mrsimpson
    mrsimpson committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    c991d50 View commit details
    Browse the repository at this point in the history

  6. remove usage statistics

    @mrsimpson
    mrsimpson committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    7958976 View commit details
    Browse the repository at this point in the history

  7. remove minor changes (blank lines etc.)

    @mrsimpson
    mrsimpson committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    859a879 View commit details
    Browse the repository at this point in the history

  8. remove old artifacts from earlier packages

    @mrsimpson
    mrsimpson committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    4dc5882 View commit details
    Browse the repository at this point in the history

  9. Remove getRoomNameAndTypeByNameOrId

    @mrsimpson
    mrsimpson committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    61bb3ef View commit details
    Browse the repository at this point in the history

  10. Remove old backup

    @mrsimpson
    mrsimpson committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    fbcf477 View commit details
    Browse the repository at this point in the history

  11. remove non-existant imports

    @mrsimpson
    mrsimpson committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    879d9fb View commit details
    Browse the repository at this point in the history

  12. Remove method to hide old subscriptions

    @mrsimpson
    mrsimpson committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    d09cba4 View commit details
    Browse the repository at this point in the history

  13. remove thread slash command

    @mrsimpson
    mrsimpson committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    bd0b210 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #621 from assistify/resolve-unneccessary-diff 

    Reduce unneccessary diff between RC und Assistify.
This includes 
* formatting (blank lines)
* Resetting some obsolete artifacts of earlier merges
* Killing unused minor features
    @mrsimpson
    mrsimpson authored Jan 28, 2020
    Configuration menu
    Copy the full SHA
    a26e6e1 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2020

  1. Merge tag '2.4.3' into develop

    @mrsimpson
    mrsimpson committed Feb 7, 2020
    Configuration menu
    Copy the full SHA
    6b8f2ca View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into release/2.4

    @mrsimpson
    mrsimpson committed Feb 7, 2020
    Configuration menu
    Copy the full SHA
    3f000a3 View commit details
    Browse the repository at this point in the history

  3. Re-establish CircleCI

    @mrsimpson
    mrsimpson committed Feb 7, 2020
    Configuration menu
    Copy the full SHA
    94349ff View commit details
    Browse the repository at this point in the history

  4. linting

    @mrsimpson
    mrsimpson committed Feb 7, 2020
    Configuration menu
    Copy the full SHA
    3e303d6 View commit details
    Browse the repository at this point in the history

  5. Merge tag '2.4.7' into release/2.4

    @mrsimpson
    mrsimpson committed Feb 7, 2020
    Configuration menu
    Copy the full SHA
    f6af0a1 View commit details
    Browse the repository at this point in the history

  6. Fix github actions accessing the github registry

    @mrsimpson
    mrsimpson committed Feb 7, 2020
    Configuration menu
    Copy the full SHA
    8d2b79e View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2020

  1. Merge pull request #662 from assistify/release/2.4 

    Release 2.4
    @jschirrmacher
    jschirrmacher authored Feb 11, 2020
    Configuration menu
    Copy the full SHA
    8fd230b View commit details
    Browse the repository at this point in the history

  2. API for mass-disabling of idle users

    @mrsimpson
    mrsimpson committed Feb 11, 2020
    Configuration menu
    Copy the full SHA
    5b48a30 View commit details
    Browse the repository at this point in the history

  3. Reactively show/hide smarti light bulb 

    based on (de-) activation
    @mrsimpson
    mrsimpson committed Feb 11, 2020
    Configuration menu
    Copy the full SHA
    68eeb64 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2020

  1. Merge pull request #666 from assistify/fix/664-deactivated-smarti 

    Reactively show/hide smarti light bulb
    @jschirrmacher
    jschirrmacher authored Feb 12, 2020
    Configuration menu
    Copy the full SHA
    5ae8b05 View commit details
    Browse the repository at this point in the history

  2. Fix role being interpreted when deactivating users

    @mrsimpson
    mrsimpson committed Feb 12, 2020
    Configuration menu
    Copy the full SHA
    99f35b3 View commit details
    Browse the repository at this point in the history

  3. Remove local dockerfile

    @mrsimpson
    mrsimpson committed Feb 12, 2020
    Configuration menu
    Copy the full SHA
    18e4013 View commit details
    Browse the repository at this point in the history

  4. Remove env logging on startup

    @mrsimpson
    mrsimpson committed Feb 12, 2020
    Configuration menu
    Copy the full SHA
    a04fd8d View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/develop' into merge/3.0

    @mrsimpson
    mrsimpson committed Feb 12, 2020
    Configuration menu
    Copy the full SHA
    4af0f46 View commit details
    Browse the repository at this point in the history

  6. Fix syntax errors in Smarti UI tests 

    Not sure whether they work though due to switch to Cypress
    @mrsimpson
    mrsimpson committed Feb 12, 2020
    Configuration menu
    Copy the full SHA
    58d342f View commit details
    Browse the repository at this point in the history

  7. checkout unneccessarily change files from core

    @mrsimpson
    mrsimpson committed Feb 12, 2020
    Configuration menu
    Copy the full SHA
    f975506 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #665 from assistify/pick/deactivate-inactive-users… 

    …-api

API for mass-disabling of idle users
    @mrsimpson
    mrsimpson authored Feb 12, 2020
    Configuration menu
    Copy the full SHA
    5bb0255 View commit details
    Browse the repository at this point in the history

  9. Bump version livechat package

    @mrsimpson
    mrsimpson authored Feb 12, 2020
    Configuration menu
    Copy the full SHA
    ac0723f View commit details
    Browse the repository at this point in the history

  10. Update package-lock.json

    @mrsimpson
    mrsimpson committed Feb 12, 2020
    Configuration menu
    Copy the full SHA
    c5be203 View commit details
    Browse the repository at this point in the history

  11. Publish to docker hub in CI

    @mrsimpson
    mrsimpson committed Feb 12, 2020
    Configuration menu
    Copy the full SHA
    82f16f4 View commit details
    Browse the repository at this point in the history

  12. Remove deploy step in CI completely

    @mrsimpson
    mrsimpson authored Feb 12, 2020
    Configuration menu
    Copy the full SHA
    b880d30 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2020

  1. Remove unneccessary builds

    @mrsimpson
    mrsimpson authored Feb 13, 2020
    Configuration menu
    Copy the full SHA
    58e1177 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2020

  1. Bump version to v2.4.7-0.9.15

    @mrsimpson
    mrsimpson committed Feb 14, 2020
    Configuration menu
    Copy the full SHA
    4fb94dd View commit details
    Browse the repository at this point in the history

  2. Merge pull request #668 from assistify/release/2.4.7-0.9.15 

    Release/2.4.7 0.9.15
    @ruKurz
    ruKurz authored Feb 14, 2020
    Configuration menu
    Copy the full SHA
    2eb86d4 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2020

  1. Merge pull request #669 from assistify/master 

    Update develop after release
    @mrsimpson
    mrsimpson authored Feb 15, 2020
    Configuration menu
    Copy the full SHA
    e006726 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2020

  1. Merge tag '3.0.2' into merge/3.0

    @mrsimpson
    mrsimpson committed Mar 2, 2020
    Configuration menu
    Copy the full SHA
    bd72809 View commit details
    Browse the repository at this point in the history

  2. merge develop

    @mrsimpson
    mrsimpson committed Mar 2, 2020
    Configuration menu
    Copy the full SHA
    bacf456 View commit details
    Browse the repository at this point in the history

  3. Remove unneeded migration

    @mrsimpson
    mrsimpson committed Mar 2, 2020
    Configuration menu
    Copy the full SHA
    edf8a15 View commit details
    Browse the repository at this point in the history

  4. Grant more time to logoutOtherClients test

    @mrsimpson
    mrsimpson committed Mar 2, 2020
    Configuration menu
    Copy the full SHA
    17a94fa View commit details
    Browse the repository at this point in the history

  5. Re-enable building PR-images

    @mrsimpson
    mrsimpson committed Mar 2, 2020
    Configuration menu
    Copy the full SHA
    9d025f4 View commit details
    Browse the repository at this point in the history

  6. Use DockerHub as target for PR build

    @mrsimpson
    mrsimpson committed Mar 2, 2020
    Configuration menu
    Copy the full SHA
    8f30a9b View commit details
    Browse the repository at this point in the history

  7. Provide proper docker credentials

    @mrsimpson
    mrsimpson committed Mar 2, 2020
    Configuration menu
    Copy the full SHA
    8ac689e View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2020

  1. Propagate secrets to env during build

    @mrsimpson
    mrsimpson committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    fce99d6 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2020

  1. Merge tag '3.0.3' into release/3.0.3-0.9.15

    @mrsimpson
    mrsimpson committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    64bbac4 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #670 from assistify/merge/3.0 

    Merge Rocket.Chat 3.0
We've been validating this for quite some time now, thus merging it
    @mrsimpson
    mrsimpson authored Mar 13, 2020
    Configuration menu
    Copy the full SHA
    6132fcc View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2020

  1. Merge pull request #671 from assistify/release/3.0.3-0.9.15 

    Release/3.0.3 0.9.15
    @mrsimpson
    mrsimpson authored Mar 15, 2020
    Configuration menu
    Copy the full SHA
    e502b05 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2020

  1. Merge pull request #672 from assistify/master 

    Update develop after release
    @mrsimpson
    mrsimpson authored Mar 16, 2020
    Configuration menu
    Copy the full SHA
    50ccbfa View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2020

  1. Merge tag '3.0.7'

    @mrsimpson
    mrsimpson committed Mar 27, 2020
    Configuration menu
    Copy the full SHA
    a3f3acc View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2020

  1. Merge pull request #673 from assistify/release/3.0.7 

    Release '3.0.7'
    @jschirrmacher
    jschirrmacher authored Mar 28, 2020
    Configuration menu
    Copy the full SHA
    2dd4d60 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2020

  1. Merge tag '3.2.2' into release/3.2.2

    @mrsimpson
    mrsimpson committed May 26, 2020
    Configuration menu
    Copy the full SHA
    72ca3d2 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2020

  1. Remove everything not related to assistify-ai

    @mrsimpson
    mrsimpson committed May 27, 2020
    Configuration menu
    Copy the full SHA
    2614e85 View commit details
    Browse the repository at this point in the history

  2. Chatpal: copy global search option from defaultProvider

    @mrsimpson
    mrsimpson committed May 27, 2020
    Configuration menu
    Copy the full SHA
    baf63f2 View commit details
    Browse the repository at this point in the history

  3. Chatpal: Make "messages in current room" new result type

    @mrsimpson
    mrsimpson committed May 27, 2020
    Configuration menu
    Copy the full SHA
    84bfd6f View commit details
    Browse the repository at this point in the history

  4. Chatpal: Fix scrolling in results

    @mrsimpson
    mrsimpson committed May 27, 2020
    Configuration menu
    Copy the full SHA
    15ffb33 View commit details
    Browse the repository at this point in the history

  5. Chatpal: Fix avatar display in results

    @mrsimpson
    mrsimpson committed May 27, 2020
    Configuration menu
    Copy the full SHA
    8e73187 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2020

  1. Merge remote-tracking branch 'origin/master' into release/3.2.2

    @mrsimpson
    mrsimpson committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    e091033 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2020

  1. Merge pull request #676 from assistify/release/3.2.2 

    Release 3.2.2 & Chatpal
    @jschirrmacher
    jschirrmacher authored Jul 4, 2020
    Configuration menu
    Copy the full SHA
    4165fdf View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2020

  1. Merge branch 'master' into release-3.5.2

    @jschirrmacher
    jschirrmacher authored Sep 9, 2020
    Configuration menu
    Copy the full SHA
    2b7dd20 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2020

  1. Merge Rocket.Chat version 3.6.3

    @jschirrmacher
    jschirrmacher committed Sep 29, 2020
    Configuration menu
    Copy the full SHA
    650c65f View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2020

  1. Merge branch 'develop' into release/3.6.3

    @mrsimpson
    mrsimpson authored Oct 14, 2020
    Configuration menu
    Copy the full SHA
    4c7b89b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #678 from assistify/release/3.6.3 

    Release 3.6.3
    @mrsimpson
    mrsimpson authored Oct 14, 2020
    Configuration menu
    Copy the full SHA
    c39b16a View commit details
    Browse the repository at this point in the history

  3. Merge tag '3.7.1' into develop

    @mrsimpson
    mrsimpson committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    6d7b7b0 View commit details
    Browse the repository at this point in the history

  4. Remove unused model extension 

    RocketChat#16849 provides the same
functionality within setActiveNotLoggedInAfterWithRole
    @mrsimpson
    mrsimpson committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    97acc4b View commit details
    Browse the repository at this point in the history

  5. Merge pull request #679 from assistify/release/3.7.1 

    Release 3.7.1 - which brings some fixes not in the current (actually ahead) master
    @mrsimpson
    mrsimpson authored Oct 14, 2020
    Configuration menu
    Copy the full SHA
    e5ae924 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2020

  1. Bump version to 3.8.3

    @sampaiodiego
    sampaiodiego committed Dec 5, 2020
    Configuration menu
    Copy the full SHA
    7b6e174 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2020

  1. Merge tag '3.8.3' into develop

    @mrsimpson
    mrsimpson committed Dec 7, 2020
    Configuration menu
    Copy the full SHA
    9e231ee View commit details
    Browse the repository at this point in the history

  2. Don't build microservice-images for assistify

    @mrsimpson
    mrsimpson committed Dec 7, 2020
    Configuration menu
    Copy the full SHA
    7d5e7f0 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #681 from assistify/merge/3.8.3 

    Merge tag '3.8.3'
    @mrsimpson
    mrsimpson authored Dec 7, 2020
    Configuration menu
    Copy the full SHA
    33685f8 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2020

  1. [FIX] Issue with special message rendering (RocketChat#19817)

    @MartinSchoeler @sampaiodiego
    MartinSchoeler authored and sampaiodiego committed Dec 19, 2020
    Configuration menu
    Copy the full SHA
    dfc18f0 View commit details
    Browse the repository at this point in the history

  2. [FIX] Problem with attachment render (RocketChat#19854)

    @MartinSchoeler @sampaiodiego
    MartinSchoeler authored and sampaiodiego committed Dec 19, 2020
    Configuration menu
    Copy the full SHA
    14b0a1c View commit details
    Browse the repository at this point in the history

  3. Bump version to 3.8.4

    @sampaiodiego
    sampaiodiego committed Dec 19, 2020
    Configuration menu
    Copy the full SHA
    47b17af View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2020

  1. Regression: Fix oembed (RocketChat#19978)

    @sampaiodiego
    sampaiodiego committed Dec 31, 2020
    Configuration menu
    Copy the full SHA
    d1c9e1d View commit details
    Browse the repository at this point in the history

  2. Bump version to 3.8.5

    @sampaiodiego
    sampaiodiego committed Dec 31, 2020
    Configuration menu
    Copy the full SHA
    b71c157 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2021

  1. Merge tag '3.8.5' into fix/implicit-translation

    @mrsimpson
    mrsimpson committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    2a80341 View commit details
    Browse the repository at this point in the history

  2. [FIX] Auto Translate (RocketChat#19599) 

    Co-authored-by: Diego Sampaio <[email protected]>
    @ggazzo @sampaiodiego @mrsimpson
    2 people authored and mrsimpson committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    29a725c View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2021

  1. Merge pull request #682 from assistify/fix/implicit-translation 

    Fix implicit translation on 3.8-basis
    @jschirrmacher
    jschirrmacher authored Jan 22, 2021
    Configuration menu
    Copy the full SHA
    2d01af4 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2021

  1. Security hotfix

    @sampaiodiego
    sampaiodiego committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    14c2acf View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2021

  1. Bump version to 3.8.6

    @sampaiodiego
    sampaiodiego committed Jan 27, 2021
    Configuration menu
    Copy the full SHA
    5267e66 View commit details
    Browse the repository at this point in the history

  2. Bump version to 3.8.7

    @sampaiodiego
    sampaiodiego committed Jan 27, 2021
    Configuration menu
    Copy the full SHA
    5c9296f View commit details
    Browse the repository at this point in the history

  3. Bump version to 3.8.8

    @sampaiodiego
    sampaiodiego committed Jan 27, 2021
    Configuration menu
    Copy the full SHA
    95ed038 View commit details
    Browse the repository at this point in the history

  4. Merge tag '3.8.8' into merge/3.8.8

    @mrsimpson
    mrsimpson committed Jan 27, 2021
    Configuration menu
    Copy the full SHA
    89c14f9 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #683 from assistify/merge/3.8.8 

    Merge 3.8.8
    @mrsimpson
    mrsimpson authored Jan 27, 2021
    Configuration menu
    Copy the full SHA
    ce4cb65 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2021

  1. [FIX] Omnichannel Agents unable to take new chats in the queue (Rocke… 

    …tChat#20022)

* Removing possibility of only managers to take queue chats.

* Fix Omnichannel permission default.

Make view-livechat-queue default form agents.

Co-authored-by: Renato Becker <[email protected]>
    @rafaelblink @renatobecker @mrsimpson
    2 people authored and mrsimpson committed Feb 2, 2021
    Configuration menu
    Copy the full SHA
    b9f9f79 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2021

  1. Merge pull request #684 from assistify/fix/3.8-livechat-queue-visible 

    [FIX] Omnichannel Agents unable to take new chats in the queue (RocketChat#20022)
    @jschirrmacher
    jschirrmacher authored Feb 3, 2021
    Configuration menu
    Copy the full SHA
    ccc2746 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2021

  1. Merge tag 3.12.1 into assistify.chat

    @mrsimpson
    mrsimpson committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    429fe15 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2021

  1. Fix Assistify-Tabbar crashing the app

    @mrsimpson
    mrsimpson committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    dae5f49 View commit details
    Browse the repository at this point in the history