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] Added default option for New Room Notification #27775

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

[FIX] Added default option for New Room Notification #27775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b2a1f3
Add default option for CustomSounds
EduardoGurgel Jan 17, 2023
2f738af
Update oembedUrlWidget.html
EduardoGurgel Jan 31, 2023
62f24f3
Update en.i18n.json
EduardoGurgel Jan 31, 2023
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
6 changes: 4 additions & 2 deletions apps/meteor/app/custom-sounds/client/lib/CustomSounds.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { CachedCollectionManager } from '../../../ui-cached-collection';
import { Meteor } from 'meteor/meteor';
import { ReactiveVar } from 'meteor/reactive-var';
import _ from 'underscore';

import { CachedCollectionManager } from '../../../ui-cached-collection';
import { getURL } from '../../../utils/client';

const getCustomSoundId = (sound) => `custom-sound-${sound}`;
Expand Down Expand Up @@ -51,6 +50,9 @@ class CustomSoundsClass {
extension: 'mp3',
src: getURL('sounds/call-ended.mp3'),
});
this.add({
_id: 'default',name: 'Default',extension: '',src: getURL(''),
});
this.add({ _id: 'dialtone', name: 'Dialtone', extension: 'mp3', src: getURL('sounds/dialtone.mp3') });
this.add({ _id: 'ringtone', name: 'Ringtone', extension: 'mp3', src: getURL('sounds/ringtone.mp3') });
}
Expand Down
5 changes: 5 additions & 0 deletions apps/meteor/app/oembed/client/oembedUrlWidget.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<template name="oembedUrlWidget">
{{#if show}}
<div style="color: #AAA; padding:0.5rem;">
{{url}}
{{> collapseArrow collapsedMedia=collapsedMediaVar}}
</div>
{{#unless collapsed}}
<blockquote class="message-oembed background-transparent-darker-before">
<div style="{{#if image}}min-height: 80px;{{/if}} padding: 10px 3px;">
{{#if image}}
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1050,7 +1050,7 @@
"Cloud_workspace_support": "If you have trouble with a cloud service, please try to sync first. Should the issue persist, please open a support ticket in the Cloud Console.",
"Collaborative": "Collaborative",
"Collapse": "Collapse",
"Collapse_Embedded_Media_By_Default": "Collapse Embedded Media by Default",
"Collapse_Embedded_Media_By_Default": "Collapse Embedded Media and URLs by Default",
"color": "Color",
"Color": "Color",
"Colors": "Colors",
Expand Down
Loading