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

Fix: Notification Preferences panel is using old layout #9526

Merged
merged 12 commits into from
Jan 27, 2018
Merged

Fix: Notification Preferences panel is using old layout #9526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b62bb74
form
ggazzo Jan 26, 2018
050434e
notifications
ggazzo Jan 26, 2018
1821213
Merge branch 'contextual-bar-redesign' of github.com:RocketChat/Rocke…
ggazzo Jan 26, 2018
a020d5c
save
ggazzo Jan 26, 2018
67b936c
save working
ggazzo Jan 26, 2018
eb1e73a
missing sound choose
ggazzo Jan 26, 2018
f27eac5
break-word
ggazzo Jan 26, 2018
e4e633f
notification preferences
karlprieb Jan 26, 2018
aca649d
fix lint
karlprieb Jan 26, 2018
5301598
fix switch color
karlprieb Jan 26, 2018
1b77402
Merge remote-tracking branch 'origin/develop' into contextual-bar-red…
ggazzo Jan 27, 2018
dbacccb
fix inversion hide/show
ggazzo Jan 27, 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
14 changes: 7 additions & 7 deletions 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 @@ -65,10 +65,10 @@
{{#with settings.t}}
<div class="rc-user-info__row rc-user-info__row--separator">
<div class="rc-switch-double">
<div class="rc-switch-double__label {{equal true value 'disabled'}}">
{{_ "Private"}}
<div class="rc-switch-double__label {{equal true value 'disabled'}}">
{{_ "Public"}}{{equal default value '*'}}
<div class="rc-switch-double__description">
{{_ "Just_invited_people_can_access_this_channel"}}
{{_ "Everyone_can_access_this_channel"}}
</div>
</div>
<div class="rc-switch rc-switch--blue">
Expand All @@ -79,13 +79,13 @@
</span>
</label>
</div>
<div class="rc-switch-double__label {{equal false value 'disabled'}}">
{{_ "Public"}}{{equal default value '*'}}
<div class="rc-switch-double__label {{equal false value 'disabled'}}">
{{_ "Private"}}
<div class="rc-switch-double__description">
{{_ "Everyone_can_access_this_channel"}}
{{_ "Just_invited_people_can_access_this_channel"}}
</div>
</div>

</div>
</div>
{{/with}}
Expand Down
3 changes: 3 additions & 0 deletions packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@
"Agent": "Agent",
"Agent_added": "Agent added",
"Agent_removed": "Agent removed",
"Alerts": "Alerts",
"Alias": "Alias",
"Alias_Format": "Alias Format",
"Alias_Format_Description": "Import messages from Slack with an alias; %s is replaced by the username of the user. If empty, no alias will be used.",
Expand Down Expand Up @@ -259,6 +260,7 @@
"AtlassianCrowd": "Atlassian Crowd",
"Attachment_File_Uploaded": "File Uploaded",
"Attribute_handling": "Attribute handling",
"Audio": "Audio",
"Audio_message": "Audio message",
"Audio_Notification_Value_Description": "Can be any custom sound or the default ones: beep, chelle, ding, droplet, highbell, seasons",
"Audio_Notifications_Default_Alert": "Audio Notifications Default Alert",
Expand Down Expand Up @@ -1346,6 +1348,7 @@
"Notifications": "Notifications",
"Notifications_Always_Notify_Mobile" : "Always notify mobile",
"Notifications_Always_Notify_Mobile_Description" : "Choose to always notify mobile device regardless of presence status.",
"Notifications_Duration": "Notifications_Duration",
"Notifications_Max_Room_Members": "Max Room Members Before Disabling All Message Notifications",
"Notifications_Max_Room_Members_Description": "Max number of members in room when notifications for all messages gets disabled. Users can still change per room setting to receive all notifications on an individual basis. (0 to disable)",
"Notifications_Muted_Description": "If you choose to mute everything, you won't see the room highlight in the list when there are new messages, except for mentions. Muting notifications will override notifications settings.",
Expand Down
Loading