Skip to content

Merge master into develop & Set version to 0.66.0-develop #11277

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

Merged
rodrigok merged 15 commits into from
Jun 28, 2018
Merged

Merge master into develop & Set version to 0.66.0-develop #11277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f57fd07
Semantic markup
brylie Jan 28, 2018
047e6f3
Fix spelling of "collaborative"
stuartpb Mar 14, 2018
da7e38c
Merge branch 'master' into patch-1
engelgabriel Jun 7, 2018
c1845df
Merge pull request #9534 from brylie/patch-1
engelgabriel Jun 7, 2018
bd99dae
Merge branch 'master' into patch-1
engelgabriel Jun 7, 2018
a0c709c
Merge pull request #10134 from stuartpb/patch-1
engelgabriel Jun 7, 2018
e5333d4
[FIX] Wordpress OAuth not providing enough info to log in (#11152)
Hudell Jun 15, 2018
7897a29
Merge pull request #10998 from vynmera/fix-lazy-load-big-images-becau…
engelgabriel Jun 4, 2018
78ca556
[FIX] users model not receiving options (#11129)
sampaiodiego Jun 13, 2018
fbb72df
Bump version to 0.65.2
sampaiodiego Jun 16, 2018
138345c
Bump version to 0.65.2
engelgabriel Jun 8, 2018
ad3abbb
Merge pull request #11049 from RocketChat/fix-admin-tab-icons
engelgabriel Jun 8, 2018
706a528
Merge pull request #11167 from RocketChat/release-0.65.2
sampaiodiego Jun 16, 2018
83f4832
Merge remote-tracking branch 'origin/master' into develop-sync
rodrigok Jun 28, 2018
4f6c331
Bump version to 0.66.0-develop
rodrigok Jun 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .sandstorm/sandstorm-pkgdef.capnp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const pkgdef :Spk.PackageDefinition = (

appTitle = (defaultText = "Rocket.Chat"),

appVersion = 71, # Increment this for every release.
appVersion = 73, # Increment this for every release.

appMarketingVersion = (defaultText = "0.66.0-develop"),
# Human-readable representation of appVersion. Should match the way you
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-channel-settings/client/views/channelSettings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<div class="rc-user-info__row rc-user-info__row--separator">
<div class="rc-switch-double">
<div class="rc-switch-double__label {{equal false value 'disabled'}}">
{{_ "Colaborative"}}{{equal default value '*'}}
{{_ "Collaborative"}}{{equal default value '*'}}
<div class="rc-switch-double__description">
{{_ "All_users_in_the_channel_can_write_new_messages"}}
</div>
Expand Down