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

Merge master into develop & Set version to 0.70.0-develop #11921

Merged
merged 37 commits into from
Aug 31, 2018
Merged

Merge master into develop & Set version to 0.70.0-develop #11921

merged 37 commits into from
Aug 31, 2018

Conversation

sampaiodiego
Copy link
Member

No description provided.

rodrigok and others added 30 commits July 30, 2018 21:10
@rodrigok @sampaiodiego
[FIX] HipChat importer wasn’t compatible with latest exports (#11597)
abfe38c
@tassoevan @sampaiodiego
[FIX] Jump to message search result action (#11613)
ef8a9e3
@engelgabriel @sampaiodiego
Updated icon assets
59d92e9
@sampaiodiego
Bump version to 0.68.1
499ff2e
@sampaiodiego
Merge pull request #11616 from RocketChat/release-0.68.1
0e00032 
Release 0.68.1
@c0dzilla @sampaiodiego
[FIX] Incorrect migration version in v130.js (#11544)
5584fb6
@sampaiodiego
Bump version to 0.68.2
e383105
@sampaiodiego
Merge pull request #11630 from RocketChat/release-0.68.2
960b893 
Release 0.68.2
@Hudell @sampaiodiego
[FIX] SAML login not working when user has multiple emails (#11642)
b1d1305
@sampaiodiego
[FIX] Prune translation on room info panel (#11635)
4b27388
@rndmh3ro @sampaiodiego
[FIX] Prune translations in German (#11631)
e3b4461
@MarcosSpessatto @sampaiodiego
[FIX] User info APIs not returning customFields correctly (#11625)
b94badc
@Hudell @sampaiodiego
[FIX] Missing chat history for users without permission `preview-c-ro…
730022e 
…om` (#11639)
@sampaiodiego
Bump version to 0.68.3
6f8f90f
@sampaiodiego
Merge pull request #11650 from RocketChat/release-0.68.3
90be09e 
Release 0.68.3
@vynmera @sampaiodiego
[FIX] Regression in prune by user, and update lastMessage (#11646)
e3df820 
* Fix regression

* Also update lastMessage

* code style fix
@tassoevan @sampaiodiego
Merge pull request #11708 from RocketChat/fix-setup-wizard-logo
c90dd6b 
[FIX] Broken logo on setup wizard
@sampaiodiego
[FIX] Default server language not being applied (#11719)
224c76e 
* Fix default server language not being applied

* Always set user's language on localStorage
@sampaiodiego
Bump version to 0.68.4
8dad048
@sampaiodiego
Merge pull request #11743 from RocketChat/release-0.68.4
200a6b0 
Release 0.68.4
@sampaiodiego
Bump version to 0.69.0-rc.0
5e30341
@renatobecker @sampaiodiego
[FIX] Livechat open room method (#11830)
85d70e1
@sampaiodiego
Bump version to 0.68.5
40779b3
@sampaiodiego
Merge pull request #11852 from RocketChat/release-0.68.5
e412d01 
Release 0.68.5
@sampaiodiego
Merge remote-tracking branch 'origin/develop' into release-candidate
31e7381
@sampaiodiego
Bump version to 0.69.0-rc.1
19f6ec7
@sampaiodiego
Merge remote-tracking branch 'origin/release-candidate' into release-…
43ae6f2 
…0.69.0
@sampaiodiego
Bump version to 0.69.0
0428ec7
@sampaiodiego
Merge pull request #11881 from RocketChat/release-0.69.0
79e53f9 
Release 0.69.0
@ubarsaiyan @sampaiodiego
[FIX] Duplicated message buttons (#11853)
b5b42b6
@sampaiodiego sampaiodiego merged commit 62ee25d into develop Aug 31, 2018
@sampaiodiego sampaiodiego deleted the develop-sync branch August 31, 2018 21:43
This was referenced Sep 28, 2018
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@geekgonecrazy geekgonecrazy geekgonecrazy approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.