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

Merged Upstream develop #61

Merged
merged 95 commits into from
Jul 2, 2019
Merged

Merged Upstream develop #61

merged 95 commits into from
Jul 2, 2019

Commits on May 30, 2019

  1. Removing unnecesary federation configs (RocketChat#14674)

    @alansikora @sampaiodiego
    alansikora authored and sampaiodiego committed May 30, 2019
    Configuration menu
    Copy the full SHA
    c178ddb View commit details
    Browse the repository at this point in the history

  2. [FIX] Load messages after disconnect and message box scroll missing (R… 

    …ocketChat#14668)
    @ggazzo @sampaiodiego
    ggazzo authored and sampaiodiego committed May 30, 2019
    Configuration menu
    Copy the full SHA
    9dfbc66 View commit details
    Browse the repository at this point in the history

  3. [FIX] SAML login error. (RocketChat#14686)

    @Hudell @sampaiodiego
    Hudell authored and sampaiodiego committed May 30, 2019
    Configuration menu
    Copy the full SHA
    725837a View commit details
    Browse the repository at this point in the history

  4. Bump version to 1.1.1

    @sampaiodiego
    sampaiodiego committed May 30, 2019
    Configuration menu
    Copy the full SHA
    80341ed View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2019

  1. Service Account broadcast room callback added

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

  2. Merge branch 'service-account-creation' of https://github.com/bhardwa… 

    …jaditya/Rocket.Chat into service-account-callbacks
    @bhardwajaditya
    bhardwajaditya committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    39387a5 View commit details
    Browse the repository at this point in the history

  3. Service Account Callback completed

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

  4. Merge branch 'service-account-creation' of https://github.com/bhardwa… 

    …jaditya/Rocket.Chat into service-account-callbacks
    @bhardwajaditya
    bhardwajaditya committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    f7e1781 View commit details
    Browse the repository at this point in the history

  5. CLI errors fixed

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

Commits on Jun 8, 2019

  1. [NEW] Service Account one-tap login complete

    @bhardwajaditya
    bhardwajaditya committed Jun 8, 2019
    Configuration menu
    Copy the full SHA
    96f48ab View commit details
    Browse the repository at this point in the history

  2. Callbacks modified

    @bhardwajaditya
    bhardwajaditya committed Jun 8, 2019
    Configuration menu
    Copy the full SHA
    04d1a12 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2019

  1. Service Accounts directory tab added

    @bhardwajaditya
    bhardwajaditya committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    2bbcae7 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2019

  1. Synchronized with other branches

    @bhardwajaditya
    bhardwajaditya committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    99a43d3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'service-account-callbacks' of https://github.com/bhardw… 

    …ajaditya/Rocket.Chat into service-account-login
    @bhardwajaditya
    bhardwajaditya committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    db08336 View commit details
    Browse the repository at this point in the history

  3. [NEW] Service Accounts Login method

    @bhardwajaditya
    bhardwajaditya committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    ea7398a View commit details
    Browse the repository at this point in the history

  4. Typo fixed

    @bhardwajaditya
    bhardwajaditya committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    8a02753 View commit details
    Browse the repository at this point in the history

  5. CLI errors fixed

    @bhardwajaditya
    bhardwajaditya committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    b8ab554 View commit details
    Browse the repository at this point in the history

  6. CLI errors fixed

    @bhardwajaditya
    bhardwajaditya committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    c245094 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2019

  1. [FIX] Anonymous chat read (RocketChat#14717) 

    * Prevent errors when allowing anonymous read

* getSingleMessage for anonymous users

* Fix register user when allow read and write anonymous is enabled

* Fix anonymous with sidebar extended as default

Co-authored-by: ubergeekzone <ubergeekzone@gmail.com>
    @sampaiodiego @ubergeekzone
    sampaiodiego and ubergeekzone committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    d7a9968 View commit details
    Browse the repository at this point in the history

  2. [FIX] Anonymous chat read (RocketChat#14717) 

    * Prevent errors when allowing anonymous read

* getSingleMessage for anonymous users

* Fix register user when allow read and write anonymous is enabled

* Fix anonymous with sidebar extended as default

Co-authored-by: ubergeekzone <ubergeekzone@gmail.com>
    @sampaiodiego @ubergeekzone
    sampaiodiego and ubergeekzone committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    991b610 View commit details
    Browse the repository at this point in the history

  3. [FIX] User Real Name being erased when not modified (RocketChat#14711)

    @Hudell @sampaiodiego
    Hudell authored and sampaiodiego committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    083aeea View commit details
    Browse the repository at this point in the history

  4. [FIX] User status information on User Info panel (RocketChat#14763)

    @MarcosSpessatto @sampaiodiego
    MarcosSpessatto authored and sampaiodiego committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    af6b99f View commit details
    Browse the repository at this point in the history

  5. Bump version to 1.1.2

    @sampaiodiego
    sampaiodiego committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    a505fc5 View commit details
    Browse the repository at this point in the history

  6. Merge pull request RocketChat#14823 from RocketChat/release-1.1.2 

    Release 1.1.2
    @sampaiodiego
    sampaiodiego committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    aece97e View commit details
    Browse the repository at this point in the history

  7. Merge branch 'service-account-login' of https://github.com/bhardwajad… 

    …itya/Rocket.Chat into service-account-discovery
    @bhardwajaditya
    bhardwajaditya committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    7c27c8b View commit details
    Browse the repository at this point in the history

  8. [New] Service Account directory feature

    @bhardwajaditya
    bhardwajaditya committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    d904e45 View commit details
    Browse the repository at this point in the history

  9. CLI errors fixed

    @bhardwajaditya
    bhardwajaditya committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    8ba618a View commit details
    Browse the repository at this point in the history

  10. UsernameExists meteor method fixed

    @bhardwajaditya
    bhardwajaditya committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    0fe5546 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'service-accounts' of https://github.com/bhardwajaditya/… 

    …Rocket.Chat into service-account-callbacks
    @bhardwajaditya
    bhardwajaditya committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    c768083 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #5 from bhardwajaditya/service-account-creation 

    [NEW] Service account creation
    @bhardwajaditya
    bhardwajaditya committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    fb48d5f View commit details
    Browse the repository at this point in the history

  13. Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i… 

    …nto service-accounts
    @bhardwajaditya
    bhardwajaditya committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    1a33894 View commit details
    Browse the repository at this point in the history

  14. Sync commit

    @bhardwajaditya
    bhardwajaditya committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    356ca5d View commit details
    Browse the repository at this point in the history

  15. Sync commit

    @bhardwajaditya
    bhardwajaditya committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    6211ab6 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'service-accounts' of https://github.com/bhardwajaditya/… 

    …Rocket.Chat into service-account-login
    @bhardwajaditya
    bhardwajaditya committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    fac8adf View commit details
    Browse the repository at this point in the history

  17. Sync commit

    @bhardwajaditya
    bhardwajaditya committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    f21ad96 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2019

  1. [NEW] Add loading animation to webdav file picker (RocketChat#14759)

    @ubarsaiyan @ggazzo
    ubarsaiyan authored and ggazzo committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    86eb9f6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i… 

    …nto service-account-discovery
    @bhardwajaditya
    bhardwajaditya committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    57c28fc View commit details
    Browse the repository at this point in the history

  3. [NEW] Service Account subscription method added

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

  4. Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i… 

    …nto service-accounts
    @bhardwajaditya
    bhardwajaditya committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    645b6be View commit details
    Browse the repository at this point in the history

  5. Merge branch 'service-accounts' of https://github.com/bhardwajaditya/… 

    …Rocket.Chat into service-account-discovery
    @bhardwajaditya
    bhardwajaditya committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    6f06d65 View commit details
    Browse the repository at this point in the history

  6. changed mongo version for snap from 3.2.7 to 3.4.20 (RocketChat#14838)

    @LuluGO @geekgonecrazy
    LuluGO authored and geekgonecrazy committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    2d45cff View commit details
    Browse the repository at this point in the history

  7. add _hidden for messages loaded by thread (RocketChat#14837)

    @ggazzo @rodrigok
    ggazzo authored and rodrigok committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    4747c39 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2019

  1. Regression: thread loading parent msg if is not loaded (RocketChat#14839 

    )
    @ggazzo
    ggazzo committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    bd9c8cb View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2019

  1. [IMPROVE] Layout of livechat manager pages to new style (RocketChat#1… 

    …3900)
    @ggazzo @sampaiodiego
    ggazzo authored and sampaiodiego committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    dd45652 View commit details
    Browse the repository at this point in the history

  2. [FIX] Removes E2E action button, icon and banner when E2E is disabled. ( 

    RocketChat#14810)
    @marceloschmidt @ggazzo
    marceloschmidt authored and ggazzo committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    e614a95 View commit details
    Browse the repository at this point in the history

  3. add _hidden for messages loaded by thread (RocketChat#14837)

    @ggazzo @sampaiodiego
    ggazzo authored and sampaiodiego committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    f7cb62f View commit details
    Browse the repository at this point in the history

  4. Regression: thread loading parent msg if is not loaded (RocketChat#14839 

    )
    @ggazzo @sampaiodiego
    ggazzo authored and sampaiodiego committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    c6c90cc View commit details
    Browse the repository at this point in the history

  5. Bump version to 1.1.3

    @sampaiodiego
    sampaiodiego committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    55622a0 View commit details
    Browse the repository at this point in the history

  6. [IMPROVE] Adds link to download generated user data file (RocketChat#… 

    …14175)
    @Hudell @sampaiodiego
    Hudell authored and sampaiodiego committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    764fc93 View commit details
    Browse the repository at this point in the history

  7. [FIX] Error when using Download My Data or Export My Data (RocketChat… 

    …#14645)
    @Hudell @sampaiodiego
    Hudell authored and sampaiodiego committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    b954bb8 View commit details
    Browse the repository at this point in the history

  8. Merge pull request RocketChat#14850 from RocketChat/release-1.1.3 

    Release 1.1.3
    @sampaiodiego
    sampaiodiego committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    509a801 View commit details
    Browse the repository at this point in the history

  9. [NEW] Custom User Status (RocketChat#13933) 

    Co-Authored-By: Tasso Evangelista <tasso@tassoevan.me>
Co-Authored-By: Guilherme Gazzo <guilhermegazzo@gmail.com>
Co-Authored-By: wreiske <wreiske@mieweb.com>
    @Hudell @tassoevan
    @ggazzo @wreiske @sampaiodiego
    4 people authored and sampaiodiego committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    fbb47b6 View commit details
    Browse the repository at this point in the history

  10. Bump version to 1.2.0-rc.0

    @sampaiodiego
    sampaiodiego committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    26df671 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2019

  1. Allow debugging of cached collections by name (RocketChat#14859)

    @ggazzo @sampaiodiego
    ggazzo authored and sampaiodiego committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    c17a04d View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2019

  1. Regression: Allow debugging of cached collections by name (RocketChat… 

    …#14862)
    @ggazzo
    ggazzo committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    da9dea8 View commit details
    Browse the repository at this point in the history

  2. Regression: Fix desktop notifications not being sent (RocketChat#14860)

    @sampaiodiego
    sampaiodiego committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    0e95941 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2019

  1. Broadcast Room name change handled

    @bhardwajaditya
    bhardwajaditya committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    46b87f2 View commit details
    Browse the repository at this point in the history

  2. Lint errors fixed

    @bhardwajaditya
    bhardwajaditya committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    0562355 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2019

  1. Merge pull request #6 from bhardwajaditya/service-account-callbacks 

    [NEW] Service account callbacks
    @bhardwajaditya
    bhardwajaditya committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    6aa19d3 View commit details
    Browse the repository at this point in the history

  2. Merged service-accounts branch

    @bhardwajaditya
    bhardwajaditya committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    c43c3d7 View commit details
    Browse the repository at this point in the history

  3. getLoginToken method refactored

    @bhardwajaditya
    bhardwajaditya committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    c603a51 View commit details
    Browse the repository at this point in the history

  4. Console statements removed

    @bhardwajaditya
    bhardwajaditya committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    bf05a2d View commit details
    Browse the repository at this point in the history

  5. Sidebar header permission modified

    @bhardwajaditya
    bhardwajaditya committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    73eedd8 View commit details
    Browse the repository at this point in the history

  6. Merged with upstream develop

    @bhardwajaditya
    bhardwajaditya committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    e6e2229 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'service-accounts' of https://github.com/bhardwajaditya/… 

    …Rocket.Chat into service-account-login
    @bhardwajaditya
    bhardwajaditya committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    e752336 View commit details
    Browse the repository at this point in the history

  8. Merge branch service-accounts

    @bhardwajaditya
    bhardwajaditya committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    ab05883 View commit details
    Browse the repository at this point in the history

  9. Merge branch service-accounts

    @bhardwajaditya
    bhardwajaditya committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    68bed0a View commit details
    Browse the repository at this point in the history

  10. Added service account directory search translation key

    @bhardwajaditya
    bhardwajaditya committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    1dc5d2a View commit details
    Browse the repository at this point in the history

  11. Merge pull request #7 from bhardwajaditya/service-account-login 

    [NEW] Service account one-tap login
    @kb0304
    kb0304 committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    fdac5d2 View commit details
    Browse the repository at this point in the history

  12. Subscribers count added

    @bhardwajaditya
    bhardwajaditya committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    1b42205 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'service-accounts' of https://github.com/bhardwajaditya/… 

    …Rocket.Chat into service-account-discovery
    @bhardwajaditya
    bhardwajaditya committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    bd2811d View commit details
    Browse the repository at this point in the history

  14. Merge pull request #8 from bhardwajaditya/service-account-discovery 

    [NEW] Service account directory feature
    @kb0304
    kb0304 committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    117d725 View commit details
    Browse the repository at this point in the history

  15. [FIX] Custom status fixes (RocketChat#14853) 

    * Fixes for status message text presence issues
Added statusText to several api endpoints
Changed statusMessage to statusText since that is what it is called everywhere

* Fixed slash command for changing status

* Fixed the "name is required" issue

* Make sure the status is set blank if selecting a default status... we don't want an "online" status when someone is actually offline!

* Fixes display of custom status on the room header

* Changed the header of DM rooms to query the server for the user status text when it is not found on the internal collection

* Changed Custom Status methods to check if the user is logged in

* Improved code readability

* Fix getting status list before logging in
    @wreiske @sampaiodiego
    wreiske authored and sampaiodiego committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    24ebd2c View commit details
    Browse the repository at this point in the history

  16. Merge remote-tracking branch 'origin/develop' into release-candidate

    @sampaiodiego
    sampaiodiego committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    69b5658 View commit details
    Browse the repository at this point in the history

  17. Bump version to 1.2.0-rc.1

    @sampaiodiego
    sampaiodiego committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    1122200 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2019

  1. [FIX] LinkedIn OAuth login (RocketChat#14887)

    @engelgabriel @sampaiodiego
    engelgabriel authored and sampaiodiego committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    c229a07 View commit details
    Browse the repository at this point in the history

  2. [NEW] Show App bundles and its apps (RocketChat#14886)

    @rodrigok @sampaiodiego
    rodrigok authored and sampaiodiego committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    0788cbf View commit details
    Browse the repository at this point in the history

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

    @sampaiodiego
    sampaiodiego committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    a9bb2ae View commit details
    Browse the repository at this point in the history

  4. Bump version to 1.2.0-rc.2

    @sampaiodiego
    sampaiodiego committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    120025e View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/release-candidate' into release-… 

    …1.2.0
    @sampaiodiego
    sampaiodiego committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    a3f5320 View commit details
    Browse the repository at this point in the history

  6. Bump version to 1.2.0

    @sampaiodiego
    sampaiodiego committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    918311f View commit details
    Browse the repository at this point in the history

  7. Merge pull request RocketChat#14888 from RocketChat/release-1.2.0 

    Release 1.2.0
    @sampaiodiego
    sampaiodiego committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    eff6532 View commit details
    Browse the repository at this point in the history

  8. Bump version to 1.3.0-develop

    @sampaiodiego
    sampaiodiego committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    2ec1b9d View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i… 

    …nto service-accounts
    @bhardwajaditya
    bhardwajaditya committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    ce1f470 View commit details
    Browse the repository at this point in the history

  10. Merge pull request RocketChat#14889 from RocketChat/develop-sync 

    Merge master into develop & Set version to 1.3.0-develop
    @sampaiodiego
    sampaiodiego committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    79af3b0 View commit details
    Browse the repository at this point in the history

  11. [FIX] Not showing local app on App Details (RocketChat#14894)

    @d-gubert @sampaiodiego
    d-gubert authored and sampaiodiego committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    8c3e8bb View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2019

  1. Unread counter added in popver

    @bhardwajaditya
    bhardwajaditya committed Jun 29, 2019
    Configuration menu
    Copy the full SHA
    8e87c83 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2019

  1. Get linked service account method added

    @bhardwajaditya
    bhardwajaditya committed Jul 1, 2019
    Configuration menu
    Copy the full SHA
    5a28d41 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i… 

    …nto service-accounts
    @bhardwajaditya
    bhardwajaditya committed Jul 1, 2019
    Configuration menu
    Copy the full SHA
    61bfee3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'service-accounts' of https://github.com/bhardwajaditya/… 

    …Rocket.Chat into service-account-notification
    @bhardwajaditya
    bhardwajaditya committed Jul 1, 2019
    Configuration menu
    Copy the full SHA
    b3fc0e4 View commit details
    Browse the repository at this point in the history

  4. Merged with upstream develop

    @bhardwajaditya
    bhardwajaditya committed Jul 1, 2019
    Configuration menu
    Copy the full SHA
    58e3bf5 View commit details
    Browse the repository at this point in the history

  5. Added get linked service accounts method

    @bhardwajaditya
    bhardwajaditya committed Jul 1, 2019
    Configuration menu
    Copy the full SHA
    fdc5ed3 View commit details
    Browse the repository at this point in the history

  6. get cloud generated public key for marketplace licenses (RocketChat#1… 

    …4851)
    @geekgonecrazy @rodrigok
    geekgonecrazy authored and rodrigok committed Jul 1, 2019
    Configuration menu
    Copy the full SHA
    0bb9a52 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2019

  1. Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i… 

    …nto social-features-prototype
    @bhardwajaditya
    bhardwajaditya committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    dcc6f19 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'social_features_prototype' of https://github.com/WideCh… 

    …at/Rocket.Chat into social-features-prototype
    @bhardwajaditya
    bhardwajaditya committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    669b1f1 View commit details
    Browse the repository at this point in the history