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

refactor(promise.await): createRoom.ts, createDirectRoom.ts and cleanRoomHistory.ts #28492

Merged
merged 9 commits into from Mar 20, 2023
Merged

refactor(promise.await): createRoom.ts, createDirectRoom.ts and cleanRoomHistory.ts #28492

merged 9 commits into from Mar 20, 2023

Commits on Mar 17, 2023

  1. apps/meteor/app/lib/server/functions/cleanRoomHistory.ts

    @rodrigok
    rodrigok committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    5a28f29 View commit details
    Browse the repository at this point in the history

  2. apps/meteor/app/lib/server/functions/createDirectRoom.ts

    @rodrigok
    rodrigok committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    2b9c79b View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. apps/meteor/app/lib/server/functions/createRoom.ts

    @rodrigok
    rodrigok committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    9fc153d View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into refactor/promise-a… 

    …wait
    @rodrigok
    rodrigok committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    edb437e View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/develop' into refactor/rodrigo-p… 

    …romise-await

# Conflicts:
#	apps/meteor/app/cas/server/cas_server.js
#	apps/meteor/app/lib/server/methods/createChannel.ts
#	apps/meteor/ee/server/lib/ldap/Manager.ts
    @rodrigok
    rodrigok committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    caf1b6c View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/develop' into refactor/rodrigo-p… 

    …romise-await

# Conflicts:
#	apps/meteor/app/slackbridge/server/SlackAdapter.js
#	apps/meteor/app/utils/lib/slashCommand.ts
    @rodrigok
    rodrigok committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    efa9a83 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into refactor/rodrigo-promise-await

    @KevLehman
    KevLehman committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    8782320 View commit details
    Browse the repository at this point in the history

  6. add missing )

    @KevLehman
    KevLehman committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    fa42790 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into refactor/rodrigo-promise-await

    @kodiakhq
    kodiakhq[bot] committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    f54a487 View commit details
    Browse the repository at this point in the history