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

[FIX] [i18n] My Profile & README.md links #8270

Merged
merged 5 commits into from
Sep 23, 2017
Merged

[FIX] [i18n] My Profile & README.md links #8270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fe3ec9d
Fixed My Profile
mhajder Sep 23, 2017
9ace4b4
Fixed README.md links
mhajder Sep 23, 2017
57c4644
Use just the work Profile
engelgabriel Sep 23, 2017
5c4df9a
Use just the work profile
engelgabriel Sep 23, 2017
a3bf019
Merge branch 'develop' into develop
engelgabriel Sep 23, 2017
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
8 changes: 5 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* [Desktop apps](#desktop-apps)
* [Deployment](#deployment)
* [Snaps](#instant-server-installation-with-snaps)
* [RocketChatLauncher](#launcher)
* [RocketChatLauncher](#rocketchatlauncher)
* [Layershift](#layershift)
* [Sandstorm.io](#sandstormio)
* [Yunohost.org](#yunohostorg)
Expand Down Expand Up @@ -65,12 +65,14 @@ Checkout the latest version at [https://demo.rocket.chat](https://demo.rocket.ch
Download the Native Cross-Platform Desktop Application at [Rocket.Chat.Electron](https://github.com/RocketChat/Rocket.Chat.Electron/releases)


# Native Mobile Apps
# Mobile Apps

## Native Mobile Apps
*Note: currently the native apps doesn't support all the features that web does. If you're looking for it, you should download the Cordova apps.*

[![Rocket.Chat on Apple AppStore](https://user-images.githubusercontent.com/551004/29770691-a2082ff4-8bc6-11e7-89a6-964cd405ea8e.png)](https://itunes.apple.com/us/app/rocket-chat/id1148741252?mt=8) [![Rocket.Chat on Google Play](https://user-images.githubusercontent.com/551004/29770692-a20975c6-8bc6-11e7-8ab0-1cde275496e0.png)](https://play.google.com/store/apps/details?id=chat.rocket.android)

# Hybrid Mobile Apps (Cordova)
## Hybrid Mobile Apps (Cordova)

[![Rocket.Chat on Apple AppStore](https://user-images.githubusercontent.com/551004/29770691-a2082ff4-8bc6-11e7-89a6-964cd405ea8e.png)](https://itunes.apple.com/us/app/rocket.chat/id1028869439?mt=8) [![Rocket.Chat on Google Play](https://user-images.githubusercontent.com/551004/29770692-a20975c6-8bc6-11e7-8ab0-1cde275496e0.png)](https://play.google.com/store/apps/details?id=com.konecty.rocket.chat)

Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-ui-account/client/accountProfile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<section class="preferences-page">
<header class="preferences-page__header">
{{> burger}}
<h2 style="flex: 1 1; white-space: nowrap;">{{_ "My_profile"}}</h2>
<h2 style="flex: 1 1; white-space: nowrap;">{{_ "Profile"}}</h2>
<div class="content" style="text-align: end; max-width: 649px; flex: 1 1 100%">
<button class="rc-button rc-button--primary" name="send" type="submit" data-button="create" form="profile" {{canSave 'disabled'}}>{{_ "Save_changes"}}</button>
</div>
Expand Down