@@ -1219,6 +1216,7 @@ export default class MessageComposerInput extends React.Component {
);
From f4ed820b6f0d8bb4d0aa6441c7633a334d47afcc Mon Sep 17 00:00:00 2001
From: Matthew Hodgson {children}
+ } + case 'pill': { + const { data, text } = node; + const url = data.get('url'); + const type = data.get('type'); + + const shouldShowPillAvatar = !SettingsStore.getValue("Pill.shouldHidePillAvatar"); + const Pill = sdk.getComponent('elements.Pill'); + + if (type === Pill.TYPE_AT_ROOM_MENTION) { + return
@@ -1216,8 +1240,8 @@ export default class MessageComposerInput extends React.Component {
room={this.props.room}
onConfirm={this.setDisplayedCompletion}
onSelectionChange={this.setDisplayedCompletion}
- query={this.getAutocompleteQuery(content)}
- selection={selection}
+ query={this.getAutocompleteQuery(activeEditorState)}
+ selection={this.getSelectionRange(activeEditorState)}
/>
@@ -1232,6 +1256,8 @@ export default class MessageComposerInput extends React.Component {
value={this.state.editorState}
onChange={this.onChange}
onKeyDown={this.onKeyDown}
+ renderNode={this.renderNode}
+ spellCheck={true}
/*
blockStyleFn={MessageComposerInput.getBlockStyle}
keyBindingFn={MessageComposerInput.getKeyBinding}
@@ -1240,11 +1266,6 @@ export default class MessageComposerInput extends React.Component {
handlePastedText={this.onTextPasted}
handlePastedFiles={this.props.onFilesPasted}
stripPastedStyles={!this.state.isRichtextEnabled}
- onTab={this.onTab}
- onUpArrow={this.onUpArrow}
- onDownArrow={this.onDownArrow}
- onEscape={this.onEscape}
- spellCheck={true}
*/
/>
From d7c2c8ba7bfc8229176a588cdf530295e438792e Mon Sep 17 00:00:00 2001
From: Matthew Hodgson {children}
} case 'pill': { - const { data, text } = node; + const { data } = node; const url = data.get('url'); const completion = data.get('completion'); @@ -1039,6 +1081,7 @@ export default class MessageComposerInput extends React.Component { type={Pill.TYPE_AT_ROOM_MENTION} room={this.props.room} shouldShowPillAvatar={shouldShowPillAvatar} + isSelected={isSelected} />; } else if (Pill.isPillUrl(url)) { @@ -1046,14 +1089,26 @@ export default class MessageComposerInput extends React.Component { url={url} room={this.props.room} shouldShowPillAvatar={shouldShowPillAvatar} + isSelected={isSelected} />; } else { + const { text } = node; return { text } ; } } + case 'emoji': { + const { data } = node; + const emojiUnicode = data.get('emojiUnicode'); + const uri = RichText.unicodeToEmojiUri(emojiUnicode); + const shortname = toShort(emojiUnicode); + const className = classNames('mx_emojione', { + mx_emojione_selected: isSelected + }); + return{children}
- } + case 'paragraph': + return{children}
; + case 'block-quote': + return{children}; + case 'bulleted-list': + return
- {children}
{children}
; + case 'heading-two': + return{children}
; + case 'heading-three': + return{children}
; + case 'list-item': + return- {children}
{children}
{children};
+ case 'underline':
+ return {children};
+ case 'strikethrough':
+ return
+ { /* Calculate aspect ratio, using %padding will size _container correctly */ }
+
+
+ { /* Thumbnail CSS class resizes to exactly container size with inline CSS
+ to restrict width */ }
+ 
+
);
From bbcf2fea53d81cb344e36e21221c298be46e30d5 Mon Sep 17 00:00:00 2001
From: Luke Barnard
+ 
+
;
+ } else if (thumbUrl && !this.state.imgError) {
+ img =
+
{ /* Calculate aspect ratio, using %padding will size _container correctly */ }
@@ -240,20 +262,13 @@ export default class extends React.Component {
{ /* Thumbnail CSS class resizes to exactly container size with inline CSS
to restrict width */ }
-
+ { img }
-
- );
+ : null;
return (
- { thumbUrl && !this.state.imgError ? thumbnail : '' }
+ { thumbnail }
-
-
-
- );
- }
const contentUrl = this._getContentUrl();
let thumbUrl;
From b41b9aa4facd2e4767d993f1d173ec9fdbc03c37 Mon Sep 17 00:00:00 2001
From: Luke Barnard
-
-
+ img =
Date: Fri, 18 May 2018 15:22:24 +0100
Subject: [PATCH 0042/1196] remove unused html serializer
---
src/components/views/rooms/MessageComposerInput.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 70a9b9bd83..acd7c0fab3 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -145,7 +145,7 @@ export default class MessageComposerInput extends React.Component {
this.plainWithIdPills = new PlainWithPillsSerializer({ pillFormat: 'id' });
this.plainWithPlainPills = new PlainWithPillsSerializer({ pillFormat: 'plain' });
this.md = new Md();
- this.html = new Html();
+ //this.html = new Html(); // not used atm
this.suppressAutoComplete = false;
this.direction = '';
From 167742d9008a7588c1c3bf044563db1fcc8e9816 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Sat, 19 May 2018 20:28:38 +0100
Subject: [PATCH 0043/1196] make RTE sending work
---
res/css/views/rooms/_MessageComposer.scss | 9 ++
src/RichText.js | 8 -
.../views/rooms/MessageComposerInput.js | 137 ++++++++++--------
3 files changed, 85 insertions(+), 69 deletions(-)
diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index 14f52832f6..72d31cfddd 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -91,6 +91,15 @@ limitations under the License.
overflow: auto;
}
+// FIXME: rather unpleasant hack to get rid of margins.
+// really we should be mixing in markdown-body from gfm.css instead
+.mx_MessageComposer_editor > :first-child {
+ margin-top: 0 ! important;
+}
+.mx_MessageComposer_editor > :last-child {
+ margin-bottom: 0 ! important;
+}
+
@keyframes visualbell
{
from { background-color: #faa }
diff --git a/src/RichText.js b/src/RichText.js
index 50ed33d803..e3162a4e2c 100644
--- a/src/RichText.js
+++ b/src/RichText.js
@@ -61,14 +61,6 @@ export function stateToMarkdown(state) {
''); // this is *not* a zero width space, trust me :)
}
-export const editorStateToHTML = (editorState: Value) => {
- return Html.deserialize(editorState);
-}
-
-export function htmlToEditorState(html: string): Value {
- return Html.serialize(html);
-}
-
export function unicodeToEmojiUri(str) {
let replaceWith, unicode, alt;
if ((!emojione.unicodeAlt) || (emojione.sprites)) {
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index acd7c0fab3..ae4d5b6264 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -145,7 +145,26 @@ export default class MessageComposerInput extends React.Component {
this.plainWithIdPills = new PlainWithPillsSerializer({ pillFormat: 'id' });
this.plainWithPlainPills = new PlainWithPillsSerializer({ pillFormat: 'plain' });
this.md = new Md();
- //this.html = new Html(); // not used atm
+ this.html = new Html({
+ rules: [
+ {
+ serialize: (obj, children) => {
+ if (obj.object === 'block' || obj.object === 'inline') {
+ return this.renderNode({
+ node: obj,
+ children: children,
+ });
+ }
+ else if (obj.object === 'mark') {
+ return this.renderMark({
+ mark: obj,
+ children: children,
+ });
+ }
+ }
+ }
+ ]
+ });
this.suppressAutoComplete = false;
this.direction = '';
@@ -397,27 +416,29 @@ export default class MessageComposerInput extends React.Component {
editorState = EditorState.forceSelection(editorState, currentSelection);
}
*/
- const text = editorState.startText.text;
- const currentStartOffset = editorState.startOffset;
+ if (editorState.startText !== null) {
+ const text = editorState.startText.text;
+ const currentStartOffset = editorState.startOffset;
- // Automatic replacement of plaintext emoji to Unicode emoji
- if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) {
- // The first matched group includes just the matched plaintext emoji
- const emojiMatch = REGEX_EMOJI_WHITESPACE.exec(text.slice(0, currentStartOffset));
- if (emojiMatch) {
- // plaintext -> hex unicode
- const emojiUc = asciiList[emojiMatch[1]];
- // hex unicode -> shortname -> actual unicode
- const unicodeEmoji = shortnameToUnicode(EMOJI_UNICODE_TO_SHORTNAME[emojiUc]);
+ // Automatic replacement of plaintext emoji to Unicode emoji
+ if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) {
+ // The first matched group includes just the matched plaintext emoji
+ const emojiMatch = REGEX_EMOJI_WHITESPACE.exec(text.slice(0, currentStartOffset));
+ if (emojiMatch) {
+ // plaintext -> hex unicode
+ const emojiUc = asciiList[emojiMatch[1]];
+ // hex unicode -> shortname -> actual unicode
+ const unicodeEmoji = shortnameToUnicode(EMOJI_UNICODE_TO_SHORTNAME[emojiUc]);
- const range = Range.create({
- anchorKey: editorState.selection.startKey,
- anchorOffset: currentStartOffset - emojiMatch[1].length - 1,
- focusKey: editorState.selection.startKey,
- focusOffset: currentStartOffset,
- });
- change = change.insertTextAtRange(range, unicodeEmoji);
- editorState = change.value;
+ const range = Range.create({
+ anchorKey: editorState.selection.startKey,
+ anchorOffset: currentStartOffset - emojiMatch[1].length - 1,
+ focusKey: editorState.selection.startKey,
+ focusOffset: currentStartOffset,
+ });
+ change = change.insertTextAtRange(range, unicodeEmoji);
+ editorState = change.value;
+ }
}
}
@@ -444,13 +465,15 @@ export default class MessageComposerInput extends React.Component {
let editorState = null;
if (enabled) {
+ // for simplicity when roundtripping, we use slate-md-serializer rather than commonmark
+ editorState = this.md.deserialize(this.plainWithMdPills.serialize(this.state.editorState));
+
+ // the alternative would be something like:
+ //
// const sourceWithPills = this.plainWithMdPills.serialize(this.state.editorState);
// const markdown = new Markdown(sourceWithPills);
// editorState = this.html.deserialize(markdown.toHTML());
- // we don't really want a custom MD parser hanging around, but the
- // alternative would be:
- editorState = this.md.deserialize(this.plainWithMdPills.serialize(this.state.editorState));
} else {
// let markdown = RichText.stateToMarkdown(this.state.editorState.getCurrentContent());
// value = ContentState.createFromText(markdown);
@@ -547,6 +570,8 @@ export default class MessageComposerInput extends React.Component {
let newState: ?Value = null;
+ const DEFAULT_NODE = 'paragraph';
+
// Draft handles rich text mode commands by default but we need to do it ourselves for Markdown.
if (this.state.isRichtextEnabled) {
const type = command;
@@ -725,11 +750,14 @@ export default class MessageComposerInput extends React.Component {
*/
handleReturn = (ev) => {
if (ev.shiftKey) {
+ // FIXME: we should insert a
equivalent rather than letting Slate + // split the current block, otherwise{children};
+ return {children};
}
};
@@ -1219,7 +1229,12 @@ export default class MessageComposerInput extends React.Component {
// This avoids us having to serialize the whole thing to plaintext and convert
// selection offsets in & out of the plaintext domain.
- return editorState.document.getDescendant(editorState.selection.anchorKey).text;
+ if (editorState.selection.anchorKey) {
+ return editorState.document.getDescendant(editorState.selection.anchorKey).text;
+ }
+ else {
+ return '';
+ }
}
getSelectionRange(editorState: Value) {
From a4d9338cf0d63fa6f637a96bbb52694f97bd791a Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Sat, 19 May 2018 20:38:07 +0100
Subject: [PATCH 0044/1196] let backspace delete list nodes in RTE
---
.../views/rooms/MessageComposerInput.js | 29 ++++++++++++++++---
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index ae4d5b6264..ab104f825a 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -77,6 +77,10 @@ const ENTITY_TYPES = {
AT_ROOM_PILL: 'ATROOMPILL',
};
+// the Slate node type to default to for unstyled text when in RTE mode.
+// (we use 'line' for oneliners however)
+const DEFAULT_NODE = 'paragraph';
+
function onSendMessageFailed(err, room) {
// XXX: temporary logging to try to diagnose
@@ -152,13 +156,13 @@ export default class MessageComposerInput extends React.Component {
if (obj.object === 'block' || obj.object === 'inline') {
return this.renderNode({
node: obj,
- children: children,
+ children: children,
});
}
else if (obj.object === 'mark') {
return this.renderMark({
mark: obj,
- children: children,
+ children: children,
});
}
}
@@ -548,6 +552,8 @@ export default class MessageComposerInput extends React.Component {
switch (ev.keyCode) {
case KeyCode.ENTER:
return this.handleReturn(ev);
+ case KeyCode.BACKSPACE:
+ return this.onBackspace(ev);
case KeyCode.UP:
return this.onVerticalArrow(ev, true);
case KeyCode.DOWN:
@@ -562,6 +568,23 @@ export default class MessageComposerInput extends React.Component {
}
};
+ onBackspace = (ev: Event): boolean => {
+ if (this.state.isRichtextEnabled) {
+ // let backspace exit lists
+ const isList = this.hasBlock('list-item');
+ if (isList) {
+ const change = this.state.editorState.change();
+ change
+ .setBlocks(DEFAULT_NODE)
+ .unwrapBlock('bulleted-list')
+ .unwrapBlock('numbered-list');
+ this.onChange(change);
+ return true;
+ }
+ }
+ return;
+ };
+
handleKeyCommand = (command: string): boolean => {
if (command === 'toggle-mode') {
this.enableRichtext(!this.state.isRichtextEnabled);
@@ -570,8 +593,6 @@ export default class MessageComposerInput extends React.Component {
let newState: ?Value = null;
- const DEFAULT_NODE = 'paragraph';
-
// Draft handles rich text mode commands by default but we need to do it ourselves for Markdown.
if (this.state.isRichtextEnabled) {
const type = command;
From 58670cc3e54114c00f5bccf43d21440e5c3ceec8 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Sat, 19 May 2018 21:14:39 +0100
Subject: [PATCH 0045/1196] exit list more sanely on backspace
---
src/components/views/rooms/MessageComposerInput.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index ab104f825a..6eadbae5ec 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -572,8 +572,9 @@ export default class MessageComposerInput extends React.Component {
if (this.state.isRichtextEnabled) {
// let backspace exit lists
const isList = this.hasBlock('list-item');
- if (isList) {
- const change = this.state.editorState.change();
+ const { editorState } = this.state;
+ if (isList && editorState.anchorOffset == 0) {
+ const change = editorState.change();
change
.setBlocks(DEFAULT_NODE)
.unwrapBlock('bulleted-list')
From d426c3474f2b5703b5c1f69b5ae1313a791c8a6d Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Sat, 19 May 2018 21:36:22 +0100
Subject: [PATCH 0046/1196] fix strikethough & code, improve shift-return &
backspace
---
.../views/rooms/MessageComposerInput.js | 29 ++++++++++++-------
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 6eadbae5ec..d7884e3c83 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -551,9 +551,9 @@ export default class MessageComposerInput extends React.Component {
switch (ev.keyCode) {
case KeyCode.ENTER:
- return this.handleReturn(ev);
+ return this.handleReturn(ev, change);
case KeyCode.BACKSPACE:
- return this.onBackspace(ev);
+ return this.onBackspace(ev, change);
case KeyCode.UP:
return this.onVerticalArrow(ev, true);
case KeyCode.DOWN:
@@ -568,19 +568,27 @@ export default class MessageComposerInput extends React.Component {
}
};
- onBackspace = (ev: Event): boolean => {
+ onBackspace = (ev: Event, change: Change): Change => {
if (this.state.isRichtextEnabled) {
// let backspace exit lists
const isList = this.hasBlock('list-item');
const { editorState } = this.state;
+
if (isList && editorState.anchorOffset == 0) {
- const change = editorState.change();
change
.setBlocks(DEFAULT_NODE)
.unwrapBlock('bulleted-list')
.unwrapBlock('numbered-list');
- this.onChange(change);
- return true;
+ return change;
+ }
+ else if (editorState.anchorOffset == 0 &&
+ (this.hasBlock('block-quote') ||
+ this.hasBlock('heading-one') ||
+ this.hasBlock('heading-two') ||
+ this.hasBlock('heading-three') ||
+ this.hasBlock('code-block')))
+ {
+ return change.setBlocks(DEFAULT_NODE);
}
}
return;
@@ -770,12 +778,13 @@ export default class MessageComposerInput extends React.Component {
return true;
};
*/
- handleReturn = (ev) => {
+ handleReturn = (ev, change) => {
if (ev.shiftKey) {
+
// FIXME: we should insert a
equivalent rather than letting Slate // split the current block, otherwise
From 1f05aea884de58efda88c9c3327e8a4e4a06d594 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
+ img =
+
;
} else if (thumbUrl && !this.state.imgError) {
// Restrict the width of the thumbnail here, otherwise it will fill the container
From 089ac337f4125c34823709afabd4b9788728e740 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
equivalent rather than letting Slate + // split the current block, otherwise
will be split into two paragraphs
+ // and it'll look like a double line-break.
return;
}
if (this.state.editorState.blocks.some(
- block => block in ['code-block', 'block-quote', 'bulleted-list', 'numbered-list']
+ block => ['code-block', 'block-quote', 'list-item'].includes(block.type)
)) {
// allow the user to terminate blocks by hitting return rather than sending a msg
return;
@@ -788,47 +816,25 @@ export default class MessageComposerInput extends React.Component {
const mustSendHTML = Boolean(replyingToEv);
if (this.state.isRichtextEnabled) {
-/*
// We should only send HTML if any block is styled or contains inline style
let shouldSendHTML = false;
if (mustSendHTML) shouldSendHTML = true;
- const blocks = contentState.getBlocksAsArray();
- if (blocks.some((block) => block.getType() !== 'unstyled')) {
- shouldSendHTML = true;
- } else {
- const characterLists = blocks.map((block) => block.getCharacterList());
- // For each block of characters, determine if any inline styles are applied
- // and if yes, send HTML
- characterLists.forEach((characters) => {
- const numberOfStylesForCharacters = characters.map(
- (character) => character.getStyle().toArray().length,
- ).toArray();
- // If any character has more than 0 inline styles applied, send HTML
- if (numberOfStylesForCharacters.some((styles) => styles > 0)) {
- shouldSendHTML = true;
- }
- });
- }
if (!shouldSendHTML) {
- const hasLink = blocks.some((block) => {
- return block.getCharacterList().filter((c) => {
- const entityKey = c.getEntity();
- return entityKey && contentState.getEntity(entityKey).getType() === 'LINK';
- }).size > 0;
+ shouldSendHTML = !!editorState.document.findDescendant(node => {
+ // N.B. node.getMarks() might be private?
+ return ((node.object === 'block' && node.type !== 'line') ||
+ (node.object === 'inline') ||
+ (node.object === 'text' && node.getMarks().size > 0));
});
- shouldSendHTML = hasLink;
}
-*/
+
contentText = this.plainWithPlainPills.serialize(editorState);
if (contentText === '') return true;
- let shouldSendHTML = true;
if (shouldSendHTML) {
- contentHTML = HtmlUtils.processHtmlForSending(
- RichText.editorStateToHTML(editorState),
- );
+ contentHTML = this.html.serialize(editorState); // HtmlUtils.processHtmlForSending();
}
} else {
const sourceWithPills = this.plainWithMdPills.serialize(editorState);
@@ -1047,7 +1053,7 @@ export default class MessageComposerInput extends React.Component {
marks: editorState.activeMarks,
// XXX: shouldn't we return all the types of blocks in the current selection,
// not just the anchor?
- blockType: editorState.anchorBlock.type,
+ blockType: editorState.anchorBlock ? editorState.anchorBlock.type : null,
};
}
@@ -1121,6 +1127,10 @@ export default class MessageComposerInput extends React.Component {
const { attributes, children, node, isSelected } = props;
switch (node.type) {
+ case 'line':
+ // ideally we'd return { children }
, but as this isn't
+ // a valid react component, we don't have much choice.
+ return
{children}
;
case 'paragraph':
return {children}
; case 'block-quote': @@ -1138,7 +1148,7 @@ export default class MessageComposerInput extends React.Component { case 'numbered-list': return- {children}
{children}
{children}{children};
+ return {children};
case 'underline':
- return {children};
+ return {children};
case 'strikethrough':
- return equivalent rather than letting Slate // split the current block, otherwise
will be split into two paragraphs
// and it'll look like a double line-break.
- return;
+ return change.insertText('\n');
}
if (this.state.editorState.blocks.some(
@@ -1235,11 +1244,11 @@ export default class MessageComposerInput extends React.Component {
e.preventDefault(); // don't steal focus from the editor!
const command = {
- code: 'code-block',
+ // code: 'code-block', // let's have the button do inline code for now
quote: 'block-quote',
bullet: 'bulleted-list',
numbullet: 'numbered-list',
- strike: 'strike-through',
+ strike: 'strikethrough',
}[name] || name;
this.handleKeyCommand(command);
};
From 1536ab433acf2ad5bed2eff14e9e9e8534fc2433 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
{children}
; case 'heading-three': return{children}
; + case 'heading-four': + return{children}
; + case 'heading-five': + return{children}
; + case 'heading-six': + return{children}
; case 'list-item': returnequivalent rather than letting Slate - // split the current block, otherwise
will be split into two paragraphs - // and it'll look like a double line-break. return change.insertText('\n'); } @@ -1218,17 +1215,17 @@ export default class MessageComposerInput extends React.Component { return
{children}; case 'bulleted-list': return
- {children}
{children}
; - case 'heading-two': + case 'heading2': return{children}
; - case 'heading-three': + case 'heading3': return{children}
; - case 'heading-four': + case 'heading4': return{children}
; - case 'heading-five': + case 'heading5': return{children}
; - case 'heading-six': + case 'heading6': return{children}
; case 'list-item': return{children};
- case 'underline':
+ case 'underlined':
return {children};
- case 'strikethrough':
+ case 'deleted':
return - {children}
{children}, but as this isn't - // a valid react component, we don't have much choice. - return
{children}
;
case 'paragraph':
return {children}
; case 'block-quote': From a0d88a829da8ee71b3a7910e1c534f808727f36a Mon Sep 17 00:00:00 2001 From: Matthew Hodgson- {children}
{children}
{ formatButtons }
- 
+ src={`img/button-md-${!this.state.inputState.isRichTextEnabled}.png`} />
![]( "{_t(\"Hide")
${body}`);
- if (!this.state.isRichtextEnabled) {
+ if (!this.state.isRichTextEnabled) {
content = ContentState.createFromText(RichText.stateToMarkdown(content));
}
@@ -374,7 +374,7 @@ export default class MessageComposerInput extends React.Component {
startSelection,
blockMap);
startSelection = SelectionState.createEmpty(contentState.getFirstBlock().getKey());
- if (this.state.isRichtextEnabled) {
+ if (this.state.isRichTextEnabled) {
contentState = Modifier.setBlockType(contentState, startSelection, 'blockquote');
}
let editorState = EditorState.push(this.state.editorState, contentState, 'insert-characters');
@@ -582,52 +582,61 @@ export default class MessageComposerInput extends React.Component {
});
};
- enableRichtext(enabled: boolean) {
- if (enabled === this.state.isRichtextEnabled) return;
+ mdToRichEditorState(editorState: Value): Value {
+ // for consistency when roundtripping, we could use slate-md-serializer rather than
+ // commonmark, but then we would lose pills as the MD deserialiser doesn't know about
+ // them and doesn't have any extensibility hooks.
+ //
+ // The code looks like this:
+ //
+ // const markdown = this.plainWithMdPills.serialize(editorState);
+ //
+ // // weirdly, the Md serializer can't deserialize '' to a valid Value...
+ // if (markdown !== '') {
+ // editorState = this.md.deserialize(markdown);
+ // }
+ // else {
+ // editorState = Plain.deserialize('', { defaultBlock: DEFAULT_NODE });
+ // }
- // FIXME: this duplicates similar conversions which happen in the history & store.
- // they should be factored out.
+ // so, instead, we use commonmark proper (which is arguably more logical to the user
+ // anyway, as they'll expect the RTE view to match what they'll see in the timeline,
+ // but the HTML->MD conversion is anyone's guess).
+
+ const textWithMdPills = this.plainWithMdPills.serialize(editorState);
+ const markdown = new Markdown(textWithMdPills);
+ // HTML deserialize has custom rules to turn matrix.to links into pill objects.
+ return this.html.deserialize(markdown.toHTML());
+ }
+
+ richToMdEditorState(editorState: Value): Value {
+ // FIXME: this conversion loses pills (turning them into pure MD links).
+ // We need to add a pill-aware deserialize method
+ // to PlainWithPillsSerializer which recognises pills in raw MD and turns them into pills.
+ return Plain.deserialize(
+ // FIXME: we compile the MD out of the RTE state using slate-md-serializer
+ // which doesn't roundtrip symmetrically with commonmark, which we use for
+ // compiling MD out of the MD editor state above.
+ this.md.serialize(editorState),
+ { defaultBlock: DEFAULT_NODE }
+ );
+ }
+
+ enableRichtext(enabled: boolean) {
+ if (enabled === this.state.isRichTextEnabled) return;
let editorState = null;
if (enabled) {
- // for consistency when roundtripping, we could use slate-md-serializer rather than
- // commonmark, but then we would lose pills as the MD deserialiser doesn't know about
- // them and doesn't have any extensibility hooks.
- //
- // The code looks like this:
- //
- // const markdown = this.plainWithMdPills.serialize(this.state.editorState);
- //
- // // weirdly, the Md serializer can't deserialize '' to a valid Value...
- // if (markdown !== '') {
- // editorState = this.md.deserialize(markdown);
- // }
- // else {
- // editorState = Plain.deserialize('', { defaultBlock: DEFAULT_NODE });
- // }
-
- // so, instead, we use commonmark proper (which is arguably more logical to the user
- // anyway, as they'll expect the RTE view to match what they'll see in the timeline,
- // but the HTML->MD conversion is anyone's guess).
-
- const sourceWithPills = this.plainWithMdPills.serialize(this.state.editorState);
- const markdown = new Markdown(sourceWithPills);
- editorState = this.html.deserialize(markdown.toHTML());
+ editorState = this.mdToRichEditorState(this.state.editorState);
} else {
- // let markdown = RichText.stateToMarkdown(this.state.editorState.getCurrentContent());
- // value = ContentState.createFromText(markdown);
-
- editorState = Plain.deserialize(
- this.md.serialize(this.state.editorState),
- { defaultBlock: DEFAULT_NODE }
- );
+ editorState = this.richToMdEditorState(this.state.editorState);
}
Analytics.setRichtextMode(enabled);
this.setState({
editorState: this.createEditorState(enabled, editorState),
- isRichtextEnabled: enabled,
+ isRichTextEnabled: enabled,
}, ()=>{
this.refs.editor.focus();
});
@@ -710,7 +719,7 @@ export default class MessageComposerInput extends React.Component {
};
onBackspace = (ev: Event, change: Change): Change => {
- if (this.state.isRichtextEnabled) {
+ if (this.state.isRichTextEnabled) {
// let backspace exit lists
const isList = this.hasBlock('list-item');
const { editorState } = this.state;
@@ -740,14 +749,14 @@ export default class MessageComposerInput extends React.Component {
handleKeyCommand = (command: string): boolean => {
if (command === 'toggle-mode') {
- this.enableRichtext(!this.state.isRichtextEnabled);
+ this.enableRichtext(!this.state.isRichTextEnabled);
return true;
}
let newState: ?Value = null;
// Draft handles rich text mode commands by default but we need to do it ourselves for Markdown.
- if (this.state.isRichtextEnabled) {
+ if (this.state.isRichTextEnabled) {
const type = command;
const { editorState } = this.state;
const change = editorState.change();
@@ -913,7 +922,7 @@ export default class MessageComposerInput extends React.Component {
// FIXME: https://github.com/ianstormtaylor/slate/issues/1497 means
// that we will silently discard nested blocks (e.g. nested lists) :(
const fragment = this.html.deserialize(transfer.html);
- if (this.state.isRichtextEnabled) {
+ if (this.state.isRichTextEnabled) {
return change.insertFragment(fragment.document);
}
else {
@@ -954,7 +963,7 @@ export default class MessageComposerInput extends React.Component {
if (cmd) {
if (!cmd.error) {
- this.historyManager.save(editorState, this.state.isRichtextEnabled ? 'rich' : 'markdown');
+ this.historyManager.save(editorState, this.state.isRichTextEnabled ? 'rich' : 'markdown');
this.setState({
editorState: this.createEditorState(),
});
@@ -986,7 +995,7 @@ export default class MessageComposerInput extends React.Component {
const replyingToEv = RoomViewStore.getQuotingEvent();
const mustSendHTML = Boolean(replyingToEv);
- if (this.state.isRichtextEnabled) {
+ if (this.state.isRichTextEnabled) {
// We should only send HTML if any block is styled or contains inline style
let shouldSendHTML = false;
@@ -1032,7 +1041,7 @@ export default class MessageComposerInput extends React.Component {
this.historyManager.save(
editorState,
- this.state.isRichtextEnabled ? 'rich' : 'markdown',
+ this.state.isRichTextEnabled ? 'rich' : 'markdown',
);
if (commandText && commandText.startsWith('/me')) {
@@ -1119,7 +1128,7 @@ export default class MessageComposerInput extends React.Component {
if (up) {
const scrollCorrection = editorNode.scrollTop;
const distanceFromTop = cursorRect.top - editorRect.top + scrollCorrection;
- console.log(`Cursor distance from editor top is ${distanceFromTop}`);
+ //console.log(`Cursor distance from editor top is ${distanceFromTop}`);
if (distanceFromTop < EDGE_THRESHOLD) {
navigateHistory = true;
}
@@ -1128,7 +1137,7 @@ export default class MessageComposerInput extends React.Component {
const scrollCorrection =
editorNode.scrollHeight - editorNode.clientHeight - editorNode.scrollTop;
const distanceFromBottom = editorRect.bottom - cursorRect.bottom + scrollCorrection;
- console.log(`Cursor distance from editor bottom is ${distanceFromBottom}`);
+ //console.log(`Cursor distance from editor bottom is ${distanceFromBottom}`);
if (distanceFromBottom < EDGE_THRESHOLD) {
navigateHistory = true;
}
@@ -1168,7 +1177,19 @@ export default class MessageComposerInput extends React.Component {
return;
}
- let editorState = this.historyManager.getItem(delta, this.state.isRichtextEnabled ? 'rich' : 'markdown');
+ let editorState;
+ const historyItem = this.historyManager.getItem(delta);
+ if (historyItem) {
+ if (historyItem.format === 'rich' && !this.state.isRichTextEnabled) {
+ editorState = this.richToMdEditorState(historyItem.value);
+ }
+ else if (historyItem.format === 'markdown' && this.state.isRichTextEnabled) {
+ editorState = this.mdToRichEditorState(historyItem.value);
+ }
+ else {
+ editorState = historyItem.value;
+ }
+ }
// Move selection to the end of the selected history
const change = editorState.change().collapseToEndOf(editorState.document);
@@ -1468,8 +1489,8 @@ export default class MessageComposerInput extends React.Component {
+ title={this.state.isRichTextEnabled ? _t("Markdown is disabled") : _t("Markdown is enabled")}
+ src={`img/button-md-${!this.state.isRichTextEnabled}.png`} />
{
'mx_MessageComposer_input_markdownIndicator');
ReactTestUtils.Simulate.click(indicator);
- expect(mci.state.isRichtextEnabled).toEqual(false, 'should have changed mode');
+ expect(mci.state.isRichTextEnabled).toEqual(false, 'should have changed mode');
done();
});
});
From f981d7b7293c0eb2ad869091cabbb836b0c86a23 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Sun, 20 May 2018 22:39:40 +0100
Subject: [PATCH 0062/1196] unify buttons on the node type names, and make them
work
---
...o-n.svg => button-text-block-quote-on.svg} | 0
...-quote.svg => button-text-block-quote.svg} | 0
...t-bold-o-n.svg => button-text-bold-on.svg} | 0
...n.svg => button-text-bulleted-list-on.svg} | 0
...llet.svg => button-text-bulleted-list.svg} | 0
...t-code-o-n.svg => button-text-code-on.svg} | 0
...ike-o-n.svg => button-text-deleted-on.svg} | 0
...ext-strike.svg => button-text-deleted.svg} | 0
...alic-o-n.svg => button-text-italic-on.svg} | 0
...n.svg => button-text-numbered-list-on.svg} | 0
...llet.svg => button-text-numbered-list.svg} | 0
...-o-n.svg => button-text-underlined-on.svg} | 0
...derline.svg => button-text-underlined.svg} | 0
src/components/views/rooms/MessageComposer.js | 58 ++++++++-------
.../views/rooms/MessageComposerInput.js | 70 ++++++++++---------
15 files changed, 68 insertions(+), 60 deletions(-)
rename res/img/{button-text-quote-o-n.svg => button-text-block-quote-on.svg} (100%)
rename res/img/{button-text-quote.svg => button-text-block-quote.svg} (100%)
rename res/img/{button-text-bold-o-n.svg => button-text-bold-on.svg} (100%)
rename res/img/{button-text-bullet-o-n.svg => button-text-bulleted-list-on.svg} (100%)
rename res/img/{button-text-bullet.svg => button-text-bulleted-list.svg} (100%)
rename res/img/{button-text-code-o-n.svg => button-text-code-on.svg} (100%)
rename res/img/{button-text-strike-o-n.svg => button-text-deleted-on.svg} (100%)
rename res/img/{button-text-strike.svg => button-text-deleted.svg} (100%)
rename res/img/{button-text-italic-o-n.svg => button-text-italic-on.svg} (100%)
rename res/img/{button-text-numbullet-o-n.svg => button-text-numbered-list-on.svg} (100%)
rename res/img/{button-text-numbullet.svg => button-text-numbered-list.svg} (100%)
rename res/img/{button-text-underline-o-n.svg => button-text-underlined-on.svg} (100%)
rename res/img/{button-text-underline.svg => button-text-underlined.svg} (100%)
diff --git a/res/img/button-text-quote-o-n.svg b/res/img/button-text-block-quote-on.svg
similarity index 100%
rename from res/img/button-text-quote-o-n.svg
rename to res/img/button-text-block-quote-on.svg
diff --git a/res/img/button-text-quote.svg b/res/img/button-text-block-quote.svg
similarity index 100%
rename from res/img/button-text-quote.svg
rename to res/img/button-text-block-quote.svg
diff --git a/res/img/button-text-bold-o-n.svg b/res/img/button-text-bold-on.svg
similarity index 100%
rename from res/img/button-text-bold-o-n.svg
rename to res/img/button-text-bold-on.svg
diff --git a/res/img/button-text-bullet-o-n.svg b/res/img/button-text-bulleted-list-on.svg
similarity index 100%
rename from res/img/button-text-bullet-o-n.svg
rename to res/img/button-text-bulleted-list-on.svg
diff --git a/res/img/button-text-bullet.svg b/res/img/button-text-bulleted-list.svg
similarity index 100%
rename from res/img/button-text-bullet.svg
rename to res/img/button-text-bulleted-list.svg
diff --git a/res/img/button-text-code-o-n.svg b/res/img/button-text-code-on.svg
similarity index 100%
rename from res/img/button-text-code-o-n.svg
rename to res/img/button-text-code-on.svg
diff --git a/res/img/button-text-strike-o-n.svg b/res/img/button-text-deleted-on.svg
similarity index 100%
rename from res/img/button-text-strike-o-n.svg
rename to res/img/button-text-deleted-on.svg
diff --git a/res/img/button-text-strike.svg b/res/img/button-text-deleted.svg
similarity index 100%
rename from res/img/button-text-strike.svg
rename to res/img/button-text-deleted.svg
diff --git a/res/img/button-text-italic-o-n.svg b/res/img/button-text-italic-on.svg
similarity index 100%
rename from res/img/button-text-italic-o-n.svg
rename to res/img/button-text-italic-on.svg
diff --git a/res/img/button-text-numbullet-o-n.svg b/res/img/button-text-numbered-list-on.svg
similarity index 100%
rename from res/img/button-text-numbullet-o-n.svg
rename to res/img/button-text-numbered-list-on.svg
diff --git a/res/img/button-text-numbullet.svg b/res/img/button-text-numbered-list.svg
similarity index 100%
rename from res/img/button-text-numbullet.svg
rename to res/img/button-text-numbered-list.svg
diff --git a/res/img/button-text-underline-o-n.svg b/res/img/button-text-underlined-on.svg
similarity index 100%
rename from res/img/button-text-underline-o-n.svg
rename to res/img/button-text-underlined-on.svg
diff --git a/res/img/button-text-underline.svg b/res/img/button-text-underlined.svg
similarity index 100%
rename from res/img/button-text-underline.svg
rename to res/img/button-text-underlined.svg
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 157dc9e704..4d00927767 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -215,7 +215,7 @@ export default class MessageComposer extends React.Component {
}
}
- onFormatButtonClicked(name: "bold" | "italic" | "strike" | "code" | "underline" | "quote" | "bullet" | "numbullet", event) {
+ onFormatButtonClicked(name, event) {
event.preventDefault();
this.messageComposerInput.onFormatButtonClicked(name, event);
}
@@ -303,14 +303,14 @@ export default class MessageComposer extends React.Component {
);
- const formattingButton = (
+ const formattingButton = this.state.inputState.isRichTextEnabled ? (
- );
+ ) : null;
let placeholderText;
if (this.state.isQuoting) {
@@ -353,31 +353,27 @@ export default class MessageComposer extends React.Component {
);
}
- const {marks, blockType} = this.state.inputState;
- const formatButtons = ["bold", "italic", "strike", "underline", "code", "quote", "bullet", "numbullet"].map(
- (name) => {
- const active = marks.includes(name) || blockType === name;
- const suffix = active ? '-o-n' : '';
- const onFormatButtonClicked = this.onFormatButtonClicked.bind(this, name);
- const className = 'mx_MessageComposer_format_button mx_filterFlipColor';
- return 
;
- },
- );
+ let formatBar;
+ if (this.state.showFormatting) {
+ const {marks, blockType} = this.state.inputState;
+ const formatButtons = ["bold", "italic", "deleted", "underlined", "code", "block-quote", "bulleted-list", "numbered-list"].map(
+ (name) => {
+ const active = marks.some(mark => mark.type === name) || blockType === name;
+ const suffix = active ? '-on' : '';
+ const onFormatButtonClicked = this.onFormatButtonClicked.bind(this, name);
+ const className = 'mx_MessageComposer_format_button mx_filterFlipColor';
+ return ;
+ },
+ );
- return (
-
+ src={`img/button-md-${!this.state.inputState.isRichTextEnabled}.png`} />
+ title={this.state.isRichTextEnabled ? _t("Markdown is disabled") : _t("Markdown is enabled")}
+ src={`img/button-md-${!this.state.isRichTextEnabled}.png`} />
- );
+ ) : null;
let placeholderText;
if (this.state.isQuoting) {
@@ -353,31 +353,27 @@ export default class MessageComposer extends React.Component {
);
}
- const {marks, blockType} = this.state.inputState;
- const formatButtons = ["bold", "italic", "strike", "underline", "code", "quote", "bullet", "numbullet"].map(
- (name) => {
- const active = marks.includes(name) || blockType === name;
- const suffix = active ? '-o-n' : '';
- const onFormatButtonClicked = this.onFormatButtonClicked.bind(this, name);
- const className = 'mx_MessageComposer_format_button mx_filterFlipColor';
- return ;
- },
- );
+ let formatBar;
+ if (this.state.showFormatting) {
+ const {marks, blockType} = this.state.inputState;
+ const formatButtons = ["bold", "italic", "deleted", "underlined", "code", "block-quote", "bulleted-list", "numbered-list"].map(
+ (name) => {
+ const active = marks.some(mark => mark.type === name) || blockType === name;
+ const suffix = active ? '-on' : '';
+ const onFormatButtonClicked = this.onFormatButtonClicked.bind(this, name);
+ const className = 'mx_MessageComposer_format_button mx_filterFlipColor';
+ return ;
+ },
+ );
- return (
-
-
-
+ formatBar =
- { controls }
-
-
-
Date: Sun, 20 May 2018 22:48:40 +0100
Subject: [PATCH 0063/1196] hide formatting bar for MD editor
---
src/components/views/rooms/MessageComposer.js | 2 +-
src/components/views/rooms/MessageComposerInput.js | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 4d00927767..28502c348d 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -354,7 +354,7 @@ export default class MessageComposer extends React.Component {
}
let formatBar;
- if (this.state.showFormatting) {
+ if (this.state.showFormatting && this.state.inputState.isRichTextEnabled) {
const {marks, blockType} = this.state.inputState;
const formatButtons = ["bold", "italic", "deleted", "underlined", "code", "block-quote", "bulleted-list", "numbered-list"].map(
(name) => {
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 2d5e6d050d..2bb35c5656 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -1405,9 +1405,7 @@ export default class MessageComposerInput extends React.Component {
};
onFormatButtonClicked = (name, e) => {
- if (e) {
- e.preventDefault(); // don't steal focus from the editor!
- }
+ e.preventDefault(); // don't steal focus from the editor!
// XXX: horrible evil hack to ensure the editor is focused so the act
// of focusing it doesn't then cancel the format button being pressed
From b616fd025e56fe9b338c1bada5fb9c12ecb84c71 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Sun, 20 May 2018 23:34:06 +0100
Subject: [PATCH 0064/1196] comment out all the tests for now
---
src/components/views/rooms/MessageComposerInput.js | 2 +-
test/components/views/rooms/MessageComposerInput-test.js | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 2bb35c5656..1f0a544246 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -557,7 +557,7 @@ export default class MessageComposerInput extends React.Component {
if (this.props.onInputStateChanged) {
let blockType = editorState.blocks.first().type;
- console.log("onInputStateChanged; current block type is " + blockType + " and marks are " + editorState.activeMarks);
+ // console.log("onInputStateChanged; current block type is " + blockType + " and marks are " + editorState.activeMarks);
if (blockType === 'list-item') {
const parent = editorState.document.getParent(editorState.blocks.first().key);
diff --git a/test/components/views/rooms/MessageComposerInput-test.js b/test/components/views/rooms/MessageComposerInput-test.js
index 42921db975..708071df23 100644
--- a/test/components/views/rooms/MessageComposerInput-test.js
+++ b/test/components/views/rooms/MessageComposerInput-test.js
@@ -10,6 +10,7 @@ const MessageComposerInput = sdk.getComponent('views.rooms.MessageComposerInput'
import MatrixClientPeg from '../../../../src/MatrixClientPeg';
import RoomMember from 'matrix-js-sdk';
+/*
function addTextToDraft(text) {
const components = document.getElementsByClassName('public-DraftEditor-content');
if (components && components.length) {
@@ -300,3 +301,4 @@ describe('MessageComposerInput', () => {
expect(spy.args[0][1].formatted_body).toEqual('Click here');
});
});
+*/
\ No newline at end of file
From 4439a04689605f7244505915e3494a86954cf28c Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Sun, 20 May 2018 23:43:42 +0100
Subject: [PATCH 0065/1196] fix lint
---
.eslintrc.js | 1 +
src/ComposerHistoryManager.js | 16 +++++-----------
src/autocomplete/CommandProvider.js | 3 +--
src/autocomplete/PlainWithPillsSerializer.js | 15 ++++++---------
4 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/.eslintrc.js b/.eslintrc.js
index bf423a1ad8..62d24ea707 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -95,6 +95,7 @@ module.exports = {
"new-cap": ["warn"],
"key-spacing": ["warn"],
"prefer-const": ["warn"],
+ "arrow-parens": "off",
// crashes currently: https://github.com/eslint/eslint/issues/6274
"generator-star-spacing": "off",
diff --git a/src/ComposerHistoryManager.js b/src/ComposerHistoryManager.js
index f997e1d1cd..e78fbcdc3b 100644
--- a/src/ComposerHistoryManager.js
+++ b/src/ComposerHistoryManager.js
@@ -16,11 +16,6 @@ limitations under the License.
*/
import { Value } from 'slate';
-import Html from 'slate-html-serializer';
-import Md from 'slate-md-serializer';
-import Plain from 'slate-plain-serializer';
-import * as RichText from './RichText';
-import Markdown from './Markdown';
import _clamp from 'lodash/clamp';
@@ -38,17 +33,17 @@ class HistoryItem {
this.format = format;
}
- static fromJSON(obj): HistoryItem {
+ static fromJSON(obj: Object): HistoryItem {
return new HistoryItem(
Value.fromJSON(obj.value),
- obj.format
+ obj.format,
);
}
toJSON(): Object {
return {
value: this.value.toJSON(),
- format: this.format
+ format: this.format,
};
}
}
@@ -67,10 +62,9 @@ export default class ComposerHistoryManager {
for (; item = sessionStorage.getItem(`${this.prefix}[${this.currentIndex}]`); this.currentIndex++) {
try {
this.history.push(
- HistoryItem.fromJSON(JSON.parse(item))
+ HistoryItem.fromJSON(JSON.parse(item)),
);
- }
- catch (e) {
+ } catch (e) {
console.warn("Throwing away unserialisable history", e);
}
}
diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index 4f2aed3dc6..d56cefb021 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -132,8 +132,7 @@ export default class CommandProvider extends AutocompleteProvider {
let results;
if (command[0] == '/') {
results = COMMANDS;
- }
- else {
+ } else {
results = this.matcher.match(command[0]);
}
completions = results.map((result) => {
diff --git a/src/autocomplete/PlainWithPillsSerializer.js b/src/autocomplete/PlainWithPillsSerializer.js
index 7428241b05..c1194ae2e1 100644
--- a/src/autocomplete/PlainWithPillsSerializer.js
+++ b/src/autocomplete/PlainWithPillsSerializer.js
@@ -31,7 +31,7 @@ class PlainWithPillsSerializer {
* @param {String} options.pillFormat - either 'md', 'plain', 'id'
*/
constructor(options = {}) {
- let {
+ const {
pillFormat = 'plain',
} = options;
this.pillFormat = pillFormat;
@@ -46,7 +46,7 @@ class PlainWithPillsSerializer {
* @return {String}
*/
serialize = value => {
- return this._serializeNode(value.document)
+ return this._serializeNode(value.document);
}
/**
@@ -61,8 +61,7 @@ class PlainWithPillsSerializer {
(node.object == 'block' && Block.isBlockList(node.nodes))
) {
return node.nodes.map(this._serializeNode).join('\n');
- }
- else if (node.type == 'emoji') {
+ } else if (node.type == 'emoji') {
return node.data.get('emojiUnicode');
} else if (node.type == 'pill') {
switch (this.pillFormat) {
@@ -73,11 +72,9 @@ class PlainWithPillsSerializer {
case 'id':
return node.data.get('completionId') || node.data.get('completion');
}
- }
- else if (node.nodes) {
+ } else if (node.nodes) {
return node.nodes.map(this._serializeNode).join('');
- }
- else {
+ } else {
return node.text;
}
}
@@ -89,4 +86,4 @@ class PlainWithPillsSerializer {
* @type {PlainWithPillsSerializer}
*/
-export default PlainWithPillsSerializer
\ No newline at end of file
+export default PlainWithPillsSerializer;
From 7de45f8b7beb9e7069b643b02f8b9c904cb5aab4 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Mon, 21 May 2018 03:48:59 +0100
Subject: [PATCH 0066/1196] make quoting work
---
src/HtmlUtils.js | 32 ++++--
.../views/context_menus/MessageContextMenu.js | 2 +-
.../views/rooms/MessageComposerInput.js | 107 +++++++++++-------
3 files changed, 85 insertions(+), 56 deletions(-)
diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index 4c1564297d..607686d46d 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -403,19 +403,22 @@ class TextHighlighter extends BaseHighlighter {
}
- /* turn a matrix event body into html
- *
- * content: 'content' of the MatrixEvent
- *
- * highlights: optional list of words to highlight, ordered by longest word first
- *
- * opts.highlightLink: optional href to add to highlighted words
- * opts.disableBigEmoji: optional argument to disable the big emoji class.
- * opts.stripReplyFallback: optional argument specifying the event is a reply and so fallback needs removing
- */
+/* turn a matrix event body into html
+ *
+ * content: 'content' of the MatrixEvent
+ *
+ * highlights: optional list of words to highlight, ordered by longest word first
+ *
+ * opts.highlightLink: optional href to add to highlighted words
+ * opts.disableBigEmoji: optional argument to disable the big emoji class.
+ * opts.stripReplyFallback: optional argument specifying the event is a reply and so fallback needs removing
+ * opts.returnString: return an HTML string rather than JSX elements
+ * opts.emojiOne: optional param to do emojiOne (default true)
+ */
export function bodyToHtml(content, highlights, opts={}) {
const isHtmlMessage = content.format === "org.matrix.custom.html" && content.formatted_body;
+ const doEmojiOne = opts.emojiOne === undefined ? true : opts.emojiOne;
let bodyHasEmoji = false;
let strippedBody;
@@ -441,8 +444,9 @@ export function bodyToHtml(content, highlights, opts={}) {
if (opts.stripReplyFallback && formattedBody) formattedBody = ReplyThread.stripHTMLReply(formattedBody);
strippedBody = opts.stripReplyFallback ? ReplyThread.stripPlainReply(content.body) : content.body;
- bodyHasEmoji = containsEmoji(isHtmlMessage ? formattedBody : content.body);
-
+ if (doEmojiOne) {
+ bodyHasEmoji = containsEmoji(isHtmlMessage ? formattedBody : content.body);
+ }
// Only generate safeBody if the message was sent as org.matrix.custom.html
if (isHtmlMessage) {
@@ -467,6 +471,10 @@ export function bodyToHtml(content, highlights, opts={}) {
delete sanitizeHtmlParams.textFilter;
}
+ if (opts.returnString) {
+ return isDisplayedWithHtml ? safeBody : strippedBody;
+ }
+
let emojiBody = false;
if (!opts.disableBigEmoji && bodyHasEmoji) {
EMOJI_REGEX.lastIndex = 0;
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 99ec493ced..22c6f2aa70 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -179,7 +179,7 @@ module.exports = React.createClass({
onQuoteClick: function() {
dis.dispatch({
action: 'quote',
- text: this.props.eventTileOps.getInnerText(),
+ event: this.props.mxEvent,
});
this.closeMenu();
},
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 1f0a544246..eb4edfcfcb 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -21,7 +21,7 @@ import type SyntheticKeyboardEvent from 'react/lib/SyntheticKeyboardEvent';
import { Editor } from 'slate-react';
import { getEventTransfer } from 'slate-react';
-import { Value, Document, Event, Inline, Text, Range, Node } from 'slate';
+import { Value, Document, Event, Block, Inline, Text, Range, Node } from 'slate';
import Html from 'slate-html-serializer';
import Md from 'slate-md-serializer';
@@ -342,37 +342,44 @@ export default class MessageComposerInput extends React.Component {
});
}
break;
-/*
- case 'quote': { // old quoting, whilst rich quoting is in labs
- /// XXX: Not doing rich-text quoting from formatted-body because draft-js
- /// has regressed such that when links are quoted, errors are thrown. See
- /// https://github.com/vector-im/riot-web/issues/4756.
- const body = escape(payload.text);
- if (body) {
- let content = RichText.htmlToContentState(`
Date: Mon, 21 May 2018 18:44:00 +0900
Subject: [PATCH 0067/1196] Update sinon to 5.0.7
---
package-lock.json | 2353 +++++++++--------
package.json | 2 +-
.../structures/TimelinePanel-test.js | 2 +-
3 files changed, 1210 insertions(+), 1147 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index f183f1635d..97ed7b5dea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,25 @@
{
"name": "matrix-react-sdk",
- "version": "0.12.2",
+ "version": "0.12.4",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+ "@sinonjs/formatio": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz",
+ "integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==",
+ "dev": true,
+ "requires": {
+ "samsam": "1.3.0"
+ }
+ },
"accepts": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz",
"integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=",
"dev": true,
"requires": {
- "mime-types": "2.1.17",
+ "mime-types": "~2.1.11",
"negotiator": "0.6.1"
}
},
@@ -26,7 +35,7 @@
"integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
"dev": true,
"requires": {
- "acorn": "3.3.0"
+ "acorn": "^3.0.4"
},
"dependencies": {
"acorn": {
@@ -44,14 +53,14 @@
"dev": true
},
"ajv": {
- "version": "5.2.3",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
- "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
+ "version": "5.5.2",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+ "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
"requires": {
- "co": "4.6.0",
- "fast-deep-equal": "1.0.0",
- "json-schema-traverse": "0.3.1",
- "json-stable-stringify": "1.0.1"
+ "co": "^4.6.0",
+ "fast-deep-equal": "^1.0.0",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.3.0"
}
},
"ajv-keywords": {
@@ -66,9 +75,9 @@
"integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
"dev": true,
"requires": {
- "kind-of": "3.2.2",
- "longest": "1.0.1",
- "repeat-string": "1.6.1"
+ "kind-of": "^3.0.2",
+ "longest": "^1.0.1",
+ "repeat-string": "^1.5.2"
}
},
"amdefine": {
@@ -106,8 +115,8 @@
"integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
"dev": true,
"requires": {
- "micromatch": "2.3.11",
- "normalize-path": "2.1.1"
+ "micromatch": "^2.1.5",
+ "normalize-path": "^2.0.0"
}
},
"argparse": {
@@ -116,7 +125,7 @@
"integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
"dev": true,
"requires": {
- "sprintf-js": "1.0.3"
+ "sprintf-js": "~1.0.2"
},
"dependencies": {
"sprintf-js": {
@@ -133,7 +142,7 @@
"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
"dev": true,
"requires": {
- "arr-flatten": "1.1.0"
+ "arr-flatten": "^1.0.1"
}
},
"arr-flatten": {
@@ -148,8 +157,8 @@
"integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
"dev": true,
"requires": {
- "define-properties": "1.1.2",
- "es-abstract": "1.9.0"
+ "define-properties": "^1.1.2",
+ "es-abstract": "^1.7.0"
}
},
"array-slice": {
@@ -164,7 +173,7 @@
"integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
"dev": true,
"requires": {
- "array-uniq": "1.0.3"
+ "array-uniq": "^1.0.1"
}
},
"array-uniq": {
@@ -238,9 +247,9 @@
"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
},
"aws4": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
- "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz",
+ "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="
},
"babel-cli": {
"version": "6.26.0",
@@ -248,21 +257,21 @@
"integrity": "sha1-UCq1SHTX24itALiHoGODzgPQAvE=",
"dev": true,
"requires": {
- "babel-core": "6.26.0",
- "babel-polyfill": "6.26.0",
- "babel-register": "6.26.0",
- "babel-runtime": "6.26.0",
- "chokidar": "1.7.0",
- "commander": "2.11.0",
- "convert-source-map": "1.5.0",
- "fs-readdir-recursive": "1.0.0",
- "glob": "7.1.2",
- "lodash": "4.17.4",
- "output-file-sync": "1.1.2",
- "path-is-absolute": "1.0.1",
- "slash": "1.0.0",
- "source-map": "0.5.7",
- "v8flags": "2.1.1"
+ "babel-core": "^6.26.0",
+ "babel-polyfill": "^6.26.0",
+ "babel-register": "^6.26.0",
+ "babel-runtime": "^6.26.0",
+ "chokidar": "^1.6.1",
+ "commander": "^2.11.0",
+ "convert-source-map": "^1.5.0",
+ "fs-readdir-recursive": "^1.0.0",
+ "glob": "^7.1.2",
+ "lodash": "^4.17.4",
+ "output-file-sync": "^1.1.2",
+ "path-is-absolute": "^1.0.1",
+ "slash": "^1.0.0",
+ "source-map": "^0.5.6",
+ "v8flags": "^2.1.1"
},
"dependencies": {
"glob": {
@@ -271,12 +280,12 @@
"integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
"dev": true,
"requires": {
- "fs.realpath": "1.0.0",
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "3.0.4",
- "once": "1.4.0",
- "path-is-absolute": "1.0.1"
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
}
}
}
@@ -287,9 +296,9 @@
"integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
"dev": true,
"requires": {
- "chalk": "1.1.3",
- "esutils": "2.0.2",
- "js-tokens": "3.0.2"
+ "chalk": "^1.1.3",
+ "esutils": "^2.0.2",
+ "js-tokens": "^3.0.2"
}
},
"babel-core": {
@@ -298,25 +307,25 @@
"integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=",
"dev": true,
"requires": {
- "babel-code-frame": "6.26.0",
- "babel-generator": "6.26.0",
- "babel-helpers": "6.24.1",
- "babel-messages": "6.23.0",
- "babel-register": "6.26.0",
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0",
- "babel-traverse": "6.26.0",
- "babel-types": "6.26.0",
- "babylon": "6.18.0",
- "convert-source-map": "1.5.0",
- "debug": "2.6.9",
- "json5": "0.5.1",
- "lodash": "4.17.4",
- "minimatch": "3.0.4",
- "path-is-absolute": "1.0.1",
- "private": "0.1.8",
- "slash": "1.0.0",
- "source-map": "0.5.7"
+ "babel-code-frame": "^6.26.0",
+ "babel-generator": "^6.26.0",
+ "babel-helpers": "^6.24.1",
+ "babel-messages": "^6.23.0",
+ "babel-register": "^6.26.0",
+ "babel-runtime": "^6.26.0",
+ "babel-template": "^6.26.0",
+ "babel-traverse": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "babylon": "^6.18.0",
+ "convert-source-map": "^1.5.0",
+ "debug": "^2.6.8",
+ "json5": "^0.5.1",
+ "lodash": "^4.17.4",
+ "minimatch": "^3.0.4",
+ "path-is-absolute": "^1.0.1",
+ "private": "^0.1.7",
+ "slash": "^1.0.0",
+ "source-map": "^0.5.6"
}
},
"babel-eslint": {
@@ -325,11 +334,11 @@
"integrity": "sha1-UpNBn+NnLWZZjTJ9qWlFZ7pqXy8=",
"dev": true,
"requires": {
- "babel-traverse": "6.26.0",
- "babel-types": "6.26.0",
- "babylon": "6.18.0",
- "lodash.assign": "4.2.0",
- "lodash.pickby": "4.6.0"
+ "babel-traverse": "^6.0.20",
+ "babel-types": "^6.0.19",
+ "babylon": "^6.0.18",
+ "lodash.assign": "^4.0.0",
+ "lodash.pickby": "^4.0.0"
}
},
"babel-generator": {
@@ -338,14 +347,14 @@
"integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=",
"dev": true,
"requires": {
- "babel-messages": "6.23.0",
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0",
- "detect-indent": "4.0.0",
- "jsesc": "1.3.0",
- "lodash": "4.17.4",
- "source-map": "0.5.7",
- "trim-right": "1.0.1"
+ "babel-messages": "^6.23.0",
+ "babel-runtime": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "detect-indent": "^4.0.0",
+ "jsesc": "^1.3.0",
+ "lodash": "^4.17.4",
+ "source-map": "^0.5.6",
+ "trim-right": "^1.0.1"
}
},
"babel-helper-builder-binary-assignment-operator-visitor": {
@@ -354,9 +363,9 @@
"integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
"dev": true,
"requires": {
- "babel-helper-explode-assignable-expression": "6.24.1",
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-helper-explode-assignable-expression": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
}
},
"babel-helper-builder-react-jsx": {
@@ -365,9 +374,9 @@
"integrity": "sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0",
- "esutils": "2.0.2"
+ "babel-runtime": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "esutils": "^2.0.2"
}
},
"babel-helper-call-delegate": {
@@ -376,10 +385,10 @@
"integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
"dev": true,
"requires": {
- "babel-helper-hoist-variables": "6.24.1",
- "babel-runtime": "6.26.0",
- "babel-traverse": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-helper-hoist-variables": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
}
},
"babel-helper-define-map": {
@@ -388,10 +397,10 @@
"integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
"dev": true,
"requires": {
- "babel-helper-function-name": "6.24.1",
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0",
- "lodash": "4.17.4"
+ "babel-helper-function-name": "^6.24.1",
+ "babel-runtime": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "lodash": "^4.17.4"
}
},
"babel-helper-explode-assignable-expression": {
@@ -400,9 +409,9 @@
"integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0",
- "babel-traverse": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-runtime": "^6.22.0",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
}
},
"babel-helper-function-name": {
@@ -411,11 +420,11 @@
"integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
"dev": true,
"requires": {
- "babel-helper-get-function-arity": "6.24.1",
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0",
- "babel-traverse": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-helper-get-function-arity": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
}
},
"babel-helper-get-function-arity": {
@@ -424,8 +433,8 @@
"integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
}
},
"babel-helper-hoist-variables": {
@@ -434,8 +443,8 @@
"integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
}
},
"babel-helper-optimise-call-expression": {
@@ -444,8 +453,8 @@
"integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
}
},
"babel-helper-regex": {
@@ -454,9 +463,9 @@
"integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0",
- "lodash": "4.17.4"
+ "babel-runtime": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "lodash": "^4.17.4"
}
},
"babel-helper-remap-async-to-generator": {
@@ -465,11 +474,11 @@
"integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
"dev": true,
"requires": {
- "babel-helper-function-name": "6.24.1",
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0",
- "babel-traverse": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-helper-function-name": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
}
},
"babel-helper-replace-supers": {
@@ -478,12 +487,12 @@
"integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
"dev": true,
"requires": {
- "babel-helper-optimise-call-expression": "6.24.1",
- "babel-messages": "6.23.0",
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0",
- "babel-traverse": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-helper-optimise-call-expression": "^6.24.1",
+ "babel-messages": "^6.23.0",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
}
},
"babel-helpers": {
@@ -492,8 +501,8 @@
"integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0"
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1"
}
},
"babel-loader": {
@@ -502,10 +511,10 @@
"integrity": "sha1-CzQRLVsHSKjc2/Uaz2+b1C1QuMo=",
"dev": true,
"requires": {
- "find-cache-dir": "0.1.1",
- "loader-utils": "0.2.17",
- "mkdirp": "0.5.1",
- "object-assign": "4.1.1"
+ "find-cache-dir": "^0.1.1",
+ "loader-utils": "^0.2.16",
+ "mkdirp": "^0.5.1",
+ "object-assign": "^4.0.1"
}
},
"babel-messages": {
@@ -514,7 +523,7 @@
"integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0"
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-add-module-exports": {
@@ -529,7 +538,7 @@
"integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0"
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-syntax-async-functions": {
@@ -580,10 +589,10 @@
"integrity": "sha1-Ruo+fFr2KXgqyfHtG3zTj4Qlr9Q=",
"dev": true,
"requires": {
- "babel-helper-function-name": "6.24.1",
- "babel-plugin-syntax-async-functions": "6.13.0",
- "babel-template": "6.26.0",
- "babel-traverse": "6.26.0"
+ "babel-helper-function-name": "^6.8.0",
+ "babel-plugin-syntax-async-functions": "^6.8.0",
+ "babel-template": "^6.9.0",
+ "babel-traverse": "^6.10.4"
}
},
"babel-plugin-transform-async-to-generator": {
@@ -592,9 +601,9 @@
"integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
"dev": true,
"requires": {
- "babel-helper-remap-async-to-generator": "6.24.1",
- "babel-plugin-syntax-async-functions": "6.13.0",
- "babel-runtime": "6.26.0"
+ "babel-helper-remap-async-to-generator": "^6.24.1",
+ "babel-plugin-syntax-async-functions": "^6.8.0",
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-class-properties": {
@@ -603,10 +612,10 @@
"integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
"dev": true,
"requires": {
- "babel-helper-function-name": "6.24.1",
- "babel-plugin-syntax-class-properties": "6.13.0",
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0"
+ "babel-helper-function-name": "^6.24.1",
+ "babel-plugin-syntax-class-properties": "^6.8.0",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1"
}
},
"babel-plugin-transform-es2015-arrow-functions": {
@@ -615,7 +624,7 @@
"integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0"
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-es2015-block-scoped-functions": {
@@ -624,7 +633,7 @@
"integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0"
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-es2015-block-scoping": {
@@ -633,11 +642,11 @@
"integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0",
- "babel-traverse": "6.26.0",
- "babel-types": "6.26.0",
- "lodash": "4.17.4"
+ "babel-runtime": "^6.26.0",
+ "babel-template": "^6.26.0",
+ "babel-traverse": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "lodash": "^4.17.4"
}
},
"babel-plugin-transform-es2015-classes": {
@@ -646,15 +655,15 @@
"integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
"dev": true,
"requires": {
- "babel-helper-define-map": "6.26.0",
- "babel-helper-function-name": "6.24.1",
- "babel-helper-optimise-call-expression": "6.24.1",
- "babel-helper-replace-supers": "6.24.1",
- "babel-messages": "6.23.0",
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0",
- "babel-traverse": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-helper-define-map": "^6.24.1",
+ "babel-helper-function-name": "^6.24.1",
+ "babel-helper-optimise-call-expression": "^6.24.1",
+ "babel-helper-replace-supers": "^6.24.1",
+ "babel-messages": "^6.23.0",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
}
},
"babel-plugin-transform-es2015-computed-properties": {
@@ -663,8 +672,8 @@
"integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0"
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1"
}
},
"babel-plugin-transform-es2015-destructuring": {
@@ -673,7 +682,7 @@
"integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0"
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-es2015-duplicate-keys": {
@@ -682,8 +691,8 @@
"integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
}
},
"babel-plugin-transform-es2015-for-of": {
@@ -692,7 +701,7 @@
"integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0"
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-es2015-function-name": {
@@ -701,9 +710,9 @@
"integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
"dev": true,
"requires": {
- "babel-helper-function-name": "6.24.1",
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-helper-function-name": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
}
},
"babel-plugin-transform-es2015-literals": {
@@ -712,7 +721,7 @@
"integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0"
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-es2015-modules-amd": {
@@ -721,9 +730,9 @@
"integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
"dev": true,
"requires": {
- "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0"
+ "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1"
}
},
"babel-plugin-transform-es2015-modules-commonjs": {
@@ -732,10 +741,10 @@
"integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=",
"dev": true,
"requires": {
- "babel-plugin-transform-strict-mode": "6.24.1",
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-plugin-transform-strict-mode": "^6.24.1",
+ "babel-runtime": "^6.26.0",
+ "babel-template": "^6.26.0",
+ "babel-types": "^6.26.0"
}
},
"babel-plugin-transform-es2015-modules-systemjs": {
@@ -744,9 +753,9 @@
"integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
"dev": true,
"requires": {
- "babel-helper-hoist-variables": "6.24.1",
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0"
+ "babel-helper-hoist-variables": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1"
}
},
"babel-plugin-transform-es2015-modules-umd": {
@@ -755,9 +764,9 @@
"integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
"dev": true,
"requires": {
- "babel-plugin-transform-es2015-modules-amd": "6.24.1",
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0"
+ "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1"
}
},
"babel-plugin-transform-es2015-object-super": {
@@ -766,8 +775,8 @@
"integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
"dev": true,
"requires": {
- "babel-helper-replace-supers": "6.24.1",
- "babel-runtime": "6.26.0"
+ "babel-helper-replace-supers": "^6.24.1",
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-es2015-parameters": {
@@ -776,12 +785,12 @@
"integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
"dev": true,
"requires": {
- "babel-helper-call-delegate": "6.24.1",
- "babel-helper-get-function-arity": "6.24.1",
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0",
- "babel-traverse": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-helper-call-delegate": "^6.24.1",
+ "babel-helper-get-function-arity": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
}
},
"babel-plugin-transform-es2015-shorthand-properties": {
@@ -790,8 +799,8 @@
"integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
}
},
"babel-plugin-transform-es2015-spread": {
@@ -800,7 +809,7 @@
"integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0"
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-es2015-sticky-regex": {
@@ -809,9 +818,9 @@
"integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
"dev": true,
"requires": {
- "babel-helper-regex": "6.26.0",
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-helper-regex": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
}
},
"babel-plugin-transform-es2015-template-literals": {
@@ -820,7 +829,7 @@
"integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0"
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-es2015-typeof-symbol": {
@@ -829,7 +838,7 @@
"integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0"
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-es2015-unicode-regex": {
@@ -838,9 +847,9 @@
"integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
"dev": true,
"requires": {
- "babel-helper-regex": "6.26.0",
- "babel-runtime": "6.26.0",
- "regexpu-core": "2.0.0"
+ "babel-helper-regex": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "regexpu-core": "^2.0.0"
}
},
"babel-plugin-transform-exponentiation-operator": {
@@ -849,9 +858,9 @@
"integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
"dev": true,
"requires": {
- "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1",
- "babel-plugin-syntax-exponentiation-operator": "6.13.0",
- "babel-runtime": "6.26.0"
+ "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1",
+ "babel-plugin-syntax-exponentiation-operator": "^6.8.0",
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-flow-strip-types": {
@@ -860,8 +869,8 @@
"integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
"dev": true,
"requires": {
- "babel-plugin-syntax-flow": "6.18.0",
- "babel-runtime": "6.26.0"
+ "babel-plugin-syntax-flow": "^6.18.0",
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-object-rest-spread": {
@@ -870,8 +879,8 @@
"integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
"dev": true,
"requires": {
- "babel-plugin-syntax-object-rest-spread": "6.13.0",
- "babel-runtime": "6.26.0"
+ "babel-plugin-syntax-object-rest-spread": "^6.8.0",
+ "babel-runtime": "^6.26.0"
}
},
"babel-plugin-transform-react-display-name": {
@@ -880,7 +889,7 @@
"integrity": "sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0"
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-react-jsx": {
@@ -889,9 +898,9 @@
"integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=",
"dev": true,
"requires": {
- "babel-helper-builder-react-jsx": "6.26.0",
- "babel-plugin-syntax-jsx": "6.18.0",
- "babel-runtime": "6.26.0"
+ "babel-helper-builder-react-jsx": "^6.24.1",
+ "babel-plugin-syntax-jsx": "^6.8.0",
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-react-jsx-self": {
@@ -900,8 +909,8 @@
"integrity": "sha1-322AqdomEqEh5t3XVYvL7PBuY24=",
"dev": true,
"requires": {
- "babel-plugin-syntax-jsx": "6.18.0",
- "babel-runtime": "6.26.0"
+ "babel-plugin-syntax-jsx": "^6.8.0",
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-react-jsx-source": {
@@ -910,8 +919,8 @@
"integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=",
"dev": true,
"requires": {
- "babel-plugin-syntax-jsx": "6.18.0",
- "babel-runtime": "6.26.0"
+ "babel-plugin-syntax-jsx": "^6.8.0",
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-regenerator": {
@@ -920,7 +929,7 @@
"integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
"dev": true,
"requires": {
- "regenerator-transform": "0.10.1"
+ "regenerator-transform": "^0.10.0"
}
},
"babel-plugin-transform-runtime": {
@@ -929,7 +938,7 @@
"integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0"
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-strict-mode": {
@@ -938,8 +947,8 @@
"integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
}
},
"babel-polyfill": {
@@ -948,9 +957,9 @@
"integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0",
- "core-js": "2.5.1",
- "regenerator-runtime": "0.10.5"
+ "babel-runtime": "^6.26.0",
+ "core-js": "^2.5.0",
+ "regenerator-runtime": "^0.10.5"
},
"dependencies": {
"regenerator-runtime": {
@@ -967,30 +976,30 @@
"integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
"dev": true,
"requires": {
- "babel-plugin-check-es2015-constants": "6.22.0",
- "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
- "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
- "babel-plugin-transform-es2015-block-scoping": "6.26.0",
- "babel-plugin-transform-es2015-classes": "6.24.1",
- "babel-plugin-transform-es2015-computed-properties": "6.24.1",
- "babel-plugin-transform-es2015-destructuring": "6.23.0",
- "babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
- "babel-plugin-transform-es2015-for-of": "6.23.0",
- "babel-plugin-transform-es2015-function-name": "6.24.1",
- "babel-plugin-transform-es2015-literals": "6.22.0",
- "babel-plugin-transform-es2015-modules-amd": "6.24.1",
- "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
- "babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
- "babel-plugin-transform-es2015-modules-umd": "6.24.1",
- "babel-plugin-transform-es2015-object-super": "6.24.1",
- "babel-plugin-transform-es2015-parameters": "6.24.1",
- "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
- "babel-plugin-transform-es2015-spread": "6.22.0",
- "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
- "babel-plugin-transform-es2015-template-literals": "6.22.0",
- "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
- "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
- "babel-plugin-transform-regenerator": "6.26.0"
+ "babel-plugin-check-es2015-constants": "^6.22.0",
+ "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
+ "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
+ "babel-plugin-transform-es2015-block-scoping": "^6.24.1",
+ "babel-plugin-transform-es2015-classes": "^6.24.1",
+ "babel-plugin-transform-es2015-computed-properties": "^6.24.1",
+ "babel-plugin-transform-es2015-destructuring": "^6.22.0",
+ "babel-plugin-transform-es2015-duplicate-keys": "^6.24.1",
+ "babel-plugin-transform-es2015-for-of": "^6.22.0",
+ "babel-plugin-transform-es2015-function-name": "^6.24.1",
+ "babel-plugin-transform-es2015-literals": "^6.22.0",
+ "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
+ "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
+ "babel-plugin-transform-es2015-modules-systemjs": "^6.24.1",
+ "babel-plugin-transform-es2015-modules-umd": "^6.24.1",
+ "babel-plugin-transform-es2015-object-super": "^6.24.1",
+ "babel-plugin-transform-es2015-parameters": "^6.24.1",
+ "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1",
+ "babel-plugin-transform-es2015-spread": "^6.22.0",
+ "babel-plugin-transform-es2015-sticky-regex": "^6.24.1",
+ "babel-plugin-transform-es2015-template-literals": "^6.22.0",
+ "babel-plugin-transform-es2015-typeof-symbol": "^6.22.0",
+ "babel-plugin-transform-es2015-unicode-regex": "^6.24.1",
+ "babel-plugin-transform-regenerator": "^6.24.1"
}
},
"babel-preset-es2016": {
@@ -999,7 +1008,7 @@
"integrity": "sha1-+QC/k+LrwNJ235uKtZck6/2Vn4s=",
"dev": true,
"requires": {
- "babel-plugin-transform-exponentiation-operator": "6.24.1"
+ "babel-plugin-transform-exponentiation-operator": "^6.24.1"
}
},
"babel-preset-es2017": {
@@ -1008,8 +1017,8 @@
"integrity": "sha1-WXvq37n38gi8/YoS6bKym4svFNE=",
"dev": true,
"requires": {
- "babel-plugin-syntax-trailing-function-commas": "6.22.0",
- "babel-plugin-transform-async-to-generator": "6.24.1"
+ "babel-plugin-syntax-trailing-function-commas": "^6.22.0",
+ "babel-plugin-transform-async-to-generator": "^6.24.1"
}
},
"babel-preset-flow": {
@@ -1018,7 +1027,7 @@
"integrity": "sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0=",
"dev": true,
"requires": {
- "babel-plugin-transform-flow-strip-types": "6.22.0"
+ "babel-plugin-transform-flow-strip-types": "^6.22.0"
}
},
"babel-preset-react": {
@@ -1027,12 +1036,12 @@
"integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=",
"dev": true,
"requires": {
- "babel-plugin-syntax-jsx": "6.18.0",
- "babel-plugin-transform-react-display-name": "6.25.0",
- "babel-plugin-transform-react-jsx": "6.24.1",
- "babel-plugin-transform-react-jsx-self": "6.22.0",
- "babel-plugin-transform-react-jsx-source": "6.22.0",
- "babel-preset-flow": "6.23.0"
+ "babel-plugin-syntax-jsx": "^6.3.13",
+ "babel-plugin-transform-react-display-name": "^6.23.0",
+ "babel-plugin-transform-react-jsx": "^6.24.1",
+ "babel-plugin-transform-react-jsx-self": "^6.22.0",
+ "babel-plugin-transform-react-jsx-source": "^6.22.0",
+ "babel-preset-flow": "^6.23.0"
}
},
"babel-register": {
@@ -1041,13 +1050,13 @@
"integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
"dev": true,
"requires": {
- "babel-core": "6.26.0",
- "babel-runtime": "6.26.0",
- "core-js": "2.5.1",
- "home-or-tmp": "2.0.0",
- "lodash": "4.17.4",
- "mkdirp": "0.5.1",
- "source-map-support": "0.4.18"
+ "babel-core": "^6.26.0",
+ "babel-runtime": "^6.26.0",
+ "core-js": "^2.5.0",
+ "home-or-tmp": "^2.0.0",
+ "lodash": "^4.17.4",
+ "mkdirp": "^0.5.1",
+ "source-map-support": "^0.4.15"
}
},
"babel-runtime": {
@@ -1055,8 +1064,8 @@
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
"integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
"requires": {
- "core-js": "2.5.1",
- "regenerator-runtime": "0.11.0"
+ "core-js": "^2.4.0",
+ "regenerator-runtime": "^0.11.0"
}
},
"babel-template": {
@@ -1065,11 +1074,11 @@
"integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0",
- "babel-traverse": "6.26.0",
- "babel-types": "6.26.0",
- "babylon": "6.18.0",
- "lodash": "4.17.4"
+ "babel-runtime": "^6.26.0",
+ "babel-traverse": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "babylon": "^6.18.0",
+ "lodash": "^4.17.4"
}
},
"babel-traverse": {
@@ -1078,15 +1087,15 @@
"integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
"dev": true,
"requires": {
- "babel-code-frame": "6.26.0",
- "babel-messages": "6.23.0",
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0",
- "babylon": "6.18.0",
- "debug": "2.6.9",
- "globals": "9.18.0",
- "invariant": "2.2.2",
- "lodash": "4.17.4"
+ "babel-code-frame": "^6.26.0",
+ "babel-messages": "^6.23.0",
+ "babel-runtime": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "babylon": "^6.18.0",
+ "debug": "^2.6.8",
+ "globals": "^9.18.0",
+ "invariant": "^2.2.2",
+ "lodash": "^4.17.4"
}
},
"babel-types": {
@@ -1095,10 +1104,10 @@
"integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0",
- "esutils": "2.0.2",
- "lodash": "4.17.4",
- "to-fast-properties": "1.0.3"
+ "babel-runtime": "^6.26.0",
+ "esutils": "^2.0.2",
+ "lodash": "^4.17.4",
+ "to-fast-properties": "^1.0.3"
}
},
"babylon": {
@@ -1142,7 +1151,7 @@
"integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
"optional": true,
"requires": {
- "tweetnacl": "0.14.5"
+ "tweetnacl": "^0.14.3"
}
},
"better-assert": {
@@ -1189,28 +1198,23 @@
"dev": true,
"requires": {
"bytes": "3.0.0",
- "content-type": "1.0.4",
+ "content-type": "~1.0.4",
"debug": "2.6.9",
- "depd": "1.1.1",
- "http-errors": "1.6.2",
+ "depd": "~1.1.1",
+ "http-errors": "~1.6.2",
"iconv-lite": "0.4.19",
- "on-finished": "2.3.0",
+ "on-finished": "~2.3.0",
"qs": "6.5.1",
"raw-body": "2.3.2",
- "type-is": "1.6.15"
+ "type-is": "~1.6.15"
}
},
- "boom": {
- "version": "4.3.1",
- "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
- "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE="
- },
"brace-expansion": {
"version": "1.1.8",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
"requires": {
- "balanced-match": "1.0.0",
+ "balanced-match": "^1.0.0",
"concat-map": "0.0.1"
}
},
@@ -1220,9 +1224,9 @@
"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
"dev": true,
"requires": {
- "expand-range": "1.8.2",
- "preserve": "0.2.0",
- "repeat-element": "1.1.2"
+ "expand-range": "^1.8.1",
+ "preserve": "^0.2.0",
+ "repeat-element": "^1.1.2"
}
},
"browser-encrypt-attachment": {
@@ -1247,7 +1251,7 @@
"integrity": "sha1-BnFJtmjfMcS1hTPgLQHoBthgjiw=",
"dev": true,
"requires": {
- "inherits": "2.0.3"
+ "inherits": "^2.0.1"
}
},
"browserify-zlib": {
@@ -1256,7 +1260,7 @@
"integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
"dev": true,
"requires": {
- "pako": "0.2.9"
+ "pako": "~0.2.0"
},
"dependencies": {
"pako": {
@@ -1273,9 +1277,9 @@
"integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
"dev": true,
"requires": {
- "base64-js": "1.2.1",
- "ieee754": "1.1.8",
- "isarray": "1.0.0"
+ "base64-js": "^1.0.2",
+ "ieee754": "^1.1.4",
+ "isarray": "^1.0.0"
}
},
"builtin-status-codes": {
@@ -1296,7 +1300,7 @@
"integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
"dev": true,
"requires": {
- "callsites": "0.2.0"
+ "callsites": "^0.2.0"
}
},
"callsite": {
@@ -1328,8 +1332,8 @@
"integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
"dev": true,
"requires": {
- "align-text": "0.1.4",
- "lazy-cache": "1.0.4"
+ "align-text": "^0.1.3",
+ "lazy-cache": "^1.0.3"
}
},
"chalk": {
@@ -1338,11 +1342,11 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
- "ansi-styles": "2.2.1",
- "escape-string-regexp": "1.0.5",
- "has-ansi": "2.0.0",
- "strip-ansi": "3.0.1",
- "supports-color": "2.0.0"
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
}
},
"chokidar": {
@@ -1351,15 +1355,15 @@
"integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
"dev": true,
"requires": {
- "anymatch": "1.3.2",
- "async-each": "1.0.1",
- "fsevents": "1.1.2",
- "glob-parent": "2.0.0",
- "inherits": "2.0.3",
- "is-binary-path": "1.0.1",
- "is-glob": "2.0.1",
- "path-is-absolute": "1.0.1",
- "readdirp": "2.1.0"
+ "anymatch": "^1.3.0",
+ "async-each": "^1.0.0",
+ "fsevents": "^1.0.0",
+ "glob-parent": "^2.0.0",
+ "inherits": "^2.0.1",
+ "is-binary-path": "^1.0.0",
+ "is-glob": "^2.0.0",
+ "path-is-absolute": "^1.0.0",
+ "readdirp": "^2.0.0"
}
},
"circular-json": {
@@ -1379,7 +1383,7 @@
"integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
"dev": true,
"requires": {
- "restore-cursor": "1.0.1"
+ "restore-cursor": "^1.0.1"
}
},
"cli-width": {
@@ -1394,8 +1398,8 @@
"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
"dev": true,
"requires": {
- "center-align": "0.1.3",
- "right-align": "0.1.3",
+ "center-align": "^0.1.1",
+ "right-align": "^0.1.1",
"wordwrap": "0.0.2"
},
"dependencies": {
@@ -1436,15 +1440,15 @@
"integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=",
"dev": true,
"requires": {
- "lodash": "4.17.4"
+ "lodash": "^4.5.0"
}
},
"combined-stream": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
- "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
+ "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
"requires": {
- "delayed-stream": "1.0.0"
+ "delayed-stream": "~1.0.0"
}
},
"commander": {
@@ -1464,10 +1468,10 @@
"resolved": "https://registry.npmjs.org/commonmark/-/commonmark-0.28.1.tgz",
"integrity": "sha1-Buq41SM4uDn6Gi11rwCF7tGxvq4=",
"requires": {
- "entities": "1.1.1",
- "mdurl": "1.0.1",
- "minimist": "1.2.0",
- "string.prototype.repeat": "0.2.0"
+ "entities": "~ 1.1.1",
+ "mdurl": "~ 1.0.1",
+ "minimist": "~ 1.2.0",
+ "string.prototype.repeat": "^0.2.0"
}
},
"component-bind": {
@@ -1499,9 +1503,9 @@
"integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
"dev": true,
"requires": {
- "inherits": "2.0.3",
- "readable-stream": "2.3.3",
- "typedarray": "0.0.6"
+ "inherits": "^2.0.3",
+ "readable-stream": "^2.2.2",
+ "typedarray": "^0.0.6"
}
},
"connect": {
@@ -1512,7 +1516,7 @@
"requires": {
"debug": "2.6.9",
"finalhandler": "1.0.6",
- "parseurl": "1.3.2",
+ "parseurl": "~1.3.2",
"utils-merge": "1.0.1"
}
},
@@ -1522,7 +1526,7 @@
"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
"dev": true,
"requires": {
- "date-now": "0.1.4"
+ "date-now": "^0.1.4"
}
},
"constants-browserify": {
@@ -1563,11 +1567,11 @@
"resolved": "https://registry.npmjs.org/counterpart/-/counterpart-0.18.3.tgz",
"integrity": "sha512-tli4qPAFeYB34LvvCc/1xYRLCWjf4WsUt6sXfpggDfGDKoI8rhnabz0SljDoBpAK8z1u8GBCg0YDkbvWb16uUQ==",
"requires": {
- "date-names": "0.1.10",
- "except": "0.1.3",
- "extend": "3.0.1",
- "pluralizers": "0.1.6",
- "sprintf-js": "1.1.1"
+ "date-names": "^0.1.9",
+ "except": "^0.1.3",
+ "extend": "^3.0.0",
+ "pluralizers": "^0.1.6",
+ "sprintf-js": "^1.0.3"
}
},
"create-react-class": {
@@ -1575,24 +1579,9 @@
"resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.2.tgz",
"integrity": "sha1-zx7RXxKq1/FO9fLf4F5sQvke8Co=",
"requires": {
- "fbjs": "0.8.16",
- "loose-envify": "1.3.1",
- "object-assign": "4.1.1"
- }
- },
- "cryptiles": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
- "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
- "requires": {
- "boom": "5.2.0"
- },
- "dependencies": {
- "boom": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
- "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw=="
- }
+ "fbjs": "^0.8.9",
+ "loose-envify": "^1.3.1",
+ "object-assign": "^4.1.1"
}
},
"crypto-browserify": {
@@ -1619,7 +1608,7 @@
"integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
"dev": true,
"requires": {
- "es5-ext": "0.10.35"
+ "es5-ext": "^0.10.9"
}
},
"dashdash": {
@@ -1627,7 +1616,7 @@
"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
"requires": {
- "assert-plus": "1.0.0"
+ "assert-plus": "^1.0.0"
}
},
"date-names": {
@@ -1668,8 +1657,8 @@
"integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
"dev": true,
"requires": {
- "foreach": "2.0.5",
- "object-keys": "1.0.11"
+ "foreach": "^2.0.5",
+ "object-keys": "^1.0.8"
}
},
"del": {
@@ -1678,13 +1667,13 @@
"integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
"dev": true,
"requires": {
- "globby": "5.0.0",
- "is-path-cwd": "1.0.0",
- "is-path-in-cwd": "1.0.0",
- "object-assign": "4.1.1",
- "pify": "2.3.0",
- "pinkie-promise": "2.0.1",
- "rimraf": "2.6.2"
+ "globby": "^5.0.0",
+ "is-path-cwd": "^1.0.0",
+ "is-path-in-cwd": "^1.0.0",
+ "object-assign": "^4.0.1",
+ "pify": "^2.0.0",
+ "pinkie-promise": "^2.0.0",
+ "rimraf": "^2.2.8"
}
},
"delayed-stream": {
@@ -1704,7 +1693,7 @@
"integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
"dev": true,
"requires": {
- "repeating": "2.0.1"
+ "repeating": "^2.0.0"
}
},
"di": {
@@ -1713,14 +1702,20 @@
"integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
"dev": true
},
+ "diff": {
+ "version": "3.5.0",
+ "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+ "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+ "dev": true
+ },
"doctrine": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz",
"integrity": "sha1-xz2NKQnSIpHhoAejlYBNqLZl/mM=",
"dev": true,
"requires": {
- "esutils": "2.0.2",
- "isarray": "1.0.0"
+ "esutils": "^2.0.2",
+ "isarray": "^1.0.0"
}
},
"dom-serialize": {
@@ -1729,10 +1724,10 @@
"integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
"dev": true,
"requires": {
- "custom-event": "1.0.1",
- "ent": "2.2.0",
- "extend": "3.0.1",
- "void-elements": "2.0.1"
+ "custom-event": "~1.0.0",
+ "ent": "~2.2.0",
+ "extend": "^3.0.0",
+ "void-elements": "^2.0.0"
}
},
"dom-serializer": {
@@ -1740,8 +1735,8 @@
"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
"integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
"requires": {
- "domelementtype": "1.1.3",
- "entities": "1.1.1"
+ "domelementtype": "~1.1.1",
+ "entities": "~1.1.1"
},
"dependencies": {
"domelementtype": {
@@ -1767,7 +1762,7 @@
"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz",
"integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=",
"requires": {
- "domelementtype": "1.3.0"
+ "domelementtype": "1"
}
},
"domutils": {
@@ -1775,8 +1770,8 @@
"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz",
"integrity": "sha1-GVjMC0yUJuntNn+xyOhUiRsPo/8=",
"requires": {
- "dom-serializer": "0.1.0",
- "domelementtype": "1.3.0"
+ "dom-serializer": "0",
+ "domelementtype": "1"
}
},
"draft-js": {
@@ -1784,9 +1779,9 @@
"resolved": "https://registry.npmjs.org/draft-js/-/draft-js-0.11.0-alpha.tgz",
"integrity": "sha1-MtshCPkn6bhEbaH3nkR1wrf4aK4=",
"requires": {
- "fbjs": "0.8.16",
- "immutable": "3.7.6",
- "object-assign": "4.1.1"
+ "fbjs": "^0.8.12",
+ "immutable": "~3.7.4",
+ "object-assign": "^4.1.0"
}
},
"draft-js-export-html": {
@@ -1794,7 +1789,7 @@
"resolved": "https://registry.npmjs.org/draft-js-export-html/-/draft-js-export-html-0.6.0.tgz",
"integrity": "sha1-zIDwVExD0Kf+28U8DLCRToCQ92k=",
"requires": {
- "draft-js-utils": "1.2.0"
+ "draft-js-utils": ">=0.2.0"
}
},
"draft-js-export-markdown": {
@@ -1802,7 +1797,7 @@
"resolved": "https://registry.npmjs.org/draft-js-export-markdown/-/draft-js-export-markdown-0.3.0.tgz",
"integrity": "sha1-hjkOA86vHTR/xhaGerf1Net2v0I=",
"requires": {
- "draft-js-utils": "1.2.0"
+ "draft-js-utils": ">=0.2.0"
}
},
"draft-js-utils": {
@@ -1816,7 +1811,7 @@
"integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
"optional": true,
"requires": {
- "jsbn": "0.1.1"
+ "jsbn": "~0.1.0"
}
},
"ee-first": {
@@ -1847,7 +1842,7 @@
"resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
"integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
"requires": {
- "iconv-lite": "0.4.19"
+ "iconv-lite": "~0.4.13"
}
},
"engine.io": {
@@ -1944,9 +1939,9 @@
"integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=",
"dev": true,
"requires": {
- "graceful-fs": "4.1.11",
- "memory-fs": "0.2.0",
- "tapable": "0.1.10"
+ "graceful-fs": "^4.1.2",
+ "memory-fs": "^0.2.0",
+ "tapable": "^0.1.8"
},
"dependencies": {
"memory-fs": {
@@ -1974,7 +1969,7 @@
"integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=",
"dev": true,
"requires": {
- "prr": "0.0.0"
+ "prr": "~0.0.0"
}
},
"es-abstract": {
@@ -1983,11 +1978,11 @@
"integrity": "sha512-kk3IJoKo7A3pWJc0OV8yZ/VEX2oSUytfekrJiqoxBlKJMFAJVJVpGdHClCCTdv+Fn2zHfpDHHIelMFhZVfef3Q==",
"dev": true,
"requires": {
- "es-to-primitive": "1.1.1",
- "function-bind": "1.1.1",
- "has": "1.0.1",
- "is-callable": "1.1.3",
- "is-regex": "1.0.4"
+ "es-to-primitive": "^1.1.1",
+ "function-bind": "^1.1.1",
+ "has": "^1.0.1",
+ "is-callable": "^1.1.3",
+ "is-regex": "^1.0.4"
}
},
"es-to-primitive": {
@@ -1996,9 +1991,9 @@
"integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
"dev": true,
"requires": {
- "is-callable": "1.1.3",
- "is-date-object": "1.0.1",
- "is-symbol": "1.0.1"
+ "is-callable": "^1.1.1",
+ "is-date-object": "^1.0.1",
+ "is-symbol": "^1.0.1"
}
},
"es5-ext": {
@@ -2007,8 +2002,8 @@
"integrity": "sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=",
"dev": true,
"requires": {
- "es6-iterator": "2.0.3",
- "es6-symbol": "3.1.1"
+ "es6-iterator": "~2.0.1",
+ "es6-symbol": "~3.1.1"
}
},
"es6-iterator": {
@@ -2017,9 +2012,9 @@
"integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
"dev": true,
"requires": {
- "d": "1.0.0",
- "es5-ext": "0.10.35",
- "es6-symbol": "3.1.1"
+ "d": "1",
+ "es5-ext": "^0.10.35",
+ "es6-symbol": "^3.1.1"
}
},
"es6-map": {
@@ -2028,12 +2023,12 @@
"integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
"dev": true,
"requires": {
- "d": "1.0.0",
- "es5-ext": "0.10.35",
- "es6-iterator": "2.0.3",
- "es6-set": "0.1.5",
- "es6-symbol": "3.1.1",
- "event-emitter": "0.3.5"
+ "d": "1",
+ "es5-ext": "~0.10.14",
+ "es6-iterator": "~2.0.1",
+ "es6-set": "~0.1.5",
+ "es6-symbol": "~3.1.1",
+ "event-emitter": "~0.3.5"
}
},
"es6-set": {
@@ -2042,11 +2037,11 @@
"integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
"dev": true,
"requires": {
- "d": "1.0.0",
- "es5-ext": "0.10.35",
- "es6-iterator": "2.0.3",
+ "d": "1",
+ "es5-ext": "~0.10.14",
+ "es6-iterator": "~2.0.1",
"es6-symbol": "3.1.1",
- "event-emitter": "0.3.5"
+ "event-emitter": "~0.3.5"
}
},
"es6-symbol": {
@@ -2055,8 +2050,8 @@
"integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
"dev": true,
"requires": {
- "d": "1.0.0",
- "es5-ext": "0.10.35"
+ "d": "1",
+ "es5-ext": "~0.10.14"
}
},
"es6-weak-map": {
@@ -2065,10 +2060,10 @@
"integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
"dev": true,
"requires": {
- "d": "1.0.0",
- "es5-ext": "0.10.35",
- "es6-iterator": "2.0.3",
- "es6-symbol": "3.1.1"
+ "d": "1",
+ "es5-ext": "^0.10.14",
+ "es6-iterator": "^2.0.1",
+ "es6-symbol": "^3.1.1"
}
},
"escape-html": {
@@ -2089,10 +2084,10 @@
"integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
"dev": true,
"requires": {
- "es6-map": "0.1.5",
- "es6-weak-map": "2.0.2",
- "esrecurse": "4.2.0",
- "estraverse": "4.2.0"
+ "es6-map": "^0.1.3",
+ "es6-weak-map": "^2.0.1",
+ "esrecurse": "^4.1.0",
+ "estraverse": "^4.1.1"
}
},
"eslint": {
@@ -2101,41 +2096,41 @@
"integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=",
"dev": true,
"requires": {
- "babel-code-frame": "6.26.0",
- "chalk": "1.1.3",
- "concat-stream": "1.6.0",
- "debug": "2.6.9",
- "doctrine": "2.0.0",
- "escope": "3.6.0",
- "espree": "3.5.1",
- "esquery": "1.0.0",
- "estraverse": "4.2.0",
- "esutils": "2.0.2",
- "file-entry-cache": "2.0.0",
- "glob": "7.1.2",
- "globals": "9.18.0",
- "ignore": "3.3.5",
- "imurmurhash": "0.1.4",
- "inquirer": "0.12.0",
- "is-my-json-valid": "2.16.1",
- "is-resolvable": "1.0.0",
- "js-yaml": "3.10.0",
- "json-stable-stringify": "1.0.1",
- "levn": "0.3.0",
- "lodash": "4.17.4",
- "mkdirp": "0.5.1",
- "natural-compare": "1.4.0",
- "optionator": "0.8.2",
- "path-is-inside": "1.0.2",
- "pluralize": "1.2.1",
- "progress": "1.1.8",
- "require-uncached": "1.0.3",
- "shelljs": "0.7.8",
- "strip-bom": "3.0.0",
- "strip-json-comments": "2.0.1",
- "table": "3.8.3",
- "text-table": "0.2.0",
- "user-home": "2.0.0"
+ "babel-code-frame": "^6.16.0",
+ "chalk": "^1.1.3",
+ "concat-stream": "^1.5.2",
+ "debug": "^2.1.1",
+ "doctrine": "^2.0.0",
+ "escope": "^3.6.0",
+ "espree": "^3.4.0",
+ "esquery": "^1.0.0",
+ "estraverse": "^4.2.0",
+ "esutils": "^2.0.2",
+ "file-entry-cache": "^2.0.0",
+ "glob": "^7.0.3",
+ "globals": "^9.14.0",
+ "ignore": "^3.2.0",
+ "imurmurhash": "^0.1.4",
+ "inquirer": "^0.12.0",
+ "is-my-json-valid": "^2.10.0",
+ "is-resolvable": "^1.0.0",
+ "js-yaml": "^3.5.1",
+ "json-stable-stringify": "^1.0.0",
+ "levn": "^0.3.0",
+ "lodash": "^4.0.0",
+ "mkdirp": "^0.5.0",
+ "natural-compare": "^1.4.0",
+ "optionator": "^0.8.2",
+ "path-is-inside": "^1.0.1",
+ "pluralize": "^1.2.1",
+ "progress": "^1.1.8",
+ "require-uncached": "^1.0.2",
+ "shelljs": "^0.7.5",
+ "strip-bom": "^3.0.0",
+ "strip-json-comments": "~2.0.1",
+ "table": "^3.7.8",
+ "text-table": "~0.2.0",
+ "user-home": "^2.0.0"
},
"dependencies": {
"glob": {
@@ -2144,12 +2139,12 @@
"integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
"dev": true,
"requires": {
- "fs.realpath": "1.0.0",
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "3.0.4",
- "once": "1.4.0",
- "path-is-absolute": "1.0.1"
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
}
},
"user-home": {
@@ -2158,7 +2153,7 @@
"integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=",
"dev": true,
"requires": {
- "os-homedir": "1.0.2"
+ "os-homedir": "^1.0.0"
}
}
}
@@ -2181,7 +2176,7 @@
"integrity": "sha512-RiQv+7Z9QDJuzt+NO8sYgkLGT+h+WeCrxP7y8lI7wpU41x3x/2o3PGtHk9ck8QnA9/mlbNcy/hG0eKvmd7npaA==",
"dev": true,
"requires": {
- "lodash": "4.17.4"
+ "lodash": "^4.15.0"
}
},
"eslint-plugin-react": {
@@ -2190,10 +2185,10 @@
"integrity": "sha512-KC7Snr4YsWZD5flu6A5c0AcIZidzW3Exbqp7OT67OaD2AppJtlBr/GuPrW/vaQM/yfZotEvKAdrxrO+v8vwYJA==",
"dev": true,
"requires": {
- "doctrine": "2.1.0",
- "has": "1.0.1",
- "jsx-ast-utils": "2.0.1",
- "prop-types": "15.6.0"
+ "doctrine": "^2.0.2",
+ "has": "^1.0.1",
+ "jsx-ast-utils": "^2.0.1",
+ "prop-types": "^15.6.0"
},
"dependencies": {
"doctrine": {
@@ -2202,7 +2197,7 @@
"integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
"dev": true,
"requires": {
- "esutils": "2.0.2"
+ "esutils": "^2.0.2"
}
}
}
@@ -2213,8 +2208,8 @@
"integrity": "sha1-DJiLirRttTEAoZVK5LqZXd0n2H4=",
"dev": true,
"requires": {
- "acorn": "5.1.2",
- "acorn-jsx": "3.0.1"
+ "acorn": "^5.1.1",
+ "acorn-jsx": "^3.0.0"
}
},
"esprima": {
@@ -2229,7 +2224,7 @@
"integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=",
"dev": true,
"requires": {
- "estraverse": "4.2.0"
+ "estraverse": "^4.0.0"
}
},
"esrecurse": {
@@ -2238,8 +2233,8 @@
"integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=",
"dev": true,
"requires": {
- "estraverse": "4.2.0",
- "object-assign": "4.1.1"
+ "estraverse": "^4.1.0",
+ "object-assign": "^4.0.1"
}
},
"estraverse": {
@@ -2266,8 +2261,8 @@
"integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
"dev": true,
"requires": {
- "d": "1.0.0",
- "es5-ext": "0.10.35"
+ "d": "1",
+ "es5-ext": "~0.10.14"
}
},
"eventemitter3": {
@@ -2302,9 +2297,9 @@
"integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=",
"dev": true,
"requires": {
- "array-slice": "0.2.3",
- "array-unique": "0.2.1",
- "braces": "0.1.5"
+ "array-slice": "^0.2.3",
+ "array-unique": "^0.2.1",
+ "braces": "^0.1.2"
},
"dependencies": {
"braces": {
@@ -2313,7 +2308,7 @@
"integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=",
"dev": true,
"requires": {
- "expand-range": "0.1.1"
+ "expand-range": "^0.1.0"
}
},
"expand-range": {
@@ -2322,8 +2317,8 @@
"integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=",
"dev": true,
"requires": {
- "is-number": "0.1.1",
- "repeat-string": "0.2.2"
+ "is-number": "^0.1.1",
+ "repeat-string": "^0.2.2"
}
},
"is-number": {
@@ -2346,7 +2341,7 @@
"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
"dev": true,
"requires": {
- "is-posix-bracket": "0.1.1"
+ "is-posix-bracket": "^0.1.0"
}
},
"expand-range": {
@@ -2355,7 +2350,7 @@
"integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
"dev": true,
"requires": {
- "fill-range": "2.2.3"
+ "fill-range": "^2.1.0"
}
},
"expect": {
@@ -2364,13 +2359,13 @@
"integrity": "sha1-1Fj+TFYAQDa64yMkFqP2Nh8E+WU=",
"dev": true,
"requires": {
- "define-properties": "1.1.2",
- "has": "1.0.1",
- "is-equal": "1.5.5",
- "is-regex": "1.0.4",
- "object-inspect": "1.3.0",
- "object-keys": "1.0.11",
- "tmatch": "2.0.1"
+ "define-properties": "~1.1.2",
+ "has": "^1.0.1",
+ "is-equal": "^1.5.1",
+ "is-regex": "^1.0.3",
+ "object-inspect": "^1.1.0",
+ "object-keys": "^1.0.9",
+ "tmatch": "^2.0.1"
}
},
"extend": {
@@ -2384,7 +2379,7 @@
"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
"dev": true,
"requires": {
- "is-extglob": "1.0.0"
+ "is-extglob": "^1.0.0"
}
},
"extsprintf": {
@@ -2393,9 +2388,14 @@
"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
},
"fast-deep-equal": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
- "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8="
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+ "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
+ },
+ "fast-json-stable-stringify": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+ "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
},
"fast-levenshtein": {
"version": "2.0.6",
@@ -2408,7 +2408,7 @@
"resolved": "https://registry.npmjs.org/fbemitter/-/fbemitter-2.1.1.tgz",
"integrity": "sha1-Uj4U/a9SSIBbsC9i78M75wP1GGU=",
"requires": {
- "fbjs": "0.8.16"
+ "fbjs": "^0.8.4"
}
},
"fbjs": {
@@ -2416,13 +2416,13 @@
"resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz",
"integrity": "sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=",
"requires": {
- "core-js": "1.2.7",
- "isomorphic-fetch": "2.2.1",
- "loose-envify": "1.3.1",
- "object-assign": "4.1.1",
- "promise": "7.3.1",
- "setimmediate": "1.0.5",
- "ua-parser-js": "0.7.17"
+ "core-js": "^1.0.0",
+ "isomorphic-fetch": "^2.1.1",
+ "loose-envify": "^1.0.0",
+ "object-assign": "^4.1.0",
+ "promise": "^7.1.1",
+ "setimmediate": "^1.0.5",
+ "ua-parser-js": "^0.7.9"
},
"dependencies": {
"core-js": {
@@ -2438,8 +2438,8 @@
"integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
"dev": true,
"requires": {
- "escape-string-regexp": "1.0.5",
- "object-assign": "4.1.1"
+ "escape-string-regexp": "^1.0.5",
+ "object-assign": "^4.1.0"
}
},
"file-entry-cache": {
@@ -2448,8 +2448,8 @@
"integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
"dev": true,
"requires": {
- "flat-cache": "1.3.0",
- "object-assign": "4.1.1"
+ "flat-cache": "^1.2.1",
+ "object-assign": "^4.0.1"
}
},
"file-saver": {
@@ -2474,11 +2474,11 @@
"integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
"dev": true,
"requires": {
- "is-number": "2.1.0",
- "isobject": "2.1.0",
- "randomatic": "1.1.7",
- "repeat-element": "1.1.2",
- "repeat-string": "1.6.1"
+ "is-number": "^2.1.0",
+ "isobject": "^2.0.0",
+ "randomatic": "^1.1.3",
+ "repeat-element": "^1.1.2",
+ "repeat-string": "^1.5.2"
}
},
"finalhandler": {
@@ -2488,12 +2488,12 @@
"dev": true,
"requires": {
"debug": "2.6.9",
- "encodeurl": "1.0.1",
- "escape-html": "1.0.3",
- "on-finished": "2.3.0",
- "parseurl": "1.3.2",
- "statuses": "1.3.1",
- "unpipe": "1.0.0"
+ "encodeurl": "~1.0.1",
+ "escape-html": "~1.0.3",
+ "on-finished": "~2.3.0",
+ "parseurl": "~1.3.2",
+ "statuses": "~1.3.1",
+ "unpipe": "~1.0.0"
}
},
"find-cache-dir": {
@@ -2502,9 +2502,9 @@
"integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=",
"dev": true,
"requires": {
- "commondir": "1.0.1",
- "mkdirp": "0.5.1",
- "pkg-dir": "1.0.0"
+ "commondir": "^1.0.1",
+ "mkdirp": "^0.5.1",
+ "pkg-dir": "^1.0.0"
}
},
"find-up": {
@@ -2513,8 +2513,8 @@
"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
"dev": true,
"requires": {
- "path-exists": "2.1.0",
- "pinkie-promise": "2.0.1"
+ "path-exists": "^2.0.0",
+ "pinkie-promise": "^2.0.0"
}
},
"flat-cache": {
@@ -2523,10 +2523,10 @@
"integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
"dev": true,
"requires": {
- "circular-json": "0.3.3",
- "del": "2.2.2",
- "graceful-fs": "4.1.11",
- "write": "0.2.1"
+ "circular-json": "^0.3.1",
+ "del": "^2.0.2",
+ "graceful-fs": "^4.1.2",
+ "write": "^0.2.1"
}
},
"flow-parser": {
@@ -2540,9 +2540,9 @@
"resolved": "https://registry.npmjs.org/flux/-/flux-2.1.1.tgz",
"integrity": "sha1-LGrGUtQzdIiWhInGWG86/yajjqQ=",
"requires": {
- "fbemitter": "2.1.1",
+ "fbemitter": "^2.0.0",
"fbjs": "0.1.0-alpha.7",
- "immutable": "3.7.6"
+ "immutable": "^3.7.4"
},
"dependencies": {
"core-js": {
@@ -2555,9 +2555,9 @@
"resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.1.0-alpha.7.tgz",
"integrity": "sha1-rUMIuPIy+zxzYDNJ6nJdHpw5Mjw=",
"requires": {
- "core-js": "1.2.7",
- "promise": "7.3.1",
- "whatwg-fetch": "0.9.0"
+ "core-js": "^1.0.0",
+ "promise": "^7.0.3",
+ "whatwg-fetch": "^0.9.0"
}
},
"whatwg-fetch": {
@@ -2572,7 +2572,7 @@
"resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-2.4.3.tgz",
"integrity": "sha512-sT5Ip9nyAIxWq8Apt1Fdv6yTci5GotaOtO5Ro1/+F3PizttNBcCYz8j/Qze54PPFK73KUbOqh++HUCiyNPqvhA==",
"requires": {
- "tabbable": "1.1.2"
+ "tabbable": "^1.0.3"
}
},
"focus-trap-react": {
@@ -2580,7 +2580,7 @@
"resolved": "https://registry.npmjs.org/focus-trap-react/-/focus-trap-react-3.1.2.tgz",
"integrity": "sha512-MoQmONoy9gRPyrC5DGezkcOMGgx7MtIOAQDHe098UtL2sA2vmucJwEmQisb+8LRXNYFHxuw5zJ1oLFeKu4Mteg==",
"requires": {
- "focus-trap": "2.4.3"
+ "focus-trap": "^2.0.1"
}
},
"for-in": {
@@ -2595,7 +2595,7 @@
"integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
"dev": true,
"requires": {
- "for-in": "1.0.2"
+ "for-in": "^1.0.1"
}
},
"foreach": {
@@ -2616,22 +2616,13 @@
"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
},
"form-data": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
- "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
+ "version": "2.3.2",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
+ "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
"requires": {
- "asynckit": "0.4.0",
- "combined-stream": "1.0.5",
- "mime-types": "2.1.17"
- }
- },
- "formatio": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz",
- "integrity": "sha1-XtPM1jZVEJc4NGXZlhmRAOhhYek=",
- "dev": true,
- "requires": {
- "samsam": "1.1.2"
+ "asynckit": "^0.4.0",
+ "combined-stream": "1.0.6",
+ "mime-types": "^2.1.12"
}
},
"fs-access": {
@@ -2640,7 +2631,7 @@
"integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
"dev": true,
"requires": {
- "null-check": "1.0.0"
+ "null-check": "^1.0.0"
}
},
"fs-readdir-recursive": {
@@ -2662,8 +2653,8 @@
"dev": true,
"optional": true,
"requires": {
- "nan": "2.7.0",
- "node-pre-gyp": "0.6.36"
+ "nan": "^2.3.0",
+ "node-pre-gyp": "^0.6.36"
},
"dependencies": {
"abbrev": {
@@ -2699,8 +2690,8 @@
"dev": true,
"optional": true,
"requires": {
- "delegates": "1.0.0",
- "readable-stream": "2.2.9"
+ "delegates": "^1.0.0",
+ "readable-stream": "^2.0.6"
}
},
"asn1": {
@@ -2744,7 +2735,7 @@
"dev": true,
"optional": true,
"requires": {
- "tweetnacl": "0.14.5"
+ "tweetnacl": "^0.14.3"
}
},
"block-stream": {
@@ -2752,15 +2743,16 @@
"bundled": true,
"dev": true,
"requires": {
- "inherits": "2.0.3"
+ "inherits": "~2.0.0"
}
},
"boom": {
"version": "2.10.1",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
- "hoek": "2.16.3"
+ "hoek": "2.x.x"
}
},
"brace-expansion": {
@@ -2768,7 +2760,7 @@
"bundled": true,
"dev": true,
"requires": {
- "balanced-match": "0.4.2",
+ "balanced-match": "^0.4.1",
"concat-map": "0.0.1"
}
},
@@ -2799,7 +2791,7 @@
"bundled": true,
"dev": true,
"requires": {
- "delayed-stream": "1.0.0"
+ "delayed-stream": "~1.0.0"
}
},
"concat-map": {
@@ -2823,7 +2815,7 @@
"dev": true,
"optional": true,
"requires": {
- "boom": "2.10.1"
+ "boom": "2.x.x"
}
},
"dashdash": {
@@ -2832,7 +2824,7 @@
"dev": true,
"optional": true,
"requires": {
- "assert-plus": "1.0.0"
+ "assert-plus": "^1.0.0"
},
"dependencies": {
"assert-plus": {
@@ -2875,7 +2867,7 @@
"dev": true,
"optional": true,
"requires": {
- "jsbn": "0.1.1"
+ "jsbn": "~0.1.0"
}
},
"extend": {
@@ -2916,10 +2908,10 @@
"bundled": true,
"dev": true,
"requires": {
- "graceful-fs": "4.1.11",
- "inherits": "2.0.3",
- "mkdirp": "0.5.1",
- "rimraf": "2.6.1"
+ "graceful-fs": "^4.1.2",
+ "inherits": "~2.0.0",
+ "mkdirp": ">=0.5 0",
+ "rimraf": "2"
}
},
"fstream-ignore": {
@@ -2928,9 +2920,9 @@
"dev": true,
"optional": true,
"requires": {
- "fstream": "1.0.11",
- "inherits": "2.0.3",
- "minimatch": "3.0.4"
+ "fstream": "^1.0.0",
+ "inherits": "2",
+ "minimatch": "^3.0.0"
}
},
"gauge": {
@@ -2939,14 +2931,14 @@
"dev": true,
"optional": true,
"requires": {
- "aproba": "1.1.1",
- "console-control-strings": "1.1.0",
- "has-unicode": "2.0.1",
- "object-assign": "4.1.1",
- "signal-exit": "3.0.2",
- "string-width": "1.0.2",
- "strip-ansi": "3.0.1",
- "wide-align": "1.1.2"
+ "aproba": "^1.0.3",
+ "console-control-strings": "^1.0.0",
+ "has-unicode": "^2.0.0",
+ "object-assign": "^4.1.0",
+ "signal-exit": "^3.0.0",
+ "string-width": "^1.0.1",
+ "strip-ansi": "^3.0.1",
+ "wide-align": "^1.1.0"
}
},
"getpass": {
@@ -2955,7 +2947,7 @@
"dev": true,
"optional": true,
"requires": {
- "assert-plus": "1.0.0"
+ "assert-plus": "^1.0.0"
},
"dependencies": {
"assert-plus": {
@@ -2971,12 +2963,12 @@
"bundled": true,
"dev": true,
"requires": {
- "fs.realpath": "1.0.0",
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "3.0.4",
- "once": "1.4.0",
- "path-is-absolute": "1.0.1"
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
}
},
"graceful-fs": {
@@ -3021,7 +3013,8 @@
"hoek": {
"version": "2.16.3",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"http-signature": {
"version": "1.1.1",
@@ -3029,9 +3022,9 @@
"dev": true,
"optional": true,
"requires": {
- "assert-plus": "0.2.0",
- "jsprim": "1.4.0",
- "sshpk": "1.13.0"
+ "assert-plus": "^0.2.0",
+ "jsprim": "^1.2.2",
+ "sshpk": "^1.7.0"
}
},
"inflight": {
@@ -3039,8 +3032,8 @@
"bundled": true,
"dev": true,
"requires": {
- "once": "1.4.0",
- "wrappy": "1.0.2"
+ "once": "^1.3.0",
+ "wrappy": "1"
}
},
"inherits": {
@@ -3085,7 +3078,7 @@
"dev": true,
"optional": true,
"requires": {
- "jsbn": "0.1.1"
+ "jsbn": "~0.1.0"
}
},
"jsbn": {
@@ -3106,7 +3099,7 @@
"dev": true,
"optional": true,
"requires": {
- "jsonify": "0.0.0"
+ "jsonify": "~0.0.0"
}
},
"json-stringify-safe": {
@@ -3187,15 +3180,15 @@
"dev": true,
"optional": true,
"requires": {
- "mkdirp": "0.5.1",
- "nopt": "4.0.1",
- "npmlog": "4.1.0",
- "rc": "1.2.1",
- "request": "2.81.0",
- "rimraf": "2.6.1",
- "semver": "5.3.0",
- "tar": "2.2.1",
- "tar-pack": "3.4.0"
+ "mkdirp": "^0.5.1",
+ "nopt": "^4.0.1",
+ "npmlog": "^4.0.2",
+ "rc": "^1.1.7",
+ "request": "^2.81.0",
+ "rimraf": "^2.6.1",
+ "semver": "^5.3.0",
+ "tar": "^2.2.1",
+ "tar-pack": "^3.4.0"
}
},
"nopt": {
@@ -3214,10 +3207,10 @@
"dev": true,
"optional": true,
"requires": {
- "are-we-there-yet": "1.1.4",
- "console-control-strings": "1.1.0",
- "gauge": "2.7.4",
- "set-blocking": "2.0.0"
+ "are-we-there-yet": "~1.1.2",
+ "console-control-strings": "~1.1.0",
+ "gauge": "~2.7.3",
+ "set-blocking": "~2.0.0"
}
},
"number-is-nan": {
@@ -3242,7 +3235,7 @@
"bundled": true,
"dev": true,
"requires": {
- "wrappy": "1.0.2"
+ "wrappy": "1"
}
},
"os-homedir": {
@@ -3320,13 +3313,13 @@
"bundled": true,
"dev": true,
"requires": {
- "buffer-shims": "1.0.0",
- "core-util-is": "1.0.2",
- "inherits": "2.0.3",
- "isarray": "1.0.0",
- "process-nextick-args": "1.0.7",
- "string_decoder": "1.0.1",
- "util-deprecate": "1.0.2"
+ "buffer-shims": "~1.0.0",
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.1",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~1.0.6",
+ "string_decoder": "~1.0.0",
+ "util-deprecate": "~1.0.1"
}
},
"request": {
@@ -3335,28 +3328,28 @@
"dev": true,
"optional": true,
"requires": {
- "aws-sign2": "0.6.0",
- "aws4": "1.6.0",
- "caseless": "0.12.0",
- "combined-stream": "1.0.5",
- "extend": "3.0.1",
- "forever-agent": "0.6.1",
- "form-data": "2.1.4",
- "har-validator": "4.2.1",
- "hawk": "3.1.3",
- "http-signature": "1.1.1",
- "is-typedarray": "1.0.0",
- "isstream": "0.1.2",
- "json-stringify-safe": "5.0.1",
- "mime-types": "2.1.15",
- "oauth-sign": "0.8.2",
- "performance-now": "0.2.0",
- "qs": "6.4.0",
- "safe-buffer": "5.0.1",
- "stringstream": "0.0.5",
- "tough-cookie": "2.3.2",
- "tunnel-agent": "0.6.0",
- "uuid": "3.0.1"
+ "aws-sign2": "~0.6.0",
+ "aws4": "^1.2.1",
+ "caseless": "~0.12.0",
+ "combined-stream": "~1.0.5",
+ "extend": "~3.0.0",
+ "forever-agent": "~0.6.1",
+ "form-data": "~2.1.1",
+ "har-validator": "~4.2.1",
+ "hawk": "~3.1.3",
+ "http-signature": "~1.1.0",
+ "is-typedarray": "~1.0.0",
+ "isstream": "~0.1.2",
+ "json-stringify-safe": "~5.0.1",
+ "mime-types": "~2.1.7",
+ "oauth-sign": "~0.8.1",
+ "performance-now": "^0.2.0",
+ "qs": "~6.4.0",
+ "safe-buffer": "^5.0.1",
+ "stringstream": "~0.0.4",
+ "tough-cookie": "~2.3.0",
+ "tunnel-agent": "^0.6.0",
+ "uuid": "^3.0.0"
}
},
"rimraf": {
@@ -3364,7 +3357,7 @@
"bundled": true,
"dev": true,
"requires": {
- "glob": "7.1.2"
+ "glob": "^7.0.5"
}
},
"safe-buffer": {
@@ -3405,15 +3398,15 @@
"dev": true,
"optional": true,
"requires": {
- "asn1": "0.2.3",
- "assert-plus": "1.0.0",
- "bcrypt-pbkdf": "1.0.1",
- "dashdash": "1.14.1",
- "ecc-jsbn": "0.1.1",
- "getpass": "0.1.7",
- "jodid25519": "1.0.2",
- "jsbn": "0.1.1",
- "tweetnacl": "0.14.5"
+ "asn1": "~0.2.3",
+ "assert-plus": "^1.0.0",
+ "bcrypt-pbkdf": "^1.0.0",
+ "dashdash": "^1.12.0",
+ "ecc-jsbn": "~0.1.1",
+ "getpass": "^0.1.1",
+ "jodid25519": "^1.0.0",
+ "jsbn": "~0.1.0",
+ "tweetnacl": "~0.14.0"
},
"dependencies": {
"assert-plus": {
@@ -3467,9 +3460,9 @@
"bundled": true,
"dev": true,
"requires": {
- "block-stream": "0.0.9",
- "fstream": "1.0.11",
- "inherits": "2.0.3"
+ "block-stream": "*",
+ "fstream": "^1.0.2",
+ "inherits": "2"
}
},
"tar-pack": {
@@ -3478,14 +3471,14 @@
"dev": true,
"optional": true,
"requires": {
- "debug": "2.6.8",
- "fstream": "1.0.11",
- "fstream-ignore": "1.0.5",
- "once": "1.4.0",
- "readable-stream": "2.2.9",
- "rimraf": "2.6.1",
- "tar": "2.2.1",
- "uid-number": "0.0.6"
+ "debug": "^2.2.0",
+ "fstream": "^1.0.10",
+ "fstream-ignore": "^1.0.5",
+ "once": "^1.3.3",
+ "readable-stream": "^2.1.4",
+ "rimraf": "^2.5.1",
+ "tar": "^2.2.1",
+ "uid-number": "^0.0.6"
}
},
"tough-cookie": {
@@ -3544,7 +3537,7 @@
"dev": true,
"optional": true,
"requires": {
- "string-width": "1.0.2"
+ "string-width": "^1.0.2"
}
},
"wrappy": {
@@ -3566,7 +3559,8 @@
"integrity": "sha1-luQg/efvARrEnCWKYhMU/ldlNvk="
},
"gemini-scrollbar": {
- "version": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
+ "version": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b",
+ "from": "gemini-scrollbar@github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
},
"generate-function": {
"version": "2.0.0",
@@ -3580,7 +3574,7 @@
"integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
"dev": true,
"requires": {
- "is-property": "1.0.2"
+ "is-property": "^1.0.0"
}
},
"getpass": {
@@ -3588,7 +3582,7 @@
"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
"requires": {
- "assert-plus": "1.0.0"
+ "assert-plus": "^1.0.0"
}
},
"gfm.css": {
@@ -3601,11 +3595,11 @@
"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
"integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
"requires": {
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "3.0.4",
- "once": "1.4.0",
- "path-is-absolute": "1.0.1"
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "2 || 3",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
}
},
"glob-base": {
@@ -3614,8 +3608,8 @@
"integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
"dev": true,
"requires": {
- "glob-parent": "2.0.0",
- "is-glob": "2.0.1"
+ "glob-parent": "^2.0.0",
+ "is-glob": "^2.0.0"
}
},
"glob-parent": {
@@ -3624,7 +3618,7 @@
"integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
"dev": true,
"requires": {
- "is-glob": "2.0.1"
+ "is-glob": "^2.0.0"
}
},
"globals": {
@@ -3639,12 +3633,12 @@
"integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
"dev": true,
"requires": {
- "array-union": "1.0.2",
- "arrify": "1.0.1",
- "glob": "7.1.2",
- "object-assign": "4.1.1",
- "pify": "2.3.0",
- "pinkie-promise": "2.0.1"
+ "array-union": "^1.0.1",
+ "arrify": "^1.0.0",
+ "glob": "^7.0.3",
+ "object-assign": "^4.0.1",
+ "pify": "^2.0.0",
+ "pinkie-promise": "^2.0.0"
},
"dependencies": {
"glob": {
@@ -3653,12 +3647,12 @@
"integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
"dev": true,
"requires": {
- "fs.realpath": "1.0.0",
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "3.0.4",
- "once": "1.4.0",
- "path-is-absolute": "1.0.1"
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
}
}
}
@@ -3679,8 +3673,8 @@
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
"integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
"requires": {
- "ajv": "5.2.3",
- "har-schema": "2.0.0"
+ "ajv": "^5.1.0",
+ "har-schema": "^2.0.0"
}
},
"has": {
@@ -3689,7 +3683,7 @@
"integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
"dev": true,
"requires": {
- "function-bind": "1.1.1"
+ "function-bind": "^1.0.2"
}
},
"has-ansi": {
@@ -3698,7 +3692,7 @@
"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
"dev": true,
"requires": {
- "ansi-regex": "2.1.1"
+ "ansi-regex": "^2.0.0"
}
},
"has-binary": {
@@ -3730,16 +3724,6 @@
"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
"dev": true
},
- "hawk": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
- "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
- "requires": {
- "boom": "4.3.1",
- "cryptiles": "3.1.2",
- "sntp": "2.0.2"
- }
- },
"he": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
@@ -3762,8 +3746,8 @@
"integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
"dev": true,
"requires": {
- "os-homedir": "1.0.2",
- "os-tmpdir": "1.0.2"
+ "os-homedir": "^1.0.0",
+ "os-tmpdir": "^1.0.1"
}
},
"htmlparser2": {
@@ -3771,12 +3755,12 @@
"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
"integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
"requires": {
- "domelementtype": "1.3.0",
- "domhandler": "2.4.1",
- "domutils": "1.6.2",
- "entities": "1.1.1",
- "inherits": "2.0.3",
- "readable-stream": "2.3.3"
+ "domelementtype": "^1.3.0",
+ "domhandler": "^2.3.0",
+ "domutils": "^1.5.1",
+ "entities": "^1.1.1",
+ "inherits": "^2.0.1",
+ "readable-stream": "^2.0.2"
}
},
"http-errors": {
@@ -3788,7 +3772,7 @@
"depd": "1.1.1",
"inherits": "2.0.3",
"setprototypeof": "1.0.3",
- "statuses": "1.3.1"
+ "statuses": ">= 1.3.1 < 2"
}
},
"http-proxy": {
@@ -3797,8 +3781,8 @@
"integrity": "sha1-Bt/ykpUr9k2+hHH6nfcwZtTzd0I=",
"dev": true,
"requires": {
- "eventemitter3": "1.2.0",
- "requires-port": "1.0.0"
+ "eventemitter3": "1.x.x",
+ "requires-port": "1.x.x"
}
},
"http-signature": {
@@ -3806,9 +3790,9 @@
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
"requires": {
- "assert-plus": "1.0.0",
- "jsprim": "1.4.1",
- "sshpk": "1.13.1"
+ "assert-plus": "^1.0.0",
+ "jsprim": "^1.2.2",
+ "sshpk": "^1.7.0"
}
},
"https-browserify": {
@@ -3855,8 +3839,8 @@
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
"requires": {
- "once": "1.4.0",
- "wrappy": "1.0.2"
+ "once": "^1.3.0",
+ "wrappy": "1"
}
},
"inherits": {
@@ -3870,19 +3854,19 @@
"integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
"dev": true,
"requires": {
- "ansi-escapes": "1.4.0",
- "ansi-regex": "2.1.1",
- "chalk": "1.1.3",
- "cli-cursor": "1.0.2",
- "cli-width": "2.2.0",
- "figures": "1.7.0",
- "lodash": "4.17.4",
- "readline2": "1.0.1",
- "run-async": "0.1.0",
- "rx-lite": "3.1.2",
- "string-width": "1.0.2",
- "strip-ansi": "3.0.1",
- "through": "2.3.8"
+ "ansi-escapes": "^1.1.0",
+ "ansi-regex": "^2.0.0",
+ "chalk": "^1.0.0",
+ "cli-cursor": "^1.0.1",
+ "cli-width": "^2.0.0",
+ "figures": "^1.3.5",
+ "lodash": "^4.3.0",
+ "readline2": "^1.0.1",
+ "run-async": "^0.1.0",
+ "rx-lite": "^3.1.2",
+ "string-width": "^1.0.1",
+ "strip-ansi": "^3.0.0",
+ "through": "^2.3.6"
}
},
"interpret": {
@@ -3896,7 +3880,7 @@
"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
"integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
"requires": {
- "loose-envify": "1.3.1"
+ "loose-envify": "^1.0.0"
}
},
"is-arrow-function": {
@@ -3905,7 +3889,7 @@
"integrity": "sha1-Kb4sLY2UUIUri7r7Y1unuNjofsI=",
"dev": true,
"requires": {
- "is-callable": "1.1.3"
+ "is-callable": "^1.0.4"
}
},
"is-binary-path": {
@@ -3914,7 +3898,7 @@
"integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
"dev": true,
"requires": {
- "binary-extensions": "1.10.0"
+ "binary-extensions": "^1.0.0"
}
},
"is-boolean-object": {
@@ -3953,17 +3937,17 @@
"integrity": "sha1-XoXxlX4FKIMkf+s4aWWju6Ffuz0=",
"dev": true,
"requires": {
- "has": "1.0.1",
- "is-arrow-function": "2.0.3",
- "is-boolean-object": "1.0.0",
- "is-callable": "1.1.3",
- "is-date-object": "1.0.1",
- "is-generator-function": "1.0.6",
- "is-number-object": "1.0.3",
- "is-regex": "1.0.4",
- "is-string": "1.0.4",
- "is-symbol": "1.0.1",
- "object.entries": "1.0.4"
+ "has": "^1.0.1",
+ "is-arrow-function": "^2.0.3",
+ "is-boolean-object": "^1.0.0",
+ "is-callable": "^1.1.3",
+ "is-date-object": "^1.0.1",
+ "is-generator-function": "^1.0.6",
+ "is-number-object": "^1.0.3",
+ "is-regex": "^1.0.3",
+ "is-string": "^1.0.4",
+ "is-symbol": "^1.0.1",
+ "object.entries": "^1.0.4"
}
},
"is-equal-shallow": {
@@ -3972,7 +3956,7 @@
"integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
"dev": true,
"requires": {
- "is-primitive": "2.0.0"
+ "is-primitive": "^2.0.0"
}
},
"is-extendable": {
@@ -3993,7 +3977,7 @@
"integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
"dev": true,
"requires": {
- "number-is-nan": "1.0.1"
+ "number-is-nan": "^1.0.0"
}
},
"is-fullwidth-code-point": {
@@ -4002,7 +3986,7 @@
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"dev": true,
"requires": {
- "number-is-nan": "1.0.1"
+ "number-is-nan": "^1.0.0"
}
},
"is-generator-function": {
@@ -4017,7 +4001,7 @@
"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
"dev": true,
"requires": {
- "is-extglob": "1.0.0"
+ "is-extglob": "^1.0.0"
}
},
"is-my-json-valid": {
@@ -4026,10 +4010,10 @@
"integrity": "sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==",
"dev": true,
"requires": {
- "generate-function": "2.0.0",
- "generate-object-property": "1.2.0",
- "jsonpointer": "4.0.1",
- "xtend": "4.0.1"
+ "generate-function": "^2.0.0",
+ "generate-object-property": "^1.1.0",
+ "jsonpointer": "^4.0.0",
+ "xtend": "^4.0.0"
}
},
"is-number": {
@@ -4038,7 +4022,7 @@
"integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
}
},
"is-number-object": {
@@ -4059,7 +4043,7 @@
"integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
"dev": true,
"requires": {
- "is-path-inside": "1.0.0"
+ "is-path-inside": "^1.0.0"
}
},
"is-path-inside": {
@@ -4068,7 +4052,7 @@
"integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=",
"dev": true,
"requires": {
- "path-is-inside": "1.0.2"
+ "path-is-inside": "^1.0.1"
}
},
"is-posix-bracket": {
@@ -4095,7 +4079,7 @@
"integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
"dev": true,
"requires": {
- "has": "1.0.1"
+ "has": "^1.0.1"
}
},
"is-resolvable": {
@@ -4104,7 +4088,7 @@
"integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=",
"dev": true,
"requires": {
- "tryit": "1.0.3"
+ "tryit": "^1.0.1"
}
},
"is-stream": {
@@ -4160,8 +4144,8 @@
"resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
"integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
"requires": {
- "node-fetch": "1.7.3",
- "whatwg-fetch": "1.1.1"
+ "node-fetch": "^1.0.1",
+ "whatwg-fetch": ">=0.10.0"
}
},
"isstream": {
@@ -4185,8 +4169,8 @@
"integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
"dev": true,
"requires": {
- "argparse": "1.0.9",
- "esprima": "4.0.0"
+ "argparse": "^1.0.7",
+ "esprima": "^4.0.0"
}
},
"jsbn": {
@@ -4221,8 +4205,9 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
"integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+ "dev": true,
"requires": {
- "jsonify": "0.0.0"
+ "jsonify": "~0.0.0"
}
},
"json-stringify-safe": {
@@ -4245,7 +4230,8 @@
"jsonify": {
"version": "0.0.0",
"resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
- "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
+ "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+ "dev": true
},
"jsonpointer": {
"version": "4.0.1",
@@ -4270,42 +4256,48 @@
"integrity": "sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=",
"dev": true,
"requires": {
- "array-includes": "3.0.3"
+ "array-includes": "^3.0.3"
}
},
+ "just-extend": {
+ "version": "1.1.27",
+ "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz",
+ "integrity": "sha512-mJVp13Ix6gFo3SBAy9U/kL+oeZqzlYYYLQBwXVBlVzIsZwBqGREnOro24oC/8s8aox+rJhtZ2DiQof++IrkA+g==",
+ "dev": true
+ },
"karma": {
"version": "1.7.1",
"resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz",
"integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==",
"dev": true,
"requires": {
- "bluebird": "3.5.1",
- "body-parser": "1.18.2",
- "chokidar": "1.7.0",
- "colors": "1.1.2",
- "combine-lists": "1.0.1",
- "connect": "3.6.5",
- "core-js": "2.5.1",
- "di": "0.0.1",
- "dom-serialize": "2.2.1",
- "expand-braces": "0.1.2",
- "glob": "7.1.2",
- "graceful-fs": "4.1.11",
- "http-proxy": "1.16.2",
- "isbinaryfile": "3.0.2",
- "lodash": "3.10.1",
- "log4js": "0.6.38",
- "mime": "1.4.1",
- "minimatch": "3.0.4",
- "optimist": "0.6.1",
- "qjobs": "1.1.5",
- "range-parser": "1.2.0",
- "rimraf": "2.6.2",
- "safe-buffer": "5.1.1",
+ "bluebird": "^3.3.0",
+ "body-parser": "^1.16.1",
+ "chokidar": "^1.4.1",
+ "colors": "^1.1.0",
+ "combine-lists": "^1.0.0",
+ "connect": "^3.6.0",
+ "core-js": "^2.2.0",
+ "di": "^0.0.1",
+ "dom-serialize": "^2.2.0",
+ "expand-braces": "^0.1.1",
+ "glob": "^7.1.1",
+ "graceful-fs": "^4.1.2",
+ "http-proxy": "^1.13.0",
+ "isbinaryfile": "^3.0.0",
+ "lodash": "^3.8.0",
+ "log4js": "^0.6.31",
+ "mime": "^1.3.4",
+ "minimatch": "^3.0.2",
+ "optimist": "^0.6.1",
+ "qjobs": "^1.1.4",
+ "range-parser": "^1.2.0",
+ "rimraf": "^2.6.0",
+ "safe-buffer": "^5.0.1",
"socket.io": "1.7.3",
- "source-map": "0.5.7",
+ "source-map": "^0.5.3",
"tmp": "0.0.31",
- "useragent": "2.2.1"
+ "useragent": "^2.1.12"
},
"dependencies": {
"glob": {
@@ -4314,12 +4306,12 @@
"integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
"dev": true,
"requires": {
- "fs.realpath": "1.0.0",
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "3.0.4",
- "once": "1.4.0",
- "path-is-absolute": "1.0.1"
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
}
},
"lodash": {
@@ -4336,8 +4328,8 @@
"integrity": "sha1-TG1wDRY6nTTGGO/YeRi+SeekqMk=",
"dev": true,
"requires": {
- "fs-access": "1.0.1",
- "which": "1.3.0"
+ "fs-access": "^1.0.0",
+ "which": "^1.2.1"
}
},
"karma-cli": {
@@ -4346,7 +4338,7 @@
"integrity": "sha1-ys6oQ3Hs4Zh2JlyPoQLru5/uSow=",
"dev": true,
"requires": {
- "resolve": "1.4.0"
+ "resolve": "^1.1.6"
}
},
"karma-junit-reporter": {
@@ -4355,7 +4347,7 @@
"integrity": "sha1-SSojZyj+TJKqz0GfzQEQpDJ+nX8=",
"dev": true,
"requires": {
- "path-is-absolute": "1.0.1",
+ "path-is-absolute": "^1.0.0",
"xmlbuilder": "3.1.0"
}
},
@@ -4377,7 +4369,7 @@
"integrity": "sha1-kTIsd/jxPUb+0GKwQuEAnUxFBdg=",
"dev": true,
"requires": {
- "graceful-fs": "4.1.11"
+ "graceful-fs": "^4.1.2"
}
},
"karma-spec-reporter": {
@@ -4386,7 +4378,7 @@
"integrity": "sha1-SDDccUihVcfXoYbmMjOaDYD63sM=",
"dev": true,
"requires": {
- "colors": "1.1.2"
+ "colors": "^1.1.2"
}
},
"karma-summary-reporter": {
@@ -4395,7 +4387,7 @@
"integrity": "sha1-nHQKJLYL+RNes59acylsTM0Q2Zs=",
"dev": true,
"requires": {
- "chalk": "1.1.3"
+ "chalk": "^1.1.3"
}
},
"karma-webpack": {
@@ -4404,11 +4396,11 @@
"integrity": "sha1-OdX9Lt7qPMPvW0BZibN9Ww5qO04=",
"dev": true,
"requires": {
- "async": "0.9.2",
- "loader-utils": "0.2.17",
- "lodash": "3.10.1",
- "source-map": "0.1.43",
- "webpack-dev-middleware": "1.12.0"
+ "async": "~0.9.0",
+ "loader-utils": "^0.2.5",
+ "lodash": "^3.8.0",
+ "source-map": "^0.1.41",
+ "webpack-dev-middleware": "^1.0.11"
},
"dependencies": {
"lodash": {
@@ -4423,7 +4415,7 @@
"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
"dev": true,
"requires": {
- "amdefine": "1.0.1"
+ "amdefine": ">=0.0.4"
}
}
}
@@ -4434,7 +4426,7 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
"requires": {
- "is-buffer": "1.1.5"
+ "is-buffer": "^1.1.5"
}
},
"lazy-cache": {
@@ -4449,8 +4441,8 @@
"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
"dev": true,
"requires": {
- "prelude-ls": "1.1.2",
- "type-check": "0.3.2"
+ "prelude-ls": "~1.1.2",
+ "type-check": "~0.3.2"
}
},
"linkifyjs": {
@@ -4458,9 +4450,9 @@
"resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-2.1.5.tgz",
"integrity": "sha512-8FqxPXQDLjI2nNHlM7eGewxE6DHvMbtiW0AiXzm0s4RkTwVZYRDTeVXkiRxLHTd4CuRBQY/JPtvtqJWdS7gHyA==",
"requires": {
- "jquery": "3.2.1",
- "react": "15.6.2",
- "react-dom": "15.6.2"
+ "jquery": ">=1.9.0",
+ "react": ">=0.14.0",
+ "react-dom": ">=0.14.0"
}
},
"loader-utils": {
@@ -4469,10 +4461,10 @@
"integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
"dev": true,
"requires": {
- "big.js": "3.2.0",
- "emojis-list": "2.1.0",
- "json5": "0.5.1",
- "object-assign": "4.1.1"
+ "big.js": "^3.1.3",
+ "emojis-list": "^2.0.0",
+ "json5": "^0.5.0",
+ "object-assign": "^4.0.1"
}
},
"lodash": {
@@ -4491,6 +4483,12 @@
"integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
"dev": true
},
+ "lodash.get": {
+ "version": "4.4.2",
+ "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+ "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+ "dev": true
+ },
"lodash.pickby": {
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz",
@@ -4503,8 +4501,8 @@
"integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=",
"dev": true,
"requires": {
- "readable-stream": "1.0.34",
- "semver": "4.3.6"
+ "readable-stream": "~1.0.2",
+ "semver": "~4.3.3"
},
"dependencies": {
"isarray": {
@@ -4519,10 +4517,10 @@
"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
"dev": true,
"requires": {
- "core-util-is": "1.0.2",
- "inherits": "2.0.3",
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.1",
"isarray": "0.0.1",
- "string_decoder": "0.10.31"
+ "string_decoder": "~0.10.x"
}
},
"string_decoder": {
@@ -4534,10 +4532,9 @@
}
},
"lolex": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.3.2.tgz",
- "integrity": "sha1-fD2mL/yzDw9agKJWbKJORdigHzE=",
- "dev": true
+ "version": "2.3.2",
+ "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz",
+ "integrity": "sha512-A5pN2tkFj7H0dGIAM6MFvHKMJcPnjZsOMvR7ujCjfgW5TbV6H9vb1PgxLtHvjqNZTHsUolz+6/WEO0N1xNx2ng=="
},
"longest": {
"version": "1.0.1",
@@ -4550,7 +4547,7 @@
"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
"integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
"requires": {
- "js-tokens": "3.0.2"
+ "js-tokens": "^3.0.0"
}
},
"lru-cache": {
@@ -4560,16 +4557,16 @@
"dev": true
},
"matrix-js-sdk": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.10.1.tgz",
- "integrity": "sha512-BLo+Okn2o///TyWBKtjFXvhlD32vGfr10eTE51hHx/jwaXO82VyGMzMi+IDPS4SDYUbvXI7PpamECeh9TXnV2w==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.10.2.tgz",
+ "integrity": "sha512-7o9a+4wWmxoW4cfdGVLGjZgTFLpWf/I0UqyicIzdV73qotYIO/q6k1bLf1+G0hgwZ/umwke4CB7GemxvvvxMcA==",
"requires": {
- "another-json": "0.2.0",
- "babel-runtime": "6.26.0",
- "bluebird": "3.5.1",
- "browser-request": "0.3.3",
- "content-type": "1.0.4",
- "request": "2.83.0"
+ "another-json": "^0.2.0",
+ "babel-runtime": "^6.26.0",
+ "bluebird": "^3.5.0",
+ "browser-request": "^0.3.3",
+ "content-type": "^1.0.2",
+ "request": "^2.53.0"
}
},
"matrix-mock-request": {
@@ -4578,8 +4575,8 @@
"integrity": "sha1-2aWrqNPYJG6I/3YyWYuZwUE/QjI=",
"dev": true,
"requires": {
- "bluebird": "3.5.1",
- "expect": "1.20.2"
+ "bluebird": "^3.5.0",
+ "expect": "^1.20.2"
}
},
"matrix-react-test-utils": {
@@ -4588,8 +4585,8 @@
"integrity": "sha1-tUiETQ6+M46hucjxZHTDDRfDvfQ=",
"dev": true,
"requires": {
- "react": "15.6.2",
- "react-dom": "15.6.2"
+ "react": "^15.6.1",
+ "react-dom": "^15.6.1"
}
},
"mdurl": {
@@ -4614,8 +4611,8 @@
"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
"dev": true,
"requires": {
- "errno": "0.1.4",
- "readable-stream": "2.3.3"
+ "errno": "^0.1.3",
+ "readable-stream": "^2.0.1"
}
},
"micromatch": {
@@ -4624,19 +4621,19 @@
"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
"dev": true,
"requires": {
- "arr-diff": "2.0.0",
- "array-unique": "0.2.1",
- "braces": "1.8.5",
- "expand-brackets": "0.1.5",
- "extglob": "0.3.2",
- "filename-regex": "2.0.1",
- "is-extglob": "1.0.0",
- "is-glob": "2.0.1",
- "kind-of": "3.2.2",
- "normalize-path": "2.1.1",
- "object.omit": "2.0.1",
- "parse-glob": "3.0.4",
- "regex-cache": "0.4.4"
+ "arr-diff": "^2.0.0",
+ "array-unique": "^0.2.1",
+ "braces": "^1.8.2",
+ "expand-brackets": "^0.1.4",
+ "extglob": "^0.3.1",
+ "filename-regex": "^2.0.0",
+ "is-extglob": "^1.0.0",
+ "is-glob": "^2.0.1",
+ "kind-of": "^3.0.2",
+ "normalize-path": "^2.0.1",
+ "object.omit": "^2.0.0",
+ "parse-glob": "^3.0.4",
+ "regex-cache": "^0.4.2"
}
},
"mime": {
@@ -4655,7 +4652,7 @@
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
"integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
"requires": {
- "mime-db": "1.30.0"
+ "mime-db": "~1.30.0"
}
},
"minimatch": {
@@ -4663,7 +4660,7 @@
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
"requires": {
- "brace-expansion": "1.1.8"
+ "brace-expansion": "^1.1.7"
}
},
"minimist": {
@@ -4728,12 +4725,12 @@
"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
"dev": true,
"requires": {
- "fs.realpath": "1.0.0",
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "3.0.4",
- "once": "1.4.0",
- "path-is-absolute": "1.0.1"
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
}
},
"growl": {
@@ -4754,7 +4751,7 @@
"integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
"dev": true,
"requires": {
- "has-flag": "2.0.0"
+ "has-flag": "^2.0.0"
}
}
}
@@ -4790,13 +4787,34 @@
"integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
"dev": true
},
+ "nise": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/nise/-/nise-1.3.3.tgz",
+ "integrity": "sha512-v1J/FLUB9PfGqZLGDBhQqODkbLotP0WtLo9R4EJY2PPu5f5Xg4o0rA8FDlmrjFSv9vBBKcfnOSpfYYuu5RTHqg==",
+ "dev": true,
+ "requires": {
+ "@sinonjs/formatio": "^2.0.0",
+ "just-extend": "^1.1.27",
+ "lolex": "^2.3.2",
+ "path-to-regexp": "^1.7.0",
+ "text-encoding": "^0.6.4"
+ },
+ "dependencies": {
+ "lolex": {
+ "version": "2.6.0",
+ "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.6.0.tgz",
+ "integrity": "sha512-e1UtIo1pbrIqEXib/yMjHciyqkng5lc0rrIbytgjmRgDR9+2ceNIAcwOWSgylRjoEP9VdVguCSRwnNmlbnOUwA==",
+ "dev": true
+ }
+ }
+ },
"node-fetch": {
"version": "1.7.3",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
"integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
"requires": {
- "encoding": "0.1.12",
- "is-stream": "1.1.0"
+ "encoding": "^0.1.11",
+ "is-stream": "^1.0.1"
}
},
"node-libs-browser": {
@@ -4805,28 +4823,28 @@
"integrity": "sha1-PicsCBnjCJNeJmdECNevDhSRuDs=",
"dev": true,
"requires": {
- "assert": "1.4.1",
- "browserify-zlib": "0.1.4",
- "buffer": "4.9.1",
- "console-browserify": "1.1.0",
- "constants-browserify": "1.0.0",
+ "assert": "^1.1.1",
+ "browserify-zlib": "^0.1.4",
+ "buffer": "^4.9.0",
+ "console-browserify": "^1.1.0",
+ "constants-browserify": "^1.0.0",
"crypto-browserify": "3.3.0",
- "domain-browser": "1.1.7",
- "events": "1.1.1",
+ "domain-browser": "^1.1.1",
+ "events": "^1.0.0",
"https-browserify": "0.0.1",
- "os-browserify": "0.2.1",
+ "os-browserify": "^0.2.0",
"path-browserify": "0.0.0",
- "process": "0.11.10",
- "punycode": "1.4.1",
- "querystring-es3": "0.2.1",
- "readable-stream": "2.3.3",
- "stream-browserify": "2.0.1",
- "stream-http": "2.7.2",
- "string_decoder": "0.10.31",
- "timers-browserify": "2.0.4",
+ "process": "^0.11.0",
+ "punycode": "^1.2.4",
+ "querystring-es3": "^0.2.0",
+ "readable-stream": "^2.0.5",
+ "stream-browserify": "^2.0.1",
+ "stream-http": "^2.3.1",
+ "string_decoder": "^0.10.25",
+ "timers-browserify": "^2.0.2",
"tty-browserify": "0.0.0",
- "url": "0.11.0",
- "util": "0.10.3",
+ "url": "^0.11.0",
+ "util": "^0.10.3",
"vm-browserify": "0.0.4"
},
"dependencies": {
@@ -4844,7 +4862,7 @@
"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
"dev": true,
"requires": {
- "remove-trailing-separator": "1.1.0"
+ "remove-trailing-separator": "^1.0.1"
}
},
"null-check": {
@@ -4893,10 +4911,10 @@
"integrity": "sha1-G/mk3SKI9bM/Opk9JXZh8F0WGl8=",
"dev": true,
"requires": {
- "define-properties": "1.1.2",
- "es-abstract": "1.9.0",
- "function-bind": "1.1.1",
- "has": "1.0.1"
+ "define-properties": "^1.1.2",
+ "es-abstract": "^1.6.1",
+ "function-bind": "^1.1.0",
+ "has": "^1.0.1"
}
},
"object.omit": {
@@ -4905,8 +4923,8 @@
"integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
"dev": true,
"requires": {
- "for-own": "0.1.5",
- "is-extendable": "0.1.1"
+ "for-own": "^0.1.4",
+ "is-extendable": "^0.1.1"
}
},
"on-finished": {
@@ -4923,7 +4941,7 @@
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"requires": {
- "wrappy": "1.0.2"
+ "wrappy": "1"
}
},
"onetime": {
@@ -4937,8 +4955,8 @@
"resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
"integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
"requires": {
- "minimist": "0.0.10",
- "wordwrap": "0.0.3"
+ "minimist": "~0.0.1",
+ "wordwrap": "~0.0.2"
},
"dependencies": {
"minimist": {
@@ -4954,12 +4972,12 @@
"integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
"dev": true,
"requires": {
- "deep-is": "0.1.3",
- "fast-levenshtein": "2.0.6",
- "levn": "0.3.0",
- "prelude-ls": "1.1.2",
- "type-check": "0.3.2",
- "wordwrap": "1.0.0"
+ "deep-is": "~0.1.3",
+ "fast-levenshtein": "~2.0.4",
+ "levn": "~0.3.0",
+ "prelude-ls": "~1.1.2",
+ "type-check": "~0.3.2",
+ "wordwrap": "~1.0.0"
},
"dependencies": {
"wordwrap": {
@@ -5000,9 +5018,9 @@
"integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=",
"dev": true,
"requires": {
- "graceful-fs": "4.1.11",
- "mkdirp": "0.5.1",
- "object-assign": "4.1.1"
+ "graceful-fs": "^4.1.4",
+ "mkdirp": "^0.5.1",
+ "object-assign": "^4.1.0"
}
},
"pako": {
@@ -5022,10 +5040,10 @@
"integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
"dev": true,
"requires": {
- "glob-base": "0.3.0",
- "is-dotfile": "1.0.3",
- "is-extglob": "1.0.0",
- "is-glob": "2.0.1"
+ "glob-base": "^0.3.0",
+ "is-dotfile": "^1.0.0",
+ "is-extglob": "^1.0.0",
+ "is-glob": "^2.0.0"
}
},
"parsejson": {
@@ -5034,7 +5052,7 @@
"integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=",
"dev": true,
"requires": {
- "better-assert": "1.0.2"
+ "better-assert": "~1.0.0"
}
},
"parseqs": {
@@ -5043,7 +5061,7 @@
"integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
"dev": true,
"requires": {
- "better-assert": "1.0.2"
+ "better-assert": "~1.0.0"
}
},
"parseuri": {
@@ -5052,7 +5070,7 @@
"integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
"dev": true,
"requires": {
- "better-assert": "1.0.2"
+ "better-assert": "~1.0.0"
}
},
"parseurl": {
@@ -5073,7 +5091,7 @@
"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
"dev": true,
"requires": {
- "pinkie-promise": "2.0.1"
+ "pinkie-promise": "^2.0.0"
}
},
"path-is-absolute": {
@@ -5093,6 +5111,23 @@
"integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
"dev": true
},
+ "path-to-regexp": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
+ "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
+ "dev": true,
+ "requires": {
+ "isarray": "0.0.1"
+ },
+ "dependencies": {
+ "isarray": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+ "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+ "dev": true
+ }
+ }
+ },
"pbkdf2-compat": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz",
@@ -5122,7 +5157,7 @@
"integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
"dev": true,
"requires": {
- "pinkie": "2.0.4"
+ "pinkie": "^2.0.0"
}
},
"pkg-dir": {
@@ -5131,7 +5166,7 @@
"integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
"dev": true,
"requires": {
- "find-up": "1.1.2"
+ "find-up": "^1.0.0"
}
},
"pluralize": {
@@ -5185,7 +5220,7 @@
"resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
"integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
"requires": {
- "asap": "2.0.6"
+ "asap": "~2.0.3"
}
},
"prop-types": {
@@ -5193,9 +5228,9 @@
"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz",
"integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=",
"requires": {
- "fbjs": "0.8.16",
- "loose-envify": "1.3.1",
- "object-assign": "4.1.1"
+ "fbjs": "^0.8.16",
+ "loose-envify": "^1.3.1",
+ "object-assign": "^4.1.1"
}
},
"prr": {
@@ -5236,7 +5271,7 @@
"resolved": "https://registry.npmjs.org/raf/-/raf-3.4.0.tgz",
"integrity": "sha512-pDP/NMRAXoTfrhCfyfSEwJAKLaxBU9eApMeBPB1TkDouZmvPerIClV8lTAd+uF8ZiTaVl69e1FCxQrAd/VTjGw==",
"requires": {
- "performance-now": "2.1.0"
+ "performance-now": "^2.1.0"
}
},
"raf-schd": {
@@ -5250,8 +5285,8 @@
"integrity": "sha1-x6vpzIuHwLqodrGf3oP9RkeX44w=",
"dev": true,
"requires": {
- "is-number": "3.0.0",
- "kind-of": "4.0.0"
+ "is-number": "^3.0.0",
+ "kind-of": "^4.0.0"
},
"dependencies": {
"is-number": {
@@ -5260,7 +5295,7 @@
"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
@@ -5269,7 +5304,7 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
"requires": {
- "is-buffer": "1.1.5"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -5280,7 +5315,7 @@
"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
"dev": true,
"requires": {
- "is-buffer": "1.1.5"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -5308,11 +5343,11 @@
"resolved": "https://registry.npmjs.org/react/-/react-15.6.2.tgz",
"integrity": "sha1-26BDSrQ5z+gvEI8PURZjkIF5qnI=",
"requires": {
- "create-react-class": "15.6.2",
- "fbjs": "0.8.16",
- "loose-envify": "1.3.1",
- "object-assign": "4.1.1",
- "prop-types": "15.6.0"
+ "create-react-class": "^15.6.0",
+ "fbjs": "^0.8.9",
+ "loose-envify": "^1.1.0",
+ "object-assign": "^4.1.0",
+ "prop-types": "^15.5.10"
}
},
"react-addons-css-transition-group": {
@@ -5331,16 +5366,16 @@
"resolved": "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-4.0.1.tgz",
"integrity": "sha512-d73RMu4QOFCyjUELLWFyY/EuclnfqulI9pECx+2gIuJvV0ycf1uR88o+1x0RSB9ILD70inHMzCBKNkWVbbt+vA==",
"requires": {
- "babel-runtime": "6.26.0",
- "invariant": "2.2.2",
- "memoize-one": "3.1.1",
- "prop-types": "15.6.0",
- "raf-schd": "2.1.1",
- "react-motion": "0.5.2",
- "react-redux": "5.0.7",
- "redux": "3.7.2",
- "redux-thunk": "2.2.0",
- "reselect": "3.0.1"
+ "babel-runtime": "^6.26.0",
+ "invariant": "^2.2.2",
+ "memoize-one": "^3.0.1",
+ "prop-types": "^15.6.0",
+ "raf-schd": "^2.1.0",
+ "react-motion": "^0.5.2",
+ "react-redux": "^5.0.6",
+ "redux": "^3.7.2",
+ "redux-thunk": "^2.2.0",
+ "reselect": "^3.0.1"
}
},
"react-dom": {
@@ -5348,14 +5383,15 @@
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.2.tgz",
"integrity": "sha1-Qc+t9pO3V/rycIRDodH9WgK+9zA=",
"requires": {
- "fbjs": "0.8.16",
- "loose-envify": "1.3.1",
- "object-assign": "4.1.1",
- "prop-types": "15.6.0"
+ "fbjs": "^0.8.9",
+ "loose-envify": "^1.1.0",
+ "object-assign": "^4.1.0",
+ "prop-types": "^15.5.10"
}
},
"react-gemini-scrollbar": {
"version": "github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9",
+ "from": "react-gemini-scrollbar@github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9",
"requires": {
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
}
@@ -5365,9 +5401,9 @@
"resolved": "https://registry.npmjs.org/react-motion/-/react-motion-0.5.2.tgz",
"integrity": "sha512-9q3YAvHoUiWlP3cK0v+w1N5Z23HXMj4IF4YuvjvWegWqNPfLXsOBE/V7UvQGpXxHFKRQQcNcVQE31g9SB/6qgQ==",
"requires": {
- "performance-now": "0.2.0",
- "prop-types": "15.6.0",
- "raf": "3.4.0"
+ "performance-now": "^0.2.0",
+ "prop-types": "^15.5.8",
+ "raf": "^3.1.0"
},
"dependencies": {
"performance-now": {
@@ -5382,12 +5418,12 @@
"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.0.7.tgz",
"integrity": "sha512-5VI8EV5hdgNgyjfmWzBbdrqUkrVRKlyTKk1sGH3jzM2M2Mhj/seQgPXaz6gVAj2lz/nz688AdTqMO18Lr24Zhg==",
"requires": {
- "hoist-non-react-statics": "2.5.0",
- "invariant": "2.2.2",
- "lodash": "4.17.10",
- "lodash-es": "4.17.10",
- "loose-envify": "1.3.1",
- "prop-types": "15.6.0"
+ "hoist-non-react-statics": "^2.5.0",
+ "invariant": "^2.0.0",
+ "lodash": "^4.17.5",
+ "lodash-es": "^4.17.5",
+ "loose-envify": "^1.1.0",
+ "prop-types": "^15.6.0"
},
"dependencies": {
"lodash": {
@@ -5402,13 +5438,13 @@
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
"requires": {
- "core-util-is": "1.0.2",
- "inherits": "2.0.3",
- "isarray": "1.0.0",
- "process-nextick-args": "1.0.7",
- "safe-buffer": "5.1.1",
- "string_decoder": "1.0.3",
- "util-deprecate": "1.0.2"
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~1.0.6",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.0.3",
+ "util-deprecate": "~1.0.1"
}
},
"readdirp": {
@@ -5417,10 +5453,10 @@
"integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
"dev": true,
"requires": {
- "graceful-fs": "4.1.11",
- "minimatch": "3.0.4",
- "readable-stream": "2.3.3",
- "set-immediate-shim": "1.0.1"
+ "graceful-fs": "^4.1.2",
+ "minimatch": "^3.0.2",
+ "readable-stream": "^2.0.2",
+ "set-immediate-shim": "^1.0.1"
}
},
"readline2": {
@@ -5429,8 +5465,8 @@
"integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
"dev": true,
"requires": {
- "code-point-at": "1.1.0",
- "is-fullwidth-code-point": "1.0.0",
+ "code-point-at": "^1.0.0",
+ "is-fullwidth-code-point": "^1.0.0",
"mute-stream": "0.0.5"
}
},
@@ -5440,7 +5476,7 @@
"integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
"dev": true,
"requires": {
- "resolve": "1.4.0"
+ "resolve": "^1.1.6"
}
},
"redux": {
@@ -5448,10 +5484,10 @@
"resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz",
"integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==",
"requires": {
- "lodash": "4.17.4",
- "lodash-es": "4.17.10",
- "loose-envify": "1.3.1",
- "symbol-observable": "1.2.0"
+ "lodash": "^4.2.1",
+ "lodash-es": "^4.2.1",
+ "loose-envify": "^1.1.0",
+ "symbol-observable": "^1.0.3"
}
},
"redux-thunk": {
@@ -5476,9 +5512,9 @@
"integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
"dev": true,
"requires": {
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0",
- "private": "0.1.8"
+ "babel-runtime": "^6.18.0",
+ "babel-types": "^6.19.0",
+ "private": "^0.1.6"
}
},
"regex-cache": {
@@ -5487,7 +5523,7 @@
"integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
"dev": true,
"requires": {
- "is-equal-shallow": "0.1.3"
+ "is-equal-shallow": "^0.1.3"
}
},
"regexp-quote": {
@@ -5501,9 +5537,9 @@
"integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
"dev": true,
"requires": {
- "regenerate": "1.3.3",
- "regjsgen": "0.2.0",
- "regjsparser": "0.1.5"
+ "regenerate": "^1.2.1",
+ "regjsgen": "^0.2.0",
+ "regjsparser": "^0.1.4"
}
},
"regjsgen": {
@@ -5518,7 +5554,7 @@
"integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
"dev": true,
"requires": {
- "jsesc": "0.5.0"
+ "jsesc": "~0.5.0"
},
"dependencies": {
"jsesc": {
@@ -5553,36 +5589,34 @@
"integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
"dev": true,
"requires": {
- "is-finite": "1.0.2"
+ "is-finite": "^1.0.0"
}
},
"request": {
- "version": "2.83.0",
- "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
- "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
+ "version": "2.87.0",
+ "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
+ "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
"requires": {
- "aws-sign2": "0.7.0",
- "aws4": "1.6.0",
- "caseless": "0.12.0",
- "combined-stream": "1.0.5",
- "extend": "3.0.1",
- "forever-agent": "0.6.1",
- "form-data": "2.3.1",
- "har-validator": "5.0.3",
- "hawk": "6.0.2",
- "http-signature": "1.2.0",
- "is-typedarray": "1.0.0",
- "isstream": "0.1.2",
- "json-stringify-safe": "5.0.1",
- "mime-types": "2.1.17",
- "oauth-sign": "0.8.2",
- "performance-now": "2.1.0",
- "qs": "6.5.1",
- "safe-buffer": "5.1.1",
- "stringstream": "0.0.5",
- "tough-cookie": "2.3.3",
- "tunnel-agent": "0.6.0",
- "uuid": "3.1.0"
+ "aws-sign2": "~0.7.0",
+ "aws4": "^1.6.0",
+ "caseless": "~0.12.0",
+ "combined-stream": "~1.0.5",
+ "extend": "~3.0.1",
+ "forever-agent": "~0.6.1",
+ "form-data": "~2.3.1",
+ "har-validator": "~5.0.3",
+ "http-signature": "~1.2.0",
+ "is-typedarray": "~1.0.0",
+ "isstream": "~0.1.2",
+ "json-stringify-safe": "~5.0.1",
+ "mime-types": "~2.1.17",
+ "oauth-sign": "~0.8.2",
+ "performance-now": "^2.1.0",
+ "qs": "~6.5.1",
+ "safe-buffer": "^5.1.1",
+ "tough-cookie": "~2.3.3",
+ "tunnel-agent": "^0.6.0",
+ "uuid": "^3.1.0"
}
},
"require-json": {
@@ -5597,8 +5631,8 @@
"integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
"dev": true,
"requires": {
- "caller-path": "0.1.0",
- "resolve-from": "1.0.1"
+ "caller-path": "^0.1.0",
+ "resolve-from": "^1.0.0"
}
},
"requires-port": {
@@ -5618,7 +5652,7 @@
"integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==",
"dev": true,
"requires": {
- "path-parse": "1.0.5"
+ "path-parse": "^1.0.5"
}
},
"resolve-from": {
@@ -5633,8 +5667,8 @@
"integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
"dev": true,
"requires": {
- "exit-hook": "1.1.1",
- "onetime": "1.1.0"
+ "exit-hook": "^1.0.0",
+ "onetime": "^1.0.0"
}
},
"right-align": {
@@ -5643,7 +5677,7 @@
"integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
"dev": true,
"requires": {
- "align-text": "0.1.4"
+ "align-text": "^0.1.1"
}
},
"rimraf": {
@@ -5652,7 +5686,7 @@
"integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
"dev": true,
"requires": {
- "glob": "7.1.2"
+ "glob": "^7.0.5"
},
"dependencies": {
"glob": {
@@ -5661,12 +5695,12 @@
"integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
"dev": true,
"requires": {
- "fs.realpath": "1.0.0",
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "3.0.4",
- "once": "1.4.0",
- "path-is-absolute": "1.0.1"
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
}
}
}
@@ -5683,7 +5717,7 @@
"integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
"dev": true,
"requires": {
- "once": "1.4.0"
+ "once": "^1.3.0"
}
},
"rx-lite": {
@@ -5698,9 +5732,9 @@
"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
},
"samsam": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz",
- "integrity": "sha1-vsEf3IOp/aBjQBIQ5AF2wwJNFWc=",
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz",
+ "integrity": "sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==",
"dev": true
},
"sanitize-html": {
@@ -5708,9 +5742,9 @@
"resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz",
"integrity": "sha1-cw/6Ikm98YMz7/5FsoYXPJxa0Lg=",
"requires": {
- "htmlparser2": "3.9.2",
+ "htmlparser2": "^3.9.0",
"regexp-quote": "0.0.0",
- "xtend": "4.0.1"
+ "xtend": "^4.0.0"
}
},
"semver": {
@@ -5748,9 +5782,9 @@
"integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=",
"dev": true,
"requires": {
- "glob": "7.1.2",
- "interpret": "1.0.4",
- "rechoir": "0.6.2"
+ "glob": "^7.0.0",
+ "interpret": "^1.0.0",
+ "rechoir": "^0.6.2"
},
"dependencies": {
"glob": {
@@ -5759,26 +5793,52 @@
"integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
"dev": true,
"requires": {
- "fs.realpath": "1.0.0",
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "3.0.4",
- "once": "1.4.0",
- "path-is-absolute": "1.0.1"
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
}
}
}
},
"sinon": {
- "version": "1.17.7",
- "resolved": "https://registry.npmjs.org/sinon/-/sinon-1.17.7.tgz",
- "integrity": "sha1-RUKk9JugxFwF6y6d2dID4rjv4L8=",
+ "version": "5.0.7",
+ "resolved": "https://registry.npmjs.org/sinon/-/sinon-5.0.7.tgz",
+ "integrity": "sha512-GvNLrwpvLZ8jIMZBUhHGUZDq5wlUdceJWyHvZDmqBxnjazpxY1L0FNbGBX6VpcOEoQ8Q4XMWFzm2myJMvx+VjA==",
"dev": true,
"requires": {
- "formatio": "1.1.1",
- "lolex": "1.3.2",
- "samsam": "1.1.2",
- "util": "0.10.3"
+ "@sinonjs/formatio": "^2.0.0",
+ "diff": "^3.1.0",
+ "lodash.get": "^4.4.2",
+ "lolex": "^2.2.0",
+ "nise": "^1.2.0",
+ "supports-color": "^5.1.0",
+ "type-detect": "^4.0.5"
+ },
+ "dependencies": {
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
+ },
+ "lolex": {
+ "version": "2.6.0",
+ "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.6.0.tgz",
+ "integrity": "sha512-e1UtIo1pbrIqEXib/yMjHciyqkng5lc0rrIbytgjmRgDR9+2ceNIAcwOWSgylRjoEP9VdVguCSRwnNmlbnOUwA==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "5.4.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^3.0.0"
+ }
+ }
}
},
"slash": {
@@ -5793,11 +5853,6 @@
"integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
"dev": true
},
- "sntp": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz",
- "integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys="
- },
"socket.io": {
"version": "1.7.3",
"resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.7.3.tgz",
@@ -5958,9 +6013,9 @@
"integrity": "sha512-MYbFX9DYxmTQFfy2v8FC1XZwpwHKYxg3SK8Wb7VPBKuhDjz8gi9re2819MsG4p49HDyiOSUKlmZ+nQBArW5CGw==",
"dev": true,
"requires": {
- "async": "2.6.0",
- "loader-utils": "0.2.17",
- "source-map": "0.6.1"
+ "async": "^2.5.0",
+ "loader-utils": "~0.2.2",
+ "source-map": "~0.6.1"
},
"dependencies": {
"async": {
@@ -5969,7 +6024,7 @@
"integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
"dev": true,
"requires": {
- "lodash": "4.17.4"
+ "lodash": "^4.14.0"
}
},
"source-map": {
@@ -5986,7 +6041,7 @@
"integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
"dev": true,
"requires": {
- "source-map": "0.5.7"
+ "source-map": "^0.5.6"
}
},
"sprintf-js": {
@@ -5995,18 +6050,18 @@
"integrity": "sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw="
},
"sshpk": {
- "version": "1.13.1",
- "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
- "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+ "version": "1.14.1",
+ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz",
+ "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=",
"requires": {
- "asn1": "0.2.3",
- "assert-plus": "1.0.0",
- "bcrypt-pbkdf": "1.0.1",
- "dashdash": "1.14.1",
- "ecc-jsbn": "0.1.1",
- "getpass": "0.1.7",
- "jsbn": "0.1.1",
- "tweetnacl": "0.14.5"
+ "asn1": "~0.2.3",
+ "assert-plus": "^1.0.0",
+ "bcrypt-pbkdf": "^1.0.0",
+ "dashdash": "^1.12.0",
+ "ecc-jsbn": "~0.1.1",
+ "getpass": "^0.1.1",
+ "jsbn": "~0.1.0",
+ "tweetnacl": "~0.14.0"
}
},
"statuses": {
@@ -6021,8 +6076,8 @@
"integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
"dev": true,
"requires": {
- "inherits": "2.0.3",
- "readable-stream": "2.3.3"
+ "inherits": "~2.0.1",
+ "readable-stream": "^2.0.2"
}
},
"stream-http": {
@@ -6031,11 +6086,11 @@
"integrity": "sha1-QKBQ7I3DtTsz2ZCUFcAsC/Gr+60=",
"dev": true,
"requires": {
- "builtin-status-codes": "3.0.0",
- "inherits": "2.0.3",
- "readable-stream": "2.3.3",
- "to-arraybuffer": "1.0.1",
- "xtend": "4.0.1"
+ "builtin-status-codes": "^3.0.0",
+ "inherits": "^2.0.1",
+ "readable-stream": "^2.2.6",
+ "to-arraybuffer": "^1.0.0",
+ "xtend": "^4.0.0"
}
},
"string-width": {
@@ -6044,9 +6099,9 @@
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"dev": true,
"requires": {
- "code-point-at": "1.1.0",
- "is-fullwidth-code-point": "1.0.0",
- "strip-ansi": "3.0.1"
+ "code-point-at": "^1.0.0",
+ "is-fullwidth-code-point": "^1.0.0",
+ "strip-ansi": "^3.0.0"
}
},
"string.prototype.repeat": {
@@ -6059,21 +6114,16 @@
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
"requires": {
- "safe-buffer": "5.1.1"
+ "safe-buffer": "~5.1.0"
}
},
- "stringstream": {
- "version": "0.0.5",
- "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
- "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
- },
"strip-ansi": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"requires": {
- "ansi-regex": "2.1.1"
+ "ansi-regex": "^2.0.0"
}
},
"strip-bom": {
@@ -6110,12 +6160,12 @@
"integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=",
"dev": true,
"requires": {
- "ajv": "4.11.8",
- "ajv-keywords": "1.5.1",
- "chalk": "1.1.3",
- "lodash": "4.17.4",
+ "ajv": "^4.7.0",
+ "ajv-keywords": "^1.0.0",
+ "chalk": "^1.1.1",
+ "lodash": "^4.0.0",
"slice-ansi": "0.0.4",
- "string-width": "2.1.1"
+ "string-width": "^2.0.0"
},
"dependencies": {
"ajv": {
@@ -6124,8 +6174,8 @@
"integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
"dev": true,
"requires": {
- "co": "4.6.0",
- "json-stable-stringify": "1.0.1"
+ "co": "^4.6.0",
+ "json-stable-stringify": "^1.0.1"
}
},
"ansi-regex": {
@@ -6146,8 +6196,8 @@
"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
"dev": true,
"requires": {
- "is-fullwidth-code-point": "2.0.0",
- "strip-ansi": "4.0.0"
+ "is-fullwidth-code-point": "^2.0.0",
+ "strip-ansi": "^4.0.0"
}
},
"strip-ansi": {
@@ -6156,7 +6206,7 @@
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"dev": true,
"requires": {
- "ansi-regex": "3.0.0"
+ "ansi-regex": "^3.0.0"
}
}
}
@@ -6167,6 +6217,12 @@
"integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
"dev": true
},
+ "text-encoding": {
+ "version": "0.6.4",
+ "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz",
+ "integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk=",
+ "dev": true
+ },
"text-encoding-utf-8": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/text-encoding-utf-8/-/text-encoding-utf-8-1.0.1.tgz",
@@ -6196,7 +6252,7 @@
"integrity": "sha512-uZYhyU3EX8O7HQP+J9fTVYwsq90Vr68xPEFo7yrVImIxYvHgukBEgOB/SgGoorWVTzGM/3Z+wUNnboA4M8jWrg==",
"dev": true,
"requires": {
- "setimmediate": "1.0.5"
+ "setimmediate": "^1.0.4"
}
},
"tmatch": {
@@ -6211,7 +6267,7 @@
"integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=",
"dev": true,
"requires": {
- "os-tmpdir": "1.0.2"
+ "os-tmpdir": "~1.0.1"
}
},
"to-array": {
@@ -6233,11 +6289,11 @@
"dev": true
},
"tough-cookie": {
- "version": "2.3.3",
- "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
- "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+ "version": "2.3.4",
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
+ "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
"requires": {
- "punycode": "1.4.1"
+ "punycode": "^1.4.1"
}
},
"trim-right": {
@@ -6263,7 +6319,7 @@
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
"requires": {
- "safe-buffer": "5.1.1"
+ "safe-buffer": "^5.0.1"
}
},
"tweetnacl": {
@@ -6278,9 +6334,15 @@
"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
"dev": true,
"requires": {
- "prelude-ls": "1.1.2"
+ "prelude-ls": "~1.1.2"
}
},
+ "type-detect": {
+ "version": "4.0.8",
+ "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+ "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+ "dev": true
+ },
"type-is": {
"version": "1.6.15",
"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz",
@@ -6288,7 +6350,7 @@
"dev": true,
"requires": {
"media-typer": "0.3.0",
- "mime-types": "2.1.17"
+ "mime-types": "~2.1.15"
}
},
"typedarray": {
@@ -6308,10 +6370,10 @@
"integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=",
"dev": true,
"requires": {
- "async": "0.2.10",
- "source-map": "0.5.7",
- "uglify-to-browserify": "1.0.2",
- "yargs": "3.10.0"
+ "async": "~0.2.6",
+ "source-map": "~0.5.1",
+ "uglify-to-browserify": "~1.0.0",
+ "yargs": "~3.10.0"
},
"dependencies": {
"async": {
@@ -6368,8 +6430,8 @@
"integrity": "sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=",
"dev": true,
"requires": {
- "lru-cache": "2.2.4",
- "tmp": "0.0.31"
+ "lru-cache": "2.2.x",
+ "tmp": "0.0.x"
}
},
"util": {
@@ -6401,9 +6463,9 @@
"dev": true
},
"uuid": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
- "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
+ "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
},
"v8flags": {
"version": "2.1.1",
@@ -6411,13 +6473,14 @@
"integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
"dev": true,
"requires": {
- "user-home": "1.1.1"
+ "user-home": "^1.1.1"
}
},
"velocity-vector": {
"version": "github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f",
+ "from": "velocity-vector@github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f",
"requires": {
- "jquery": "3.2.1"
+ "jquery": ">= 1.4.3"
}
},
"verror": {
@@ -6425,9 +6488,9 @@
"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
"requires": {
- "assert-plus": "1.0.0",
+ "assert-plus": "^1.0.0",
"core-util-is": "1.0.2",
- "extsprintf": "1.3.0"
+ "extsprintf": "^1.2.0"
}
},
"vm-browserify": {
@@ -6451,7 +6514,7 @@
"integrity": "sha1-MbTbZnjyrgHDnqn7hyWpAx5Vins=",
"dev": true,
"requires": {
- "foreachasync": "3.0.0"
+ "foreachasync": "^3.0.0"
}
},
"watchpack": {
@@ -6460,9 +6523,9 @@
"integrity": "sha1-Yuqkq15bo1/fwBgnVibjwPXj+ws=",
"dev": true,
"requires": {
- "async": "0.9.2",
- "chokidar": "1.7.0",
- "graceful-fs": "4.1.11"
+ "async": "^0.9.0",
+ "chokidar": "^1.0.0",
+ "graceful-fs": "^4.1.2"
}
},
"webpack": {
@@ -6471,21 +6534,21 @@
"integrity": "sha1-T/MfU9sDM55VFkqdRo7gMklo/pg=",
"dev": true,
"requires": {
- "acorn": "3.3.0",
- "async": "1.5.2",
- "clone": "1.0.2",
- "enhanced-resolve": "0.9.1",
- "interpret": "0.6.6",
- "loader-utils": "0.2.17",
- "memory-fs": "0.3.0",
- "mkdirp": "0.5.1",
- "node-libs-browser": "0.7.0",
- "optimist": "0.6.1",
- "supports-color": "3.2.3",
- "tapable": "0.1.10",
- "uglify-js": "2.7.5",
- "watchpack": "0.2.9",
- "webpack-core": "0.6.9"
+ "acorn": "^3.0.0",
+ "async": "^1.3.0",
+ "clone": "^1.0.2",
+ "enhanced-resolve": "~0.9.0",
+ "interpret": "^0.6.4",
+ "loader-utils": "^0.2.11",
+ "memory-fs": "~0.3.0",
+ "mkdirp": "~0.5.0",
+ "node-libs-browser": "^0.7.0",
+ "optimist": "~0.6.0",
+ "supports-color": "^3.1.0",
+ "tapable": "~0.1.8",
+ "uglify-js": "~2.7.3",
+ "watchpack": "^0.2.1",
+ "webpack-core": "~0.6.9"
},
"dependencies": {
"acorn": {
@@ -6512,8 +6575,8 @@
"integrity": "sha1-e8xrYp46Q+hx1+Kaymrop/FcuyA=",
"dev": true,
"requires": {
- "errno": "0.1.4",
- "readable-stream": "2.3.3"
+ "errno": "^0.1.3",
+ "readable-stream": "^2.0.1"
}
},
"supports-color": {
@@ -6522,7 +6585,7 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
- "has-flag": "1.0.0"
+ "has-flag": "^1.0.0"
}
}
}
@@ -6533,8 +6596,8 @@
"integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
"dev": true,
"requires": {
- "source-list-map": "0.1.8",
- "source-map": "0.4.4"
+ "source-list-map": "~0.1.7",
+ "source-map": "~0.4.1"
},
"dependencies": {
"source-map": {
@@ -6543,7 +6606,7 @@
"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
"dev": true,
"requires": {
- "amdefine": "1.0.1"
+ "amdefine": ">=0.0.4"
}
}
}
@@ -6554,11 +6617,11 @@
"integrity": "sha1-007++y7dp+HTtdvgcolRMhllFwk=",
"dev": true,
"requires": {
- "memory-fs": "0.4.1",
- "mime": "1.4.1",
- "path-is-absolute": "1.0.1",
- "range-parser": "1.2.0",
- "time-stamp": "2.0.0"
+ "memory-fs": "~0.4.1",
+ "mime": "^1.3.4",
+ "path-is-absolute": "^1.0.0",
+ "range-parser": "^1.0.3",
+ "time-stamp": "^2.0.0"
}
},
"whatwg-fetch": {
@@ -6572,7 +6635,7 @@
"integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
"dev": true,
"requires": {
- "isexe": "2.0.0"
+ "isexe": "^2.0.0"
}
},
"window-size": {
@@ -6597,7 +6660,7 @@
"integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
"dev": true,
"requires": {
- "mkdirp": "0.5.1"
+ "mkdirp": "^0.5.1"
}
},
"ws": {
@@ -6606,8 +6669,8 @@
"integrity": "sha1-iiRPoFJAHgjJiGz0SoUYnh/UBn8=",
"dev": true,
"requires": {
- "options": "0.0.6",
- "ultron": "1.0.2"
+ "options": ">=0.0.5",
+ "ultron": "1.0.x"
}
},
"wtf-8": {
@@ -6622,7 +6685,7 @@
"integrity": "sha1-LIaIjy1OrehQ+jjKf3Ij9yCVFuE=",
"dev": true,
"requires": {
- "lodash": "3.10.1"
+ "lodash": "^3.5.0"
},
"dependencies": {
"lodash": {
@@ -6650,9 +6713,9 @@
"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
"dev": true,
"requires": {
- "camelcase": "1.2.1",
- "cliui": "2.1.0",
- "decamelize": "1.2.0",
+ "camelcase": "^1.0.2",
+ "cliui": "^2.1.0",
+ "decamelize": "^1.0.0",
"window-size": "0.1.0"
}
},
diff --git a/package.json b/package.json
index 60f65f4c39..5864b35fc4 100644
--- a/package.json
+++ b/package.json
@@ -134,7 +134,7 @@
"react-addons-test-utils": "^15.4.0",
"require-json": "0.0.1",
"rimraf": "^2.4.3",
- "sinon": "^1.17.3",
+ "sinon": "^5.0.7",
"source-map-loader": "^0.2.3",
"walk": "^2.3.9",
"webpack": "^1.12.14"
diff --git a/test/components/structures/TimelinePanel-test.js b/test/components/structures/TimelinePanel-test.js
index 74037d2926..ea62d427bc 100644
--- a/test/components/structures/TimelinePanel-test.js
+++ b/test/components/structures/TimelinePanel-test.js
@@ -235,7 +235,7 @@ describe('TimelinePanel', function() {
// now, if we update the events, there shouldn't be any
// more requests.
- client.paginateEventTimeline.reset();
+ client.paginateEventTimeline.resetHistory();
panel.forceUpdate();
expect(messagePanel.props.backPaginating).toBe(false);
setTimeout(() => {
From 11cea616615989157e335d7ea2e323ce7fc978f8 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Mon, 21 May 2018 12:28:08 +0100
Subject: [PATCH 0068/1196] refocus editor after clicking on autocompletes
---
src/components/views/rooms/MessageComposerInput.js | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index eb4edfcfcb..6919a304c2 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -1313,7 +1313,8 @@ export default class MessageComposerInput extends React.Component {
if (range) {
const change = editorState.change()
.collapseToAnchor()
- .moveOffsetsTo(range.start, range.end);
+ .moveOffsetsTo(range.start, range.end)
+ .focus();
editorState = change.value;
}
@@ -1321,12 +1322,14 @@ export default class MessageComposerInput extends React.Component {
if (inline) {
change = editorState.change()
.insertInlineAtRange(editorState.selection, inline)
- .insertText(suffix);
+ .insertText(suffix)
+ .focus();
}
else {
change = editorState.change()
.insertTextAtRange(editorState.selection, completion)
- .insertText(suffix);
+ .insertText(suffix)
+ .focus();
}
editorState = change.value;
From 836dc8b0ef2b3d086747c85fbcdd885d7102304c Mon Sep 17 00:00:00 2001
From: Luke Barnard
Date: Mon, 21 May 2018 16:59:13 +0100
Subject: [PATCH 0069/1196] Factor out all shared logic between MStickerBody
and MImageBody
The benefits of this:
- One code path for determining spinner/placeholder and it's position
for loading images/stickers. This includes spinner used in e2e
decryption of images.
- Very small definition for MStickerBody, only overriding the minimal
differences is has from MImageBody.
The disadvantages:
- Slightly more complicated MImageBody, but hopefully not less
readable.
---
res/css/views/messages/_MImageBody.scss | 11 +-
res/css/views/messages/_MStickerBody.scss | 32 +---
src/components/views/messages/MImageBody.js | 89 ++++++++--
src/components/views/messages/MStickerBody.js | 162 ++++--------------
4 files changed, 111 insertions(+), 183 deletions(-)
diff --git a/res/css/views/messages/_MImageBody.scss b/res/css/views/messages/_MImageBody.scss
index 64821434dd..4c763c5991 100644
--- a/res/css/views/messages/_MImageBody.scss
+++ b/res/css/views/messages/_MImageBody.scss
@@ -37,11 +37,12 @@ limitations under the License.
}
.mx_MImageBody_thumbnail_spinner {
- display: flex;
- align-items: center;
- width: 100%;
+ position: absolute;
+ left: 50%;
+ top: 50%;
}
-.mx_MImageBody_thumbnail_spinner img {
- margin: auto;
+// Inner img and TintableSvg should be centered around 0, 0
+.mx_MImageBody_thumbnail_spinner > * {
+ transform: translate(-50%, -50%);
}
diff --git a/res/css/views/messages/_MStickerBody.scss b/res/css/views/messages/_MStickerBody.scss
index 3e6bbe5aa4..e4977bcc34 100644
--- a/res/css/views/messages/_MStickerBody.scss
+++ b/res/css/views/messages/_MStickerBody.scss
@@ -14,33 +14,11 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-.mx_MStickerBody {
- display: block;
- margin-right: 34px;
- min-height: 110px;
- padding: 20px 0;
+.mx_MStickerBody_wrapper {
+ padding: 20px 0px;
}
-.mx_MStickerBody_image_container {
- display: inline-block;
- position: relative;
-}
-
-.mx_MStickerBody_image {
- max-width: 100%;
- opacity: 0;
-}
-
-.mx_MStickerBody_image_visible {
- opacity: 1;
-}
-
-.mx_MStickerBody_placeholder {
- position: absolute;
- opacity: 1;
-}
-
-.mx_MStickerBody_placeholder_invisible {
- transition: 500ms;
- opacity: 0;
+.mx_MStickerBody_tooltip {
+ position: absolute;
+ top: 50%;
}
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index d9108a2fe1..03dad5e439 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -62,6 +62,8 @@ export default class extends React.Component {
decryptedBlob: null,
error: null,
imgError: false,
+ imgLoaded: false,
+ hover: false,
};
}
@@ -116,6 +118,8 @@ export default class extends React.Component {
}
onImageEnter(e) {
+ this.setState({ hover: true });
+
if (!this._isGif() || SettingsStore.getValue("autoplayGifsAndVideos")) {
return;
}
@@ -124,6 +128,8 @@ export default class extends React.Component {
}
onImageLeave(e) {
+ this.setState({ hover: false });
+
if (!this._isGif() || SettingsStore.getValue("autoplayGifsAndVideos")) {
return;
}
@@ -139,6 +145,7 @@ export default class extends React.Component {
onImageLoad() {
this.props.onWidgetLoad();
+ this.setState({ imgLoaded: true });
}
_getContentUrl() {
@@ -237,14 +244,22 @@ export default class extends React.Component {
const maxWidth = content.info.w * maxHeight / content.info.h;
let img = null;
+ let placeholder = null;
+
// e2e image hasn't been decrypted yet
if (content.file !== undefined && this.state.decryptedUrl === null) {
- img = ;
+ } else if (!this.state.imgLoaded) {
+ // Deliberately, getSpinner is left unimplemented here, MStickerBody overides
+ placeholder = this.getPlaceholder();
+ }
+
+ const showPlaceholder = Boolean(placeholder);
+
+ if (thumbUrl && !this.state.imgError) {
// Restrict the width of the thumbnail here, otherwise it will fill the container
// which has the same width as the timeline
+ // mx_MImageBody_thumbnail resizes img to exactly container size
img = ;
}
- const thumbnail = img ?
-
-
+
+ }
+
+ return (
+
{ formatButtons }
+
);
}
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index aac7c7ddbb..2d5e6d050d 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -132,9 +132,6 @@ export default class MessageComposerInput extends React.Component {
// js-sdk Room object
room: PropTypes.object.isRequired,
- // called with current plaintext content (as a string) whenever it changes
- onContentChanged: PropTypes.func,
-
onFilesPasted: PropTypes.func,
onInputStateChanged: PropTypes.func,
@@ -319,15 +316,6 @@ export default class MessageComposerInput extends React.Component {
dis.unregister(this.dispatcherRef);
}
- componentWillUpdate(nextProps, nextState) {
- // this is dirty, but moving all this state to MessageComposer is dirtier
- if (this.props.onInputStateChanged && nextState !== this.state) {
- const state = this.getSelectionInfo(nextState.editorState);
- state.isRichTextEnabled = nextState.isRichTextEnabled;
- this.props.onInputStateChanged(state);
- }
- }
-
onAction = (payload) => {
const editor = this.refs.editor;
let editorState = this.state.editorState;
@@ -567,6 +555,27 @@ export default class MessageComposerInput extends React.Component {
}
}
+ if (this.props.onInputStateChanged) {
+ let blockType = editorState.blocks.first().type;
+ console.log("onInputStateChanged; current block type is " + blockType + " and marks are " + editorState.activeMarks);
+
+ if (blockType === 'list-item') {
+ const parent = editorState.document.getParent(editorState.blocks.first().key);
+ if (parent.type === 'numbered-list') {
+ blockType = 'numbered-list';
+ }
+ else if (parent.type === 'bulleted-list') {
+ blockType = 'bulleted-list';
+ }
+ }
+ const inputState = {
+ marks: editorState.activeMarks,
+ isRichTextEnabled: this.state.isRichTextEnabled,
+ blockType
+ };
+ this.props.onInputStateChanged(inputState);
+ }
+
// Record the editor state for this room so that it can be retrieved after
// switching to another room and back
dis.dispatch({
@@ -1239,17 +1248,6 @@ export default class MessageComposerInput extends React.Component {
await this.setDisplayedCompletion(null); // restore originalEditorState
};
- /* returns inline style and block type of current SelectionState so MessageComposer can render formatting
- buttons. */
- getSelectionInfo(editorState: Value) {
- return {
- marks: editorState.activeMarks,
- // XXX: shouldn't we return all the types of blocks in the current selection,
- // not just the anchor?
- blockType: editorState.anchorBlock ? editorState.anchorBlock.type : null,
- };
- }
-
/* If passed null, restores the original editor content from state.originalEditorState.
* If passed a non-null displayedCompletion, modifies state.originalEditorState to compute new state.editorState.
*/
@@ -1406,18 +1404,22 @@ export default class MessageComposerInput extends React.Component {
}
};
- onFormatButtonClicked = (name: "bold" | "italic" | "strike" | "code" | "underline" | "quote" | "bullet" | "numbullet", e) => {
- e.preventDefault(); // don't steal focus from the editor!
+ onFormatButtonClicked = (name, e) => {
+ if (e) {
+ e.preventDefault(); // don't steal focus from the editor!
+ }
- const command = {
- // code: 'code-block', // let's have the button do inline code for now
- quote: 'block-quote',
- bullet: 'bulleted-list',
- numbullet: 'numbered-list',
- underline: 'underlined',
- strike: 'deleted',
- }[name] || name;
- this.handleKeyCommand(command);
+ // XXX: horrible evil hack to ensure the editor is focused so the act
+ // of focusing it doesn't then cancel the format button being pressed
+ if (document.activeElement && document.activeElement.className !== 'mx_MessageComposer_editor') {
+ this.refs.editor.focus();
+ setTimeout(()=>{
+ this.handleKeyCommand(name);
+ }, 500); // can't find any callback to hook this to. onFocus and onChange and willComponentUpdate fire too early.
+ return;
+ }
+
+ this.handleKeyCommand(name);
};
getAutocompleteQuery(editorState: Value) {
From e460cf35e0c553825a5d3ee2f11b449249acdcbd Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
+
+ { formatBar }
+ { controls }
+
+ ${body}`); - if (!this.state.isRichTextEnabled) { - content = ContentState.createFromText(RichText.stateToMarkdown(content)); - } + case 'quote': { + const html = HtmlUtils.bodyToHtml(payload.event.getContent(), null, { + returnString: true, + emojiOne: false, + }); + const fragment = this.html.deserialize(html); + // FIXME: do we want to put in a permalink to the original quote here? + // If so, what should be the format, and how do we differentiate it from replies? - const blockMap = content.getBlockMap(); - let startSelection = SelectionState.createEmpty(contentState.getFirstBlock().getKey()); - contentState = Modifier.splitBlock(contentState, startSelection); - startSelection = SelectionState.createEmpty(contentState.getFirstBlock().getKey()); - contentState = Modifier.replaceWithFragment(contentState, - startSelection, - blockMap); - startSelection = SelectionState.createEmpty(contentState.getFirstBlock().getKey()); - if (this.state.isRichTextEnabled) { - contentState = Modifier.setBlockType(contentState, startSelection, 'blockquote'); + const quote = Block.create('block-quote'); + if (this.state.isRichTextEnabled) { + let change = editorState.change(); + if (editorState.anchorText.text === '' && editorState.anchorBlock.nodes.size === 1) { + // replace the current block rather than split the block + change = change.replaceNodeByKey(editorState.anchorBlock.key, quote); } - let editorState = EditorState.push(this.state.editorState, contentState, 'insert-characters'); - editorState = EditorState.moveSelectionToEnd(editorState); - this.onEditorContentChanged(editorState); - editor.focus(); + else { + // insert it into the middle of the block (splitting it) + change = change.insertBlock(quote); + } + change = change.insertFragmentByKey(quote.key, 0, fragment.document) + .focus(); + this.onChange(change); + } + else { + let fragmentChange = fragment.change(); + fragmentChange.moveToRangeOf(fragment.document) + .wrapBlock(quote); + + // FIXME: handle pills and use commonmark rather than md-serialize + const md = this.md.serialize(fragmentChange.value); + let change = editorState.change() + .insertText(md + '\n\n') + .focus(); + this.onChange(change); } } break; -*/ } }; @@ -555,7 +562,7 @@ export default class MessageComposerInput extends React.Component { } } - if (this.props.onInputStateChanged) { + if (this.props.onInputStateChanged && editorState.blocks.size > 0) { let blockType = editorState.blocks.first().type; // console.log("onInputStateChanged; current block type is " + blockType + " and marks are " + editorState.activeMarks); @@ -740,17 +747,31 @@ export default class MessageComposerInput extends React.Component { .unwrapBlock('numbered-list'); return change; } - else if (editorState.anchorOffset == 0 && - (this.hasBlock('block-quote') || - this.hasBlock('heading1') || - this.hasBlock('heading2') || - this.hasBlock('heading3') || - this.hasBlock('heading4') || - this.hasBlock('heading5') || - this.hasBlock('heading6') || - this.hasBlock('code-block'))) - { - return change.setBlocks(DEFAULT_NODE); + else if (editorState.anchorOffset == 0 && editorState.isCollapsed) { + // turn blocks back into paragraphs + if ((this.hasBlock('block-quote') || + this.hasBlock('heading1') || + this.hasBlock('heading2') || + this.hasBlock('heading3') || + this.hasBlock('heading4') || + this.hasBlock('heading5') || + this.hasBlock('heading6') || + this.hasBlock('code-block'))) + { + return change.setBlocks(DEFAULT_NODE); + } + + // remove paragraphs entirely if they're nested + const parent = editorState.document.getParent(editorState.anchorBlock.key); + if (editorState.anchorOffset == 0 && + this.hasBlock('paragraph') && + parent.nodes.size == 1 && + parent.object !== 'document') + { + return change.replaceNodeByKey(editorState.anchorBlock.key, editorState.anchorText) + .collapseToEndOf(parent) + .focus(); + } } } return; @@ -1013,7 +1034,7 @@ export default class MessageComposerInput extends React.Component { if (!shouldSendHTML) { shouldSendHTML = !!editorState.document.findDescendant(node => { // N.B. node.getMarks() might be private? - return ((node.object === 'block' && node.type !== 'line') || + return ((node.object === 'block' && node.type !== 'paragraph') || (node.object === 'inline') || (node.object === 'text' && node.getMarks().size > 0)); }); @@ -1131,13 +1152,13 @@ export default class MessageComposerInput extends React.Component { // heuristic to handle tall emoji, pills, etc pushing the cursor away from the top // or bottom of the page. // XXX: is this going to break on large inline images or top-to-bottom scripts? - const EDGE_THRESHOLD = 8; + const EDGE_THRESHOLD = 15; let navigateHistory = false; if (up) { const scrollCorrection = editorNode.scrollTop; const distanceFromTop = cursorRect.top - editorRect.top + scrollCorrection; - //console.log(`Cursor distance from editor top is ${distanceFromTop}`); + console.log(`Cursor distance from editor top is ${distanceFromTop}`); if (distanceFromTop < EDGE_THRESHOLD) { navigateHistory = true; } @@ -1146,7 +1167,7 @@ export default class MessageComposerInput extends React.Component { const scrollCorrection = editorNode.scrollHeight - editorNode.clientHeight - editorNode.scrollTop; const distanceFromBottom = editorRect.bottom - cursorRect.bottom + scrollCorrection; - //console.log(`Cursor distance from editor bottom is ${distanceFromBottom}`); + console.log(`Cursor distance from editor bottom is ${distanceFromBottom}`); if (distanceFromBottom < EDGE_THRESHOLD) { navigateHistory = true; } From 35ab573bc54c56911a6f566ce6227289658e6e22 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki
-
-
;
- } else if (thumbUrl && !this.state.imgError) {
+ placeholder =
- ;
+ } else if (!this.state.imgLoaded) {
+ // Deliberately, getSpinner is left unimplemented here, MStickerBody overides
+ placeholder = this.getPlaceholder();
+ }
+
+ const showPlaceholder = Boolean(placeholder);
+
+ if (thumbUrl && !this.state.imgError) {
// Restrict the width of the thumbnail here, otherwise it will fill the container
// which has the same width as the timeline
+ // mx_MImageBody_thumbnail resizes img to exactly container size
img =
- { /* Calculate aspect ratio, using %padding will size _container correctly */ }
-
- { /* mx_MImageBody_thumbnail resizes img to exactly container size */ }
+ const thumbnail = (
+
Date: Tue, 22 May 2018 10:43:16 +0100
Subject: [PATCH 0070/1196] Only include placeholder in DOM when necessary
---
src/components/views/messages/MImageBody.js | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index f27124238e..e2316b2fcc 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -276,15 +276,16 @@ export default class extends React.Component {
{ /* Calculate aspect ratio, using %padding will size _container correctly */ }
-
+ { /* Calculate aspect ratio, using %padding will size _container correctly */ }
+
+
+
+ );
+
+ return this.wrapImage(contentUrl, thumbnail);
+ }
+
+ // Overidden by MStickerBody
+ wrapImage(contentUrl, children) {
+ return
+ {children}
+ ;
+ }
+
+ // Overidden by MStickerBody
+ getPlaceholder() {
+ // MImageBody doesn't show a placeholder whilst the image loads, (but it could do)
+ return null;
+ }
+
+ // Overidden by MStickerBody
+ getTooltip() {
+ return null;
+ }
+
+ // Overidden by MStickerBody
+ getFileBody() {
+ return
+
+
+
+ { placeholder }
+
+
{ img }
- : null;
- return (
-
- { thumbnail }
-
- { this.state.placeholderVisible &&
- 
- { tooltip }
-
-
- );
- }
-
// Empty to prevent default behaviour of MImageBody
onClick() {
}
+
+ // MStickerBody doesn't need a wrapping ``, but it does need extra padding
+ // which is added by mx_MStickerBody_wrapper
+ wrapImage(contentUrl, children) {
+ return
-
}
- { children }
;
+ }
+
+ // Placeholder to show in place of the sticker image if
+ // img onLoad hasn't fired yet.
+ getPlaceholder() {
+ const TintableSVG = sdk.getComponent('elements.TintableSvg');
+ return
+
;
+ }
+
+ // Don't show "Download this_file.png ..."
+ getFileBody() {
+ return null;
+ }
}
From e4f8c09c32d9a03567de9a1e9a1954928915e29b Mon Sep 17 00:00:00 2001
From: Luke Barnard
-
Date: Sat, 26 May 2018 19:17:59 -0600
Subject: [PATCH 0110/1196] Update pinned messages in real time
Fixes https://github.com/vector-im/riot-web/issues/5358
Signed-off-by: Travis Ralston
---
src/components/views/rooms/PinnedEventsPanel.js | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/src/components/views/rooms/PinnedEventsPanel.js b/src/components/views/rooms/PinnedEventsPanel.js
index 4624b3c051..e75cbea817 100644
--- a/src/components/views/rooms/PinnedEventsPanel.js
+++ b/src/components/views/rooms/PinnedEventsPanel.js
@@ -39,6 +39,19 @@ module.exports = React.createClass({
componentDidMount: function() {
this._updatePinnedMessages();
+ MatrixClientPeg.get().on("RoomState.events", this._onEvent);
+ },
+
+ componentWillUnmount: function() {
+ if (MatrixClientPeg.get()) {
+ MatrixClientPeg.get().removeListener("RoomState.events", this._onEvent);
+ }
+ },
+
+ _onEvent: function(ev) {
+ if (ev.getRoomId() === this.props.room.roomId && ev.getType() === "m.room.pinned_events") {
+ this._updatePinnedMessages();
+ }
},
_updatePinnedMessages: function() {
From 53396ff38dcac527605d327f5b4123c4a8884727 Mon Sep 17 00:00:00 2001
From: Travis Ralston
Date: Sat, 26 May 2018 19:42:09 -0600
Subject: [PATCH 0111/1196] Show timestamp of pinned messages on hover
Addresses part of https://github.com/vector-im/riot-web/issues/5405
Signed-off-by: Travis Ralston
---
res/css/views/rooms/_PinnedEventTile.scss | 14 ++++++++++++--
src/components/views/rooms/PinnedEventTile.js | 4 ++++
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/res/css/views/rooms/_PinnedEventTile.scss b/res/css/views/rooms/_PinnedEventTile.scss
index fa76f4c679..f7417272b6 100644
--- a/res/css/views/rooms/_PinnedEventTile.scss
+++ b/res/css/views/rooms/_PinnedEventTile.scss
@@ -25,19 +25,29 @@ limitations under the License.
background-color: $event-selected-color;
}
-.mx_PinnedEventTile .mx_PinnedEventTile_sender {
+.mx_PinnedEventTile .mx_PinnedEventTile_sender,
+.mx_PinnedEventTile .mx_PinnedEventTile_timestamp {
color: #868686;
font-size: 0.8em;
vertical-align: top;
- display: block;
+ display: inline-block;
padding-bottom: 3px;
}
+.mx_PinnedEventTile .mx_PinnedEventTile_timestamp {
+ padding-left: 15px;
+ display: none;
+}
+
.mx_PinnedEventTile .mx_PinnedEventTile_senderAvatar .mx_BaseAvatar {
float: left;
margin-right: 10px;
}
+.mx_PinnedEventTile:hover .mx_PinnedEventTile_timestamp {
+ display: inline-block;
+}
+
.mx_PinnedEventTile:hover .mx_PinnedEventTile_actions {
display: block;
}
diff --git a/src/components/views/rooms/PinnedEventTile.js b/src/components/views/rooms/PinnedEventTile.js
index 478454a3d8..d0572e489a 100644
--- a/src/components/views/rooms/PinnedEventTile.js
+++ b/src/components/views/rooms/PinnedEventTile.js
@@ -22,6 +22,7 @@ import AccessibleButton from "../elements/AccessibleButton";
import MessageEvent from "../messages/MessageEvent";
import MemberAvatar from "../avatars/MemberAvatar";
import { _t } from '../../../languageHandler';
+import {formatFullDate} from '../../../DateUtils';
module.exports = React.createClass({
displayName: 'PinnedEventTile',
@@ -86,6 +87,9 @@ module.exports = React.createClass({
{ sender.name }
+
+ { formatFullDate(new Date(this.props.mxEvent.getTs())) }
+
{}} // we need to give this, apparently
From 752605429cd8072aa59ec145d31e3d33a2f4c596 Mon Sep 17 00:00:00 2001
From: Travis Ralston
Date: Sat, 26 May 2018 19:32:23 -0600
Subject: [PATCH 0112/1196] Persist pinned message open-ness between room
switches
Addresses part of https://github.com/vector-im/riot-web/issues/5405
Signed-off-by: Travis Ralston
---
src/components/structures/RoomView.js | 9 +++++++--
src/settings/Settings.js | 4 ++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index c5f6a75cc5..eae621b722 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -44,7 +44,7 @@ import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../Keyboard';
import RoomViewStore from '../../stores/RoomViewStore';
import RoomScrollStateStore from '../../stores/RoomScrollStateStore';
-import SettingsStore from "../../settings/SettingsStore";
+import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
const DEBUG = false;
let debuglog = function() {};
@@ -115,6 +115,7 @@ module.exports = React.createClass({
showApps: false,
isAlone: false,
isPeeking: false,
+ showingPinned: false,
// error object, as from the matrix client/server API
// If we failed to load information about the room,
@@ -182,6 +183,7 @@ module.exports = React.createClass({
isInitialEventHighlighted: RoomViewStore.isInitialEventHighlighted(),
forwardingEvent: RoomViewStore.getForwardingEvent(),
shouldPeek: RoomViewStore.shouldPeek(),
+ showingPinned: SettingsStore.getValue("PinnedEvents.isOpen", RoomViewStore.getRoomId()),
};
// Temporary logging to diagnose https://github.com/vector-im/riot-web/issues/4307
@@ -1135,7 +1137,10 @@ module.exports = React.createClass({
},
onPinnedClick: function() {
- this.setState({showingPinned: !this.state.showingPinned, searching: false});
+ const nowShowingPinned = !this.state.showingPinned;
+ const roomId = this.state.room.roomId;
+ this.setState({showingPinned: nowShowingPinned, searching: false});
+ SettingsStore.setValue("PinnedEvents.isOpen", roomId, SettingLevel.ROOM_DEVICE, nowShowingPinned);
},
onSettingsClick: function() {
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index b1bc4161fd..456665aeb8 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -274,4 +274,8 @@ export const SETTINGS = {
displayName: _td('Enable widget screenshots on supported widgets'),
default: false,
},
+ "PinnedEvents.isOpen": {
+ supportedLevels: ['room-device'],
+ default: false,
+ },
};
From e690bcb6efd58ecb85f2373949d840794bc1ab48 Mon Sep 17 00:00:00 2001
From: Travis Ralston
Date: Sat, 26 May 2018 20:54:19 -0600
Subject: [PATCH 0113/1196] Replace "Login as guest" with "Try the app first"
on login page
Fixes vector-im/riot-web#5875
Signed-off-by: Travis Ralston
---
src/components/structures/login/Login.js | 2 +-
src/i18n/strings/bg.json | 1 -
src/i18n/strings/ca.json | 1 -
src/i18n/strings/cs.json | 1 -
src/i18n/strings/da.json | 1 -
src/i18n/strings/de_DE.json | 1 -
src/i18n/strings/el.json | 1 -
src/i18n/strings/en_EN.json | 2 +-
src/i18n/strings/en_US.json | 1 -
src/i18n/strings/eo.json | 1 -
src/i18n/strings/es.json | 1 -
src/i18n/strings/eu.json | 1 -
src/i18n/strings/fi.json | 1 -
src/i18n/strings/fr.json | 1 -
src/i18n/strings/gl.json | 1 -
src/i18n/strings/hu.json | 1 -
src/i18n/strings/id.json | 1 -
src/i18n/strings/it.json | 1 -
src/i18n/strings/ko.json | 1 -
src/i18n/strings/lv.json | 1 -
src/i18n/strings/nl.json | 1 -
src/i18n/strings/pl.json | 1 -
src/i18n/strings/pt.json | 1 -
src/i18n/strings/pt_BR.json | 1 -
src/i18n/strings/ru.json | 1 -
src/i18n/strings/sk.json | 1 -
src/i18n/strings/sr.json | 1 -
src/i18n/strings/sv.json | 1 -
src/i18n/strings/th.json | 1 -
src/i18n/strings/tr.json | 1 -
src/i18n/strings/zh_Hans.json | 1 -
src/i18n/strings/zh_Hant.json | 1 -
32 files changed, 2 insertions(+), 32 deletions(-)
diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index 7f4aa0325a..1332f52f97 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -399,7 +399,7 @@ module.exports = React.createClass({
if (this.props.enableGuest) {
loginAsGuestJsx =
- { _t('Login as guest') }
+ { _t('Try the app first') }
;
}
diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 4911ad970e..2a7696f872 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -888,7 +888,6 @@
"This homeserver doesn't offer any login flows which are supported by this client.": "Този Home сървър не предлага методи за влизане, които се поддържат от този клиент.",
"Error: Problem communicating with the given homeserver.": "Грешка: Проблем при комуникацията с дадения Home сървър.",
"Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "Не е възможно свързване към Home сървъра чрез HTTP, когато има HTTPS адрес в лентата на браузъра Ви. Или използвайте HTTPS или включете функция небезопасни скриптове.",
- "Login as guest": "Влез като гост",
"Sign in to get started": "Влезте в профила си, за да започнете",
"Set a display name:": "Задаване на име:",
"Upload an avatar:": "Качване на профилна снимка:",
diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 407b9f61d4..ab4e803342 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -579,7 +579,6 @@
"%(nameList)s %(transitionList)s": "%(transitionList)s%(nameList)s",
"%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s han entrat",
"Guest access is disabled on this Home Server.": "L'accés a usuaris d'altres xarxes no està permès en aquest servidor.",
- "Login as guest": "Inicia sessió com a convidat",
"Unblacklist": "Treure de la llista negre",
"%(oneUser)sjoined %(count)s times|one": "%(oneUser)s s'ha unit",
"%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s han sortit",
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 33c7a3d5f1..441e16e2c3 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -239,7 +239,6 @@
"Level:": "Úroveň:",
"Local addresses for this room:": "Místní adresy této místnosti:",
"Logged in as:": "Přihlášen/a jako:",
- "Login as guest": "Přihlášen/a jako host",
"matrix-react-sdk version:": "Verze matrix-react-sdk:",
"Mobile phone number": "Číslo mobilního telefonu",
"Mobile phone number (optional)": "Číslo mobilního telefonu (nepovinné)",
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 2a59530d5a..e10534d7f1 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -39,7 +39,6 @@
"Searches DuckDuckGo for results": "Søger DuckDuckGo for resultater",
"Commands": "kommandoer",
"Emoji": "Emoji",
- "Login as guest": "Log ind som gæst",
"Sign in": "Log ind",
"Warning!": "Advarsel!",
"Account": "Konto",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 4892b91b48..16ca9462b3 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -40,7 +40,6 @@
"Searches DuckDuckGo for results": "Verwendet DuckDuckGo für Suchergebnisse",
"Commands": "Kommandos",
"Emoji": "Emoji",
- "Login as guest": "Als Gast anmelden",
"Sign in": "Anmelden",
"Warning!": "Warnung!",
"Error": "Fehler",
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index fabd88c74a..929ca5e7df 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -142,7 +142,6 @@
"%(targetName)s left the room.": "Ο χρήστης %(targetName)s έφυγε από το δωμάτιο.",
"Local addresses for this room:": "Τοπική διεύθυνση για το δωμάτιο:",
"Logged in as:": "Συνδεθήκατε ως:",
- "Login as guest": "Σύνδεση ως επισκέπτης",
"Logout": "Αποσύνδεση",
"Low priority": "Χαμηλής προτεραιότητας",
"matrix-react-sdk version:": "Έκδοση matrix-react-sdk:",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index bf9e395bee..8e068d5651 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1120,7 +1120,7 @@
"Error: Problem communicating with the given homeserver.": "Error: Problem communicating with the given homeserver.",
"Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.",
"Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.",
- "Login as guest": "Login as guest",
+ "Try the app first": "Try the app first",
"Sign in to get started": "Sign in to get started",
"Failed to fetch avatar URL": "Failed to fetch avatar URL",
"Set a display name:": "Set a display name:",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 43e2041020..2a1b97b536 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -209,7 +209,6 @@
"Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
"Local addresses for this room:": "Local addresses for this room:",
"Logged in as:": "Logged in as:",
- "Login as guest": "Login as guest",
"Logout": "Logout",
"Low priority": "Low priority",
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s made future room history visible to all room members, from the point they are invited.",
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 68645ffd9c..f48d10fa9f 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -862,7 +862,6 @@
"Error: Problem communicating with the given homeserver.": "Eraro: Estas problemo en komunikado kun la hejmservilo.",
"Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "Hejmservilo ne alkonekteblas per HTTP kun HTTPS URL en via adresbreto. Aŭ uzu HTTPS aŭ ŝaltu malsekurajn skriptojn.",
"Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Ne eblas konekti al hejmservilo – bonvolu kontroli vian konekton, certigi ke la SSL-atestilo de via hejmservilo estas fidata, kaj ke neniu foliumila kromprogramo baras petojn.",
- "Login as guest": "Saluti kiel gasto",
"Sign in to get started": "Komencu per saluto",
"Failed to fetch avatar URL": "Malsukcesis venigi adreson de profilbildo",
"Set a display name:": "Agordi vidigan nomon:",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 8e7925ba36..5180461828 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -166,7 +166,6 @@
"%(targetName)s left the room.": "%(targetName)s ha dejado la sala.",
"Local addresses for this room:": "Direcciones locales para esta sala:",
"Logged in as:": "Sesión iniciada como:",
- "Login as guest": "Iniciar sesión como invitado",
"Logout": "Cerrar Sesión",
"Low priority": "Baja prioridad",
"Accept": "Aceptar",
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 04d2e86664..9c9e5a7589 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -298,7 +298,6 @@
"Level:": "Maila:",
"Local addresses for this room:": "Gela honen tokiko helbideak:",
"Logged in as:": "Saioa hasteko erabiltzailea:",
- "Login as guest": "Hasi saioa bisitari gisa",
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, gonbidapena egiten zaienetik.",
"%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, elkartzen direnetik.",
"%(senderName)s made future room history visible to all room members.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat.",
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index e5787ab561..b96dbafa14 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -198,7 +198,6 @@
"Level:": "Taso:",
"Local addresses for this room:": "Tämän huoneen paikalliset osoitteet:",
"Logged in as:": "Kirjautunut käyttäjänä:",
- "Login as guest": "Kirjaudu vieraana",
"Logout": "Kirjaudu ulos",
"Low priority": "Alhainen prioriteetti",
"Manage Integrations": "Hallinoi integraatioita",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index dc36520506..5194dc21e7 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -166,7 +166,6 @@
"%(targetName)s left the room.": "%(targetName)s a quitté le salon.",
"Local addresses for this room:": "Adresses locales pour ce salon :",
"Logged in as:": "Identifié en tant que :",
- "Login as guest": "Se connecter en tant que visiteur",
"Logout": "Se déconnecter",
"Low priority": "Priorité basse",
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s a rendu l'historique visible à tous les membres du salon, depuis le moment où ils ont été invités.",
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index fdab066031..fc1adfc478 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -879,7 +879,6 @@
"Error: Problem communicating with the given homeserver.": "Fallo: problema ao comunicarse con servidor proporcionado.",
"Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "Non se pode conectar ao servidor vía HTTP cando na barra de enderezos do navegador está HTTPS. Utilice HTTPS ou active scripts non seguros.",
"Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Non se conectou ao servidor - por favor comprobe a conexión, asegúrese de o certificado SSL do servidor é de confianza, e que ningún engadido do navegador está bloqueando as peticións.",
- "Login as guest": "Conexión como convidado",
"Sign in to get started": "Conéctese para iniciar",
"Failed to fetch avatar URL": "Fallo ao obter o URL do avatar",
"Set a display name:": "Establecer nome público:",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index f2aaac9a81..6012e857f5 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -238,7 +238,6 @@
"Level:": "Szint:",
"Local addresses for this room:": "A szoba helyi címe:",
"Logged in as:": "Bejelentkezve mint:",
- "Login as guest": "Belépés vendégként",
"Logout": "Kilép",
"Low priority": "Alacsony prioritás",
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s elérhetővé tette a szoba új üzeneteit nekik minden résztvevő a szobában, amióta meg van hívva.",
diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
index 9db1a4a99c..00d56e6074 100644
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -62,7 +62,6 @@
"Sign in with": "Masuk dengan",
"Leave room": "Meninggalkan ruang",
"Level:": "Tingkat:",
- "Login as guest": "Masuk sebagai tamu",
"Logout": "Keluar",
"Low priority": "Prioritas rendah",
"Markdown is disabled": "Markdown dinonaktifkan",
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 068ad01ff1..5ba19d1622 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -909,7 +909,6 @@
"Error: Problem communicating with the given homeserver.": "Errore: problema di comunicazione con l'homeserver dato.",
"Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "Impossibile connettersi all'homeserver via HTTP quando c'è un URL HTTPS nella barra del tuo browser. Usa HTTPS o attiva gli script non sicuri.",
"Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Impossibile connettersi all'homeserver - controlla la tua connessione, assicurati che il certificato SSL dell'homeserver sia fidato e che un'estensione del browser non stia bloccando le richieste.",
- "Login as guest": "Accedi come ospite",
"Sign in to get started": "Accedi per iniziare",
"Failed to fetch avatar URL": "Ricezione URL dell'avatar fallita",
"Set a display name:": "Imposta un nome visualizzato:",
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 4e0a988223..58333f23ad 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -240,7 +240,6 @@
"Level:": "등급:",
"Local addresses for this room:": "이 방의 로컬 주소:",
"Logged in as:": "로그인:",
- "Login as guest": "손님으로 로그인",
"Logout": "로그아웃",
"Low priority": "낮은 우선순위",
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s님이 이후 방의 기록을 볼 수 있게 하셨어요 방 구성원 모두, 초대받은 시점부터.",
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 01e3ae5c6d..37cb6ec324 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -224,7 +224,6 @@
"Level:": "Līmenis:",
"Local addresses for this room:": "Šīs istabas lokālās adreses:",
"Logged in as:": "Pierakstījās kā:",
- "Login as guest": "Pierakstīties kā viesim",
"Logout": "Izrakstīties",
"Low priority": "Zemas prioritātes",
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem no brīža, kad tie tika uzaicināti.",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 0df2cf1bd7..3e48fb9c3a 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -305,7 +305,6 @@
"Level:": "Niveau:",
"Local addresses for this room:": "Lokale adressen voor deze ruimte:",
"Logged in as:": "Ingelogd als:",
- "Login as guest": "Als gast inloggen",
"Logout": "Uitloggen",
"Low priority": "Lage prioriteit",
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s heeft de toekomstige ruimtegeschiedenis zichtbaar gemaakt voor alle kamerleden, vanaf het moment dat ze uitgenodigt zijn.",
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index d3dcb72f49..2ef30f7732 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -303,7 +303,6 @@
"Publish this room to the public in %(domain)s's room directory?": "Czy opublikować ten pokój dla ogółu w spisie pokojów domeny %(domain)s?",
"Local addresses for this room:": "Lokalne adresy dla tego pokoju:",
"Logged in as:": "Zalogowany jako:",
- "Login as guest": "Zaloguj jako gość",
"Logout": "Wyloguj",
"Low priority": "Niski priorytet",
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s uczynił przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju, od momentu ich zaproszenia.",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index d165c6c057..9b1c599501 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -83,7 +83,6 @@
"Kicks user with given id": "Remove usuário com o identificador informado",
"Labs": "Laboratório",
"Leave room": "Sair da sala",
- "Login as guest": "Entrar como visitante",
"Logout": "Sair",
"Low priority": "Baixa prioridade",
"Manage Integrations": "Gerenciar integrações",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 0a4d847805..55a503dbe7 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -83,7 +83,6 @@
"Kicks user with given id": "Remove usuário com o identificador informado",
"Labs": "Laboratório",
"Leave room": "Sair da sala",
- "Login as guest": "Entrar como visitante",
"Logout": "Sair",
"Low priority": "Baixa prioridade",
"Manage Integrations": "Gerenciar integrações",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index e2529ed1bc..c93b9a2e3b 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -75,7 +75,6 @@
"Kicks user with given id": "Выкидывает пользователя с заданным ID",
"Labs": "Лаборатория",
"Leave room": "Покинуть комнату",
- "Login as guest": "Войти как гость",
"Logout": "Выйти",
"Low priority": "Неважные",
"Manage Integrations": "Управление интеграциями",
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index c7f38cff35..b40ba8f750 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -822,7 +822,6 @@
"Error: Problem communicating with the given homeserver.": "Chyba: Nie je možné komunikovať so zadaným domovským serverom.",
"Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "K domovskému serveru nie je možné pripojiť sa použitím protokolu HTTP keďže v adresnom riadku prehliadača máte HTTPS adresu. Použite protokol HTTPS alebo povolte nezabezpečené skripty.",
"Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Nie je možné pripojiť sa k domovskému serveru - skontrolujte prosím funkčnosť vašeho pripojenia na internet, uistite sa že certifikát domovského servera je dôverihodný, a že žiaden doplnok nainštalovaný v prehliadači nemôže blokovať požiadavky.",
- "Login as guest": "Prihlásiť sa ako hosť",
"Failed to fetch avatar URL": "Nepodarilo sa získať URL adresu obrázka",
"Set a display name:": "Nastaviť zobrazované meno:",
"Upload an avatar:": "Nahrať obrázok:",
diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index ebacd28a5c..e73107376b 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -903,7 +903,6 @@
"Error: Problem communicating with the given homeserver.": "Грешка: проблем у комуницирању са датим кућним сервером.",
"Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "Не могу да се повежем на кућни сервер преко HTTP-а када се користи HTTPS адреса у траци вашег прегледача. Или користите HTTPS или омогућите небезбедне скрипте.",
"Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Не могу да се повежем на кућни сервер. Проверите вашу интернет везу, постарајте се да верујете SSL сертификату кућног сервера и да проширење прегледача не блокира захтеве.",
- "Login as guest": "Пријави се као гост",
"Sign in to get started": "Пријави се да почнеш",
"Failed to fetch avatar URL": "Нисам успео да добавим адресу аватара",
"Set a display name:": "Постави приказно име:",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 0f898a3374..36c858247e 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -224,7 +224,6 @@
"Level:": "Nivå:",
"Local addresses for this room:": "Lokala adresser för rummet:",
"Logged in as:": "Inloggad som:",
- "Login as guest": "Logga in som gäst",
"Logout": "Logga ut",
"Low priority": "Lågprioritet",
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar från att de bjöds in.",
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index 6fa7febabd..f59ae4b53b 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -178,7 +178,6 @@
"Leave room": "ออกจากห้อง",
"%(targetName)s left the room.": "%(targetName)s ออกจากห้องแล้ว",
"Logged in as:": "เข้าสู่ระบบในชื่อ:",
- "Login as guest": "เข้าสู่ระบบในฐานะแขก",
"Logout": "ออกจากระบบ",
"Markdown is disabled": "ปิดใช้งาน Markdown แล้ว",
"Markdown is enabled": "เปิดใช้งาน Markdown แล้ว",
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 797fed79ce..3fb790c0d6 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -224,7 +224,6 @@
"Level:": "Seviye :",
"Local addresses for this room:": "Bu oda için yerel adresler :",
"Logged in as:": "Olarak giriş yaptı :",
- "Login as guest": "Misafir olarak giriş yaptı",
"Logout": "Çıkış Yap",
"Low priority": "Düşük öncelikli",
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gelecekte oda geçmişini görünür yaptı Tüm oda üyeleri , davet edildiği noktadan.",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 8e2dc6e0f8..cb39c1751b 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -153,7 +153,6 @@
"Jump to first unread message.": "跳到第一条未读消息。",
"%(senderName)s kicked %(targetName)s.": "%(senderName)s 把 %(targetName)s 踢出了聊天室。.",
"Leave room": "退出聊天室",
- "Login as guest": "以游客的身份登录",
"New password": "新密码",
"Add a topic": "添加一个主题",
"Admin": "管理员",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 6ceda34507..bc5464d315 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -123,7 +123,6 @@
"Jump to first unread message.": "跳到第一則未讀訊息。",
"%(senderName)s kicked %(targetName)s.": "%(senderName)s 把 %(targetName)s 踢出了聊天室。.",
"Leave room": "離開聊天室",
- "Login as guest": "以游客的身份登錄",
"New password": "新密碼",
"Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "重設密碼目前會把所有裝置上的端到端加密金鑰重設，讓已加密的聊天歷史不可讀，除非您先匯出您的聊天室金鑰並在稍後重新匯入。這會在未來改進。",
"Return to login screen": "返回到登入畫面",
From ec53b5f5ab3d00593fca3da788ec1bf0c333cac2 Mon Sep 17 00:00:00 2001
From: Travis Ralston
Date: Sat, 26 May 2018 21:21:06 -0600
Subject: [PATCH 0114/1196] Expose at-room power level setting
Fixes https://github.com/vector-im/riot-web/issues/5835
Signed-off-by: Travis Ralston
---
src/components/views/rooms/RoomSettings.js | 27 ++++++++++++++++++++--
src/i18n/strings/en_EN.json | 1 +
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 059e07ffdb..0ccfa23bf3 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -395,7 +395,17 @@ module.exports = React.createClass({
powerLevels["events"] = Object.assign({}, this.state.powerLevels["events"] || {});
powerLevels["events"][powerLevelKey.slice(eventsLevelPrefix.length)] = value;
} else {
- powerLevels[powerLevelKey] = value;
+ const keyPath = powerLevelKey.split('.');
+ let parentObj;
+ let currentObj = powerLevels;
+ for (const key of keyPath) {
+ if (!currentObj[key]) {
+ currentObj[key] = {};
+ }
+ parentObj = currentObj;
+ currentObj = currentObj[key];
+ }
+ parentObj[keyPath[keyPath.length - 1]] = value;
}
this.setState({
powerLevels,
@@ -664,6 +674,10 @@ module.exports = React.createClass({
desc: _t('To remove other users\' messages, you must be a'),
defaultValue: 50,
},
+ "notifications.room": {
+ desc: _t('To notify everyone in the room, you must be a'),
+ defaultValue: 50,
+ },
};
const banLevel = parseIntWithDefault(powerLevels.ban, powerLevelDescriptors.ban.defaultValue);
@@ -865,7 +879,16 @@ module.exports = React.createClass({
const powerSelectors = Object.keys(powerLevelDescriptors).map((key, index) => {
const descriptor = powerLevelDescriptors[key];
- const value = parseIntWithDefault(powerLevels[key], descriptor.defaultValue);
+ const keyPath = key.split('.');
+ let currentObj = powerLevels;
+ for (const prop of keyPath) {
+ if (currentObj === undefined) {
+ break;
+ }
+ currentObj = currentObj[prop];
+ }
+
+ const value = parseIntWithDefault(currentObj, descriptor.defaultValue);
return
- { placeholder }
+ { showPlaceholder &&
+
+ }
+
-
+ { placeholder }
+
{ img }
From fb5dd4a410e25e8ea145d9f6cd7ebae74e67f3d9 Mon Sep 17 00:00:00 2001
From: Luke Barnard
Date: Tue, 22 May 2018 10:46:10 +0100
Subject: [PATCH 0071/1196] Remove spurious fixupHeight
---
src/components/views/messages/MImageBody.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index e2316b2fcc..083dc342db 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -211,7 +211,6 @@ export default class extends React.Component {
});
}).done();
}
- this.fixupHeight();
this._afterComponentDidMount();
}
From c249bee9b53f4718319f7bcc9128059709e55260 Mon Sep 17 00:00:00 2001
From: Luke Barnard
Date: Tue, 22 May 2018 16:09:54 +0100
Subject: [PATCH 0072/1196] Grammar
---
src/components/views/messages/MImageBody.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 083dc342db..c210c64318 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -240,7 +240,7 @@ export default class extends React.Component {
_messageContent(contentUrl, thumbUrl, content) {
// The maximum height of the thumbnail as it is rendered as an ![]()
const maxHeight = Math.min(THUMBNAIL_MAX_HEIGHT, content.info.h);
- // The maximum width of the thumbnail, as dictated by it's natural
+ // The maximum width of the thumbnail, as dictated by its natural
// maximum height.
const maxWidth = content.info.w * maxHeight / content.info.h;
From 538979a4ee7b6f9e4d92e57749e35a2bcc5d8689 Mon Sep 17 00:00:00 2001
From: Luke Barnard
Date: Tue, 22 May 2018 17:13:45 +0100
Subject: [PATCH 0073/1196] Fix MVideoBody spinner
---
src/components/views/messages/MVideoBody.js | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/components/views/messages/MVideoBody.js b/src/components/views/messages/MVideoBody.js
index 5365daee03..37fc94d1ed 100644
--- a/src/components/views/messages/MVideoBody.js
+++ b/src/components/views/messages/MVideoBody.js
@@ -147,12 +147,7 @@ module.exports = React.createClass({
// For now add an img tag with a spinner.
return (
-
Date: Sat, 26 May 2018 18:40:48 -0600
Subject: [PATCH 0109/1196] Align pinned message contents and reduce image size
Fixes https://github.com/vector-im/riot-web/issues/5421
Signed-off-by: Travis Ralston
---
res/css/views/rooms/_PinnedEventTile.scss | 14 +++++++-------
src/components/views/messages/MImageBody.js | 8 ++++++--
src/components/views/messages/MessageEvent.js | 6 +++++-
src/components/views/rooms/PinnedEventTile.js | 6 +++++-
4 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/res/css/views/rooms/_PinnedEventTile.scss b/res/css/views/rooms/_PinnedEventTile.scss
index be6acdf524..fa76f4c679 100644
--- a/res/css/views/rooms/_PinnedEventTile.scss
+++ b/res/css/views/rooms/_PinnedEventTile.scss
@@ -33,13 +33,6 @@ limitations under the License.
padding-bottom: 3px;
}
-.mx_PinnedEventTile .mx_EventTile_content {
- margin-left: 50px;
- position: relative;
- top: 0;
- left: 0;
-}
-
.mx_PinnedEventTile .mx_PinnedEventTile_senderAvatar .mx_BaseAvatar {
float: left;
margin-right: 10px;
@@ -65,3 +58,10 @@ limitations under the License.
display: inline-block;
font-size: 0.7em; // Smaller text to avoid conflicting with the layout
}
+
+.mx_PinnedEventTile_message {
+ margin-left: 50px;
+ position: relative;
+ top: 0;
+ left: 0;
+}
\ No newline at end of file
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 8045d43104..4dfd89ec0a 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -40,6 +40,9 @@ export default class extends React.Component {
/* called when the image has loaded */
onWidgetLoad: PropTypes.func.isRequired,
+
+ /* the maximum image height to use */
+ maxImageHeight: PropTypes.number,
}
static contextTypes = {
@@ -249,8 +252,9 @@ export default class extends React.Component {
const content = this.props.mxEvent.getContent();
const timelineWidth = this.refs.body.offsetWidth;
- const maxHeight = 600; // let images take up as much width as they can so long as the height doesn't exceed 600px.
- // the alternative here would be 600*timelineWidth/800; to scale them down to fit inside a 4:3 bounding box
+ const maxHeight = this.props.maxImageHeight || 600; // let images take up as much width as they can so long
+ // as the height doesn't exceed 600px. The alternative here would be 600*timelineWidth/800; to scale them down
+ // to fit inside a 4:3 bounding box
// FIXME: this will break on clientside generated thumbnails (as per e2e rooms)
// which may well be much smaller than the 800x600 bounding box.
diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js
index 7358e297c7..38f55c9d70 100644
--- a/src/components/views/messages/MessageEvent.js
+++ b/src/components/views/messages/MessageEvent.js
@@ -39,8 +39,11 @@ module.exports = React.createClass({
/* callback called when dynamic content in events are loaded */
onWidgetLoad: PropTypes.func,
- /* the shsape of the tile, used */
+ /* the shape of the tile, used */
tileShape: PropTypes.string,
+
+ /* the maximum image height to use, if the event is an image */
+ maxImageHeight: PropTypes.number,
},
getEventTileOps: function() {
@@ -78,6 +81,7 @@ module.exports = React.createClass({
highlightLink={this.props.highlightLink}
showUrlPreview={this.props.showUrlPreview}
tileShape={this.props.tileShape}
+ maxImageHeight={this.props.maxImageHeight}
onWidgetLoad={this.props.onWidgetLoad} />;
},
});
diff --git a/src/components/views/rooms/PinnedEventTile.js b/src/components/views/rooms/PinnedEventTile.js
index 91d656d60b..478454a3d8 100644
--- a/src/components/views/rooms/PinnedEventTile.js
+++ b/src/components/views/rooms/PinnedEventTile.js
@@ -86,7 +86,11 @@ module.exports = React.createClass({
{ sender.name }
-
);
},
From 085271a86427ecfe0c0104d6c2ed1410881ece44 Mon Sep 17 00:00:00 2001
From: Travis Ralston
+
From cace5e8bfcf4c83fd916798f176a9a45ed292f73 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Wed, 23 May 2018 00:41:46 +0100
Subject: [PATCH 0074/1196] fix bug where selection breaks after inserting
emoji
---
src/components/views/rooms/MessageComposerInput.js | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 6919a304c2..b71aaa6a42 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -33,7 +33,6 @@ import PlainWithPillsSerializer from "../../../autocomplete/PlainWithPillsSerial
// Entity} from 'draft-js';
import classNames from 'classnames';
-import escape from 'lodash/escape';
import Promise from 'bluebird';
import MatrixClientPeg from '../../../MatrixClientPeg';
@@ -507,6 +506,15 @@ export default class MessageComposerInput extends React.Component {
}
});
+ // work around weird bug where inserting emoji via the macOS
+ // emoji picker can leave the selection stuck in the emoji's
+ // child text. This seems to happen due to selection getting
+ // moved in the normalisation phase after calculating these changes
+ if (editorState.document.getParent(editorState.anchorKey).type === 'emoji') {
+ change = change.collapseToStartOfNextText();
+ editorState = change.value;
+ }
+
/*
const currentBlock = editorState.getSelection().getStartKey();
const currentSelection = editorState.getSelection();
From e7a4ffaf4531ffec7399bf42508eee491ec69718 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Wed, 23 May 2018 00:52:00 +0100
Subject: [PATCH 0075/1196] fix emojioneifying autoconverted emoji
---
.../views/rooms/MessageComposerInput.js | 51 ++++++++++---------
1 file changed, 26 insertions(+), 25 deletions(-)
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index b71aaa6a42..cb015dd0ba 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -482,6 +482,32 @@ export default class MessageComposerInput extends React.Component {
}
*/
+ if (editorState.startText !== null) {
+ const text = editorState.startText.text;
+ const currentStartOffset = editorState.startOffset;
+
+ // Automatic replacement of plaintext emoji to Unicode emoji
+ if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) {
+ // The first matched group includes just the matched plaintext emoji
+ const emojiMatch = REGEX_EMOJI_WHITESPACE.exec(text.slice(0, currentStartOffset));
+ if (emojiMatch) {
+ // plaintext -> hex unicode
+ const emojiUc = asciiList[emojiMatch[1]];
+ // hex unicode -> shortname -> actual unicode
+ const unicodeEmoji = shortnameToUnicode(EMOJI_UNICODE_TO_SHORTNAME[emojiUc]);
+
+ const range = Range.create({
+ anchorKey: editorState.selection.startKey,
+ anchorOffset: currentStartOffset - emojiMatch[1].length - 1,
+ focusKey: editorState.selection.startKey,
+ focusOffset: currentStartOffset - 1,
+ });
+ change = change.insertTextAtRange(range, unicodeEmoji);
+ editorState = change.value;
+ }
+ }
+ }
+
// emojioneify any emoji
// XXX: is getTextsAsArray a private API?
@@ -544,31 +570,6 @@ export default class MessageComposerInput extends React.Component {
editorState = EditorState.forceSelection(editorState, currentSelection);
}
*/
- if (editorState.startText !== null) {
- const text = editorState.startText.text;
- const currentStartOffset = editorState.startOffset;
-
- // Automatic replacement of plaintext emoji to Unicode emoji
- if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) {
- // The first matched group includes just the matched plaintext emoji
- const emojiMatch = REGEX_EMOJI_WHITESPACE.exec(text.slice(0, currentStartOffset));
- if (emojiMatch) {
- // plaintext -> hex unicode
- const emojiUc = asciiList[emojiMatch[1]];
- // hex unicode -> shortname -> actual unicode
- const unicodeEmoji = shortnameToUnicode(EMOJI_UNICODE_TO_SHORTNAME[emojiUc]);
-
- const range = Range.create({
- anchorKey: editorState.selection.startKey,
- anchorOffset: currentStartOffset - emojiMatch[1].length - 1,
- focusKey: editorState.selection.startKey,
- focusOffset: currentStartOffset,
- });
- change = change.insertTextAtRange(range, unicodeEmoji);
- editorState = change.value;
- }
- }
- }
if (this.props.onInputStateChanged && editorState.blocks.size > 0) {
let blockType = editorState.blocks.first().type;
From 794a60b9f8976452add3885f5a07af7f6f5362e4 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Wed, 23 May 2018 01:36:21 +0100
Subject: [PATCH 0076/1196] refocus editor immediately after executing commands
and persist selections correctly across blur/focus
---
.../views/rooms/MessageComposerInput.js | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index cb015dd0ba..3a0329c399 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -1005,12 +1005,13 @@ export default class MessageComposerInput extends React.Component {
this.historyManager.save(editorState, this.state.isRichTextEnabled ? 'rich' : 'markdown');
this.setState({
editorState: this.createEditorState(),
+ }, ()=>{
+ this.refs.editor.focus();
});
}
if (cmd.promise) {
cmd.promise.then(()=>{
console.log("Command success.");
- this.refs.editor.focus();
}, (err)=>{
console.error("Command failure: %s", err);
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
@@ -1499,6 +1500,18 @@ export default class MessageComposerInput extends React.Component {
this.handleKeyCommand('toggle-mode');
};
+ onBlur = (e) => {
+ this.selection = this.state.editorState.selection;
+ };
+
+ onFocus = (e) => {
+ if (this.selection) {
+ const change = this.state.editorState.change().select(this.selection);
+ this.onChange(change);
+ delete this.selection;
+ }
+ };
+
render() {
const activeEditorState = this.state.originalEditorState || this.state.editorState;
@@ -1532,6 +1545,8 @@ export default class MessageComposerInput extends React.Component {
onChange={this.onChange}
onKeyDown={this.onKeyDown}
onPaste={this.onPaste}
+ onBlur={this.onBlur}
+ onFocus={this.onFocus}
renderNode={this.renderNode}
renderMark={this.renderMark}
spellCheck={true}
From 6ac23248745d9303f0cdc7ce62ca94c018a1c6ba Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Wed, 23 May 2018 01:43:03 +0100
Subject: [PATCH 0077/1196] fix wordwrap and pre formatting
---
res/css/views/rooms/_MessageComposer.scss | 27 ++---------------------
1 file changed, 2 insertions(+), 25 deletions(-)
diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index 72d31cfddd..3eb445d239 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -89,6 +89,7 @@ limitations under the License.
max-height: 120px;
min-height: 19px;
overflow: auto;
+ word-break: break-word;
}
// FIXME: rather unpleasant hack to get rid of margins.
@@ -110,30 +111,6 @@ limitations under the License.
animation: 0.2s visualbell;
}
-.mx_MessageComposer_input_empty .public-DraftEditorPlaceholder-root {
- display: none;
-}
-
-/*
-.mx_MessageComposer_input .DraftEditor-root {
- width: 100%;
- flex: 1;
- word-break: break-word;
- max-height: 120px;
- min-height: 21px;
- overflow: auto;
-}
-*/
-
-.mx_MessageComposer_input .DraftEditor-root .DraftEditor-editorContainer {
- /* Ensure mx_UserPill and mx_RoomPill (see _RichText) are not obscured from the top */
- padding-top: 2px;
-}
-
-.mx_MessageComposer .public-DraftStyleDefault-block {
- overflow-x: hidden;
-}
-
.mx_MessageComposer_input blockquote {
color: $blockquote-fg-color;
margin: 0 0 16px;
@@ -141,7 +118,7 @@ limitations under the License.
border-left: 4px solid $blockquote-bar-color;
}
-.mx_MessageComposer_input pre.public-DraftStyleDefault-pre pre {
+.mx_MessageComposer_input pre {
background-color: $rte-code-bg-color;
border-radius: 3px;
padding: 10px;
From 6fba8311f9af31bee30eadd188d655a38f11478c Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Wed, 23 May 2018 02:09:30 +0100
Subject: [PATCH 0078/1196] escape blockquotes correctly
and fix NPE
---
src/components/views/rooms/MessageComposerInput.js | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 3a0329c399..4b41c76076 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -184,7 +184,7 @@ export default class MessageComposerInput extends React.Component {
// TODO: this can probably be more robust - it doesn't consider
// indenting or lists for instance.
return children.replace(/([*_~`+])/g, '\\$1')
- .replace(/^([>#\|])/g, '\\$1');
+ .replace(/^([>#\|])/mg, '\\$1');
}
else if (obj.object === 'inline') {
switch (obj.type) {
@@ -369,6 +369,7 @@ export default class MessageComposerInput extends React.Component {
let fragmentChange = fragment.change();
fragmentChange.moveToRangeOf(fragment.document)
.wrapBlock(quote);
+ //.setBlocks('block-quote');
// FIXME: handle pills and use commonmark rather than md-serialize
const md = this.md.serialize(fragmentChange.value);
@@ -536,7 +537,9 @@ export default class MessageComposerInput extends React.Component {
// emoji picker can leave the selection stuck in the emoji's
// child text. This seems to happen due to selection getting
// moved in the normalisation phase after calculating these changes
- if (editorState.document.getParent(editorState.anchorKey).type === 'emoji') {
+ if (editorState.anchorKey &&
+ editorState.document.getParent(editorState.anchorKey).type === 'emoji')
+ {
change = change.collapseToStartOfNextText();
editorState = change.value;
}
From fc1c4996fc80bd841dc3dd14165d504bdcbd6707 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Wed, 23 May 2018 02:15:34 +0100
Subject: [PATCH 0079/1196] slate-md-serializer 3.1.0 now escapes correctly
---
package.json | 2 +-
src/components/views/rooms/MessageComposerInput.js | 10 +---------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/package.json b/package.json
index dfc02a7e26..eea7a6857f 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"slate": "^0.33.4",
"slate-react": "^0.12.4",
"slate-html-serializer": "^0.6.1",
- "slate-md-serializer": "^3.0.3",
+ "slate-md-serializer": "^3.1.0",
"sanitize-html": "^1.14.1",
"text-encoding-utf-8": "^1.0.1",
"url": "^0.11.0",
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 4b41c76076..0b57e90184 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -178,15 +178,7 @@ export default class MessageComposerInput extends React.Component {
rules: [
{
serialize: (obj, children) => {
- if (obj.object === 'string') {
- // escape any MD in it. i have no idea why the serializer doesn't
- // do this already.
- // TODO: this can probably be more robust - it doesn't consider
- // indenting or lists for instance.
- return children.replace(/([*_~`+])/g, '\\$1')
- .replace(/^([>#\|])/mg, '\\$1');
- }
- else if (obj.object === 'inline') {
+ if (obj.object === 'inline') {
switch (obj.type) {
case 'pill':
return `[${ obj.data.get('completion') }](${ obj.data.get('href') })`;
From edc8264cff0ee7110d786d76961b59a55830380c Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Wed, 23 May 2018 02:48:57 +0100
Subject: [PATCH 0080/1196] shift to custom slate-md-serializer
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index eea7a6857f..542f6c7cc2 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"slate": "^0.33.4",
"slate-react": "^0.12.4",
"slate-html-serializer": "^0.6.1",
- "slate-md-serializer": "^3.1.0",
+ "slate-md-serializer": "matrix-org/slate-md-serializer#50a133a8",
"sanitize-html": "^1.14.1",
"text-encoding-utf-8": "^1.0.1",
"url": "^0.11.0",
From 6f3634c33f9d0305d79770b08c0daa01edca0d13 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Wed, 23 May 2018 03:08:55 +0100
Subject: [PATCH 0081/1196] bump slate-md-serializer
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 542f6c7cc2..63022f6c9d 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"slate": "^0.33.4",
"slate-react": "^0.12.4",
"slate-html-serializer": "^0.6.1",
- "slate-md-serializer": "matrix-org/slate-md-serializer#50a133a8",
+ "slate-md-serializer": "matrix-org/slate-md-serializer#d6a7652",
"sanitize-html": "^1.14.1",
"text-encoding-utf-8": "^1.0.1",
"url": "^0.11.0",
From a822a1c9a07d7d83ebc7b39149e3d67188dbfea8 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Wed, 23 May 2018 03:19:33 +0100
Subject: [PATCH 0082/1196] bump dep
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 63022f6c9d..f45d3a4d95 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
"flux": "2.1.1",
"focus-trap-react": "^3.0.5",
"fuse.js": "^2.2.0",
- "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
+ "gemini-scrollbar": "matrix-org/gemini-scrollbar#926a4c7",
"gfm.css": "^1.1.1",
"glob": "^5.0.14",
"highlight.js": "^9.0.0",
From 079b1238a1954fbf096627b10eb58bc378461e68 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Wed, 23 May 2018 03:20:59 +0100
Subject: [PATCH 0083/1196] bump right dep
---
package.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index f45d3a4d95..79a3bf80e1 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
"flux": "2.1.1",
"focus-trap-react": "^3.0.5",
"fuse.js": "^2.2.0",
- "gemini-scrollbar": "matrix-org/gemini-scrollbar#926a4c7",
+ "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
"gfm.css": "^1.1.1",
"glob": "^5.0.14",
"highlight.js": "^9.0.0",
@@ -86,7 +86,7 @@
"slate": "^0.33.4",
"slate-react": "^0.12.4",
"slate-html-serializer": "^0.6.1",
- "slate-md-serializer": "matrix-org/slate-md-serializer#d6a7652",
+ "slate-md-serializer": "matrix-org/slate-md-serializer#926a4c7",
"sanitize-html": "^1.14.1",
"text-encoding-utf-8": "^1.0.1",
"url": "^0.11.0",
From 95bfface99a917aaa466873ab3b050f9990dae68 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Wed, 23 May 2018 03:43:40 +0100
Subject: [PATCH 0084/1196] comment out broken logic for stripping p tags &
bump dep
---
package.json | 2 +-
src/Markdown.js | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 79a3bf80e1..33bc75eff8 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"slate": "^0.33.4",
"slate-react": "^0.12.4",
"slate-html-serializer": "^0.6.1",
- "slate-md-serializer": "matrix-org/slate-md-serializer#926a4c7",
+ "slate-md-serializer": "matrix-org/slate-md-serializer#1635f37",
"sanitize-html": "^1.14.1",
"text-encoding-utf-8": "^1.0.1",
"url": "^0.11.0",
diff --git a/src/Markdown.js b/src/Markdown.js
index e67f4df4fd..2b16800d85 100644
--- a/src/Markdown.js
+++ b/src/Markdown.js
@@ -102,6 +102,7 @@ export default class Markdown {
// (https://github.com/vector-im/riot-web/issues/3154)
softbreak: '
', }); +/* const real_paragraph = renderer.paragraph; renderer.paragraph = function(node, entering) { @@ -114,16 +115,21 @@ export default class Markdown { real_paragraph.call(this, node, entering); } }; +*/ renderer.html_inline = html_if_tag_allowed; + renderer.html_block = function(node) { +/* // as with `paragraph`, we only insert line breaks // if there are multiple lines in the markdown. const isMultiLine = is_multi_line(node); - if (isMultiLine) this.cr(); +*/ html_if_tag_allowed.call(this, node); +/* if (isMultiLine) this.cr(); +*/ }; return renderer.render(this.parsed); @@ -150,6 +156,7 @@ export default class Markdown { this.lit(s); }; +/* renderer.paragraph = function(node, entering) { // as with toHTML, only append lines to paragraphs if there are // multiple paragraphs @@ -159,10 +166,12 @@ export default class Markdown { } } }; + renderer.html_block = function(node) { this.lit(node.literal); if (is_multi_line(node) && node.next) this.lit('\n\n'); }; +*/ // convert MD links into console-friendly ' < http://foo >' style links // ...except given this function never gets called with links, it's useless. From f40af434bcfeec7e37015192993adc639b54d79e Mon Sep 17 00:00:00 2001 From: Matthew Hodgson
Date: Wed, 23 May 2018 03:46:53 +0100
Subject: [PATCH 0085/1196] unbreak Markdown.toPlaintext
---
src/Markdown.js | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/Markdown.js b/src/Markdown.js
index 2b16800d85..e02118397b 100644
--- a/src/Markdown.js
+++ b/src/Markdown.js
@@ -156,7 +156,6 @@ export default class Markdown {
this.lit(s);
};
-/*
renderer.paragraph = function(node, entering) {
// as with toHTML, only append lines to paragraphs if there are
// multiple paragraphs
@@ -171,7 +170,6 @@ export default class Markdown {
this.lit(node.literal);
if (is_multi_line(node) && node.next) this.lit('\n\n');
};
-*/
// convert MD links into console-friendly ' < http://foo >' style links
// ...except given this function never gets called with links, it's useless.
From 5b4a036e8c7db150aae1f404cb952ecb49d5970f Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Wed, 23 May 2018 03:53:05 +0100
Subject: [PATCH 0086/1196] bump dep
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 33bc75eff8..fb0fd3ec90 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"slate": "^0.33.4",
"slate-react": "^0.12.4",
"slate-html-serializer": "^0.6.1",
- "slate-md-serializer": "matrix-org/slate-md-serializer#1635f37",
+ "slate-md-serializer": "matrix-org/slate-md-serializer#f5deb3f",
"sanitize-html": "^1.14.1",
"text-encoding-utf-8": "^1.0.1",
"url": "^0.11.0",
From 87c3e92014754ff454f07cd642cb456dc19dd43f Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Wed, 23 May 2018 13:32:48 +0100
Subject: [PATCH 0087/1196] bump dep
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index fb0fd3ec90..5dc3e698f2 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"slate": "^0.33.4",
"slate-react": "^0.12.4",
"slate-html-serializer": "^0.6.1",
- "slate-md-serializer": "matrix-org/slate-md-serializer#f5deb3f",
+ "slate-md-serializer": "matrix-org/slate-md-serializer#11fe1b6",
"sanitize-html": "^1.14.1",
"text-encoding-utf-8": "^1.0.1",
"url": "^0.11.0",
From fb5240aabd67a6a6f07d85b5f003c757e38b95dd Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Wed, 23 May 2018 14:00:54 +0100
Subject: [PATCH 0088/1196] explain why we're now including s
---
src/Markdown.js | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/Markdown.js b/src/Markdown.js
index e02118397b..9d9a8621c9 100644
--- a/src/Markdown.js
+++ b/src/Markdown.js
@@ -102,6 +102,15 @@ export default class Markdown {
// (https://github.com/vector-im/riot-web/issues/3154)
softbreak: '
', }); + + // Trying to strip out the wrapping causes a lot more complication + // than it's worth, i think. For instance, this code will go and strip + // out any tag (no matter where it is in the tree) which doesn't + // contain \n's. + // On the flip side, s are quite opionated and restricted on where + // you can nest them. + // + // Let's try sending with s anyway for now, though. /* const real_paragraph = renderer.paragraph; From b0ff61f7ef3757dee9f6dc9ee0881b7868d6c015 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson
Date: Wed, 23 May 2018 14:12:08 +0100
Subject: [PATCH 0089/1196] switch code schema to match slate-md-serializer
---
.../views/rooms/MessageComposerInput.js | 26 +++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 0b57e90184..94ef88d04b 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -95,7 +95,7 @@ const BLOCK_TAGS = {
h6: 'heading6',
li: 'list-item',
ol: 'numbered-list',
- pre: 'code-block',
+ pre: 'code',
};
const MARK_TAGS = {
@@ -103,7 +103,7 @@ const MARK_TAGS = {
b: 'bold', // deprecated
em: 'italic',
i: 'italic', // deprecated
- code: 'code',
+ code: 'inline-code',
u: 'underlined',
del: 'deleted',
strike: 'deleted', // deprecated
@@ -710,7 +710,7 @@ export default class MessageComposerInput extends React.Component {
[KeyCode.KEY_B]: 'bold',
[KeyCode.KEY_I]: 'italic',
[KeyCode.KEY_U]: 'underlined',
- [KeyCode.KEY_J]: 'code',
+ [KeyCode.KEY_J]: 'inline-code',
}[ev.keyCode];
if (ctrlCmdCommand) {
@@ -760,7 +760,7 @@ export default class MessageComposerInput extends React.Component {
this.hasBlock('heading4') ||
this.hasBlock('heading5') ||
this.hasBlock('heading6') ||
- this.hasBlock('code-block')))
+ this.hasBlock('code')))
{
return change.setBlocks(DEFAULT_NODE);
}
@@ -832,7 +832,7 @@ export default class MessageComposerInput extends React.Component {
case 'heading5':
case 'heading6':
case 'list-item':
- case 'code-block': {
+ case 'code': {
const isActive = this.hasBlock(type);
const isList = this.hasBlock('list-item');
@@ -850,7 +850,7 @@ export default class MessageComposerInput extends React.Component {
// marks:
case 'bold':
case 'italic':
- case 'code':
+ case 'inline-code':
case 'underlined':
case 'deleted': {
change.toggleMark(type);
@@ -885,8 +885,8 @@ export default class MessageComposerInput extends React.Component {
'underline': (text) => `${text}`,
'strike': (text) => `${text}`,
// ("code" is triggered by ctrl+j by draft-js by default)
- 'code': (text) => treatInlineCodeAsBlock ? textMdCodeBlock(text) : `\`${text}\``,
- 'code-block': textMdCodeBlock,
+ 'inline-code': (text) => treatInlineCodeAsBlock ? textMdCodeBlock(text) : `\`${text}\``,
+ 'code': textMdCodeBlock,
'blockquote': (text) => text.split('\n').map((line) => `> ${line}\n`).join('') + '\n',
'unordered-list-item': (text) => text.split('\n').map((line) => `\n- ${line}`).join(''),
'ordered-list-item': (text) => text.split('\n').map((line, i) => `\n${i + 1}. ${line}`).join(''),
@@ -897,8 +897,8 @@ export default class MessageComposerInput extends React.Component {
'italic': -1,
'underline': -4,
'strike': -6,
- 'code': treatInlineCodeAsBlock ? -5 : -1,
- 'code-block': -5,
+ 'inline-code': treatInlineCodeAsBlock ? -5 : -1,
+ 'code': -5,
'blockquote': -2,
}[command];
@@ -971,7 +971,7 @@ export default class MessageComposerInput extends React.Component {
}
if (this.state.editorState.blocks.some(
- block => ['code-block', 'block-quote', 'list-item'].includes(block.type)
+ block => ['code', 'block-quote', 'list-item'].includes(block.type)
)) {
// allow the user to terminate blocks by hitting return rather than sending a msg
return;
@@ -1369,7 +1369,7 @@ export default class MessageComposerInput extends React.Component {
return {children} ;
case 'numbered-list':
return
Date: Wed, 23 May 2018 14:12:36 +0100
Subject: [PATCH 0090/1196] switch code schema to match slate-md-serializer
---
.../{button-text-code-on.svg => button-text-inline-code-on.svg} | 0
res/img/{button-text-code.svg => button-text-inline-code.svg} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename res/img/{button-text-code-on.svg => button-text-inline-code-on.svg} (100%)
rename res/img/{button-text-code.svg => button-text-inline-code.svg} (100%)
diff --git a/res/img/button-text-code-on.svg b/res/img/button-text-inline-code-on.svg
similarity index 100%
rename from res/img/button-text-code-on.svg
rename to res/img/button-text-inline-code-on.svg
diff --git a/res/img/button-text-code.svg b/res/img/button-text-inline-code.svg
similarity index 100%
rename from res/img/button-text-code.svg
rename to res/img/button-text-inline-code.svg
From 864a33f978dd313b23064f55eb13039ad3c1a5d3 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Wed, 23 May 2018 20:12:13 +0100
Subject: [PATCH 0091/1196] switch to using 'code' for both blocks & marks to
match md-serializer
---
package.json | 2 +-
src/components/views/rooms/MessageComposer.js | 2 +-
src/components/views/rooms/MessageComposerInput.js | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/package.json b/package.json
index 5dc3e698f2..f3f184fb65 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"slate": "^0.33.4",
"slate-react": "^0.12.4",
"slate-html-serializer": "^0.6.1",
- "slate-md-serializer": "matrix-org/slate-md-serializer#11fe1b6",
+ "slate-md-serializer": "matrix-org/slate-md-serializer#1580ed67",
"sanitize-html": "^1.14.1",
"text-encoding-utf-8": "^1.0.1",
"url": "^0.11.0",
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 28502c348d..686ab3fcb6 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -356,7 +356,7 @@ export default class MessageComposer extends React.Component {
let formatBar;
if (this.state.showFormatting && this.state.inputState.isRichTextEnabled) {
const {marks, blockType} = this.state.inputState;
- const formatButtons = ["bold", "italic", "deleted", "underlined", "code", "block-quote", "bulleted-list", "numbered-list"].map(
+ const formatButtons = ["bold", "italic", "deleted", "underlined", "inline-code", "block-quote", "bulleted-list", "numbered-list"].map(
(name) => {
const active = marks.some(mark => mark.type === name) || blockType === name;
const suffix = active ? '-on' : '';
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 94ef88d04b..50b3422fee 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -103,7 +103,7 @@ const MARK_TAGS = {
b: 'bold', // deprecated
em: 'italic',
i: 'italic', // deprecated
- code: 'inline-code',
+ code: 'code',
u: 'underlined',
del: 'deleted',
strike: 'deleted', // deprecated
@@ -853,7 +853,7 @@ export default class MessageComposerInput extends React.Component {
case 'inline-code':
case 'underlined':
case 'deleted': {
- change.toggleMark(type);
+ change.toggleMark(type === 'inline-code' ? 'code' : type);
}
break;
@@ -885,7 +885,7 @@ export default class MessageComposerInput extends React.Component {
'underline': (text) => `${text}`,
'strike': (text) => `${text}`,
// ("code" is triggered by ctrl+j by draft-js by default)
- 'inline-code': (text) => treatInlineCodeAsBlock ? textMdCodeBlock(text) : `\`${text}\``,
+ 'code': (text) => treatInlineCodeAsBlock ? textMdCodeBlock(text) : `\`${text}\``,
'code': textMdCodeBlock,
'blockquote': (text) => text.split('\n').map((line) => `> ${line}\n`).join('') + '\n',
'unordered-list-item': (text) => text.split('\n').map((line) => `\n- ${line}`).join(''),
@@ -897,7 +897,7 @@ export default class MessageComposerInput extends React.Component {
'italic': -1,
'underline': -4,
'strike': -6,
- 'inline-code': treatInlineCodeAsBlock ? -5 : -1,
+ 'code': treatInlineCodeAsBlock ? -5 : -1,
'code': -5,
'blockquote': -2,
}[command];
@@ -1424,7 +1424,7 @@ export default class MessageComposerInput extends React.Component {
return {children};
case 'italic':
return {children};
- case 'inline-code':
+ case 'code':
return
Date: Thu, 24 May 2018 18:11:51 +0000
Subject: [PATCH 0092/1196] Translated using Weblate (French)
Currently translated at 100.0% (1189 of 1189 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
src/i18n/strings/fr.json | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index dc36520506..274d13fa45 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1189,5 +1189,11 @@
"e.g. %(exampleValue)s": "par ex. %(exampleValue)s",
"Help improve Riot by sending usage data ? This will use a cookie. (See our cookie and privacy policies ).": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Cela utilisera un cookie. (Voir nos politiques de cookie et de confidentialité ).",
"Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Quand nous oublions vos messages, cela signifie que les messages que vous avez envoyés ne seront partagés avec aucun nouvel utilisateur ou avec les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à ces messages en conserveront leur propre copie.",
- "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Veuillez oublier tous les messages que j'ai envoyé quand mon compte sera désactivé (Avertissement : les futurs utilisateurs verront des conversations incomplètes)"
+ "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Veuillez oublier tous les messages que j'ai envoyé quand mon compte sera désactivé (Avertissement : les futurs utilisateurs verront des conversations incomplètes)",
+ "Reload widget": "Recharger le widget",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie (please see our Cookie Policy ).": "Veuillez aider Riot.im à s'améliorer en envoyant des données d'utilisation anonymes . Cela utilisear un cookie (veuillez voir notre politique de cookie ).",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie.": "Veuillez aider Riot.im à s'améliorer en envoyant des données d'utilisation anonymes . Cela utilisera un cookie.",
+ "Yes, I want to help!": "Oui, je veux aider !",
+ "Can't leave Server Notices room": "Impossible de quitter le salon des Annonces du serveur",
+ "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ce salon est utilisé pour les messages importants du serveur d'accueil, donc vous ne pouvez pas en partir."
}
From 065e2a980212fef0897ecc7605d882122138762c Mon Sep 17 00:00:00 2001
From: Jeff Huang
Date: Thu, 24 May 2018 23:49:56 +0000
Subject: [PATCH 0093/1196] Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1189 of 1189 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
---
src/i18n/strings/zh_Hant.json | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 6ceda34507..f545df95d3 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1172,5 +1172,23 @@
"Muted Users": "已靜音的使用者",
"Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies ).": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。（參見我們的 cookie 與隱私政策 ）。",
"Help improve Riot by sending usage data? This will use a cookie.": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。",
- "Yes please": "好的，請"
+ "Yes please": "好的，請",
+ "e.g. %(exampleValue)s": "範例：%(exampleValue)s",
+ "Reload widget": "重新載入小工具",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie (please see our Cookie Policy ).": "請透過傳送匿名使用資料 來協助改善 Riot.im。這將會使用 cookie（請參見我們的 Cookie 政策 ）。",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie.": "請透過傳送匿名使用資料 來協助改善 Riot.im。這將會使用 cookie。",
+ "Yes, I want to help!": "是的，我想要協助！",
+ "Warning: This widget might use cookies.": "警告：此小工具可能會使用 cookies。",
+ "Failed to indicate account erasure": "指示帳號刪除失敗",
+ "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "這將會讓您的帳號永久無法使用。您將無法登入，且也沒有人可以重新註冊一個相同的使用者 ID。這將會造成您的帳號離開所有已參與的聊天室，並將會從識別伺服器上移除您帳號的所有詳細資訊。此動作是不可逆的。",
+ "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "停用您的帳號預設不會讓我們忘記您已經傳送過的訊息。若您想要我們忘記您的訊息，請在下面的方框中打勾。",
+ "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "在 Matrix 中的訊息可見度類似於電子郵件。我們忘記您的訊息代表您傳送過的訊息不會有任何新的或未註冊的使用者看到，但已註冊且已經看過這些訊息的使用者還是看得到他們的副本。",
+ "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "請在我的帳號停用時忘記我傳送過的所有訊息（警告：這將會造成未來的使用者無法看見完整的對話紀錄）",
+ "To continue, please enter your password:": "要繼續，請輸入您的密碼：",
+ "password": "密碼",
+ "Can't leave Server Notices room": "無法離開伺服器通知聊天室",
+ "This room is used for important messages from the Homeserver, so you cannot leave it.": "這個聊天室是用於發佈從家伺服器而來的重要訊息，所以您不能離開它。",
+ "Terms and Conditions": "條款與細則",
+ "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "要繼續使用 %(homeserverDomain)s 家伺服器，您必須審閱並同意我們的條款與細則。",
+ "Review terms and conditions": "審閱條款與細則"
}
From f13672df39aa857ab0bb95fd704c52ba42a1486e Mon Sep 17 00:00:00 2001
From: Szimszon
Date: Fri, 25 May 2018 06:49:55 +0000
Subject: [PATCH 0094/1196] Translated using Weblate (Hungarian)
Currently translated at 100.0% (1189 of 1189 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
src/i18n/strings/hu.json | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index f2aaac9a81..f15c8893b8 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1189,5 +1189,11 @@
"Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban hasonlít az emailhez. Az általad küldött üzenet törlése azt jelenti, hogy nem osztjuk meg új-, vagy vendég felhasználóval de a már regisztrált felhasználók akik már hozzáfértek az üzenethez továbbra is elérik a saját másolatukat.",
"Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Kérlek töröld az összes általam küldött üzenetet amikor a fiókomat felfüggesztem (Figyelem: ez azt eredményezheti, hogy a jövőbeni felhasználók csak részleges beszélgetést látnak majd)",
"e.g. %(exampleValue)s": "pl. %(exampleValue)s",
- "Help improve Riot by sending usage data ? This will use a cookie. (See our cookie and privacy policies ).": "Segítesz jobbá tenni a Riotot használati adat küldésével? Ez sütit (cookie) fog használni. (Nézd meg az Általános Szerződési Feltételeket )."
+ "Help improve Riot by sending usage data ? This will use a cookie. (See our cookie and privacy policies ).": "Segítesz jobbá tenni a Riotot használati adat küldésével? Ez sütit (cookie) fog használni. (Nézd meg az Általános Szerződési Feltételeket ).",
+ "Reload widget": "Kisalkalmazás újratöltése",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie (please see our Cookie Policy ).": "Kérlek segíts javítani a Riot.im-et azzal, hogy anonim felhasználási adatokat küldesz. Ez szütit (cookie) fog használni (lásd a sütire vonatkozó szabályozásunkat ).",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie.": "Kérlek segíts javítani a Riot.im-et azzal, hogy anonim felhasználási adatokat küldesz. Ez szütit (cookie) fog használni.",
+ "Yes, I want to help!": "Igen, segítek!",
+ "Can't leave Server Notices room": "Nem lehet elhagyni a Szerver Üzenetek szobát",
+ "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ez a szoba fontos szerverüzenetek közlésére jött létre, nem tudsz kilépni belőle."
}
From 475e2d16d8c6379ef09a59dc26862d7086c13224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?=
Date: Fri, 25 May 2018 09:51:40 +0000
Subject: [PATCH 0095/1196] Translated using Weblate (Slovak)
Currently translated at 100.0% (1189 of 1189 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
---
src/i18n/strings/sk.json | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index c7f38cff35..2cab64ca49 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -1166,5 +1166,26 @@
"Refresh": "Obnoviť",
"We encountered an error trying to restore your previous session.": "Počas obnovovania vašej predchádzajúcej relácie sa vyskytla chyba.",
"Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Vymazaním úložiska prehliadača možno opravíte váš problém, no zároveň sa týmto odhlásite a história vašich šifrovaných konverzácií sa pre vás môže stať nečitateľná.",
- "Collapse Reply Thread": "Zbaliť vlákno odpovedí"
+ "Collapse Reply Thread": "Zbaliť vlákno odpovedí",
+ "e.g. %(exampleValue)s": "príklad %(exampleValue)s",
+ "Reload widget": "Obnoviť widget",
+ "Send analytics data": "Odosielať analytické údaje",
+ "Enable widget screenshots on supported widgets": "Umožniť zachytiť snímku obrazovky pre podporované widgety",
+ "Muted Users": "Umlčaní používatelia",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie (please see our Cookie Policy ).": "Prosím pomôžte nám vylepšovať Riot.im odosielaním anonymných údajov o používaní . Na tento účel použijeme cookie (prečítajte si ako používame cookies ).",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie.": "Prosím pomôžte nám vylepšovať Riot.im odosielaním anonymných údajov o používaní . Na tento účel použijeme cookie.",
+ "Yes, I want to help!": "Áno, chcem pomôcť",
+ "Warning: This widget might use cookies.": "Pozor: tento widget môže používať cookies.",
+ "Failed to indicate account erasure": "Nie je možné odstrániť odoslané správy",
+ "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Toto spôsobí, že váš účet nebude viac použiteľný. Nebudete sa môcť opätovne prihlásiť a nikto sa nebude môcť znovu zaregistrovať s rovnakým používateľským ID. Deaktiváciou účtu opustíte všetky miestnosti, do ktorých ste kedy vstúpili a vaše kontaktné údaje budú odstránené zo servera totožností. Túto akciu nie je možné vrátiť späť.",
+ "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Pri deaktivácii účtu predvolene neodstraňujeme vami odoslané správy. Ak si želáte uplatniť právo zabudnutia, zaškrtnite prosím zodpovedajúce pole nižšie.",
+ "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Viditeľnosť správ odoslaných cez matrix funguje podobne ako viditeľnosť správ elektronickej pošty. To, že zabudneme vaše správy v skutočnosti znamená, že správy ktoré ste už odoslali nebudú čitateľné pre nových alebo neregistrovaných používateľov, no registrovaní používatelia, ktorí už prístup k vašim správam majú, budú aj naďalej bez zmeny môcť pristupovať k ich vlastným kópiám vašich správ.",
+ "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Spolu s deaktivovaním účtu si želám odstrániť všetky mnou odoslané správy (Pozor: Môže sa stať, že noví používatelia uvidia neúplnú históriu konverzácií)",
+ "To continue, please enter your password:": "Aby ste mohli pokračovať, prosím zadajte svoje heslo:",
+ "password": "heslo",
+ "Can't leave Server Notices room": "Nie je možné opustiť miestnosť Oznamy zo servera",
+ "This room is used for important messages from the Homeserver, so you cannot leave it.": "Táto miestnosť je určená na dôležité oznamy a správy od správcov domovského servera, preto ju nie je možné opustiť.",
+ "Terms and Conditions": "Zmluvné podmienky",
+ "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Ak chcete aj naďalej používať domovský server %(homeserverDomain)s, mali by ste si prečítať a odsúhlasiť naše zmluvné podmienky.",
+ "Review terms and conditions": "Prečítať zmluvné podmienky"
}
From 35aeac1b252b6bd4ef830c6a92ffeaf64380795e Mon Sep 17 00:00:00 2001
From: Kenneth Larsson
Date: Fri, 25 May 2018 14:06:14 +0000
Subject: [PATCH 0096/1196] Translated using Weblate (Swedish)
Currently translated at 80.4% (957 of 1189 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
src/i18n/strings/sv.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 0f898a3374..2afd9bc5a4 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -446,7 +446,7 @@
"Add an email address above to configure email notifications": "Lägg till en epostadress här för att konfigurera epostaviseringar",
"Expand panel": "Öppna panel",
"On": "På",
- "%(count)s Members|other": "%(count)s 1 Medlemmar",
+ "%(count)s Members|other": "%(count)s medlemmar",
"Filter room names": "Filtrera rumsnamn",
"Changelog": "Ändringslogg",
"Waiting for response from server": "Väntar på svar från servern",
@@ -557,7 +557,7 @@
"Login": "Logga in",
"Download this file": "Ladda ner filen",
"Failed to change settings": "Det gick inte att spara inställningarna",
- "%(count)s Members|one": "%(count)s 1 Medlem",
+ "%(count)s Members|one": "%(count)s medlem",
"View Source": "Visa källa",
"Thank you!": "Tack!",
"Quote": "Citera",
From 806458dfc2deeaa1269176696faa7c64c141b5f6 Mon Sep 17 00:00:00 2001
From: Andrey
Date: Thu, 24 May 2018 17:21:27 +0000
Subject: [PATCH 0097/1196] Translated using Weblate (Russian)
Currently translated at 99.6% (1185 of 1189 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
src/i18n/strings/ru.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index e2529ed1bc..e77cb76aff 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1186,5 +1186,6 @@
"password": "пароль",
"Please help improve Riot.im by sending anonymous usage data . This will use a cookie (please see our Cookie Policy ).": "Пожалуйста, помогите улучшить Riot.im, отправляя анонимные данные использования . При этом будут использоваться cookie (ознакомьтесь с нашейПолитикой cookie ).",
"Please help improve Riot.im by sending anonymous usage data . This will use a cookie.": "Пожалуйста, помогите улучшить Riot.im, отправляя анонимные данные использования . При этом будут использоваться cookie.",
- "Yes, I want to help!": "Да, я хочу помочь!"
+ "Yes, I want to help!": "Да, я хочу помочь!",
+ "Reload widget": "Перезагрузить виджет"
}
From e1fc7a56ff78fdf2840f1b46db7d297e601ec9e1 Mon Sep 17 00:00:00 2001
From: stuve20
Date: Fri, 25 May 2018 14:14:08 +0000
Subject: [PATCH 0098/1196] Translated using Weblate (Swedish)
Currently translated at 80.4% (957 of 1189 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
src/i18n/strings/sv.json | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 2afd9bc5a4..c4d072b723 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -375,7 +375,7 @@
"The maximum permitted number of widgets have already been added to this room.": "Den största tillåtna mängden widgetar har redan tillsats till rummet.",
"The phone number entered looks invalid": "Telefonnumret ser felaktigt ut",
"The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Signeringsnyckeln du angav matchar signeringsnyckeln som mottogs från enheten %(deviceId)s som tillhör %(userId)s. Enheten är markerad som verifierad.",
- "This email address is already in use": "Den här epostadressen är redan i bruk",
+ "This email address is already in use": "Den här epostadressen används redan",
"This email address was not found": "Den här epostadressen finns inte",
"The email address linked to your account must be entered.": "Epostadressen som är kopplad till ditt konto måste anges.",
"The file '%(fileName)s' exceeds this home server's size limit for uploads": "Filen '%(fileName)s' överskrider serverns största tillåtna filstorlek",
@@ -385,7 +385,7 @@
"World readable": "Alla kan läsa",
"Guests can join": "Gäster kan bli medlem i rummet",
"No rooms to show": "Inga fler rum att visa",
- "This phone number is already in use": "Detta telefonnummer är redan i bruk",
+ "This phone number is already in use": "Detta telefonnummer används redan",
"The version of Riot.im": "Versionen av Riot.im",
"Call Failed": "Samtal misslyckades",
"Call Anyway": "Ring ändå",
@@ -575,9 +575,9 @@
"This room has no local addresses": "Det här rummet har inga lokala adresser",
"Updates": "Uppdateringar",
"Check for update": "Leta efter uppdatering",
- "Your language of choice": "Ditt valda språk",
+ "Your language of choice": "Ditt språkval",
"The platform you're on": "Plattformen du använder",
- "Whether or not you're logged in (we don't record your user name)": "Om du är inloggad eller inte (vi sparar inte ditt användarnamn)",
+ "Whether or not you're logged in (we don't record your user name)": "Oavsett om du är inloggad (så registreras inte ditt användarnamn)",
"Your homeserver's URL": "Din hemservers URL",
"Your identity server's URL": "Din identitetsservers URL",
"Every page you use in the app": "Varje sida du använder i appen",
From c116de441a1607c987f52fda136d7ae7d610dadd Mon Sep 17 00:00:00 2001
From: stuve20
Date: Fri, 25 May 2018 14:18:51 +0000
Subject: [PATCH 0099/1196] Translated using Weblate (Swedish)
Currently translated at 80.4% (957 of 1189 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
src/i18n/strings/sv.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index c4d072b723..b0b44e5052 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -368,7 +368,7 @@
"PM": "p.m.",
"NOTE: Apps are not end-to-end encrypted": "OBS: Apparna är inte end-to-end-krypterade",
"Revoke widget access": "Upphäv widget-åtkomst",
- "Submit": "Lämna",
+ "Submit": "Lämna in",
"Tagged as: ": "Taggad som: ",
"The default role for new room members is": "Standardrollen för nya medlemmar är",
"The main address for this room is": "Huvudadressen för det här rummet är",
From ab1261321166224bff64322a8bcfb4b531ae85df Mon Sep 17 00:00:00 2001
From: Kenneth Larsson
Date: Fri, 25 May 2018 14:20:55 +0000
Subject: [PATCH 0100/1196] Translated using Weblate (Swedish)
Currently translated at 80.6% (959 of 1189 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
src/i18n/strings/sv.json | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index b0b44e5052..d49dfe3fb6 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -958,5 +958,7 @@
"%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s gjorde framtida rumshistorik synligt för okänd (%(visibility)s).",
"Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Där denna sida innehåller identifierbar information, till exempel ett rums-, användar- eller grupp-ID, tas data bort innan den skickas till servern.",
"The remote side failed to pick up": "Mottagaren kunde inte svara",
- "Room name or alias": "Rumsnamn eller alias"
+ "Room name or alias": "Rumsnamn eller alias",
+ "Jump to read receipt": "Hoppa till läskvitto",
+ "At this time it is not possible to reply with a file so this will be sent without being a reply.": "Just nu är det inte möjligt att svara med en fil så den kommer att skickas utan att vara ett svar."
}
From 296174998bbfeb188648ea3fd55f4df92cbb6957 Mon Sep 17 00:00:00 2001
From: stuve20
Date: Fri, 25 May 2018 14:21:58 +0000
Subject: [PATCH 0101/1196] Translated using Weblate (Swedish)
Currently translated at 80.6% (959 of 1189 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
src/i18n/strings/sv.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index d49dfe3fb6..21f38169dc 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -370,7 +370,7 @@
"Revoke widget access": "Upphäv widget-åtkomst",
"Submit": "Lämna in",
"Tagged as: ": "Taggad som: ",
- "The default role for new room members is": "Standardrollen för nya medlemmar är",
+ "The default role for new room members is": "Standardrollen för nya medlemmar i rummet är",
"The main address for this room is": "Huvudadressen för det här rummet är",
"The maximum permitted number of widgets have already been added to this room.": "Den största tillåtna mängden widgetar har redan tillsats till rummet.",
"The phone number entered looks invalid": "Telefonnumret ser felaktigt ut",
From ab412122580456fc2ec9011f41d14bb7fcf402e1 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Sat, 26 May 2018 00:37:21 +0100
Subject: [PATCH 0102/1196] fix double-nested code blocks & bump md-serializer
---
package.json | 2 +-
src/components/views/rooms/MessageComposerInput.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index f3f184fb65..a65b6e2640 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"slate": "^0.33.4",
"slate-react": "^0.12.4",
"slate-html-serializer": "^0.6.1",
- "slate-md-serializer": "matrix-org/slate-md-serializer#1580ed67",
+ "slate-md-serializer": "matrix-org/slate-md-serializer#f7c4ad3",
"sanitize-html": "^1.14.1",
"text-encoding-utf-8": "^1.0.1",
"url": "^0.11.0",
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 50b3422fee..f1a4fd5140 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -1370,7 +1370,7 @@ export default class MessageComposerInput extends React.Component {
case 'numbered-list':
return
Date: Sat, 26 May 2018 02:11:20 +0100
Subject: [PATCH 0103/1196] unbreak keyboard shortcuts & ctrl-backspace
---
src/components/views/rooms/MessageComposerInput.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index f1a4fd5140..d2730027d1 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -716,7 +716,7 @@ export default class MessageComposerInput extends React.Component {
if (ctrlCmdCommand) {
return this.handleKeyCommand(ctrlCmdCommand);
}
- return false;
+ return;
}
switch (ev.keyCode) {
@@ -739,6 +739,10 @@ export default class MessageComposerInput extends React.Component {
};
onBackspace = (ev: Event, change: Change): Change => {
+ if (ev.ctrlKey || ev.metaKey || ev.altKey || ev.ctrlKey || ev.shiftKey) {
+ return;
+ }
+
if (this.state.isRichTextEnabled) {
// let backspace exit lists
const isList = this.hasBlock('list-item');
From 5147246c175a0b55d5b978e040248b82a3b71f7b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 26 May 2018 15:41:25 +0100
Subject: [PATCH 0104/1196] kill stream when using gUM for permission to device
labels to kill camera
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/UserSettings.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index c8ce79905d..4ee4f1a427 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -284,7 +284,12 @@ module.exports = React.createClass({
this.setState({ electron_settings: settings });
},
- _refreshMediaDevices: function() {
+ _refreshMediaDevices: function(stream) {
+ if (stream) {
+ // kill stream so that we don't leave it lingering around with webcam enabled etc
+ stream.getTracks().forEach((track) => track.stop());
+ }
+
Promise.resolve().then(() => {
return CallMediaHandler.getDevices();
}).then((mediaDevices) => {
From 6636fa32f67a592eb18208e89b2ae2ce226c00ac Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 26 May 2018 17:22:23 +0100
Subject: [PATCH 0105/1196] Allow selecting audio output for WebRTC Audio/Video
calls
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/CallMediaHandler.js | 22 +++++++++++-----
src/components/structures/UserSettings.js | 32 +++++++++++++++++++++--
src/settings/Settings.js | 4 +++
3 files changed, 50 insertions(+), 8 deletions(-)
diff --git a/src/CallMediaHandler.js b/src/CallMediaHandler.js
index cdc5c61921..2330f86b99 100644
--- a/src/CallMediaHandler.js
+++ b/src/CallMediaHandler.js
@@ -22,34 +22,44 @@ export default {
// Only needed for Electron atm, though should work in modern browsers
// once permission has been granted to the webapp
return navigator.mediaDevices.enumerateDevices().then(function(devices) {
- const audioIn = [];
- const videoIn = [];
+ const audiooutput = [];
+ const audioinput = [];
+ const videoinput = [];
if (devices.some((device) => !device.label)) return false;
devices.forEach((device) => {
switch (device.kind) {
- case 'audioinput': audioIn.push(device); break;
- case 'videoinput': videoIn.push(device); break;
+ case 'audiooutput': audiooutput.push(device); break;
+ case 'audioinput': audioinput.push(device); break;
+ case 'videoinput': videoinput.push(device); break;
}
});
// console.log("Loaded WebRTC Devices", mediaDevices);
return {
- audioinput: audioIn,
- videoinput: videoIn,
+ audiooutput,
+ audioinput,
+ videoinput,
};
}, (error) => { console.log('Unable to refresh WebRTC Devices: ', error); });
},
loadDevices: function() {
+ const audioOutDeviceId = SettingsStore.getValue("webrtc_audiooutput");
const audioDeviceId = SettingsStore.getValue("webrtc_audioinput");
const videoDeviceId = SettingsStore.getValue("webrtc_videoinput");
+ Matrix.setMatrixCallAudioOutput(audioOutDeviceId);
Matrix.setMatrixCallAudioInput(audioDeviceId);
Matrix.setMatrixCallVideoInput(videoDeviceId);
},
+ setAudioOutput: function(deviceId) {
+ SettingsStore.setValue("webrtc_audiooutput", null, SettingLevel.DEVICE, deviceId);
+ Matrix.setMatrixCallAudioOutput(deviceId);
+ },
+
setAudioInput: function(deviceId) {
SettingsStore.setValue("webrtc_audioinput", null, SettingLevel.DEVICE, deviceId);
Matrix.setMatrixCallAudioInput(deviceId);
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index c8ce79905d..0561071fce 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -292,6 +292,7 @@ module.exports = React.createClass({
if (this._unmounted) return;
this.setState({
mediaDevices,
+ activeAudioOutput: SettingsStore.getValueAt(SettingLevel.DEVICE, 'webrtc_audiooutput'),
activeAudioInput: SettingsStore.getValueAt(SettingLevel.DEVICE, 'webrtc_audioinput'),
activeVideoInput: SettingsStore.getValueAt(SettingLevel.DEVICE, 'webrtc_videoinput'),
});
@@ -970,6 +971,11 @@ module.exports = React.createClass({
return devices.map((device) => { device.label });
},
+ _setAudioOutput: function(deviceId) {
+ this.setState({activeAudioOutput: deviceId});
+ CallMediaHandler.setAudioOutput(deviceId);
+ },
+
_setAudioInput: function(deviceId) {
this.setState({activeAudioInput: deviceId});
CallMediaHandler.setAudioInput(deviceId);
@@ -1010,6 +1016,7 @@ module.exports = React.createClass({
const Dropdown = sdk.getComponent('elements.Dropdown');
+ let speakerDropdown = cookie and privacy policies ).": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden. (Siehe unsere Datenschutzerklärung ).",
- "Help improve Riot by sending usage data? This will use a cookie.": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden.",
- "Yes please": "Ja, bitte"
+ "Send analytics data": "Analysedaten senden"
}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index bf9e395bee..bfe1b562bc 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -42,6 +42,10 @@
"The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
"The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
"Upload Failed": "Upload Failed",
+ "Failure to create room": "Failure to create room",
+ "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+ "Send anyway": "Send anyway",
+ "Send": "Send",
"Sun": "Sun",
"Mon": "Mon",
"Tue": "Tue",
@@ -81,6 +85,7 @@
"Failed to invite users to community": "Failed to invite users to community",
"Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
"Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
+ "Unnamed Room": "Unnamed Room",
"Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
"Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
"Unable to enable Notifications": "Unable to enable Notifications",
@@ -104,7 +109,6 @@
"You need to be logged in.": "You need to be logged in.",
"You need to be able to invite users to do that.": "You need to be able to invite users to do that.",
"Unable to create widget.": "Unable to create widget.",
- "Reload widget": "Reload widget",
"Missing roomId.": "Missing roomId.",
"Failed to send request.": "Failed to send request.",
"This room is not recognised.": "This room is not recognised.",
@@ -180,11 +184,6 @@
"%(names)s and %(count)s others are typing|other": "%(names)s and %(count)s others are typing",
"%(names)s and %(count)s others are typing|one": "%(names)s and one other is typing",
"%(names)s and %(lastPerson)s are typing": "%(names)s and %(lastPerson)s are typing",
- "Failure to create room": "Failure to create room",
- "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
- "Send anyway": "Send anyway",
- "Send": "Send",
- "Unnamed Room": "Unnamed Room",
"Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
"Not a valid Riot keyfile": "Not a valid Riot keyfile",
"Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
@@ -298,6 +297,29 @@
"Off": "Off",
"On": "On",
"Noisy": "Noisy",
+ "Invalid alias format": "Invalid alias format",
+ "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
+ "Invalid address format": "Invalid address format",
+ "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
+ "not specified": "not specified",
+ "not set": "not set",
+ "Remote addresses for this room:": "Remote addresses for this room:",
+ "Addresses": "Addresses",
+ "The main address for this room is": "The main address for this room is",
+ "Local addresses for this room:": "Local addresses for this room:",
+ "This room has no local addresses": "This room has no local addresses",
+ "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
+ "Invalid community ID": "Invalid community ID",
+ "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
+ "Flair": "Flair",
+ "Showing flair for these communities:": "Showing flair for these communities:",
+ "This room is not showing flair for any communities": "This room is not showing flair for any communities",
+ "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
+ "You have enabled URL previews by default.": "You have enabled URL previews by default.",
+ "You have disabled URL previews by default.": "You have disabled URL previews by default.",
+ "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
+ "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
+ "URL Previews": "URL Previews",
"Cannot add any more widgets": "Cannot add any more widgets",
"The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
"Add a widget": "Add a widget",
@@ -394,11 +416,11 @@
"numbullet": "numbullet",
"Markdown is disabled": "Markdown is disabled",
"Markdown is enabled": "Markdown is enabled",
- "Unpin Message": "Unpin Message",
- "Jump to message": "Jump to message",
"No pinned messages.": "No pinned messages.",
"Loading...": "Loading...",
"Pinned Messages": "Pinned Messages",
+ "Unpin Message": "Unpin Message",
+ "Jump to message": "Jump to message",
"%(duration)ss": "%(duration)ss",
"%(duration)sm": "%(duration)sm",
"%(duration)sh": "%(duration)sh",
@@ -530,29 +552,6 @@
"Scroll to unread messages": "Scroll to unread messages",
"Jump to first unread message.": "Jump to first unread message.",
"Close": "Close",
- "Invalid alias format": "Invalid alias format",
- "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
- "Invalid address format": "Invalid address format",
- "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
- "not specified": "not specified",
- "not set": "not set",
- "Remote addresses for this room:": "Remote addresses for this room:",
- "Addresses": "Addresses",
- "The main address for this room is": "The main address for this room is",
- "Local addresses for this room:": "Local addresses for this room:",
- "This room has no local addresses": "This room has no local addresses",
- "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
- "Invalid community ID": "Invalid community ID",
- "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
- "Flair": "Flair",
- "Showing flair for these communities:": "Showing flair for these communities:",
- "This room is not showing flair for any communities": "This room is not showing flair for any communities",
- "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
- "You have enabled URL previews by default.": "You have enabled URL previews by default.",
- "You have disabled URL previews by default.": "You have disabled URL previews by default.",
- "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
- "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
- "URL Previews": "URL Previews",
"Sunday": "Sunday",
"Monday": "Monday",
"Tuesday": "Tuesday",
@@ -663,6 +662,7 @@
"Delete widget": "Delete widget",
"Revoke widget access": "Revoke widget access",
"Minimize apps": "Minimize apps",
+ "Reload widget": "Reload widget",
"Popout widget": "Popout widget",
"Picture": "Picture",
"Edit": "Edit",
@@ -1076,9 +1076,11 @@
"No media permissions": "No media permissions",
"You may need to manually permit Riot to access your microphone/webcam": "You may need to manually permit Riot to access your microphone/webcam",
"Missing Media Permissions, click here to request.": "Missing Media Permissions, click here to request.",
+ "No Audio Outputs detected": "No Audio Outputs detected",
"No Microphones detected": "No Microphones detected",
"No Webcams detected": "No Webcams detected",
"Default Device": "Default Device",
+ "Audio Output": "Audio Output",
"Microphone": "Microphone",
"Camera": "Camera",
"VoIP": "VoIP",
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 04d2e86664..be67127955 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1170,18 +1170,11 @@
"Enable widget screenshots on supported widgets": "Gaitu trepeten pantaila-argazkiak onartzen duten trepetetan",
"Send analytics data": "Bidali datu analitikoak",
"Muted Users": "Mutututako erabiltzaileak",
- "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies ).": "Riot hobetzen lagundu nahi erabilera datuak bidaliz? Honek cookie bat erabiliko du. (Ikusi gure Cookie eta pribatutasun politikak ).",
- "Help improve Riot by sending usage data? This will use a cookie.": "Riot hobetzen lagundu nahi erabilera datuak bidaliz? Honek cookie bat erabiliko du.",
- "Yes please": "Bai mesedez",
"Warning: This widget might use cookies.": "Abisua: Trepeta honek cookie-ak erabili litzake.",
"Terms and Conditions": "Termino eta baldintzak",
"To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "%(homeserverDomain)s hasiera-zerbitzaria erabiltzen jarraitzeko gure termino eta baldintzak irakurri eta onartu behar dituzu.",
"Review terms and conditions": "Irakurri termino eta baldintzak",
"Failed to indicate account erasure": "Ezin izan da kontuaren ezabaketa jakinarazi",
- "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This action is irreversible.": "Honek zure kontua betiko erabilgaitz bihurtuko du. Ezin izango duzu saioa hasi, eta beste inork ezin izango du erabiltzaile ID bera erabili. Ez dago ekintza hau desegiterik.",
- "Deactivating your account does not by default erase messages you have sent. If you would like to erase your messages, please tick the box below.": "Zure kontua desaktibatzean ez dira lehenetsita zuk bidalitako mezuak ezabatuko. Zuk bidalitako mezuak ezabatu nahi badituzu, markatu beheko kutxa.",
- "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Matrix-eko mezuen ikusgaitasuna, e-mail mezuen antzekoa da. Zure mezuak ezabatzeak esan nahi du bidali dituzun mezuak ez direla erabiltzaile berriekin partekatuko, baina aurretik zure mezuak jaso dituzten erabiltzaile erregistratuek bere kopia izango dute.",
"To continue, please enter your password:": "Jarraitzeko, sartu zure pasahitza:",
- "password": "pasahitza",
- "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Ezabatu bidali ditudan mezu guztiak nire kontua desaktibatzean. (Abisua: Etorkizuneko erabiltzaileek elkarrizketa partzialak ikusiko dituzte, esperientzia kaskarra sortuz)."
+ "password": "pasahitza"
}
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index dc36520506..5c14373d7e 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1169,25 +1169,17 @@
"Collapse Reply Thread": "Dévoiler le fil de réponse",
"Enable widget screenshots on supported widgets": "Activer les captures d'écran des widgets pris en charge",
"Send analytics data": "Envoyer les données analytiques",
- "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies ).": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie. (Voir nos politiques de cookie et de confidentialité ).",
- "Help improve Riot by sending usage data? This will use a cookie.": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie.",
- "Yes please": "Oui, s'il vous plaît",
"Muted Users": "Utilisateurs ignorés",
"Warning: This widget might use cookies.": "Avertissement : ce widget utilise peut-être des cookies.",
"Terms and Conditions": "Conditions générales",
"To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Pour continuer à utiliser le serveur d'accueil %(homeserverDomain)s, vous devez lire et accepter nos conditions générales.",
"Review terms and conditions": "Voir les conditions générales",
"Failed to indicate account erasure": "Échec de notification de la suppression du compte",
- "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This action is irreversible.": "Cela rendra votre compte inutilisable de façon permanente. Vous ne pourrez plus vous connecter et ne pourrez plus vous enregistrer avec le même identifiant d'utilisateur. Cette action est irréversible.",
- "Deactivating your account does not by default erase messages you have sent. If you would like to erase your messages, please tick the box below.": "Désactiver votre compte ne supprime pas les messages que vous avez envoyés par défaut. Si vous souhaitez supprimer vos messages, cochez la case ci-dessous.",
- "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Supprimer vos messages signifie que les messages que vous avez envoyés ne seront pas partagés avec de nouveaux utilisateurs ou les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à vos messages continueront d'en avoir une copie.",
"To continue, please enter your password:": "Pour continuer, veuillez renseigner votre mot de passe :",
"password": "mot de passe",
- "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Veuillez supprimer tous les messages que j'ai envoyé quand mon compte est désactivé. (Attention : les futurs utilisateurs verront alors des conversations incomplètes, ce qui est une mauvaise expérience).",
"This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Votre compte sera inutilisable de façon permanente. Vous ne pourrez plus vous reconnecter et personne ne pourra se réenregistrer avec le même identifiant d'utilisateur. Votre compte quittera tous les salons auxquels il participe et tous ses détails seront supprimés du serveur d'identité. Cette action est irréversible.",
"Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "La désactivation du compte ne nous fait pas oublier les messages que vous avez envoyés par défaut. Si vous souhaitez que nous les oubliions, cochez la case ci-dessous.",
"e.g. %(exampleValue)s": "par ex. %(exampleValue)s",
- "Help improve Riot by sending usage data ? This will use a cookie. (See our cookie and privacy policies ).": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Cela utilisera un cookie. (Voir nos politiques de cookie et de confidentialité ).",
"Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Quand nous oublions vos messages, cela signifie que les messages que vous avez envoyés ne seront partagés avec aucun nouvel utilisateur ou avec les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à ces messages en conserveront leur propre copie.",
"Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Veuillez oublier tous les messages que j'ai envoyé quand mon compte sera désactivé (Avertissement : les futurs utilisateurs verront des conversations incomplètes)"
}
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index f2aaac9a81..b45cdd3311 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1169,25 +1169,17 @@
"Collapse Reply Thread": "Beszélgetés szál becsukása",
"Enable widget screenshots on supported widgets": "Ahol az a kisalkalmazásban támogatott ott képernyőkép készítés engedélyezése",
"Send analytics data": "Analitikai adatok küldése",
- "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies ).": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ. (Nézd meg a sütikről és titoktartási irányelvekről szóló leírást).",
- "Help improve Riot by sending usage data? This will use a cookie.": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ.",
- "Yes please": "Igen, kérlek",
"Muted Users": "Elnémított felhasználók",
"Warning: This widget might use cookies.": "Figyelmeztetés: Ez a kisalkalmazás sütiket (cookies) használhat.",
"Terms and Conditions": "Általános Szerződési Feltételek",
"To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "A %(homeserverDomain)s szerver használatának folytatásához el kell olvasnod és el kell fogadnod az általános szerződési feltételeket.",
"Review terms and conditions": "Általános Szerződési Feltételek elolvasása",
"Failed to indicate account erasure": "A fiók törlésének jelzése sikertelen",
- "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This action is irreversible.": "Ezzel a felhasználói fiókod végleg használhatatlanná válik. Nem tudsz bejelentkezni, és senki más sem fog tudni újra regisztrálni ugyanezzel az azonosítóval. Ez a művelet visszafordíthatatlan.",
- "Deactivating your account does not by default erase messages you have sent. If you would like to erase your messages, please tick the box below.": "A felhasználói fiók felfüggesztése alapértelmezetten nem töröli semelyik általad küldött üzenetet. Ha az elküldött üzeneteidet törölni szeretnéd pipáld be a jelölőnégyzetet alul.",
- "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban olyan mint az e-mail. Az üzeneted törlése azt jelenti, hogy amit elküldtél már nem lesz megosztva új- vagy vendég felhasználóval, de azok a regisztrált felhasználók akik már látták az üzenetet továbbra is hozzáférnek a saját példányukhoz.",
"To continue, please enter your password:": "Folytatáshoz add meg a jelszavad:",
"password": "jelszó",
- "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Töröld az összes üzenetet amit küldtem amikor felfüggeszted a felhasználói fiókomat. (Figyelem: ezzel a jövőbeni felhasználók csak részleges beszélgetést láthatnak majd, ami rosszul eshet).",
"This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Ez végleg használhatatlanná teszi a fiókodat. Ezután nem fogsz tudni bejelentkezni, és más sem tud majd ezzel az azonosítóval fiókot létrehozni. Minden szobából amibe beléptél ki fogsz lépni, és törölni fogja minden fiók adatod az \"identity\" szerverről. Ez a művelet visszafordíthatatlan.",
"Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "A fiókod felfüggesztése nem jelenti alapértelmezetten azt, hogy az általad küldött üzenetek elfelejtődnek. Ha törölni szeretnéd az általad küldött üzeneteket, pipáld be a jelölőnégyzetet alul.",
"Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban hasonlít az emailhez. Az általad küldött üzenet törlése azt jelenti, hogy nem osztjuk meg új-, vagy vendég felhasználóval de a már regisztrált felhasználók akik már hozzáfértek az üzenethez továbbra is elérik a saját másolatukat.",
"Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Kérlek töröld az összes általam küldött üzenetet amikor a fiókomat felfüggesztem (Figyelem: ez azt eredményezheti, hogy a jövőbeni felhasználók csak részleges beszélgetést látnak majd)",
- "e.g. %(exampleValue)s": "pl. %(exampleValue)s",
- "Help improve Riot by sending usage data ? This will use a cookie. (See our cookie and privacy policies ).": "Segítesz jobbá tenni a Riotot használati adat küldésével? Ez sütit (cookie) fog használni. (Nézd meg az Általános Szerződési Feltételeket )."
+ "e.g. %(exampleValue)s": "pl. %(exampleValue)s"
}
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 068ad01ff1..ab251bdf6f 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1159,9 +1159,6 @@
"Refresh": "Aggiorna",
"We encountered an error trying to restore your previous session.": "Abbiamo riscontrato un errore tentando di ripristinare la tua sessione precedente.",
"Send analytics data": "Invia dati statistici",
- "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies ).": "Aiutare a migliorare Riot inviando statistiche d'uso? Verrà usato un cookie. (Vedi la nostra politica sui cookie e sulla privacy ).",
- "Help improve Riot by sending usage data? This will use a cookie.": "Aiutare a migliorare Riot inviando statistiche d'uso? Verrà usato un cookie.",
- "Yes please": "Sì grazie",
"Clear Storage and Sign Out": "Elimina lo storage e disconnetti",
"Send Logs": "Invia i log",
"Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Eliminare lo storage del browser potrebbe risolvere il problema, ma verrai disconnesso e la cronologia delle chat criptate sarà illeggibile.",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index e2529ed1bc..956f4fc41b 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1167,16 +1167,12 @@
"Enable widget screenshots on supported widgets": "Включить скриншоты виджета в поддерживаемых виджетах",
"Collapse Reply Thread": "Ответить с цитированием",
"Send analytics data": "Отправить данные аналитики",
- "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies ).": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie. (См. наши политики cookie и конфиденциальности ).",
- "Help improve Riot by sending usage data? This will use a cookie.": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie.",
- "Yes please": "Да, пожалуйста",
"Muted Users": "Приглушенные пользователи",
"Warning: This widget might use cookies.": "Внимание: этот виджет может использовать cookie.",
"Terms and Conditions": "Условия и положения",
"To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Для продолжения использования сервера %(homeserverDomain)s вы должны ознакомиться и принять условия и положения.",
"Review terms and conditions": "Просмотр условий и положений",
"e.g. %(exampleValue)s": "напр. %(exampleValue)s",
- "Help improve Riot by sending usage data ? This will use a cookie. (See our cookie and privacy policies ).": "Помогите улучшить Riot, отправляя данные использования ? Будут использоваться файлы cookie. (Смотрите наши политики cookie и конфиденциальности ).",
"Failed to indicate account erasure": "Не удается удалить учетную запись",
"This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Это навсегда сделает вашу учетную запись невозможной для использования. Вы не сможете войти в систему, и никто не сможет перерегистрировать тот же идентификатор пользователя. Это приведет к тому, что ваша учетная запись выйдет из всех комнат, в которые она входит, и будут удалены данные вашей учетной записи с сервера идентификации. Это действие необратимо.",
"Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "По умолчанию деактивация вашей учетной записи не приведет к удалению всех ваших сообщений. Если вы хотите, чтобы мы удалили ваши сообщения, поставьте отметку в поле ниже.",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 0f898a3374..791c6e3165 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -901,8 +901,6 @@
"This setting cannot be changed later!": "Den här inställningen kan inte ändras senare!",
"Unknown error": "Okänt fel",
"Incorrect password": "Felaktigt lösenord",
- "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Detta kommer att göra ditt konto permanent oanvändbart. Du kommer inte att kunna registrera samma användar-ID igen.",
- "This action is irreversible.": "Denna åtgärd går inte att ångra.",
"To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "För att verifiera att denna enhet kan litas på, vänligen kontakta ägaren på annat sätt (t ex personligen eller med ett telefonsamtal) och fråga om nyckeln ägaren har i sina användarinställningar för enheten matchar nyckeln nedan:",
"Device name": "Enhetsnamn",
"Device key": "Enhetsnyckel",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 6ceda34507..fd72511f8c 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1169,8 +1169,5 @@
"Collapse Reply Thread": "摺疊回覆討論串",
"Enable widget screenshots on supported widgets": "在支援的小工具上啟用小工具螢幕快照",
"Send analytics data": "傳送分析資料",
- "Muted Users": "已靜音的使用者",
- "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies ).": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。（參見我們的 cookie 與隱私政策 ）。",
- "Help improve Riot by sending usage data? This will use a cookie.": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。",
- "Yes please": "好的，請"
+ "Muted Users": "已靜音的使用者"
}
From ed9e4d82c9d476ba7146379428357db35813b9d4 Mon Sep 17 00:00:00 2001
From: Travis Ralston
Date: Sat, 26 May 2018 18:16:05 -0600
Subject: [PATCH 0107/1196] Reduce the text size on the 'Jump to pinned
message' button
Fixes https://github.com/vector-im/riot-web/issues/6329
Signed-off-by: Travis Ralston
---
res/css/views/rooms/_PinnedEventTile.scss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/res/css/views/rooms/_PinnedEventTile.scss b/res/css/views/rooms/_PinnedEventTile.scss
index ca790ef8f0..8354df0537 100644
--- a/res/css/views/rooms/_PinnedEventTile.scss
+++ b/res/css/views/rooms/_PinnedEventTile.scss
@@ -63,5 +63,5 @@ limitations under the License.
.mx_PinnedEventTile_gotoButton {
display: inline-block;
- font-size: 0.8em;
+ font-size: 0.7em; // Smaller text to avoid conflicting with the layout
}
From 62f4cfe734cc7a0f63bceb601a5c9f7d68677ba2 Mon Sep 17 00:00:00 2001
From: Travis Ralston
Date: Sat, 26 May 2018 18:21:24 -0600
Subject: [PATCH 0108/1196] Don't affect avatars in pinned message contents
This uses more direct classes to avoid affecting pills. Fixes https://github.com/vector-im/riot-web/issues/5438
Signed-off-by: Travis Ralston
---
res/css/views/rooms/_PinnedEventTile.scss | 2 +-
src/components/views/rooms/PinnedEventTile.js | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/res/css/views/rooms/_PinnedEventTile.scss b/res/css/views/rooms/_PinnedEventTile.scss
index 8354df0537..be6acdf524 100644
--- a/res/css/views/rooms/_PinnedEventTile.scss
+++ b/res/css/views/rooms/_PinnedEventTile.scss
@@ -40,7 +40,7 @@ limitations under the License.
left: 0;
}
-.mx_PinnedEventTile .mx_BaseAvatar {
+.mx_PinnedEventTile .mx_PinnedEventTile_senderAvatar .mx_BaseAvatar {
float: left;
margin-right: 10px;
}
diff --git a/src/components/views/rooms/PinnedEventTile.js b/src/components/views/rooms/PinnedEventTile.js
index b63fdde0a8..91d656d60b 100644
--- a/src/components/views/rooms/PinnedEventTile.js
+++ b/src/components/views/rooms/PinnedEventTile.js
@@ -80,7 +80,9 @@ module.exports = React.createClass({
{ unpinButton }
-
', }); +/* const real_paragraph = renderer.paragraph; renderer.paragraph = function(node, entering) { @@ -114,16 +115,21 @@ export default class Markdown { real_paragraph.call(this, node, entering); } }; +*/ renderer.html_inline = html_if_tag_allowed; + renderer.html_block = function(node) { +/* // as with `paragraph`, we only insert line breaks // if there are multiple lines in the markdown. const isMultiLine = is_multi_line(node); - if (isMultiLine) this.cr(); +*/ html_if_tag_allowed.call(this, node); +/* if (isMultiLine) this.cr(); +*/ }; return renderer.render(this.parsed); @@ -150,6 +156,7 @@ export default class Markdown { this.lit(s); }; +/* renderer.paragraph = function(node, entering) { // as with toHTML, only append lines to paragraphs if there are // multiple paragraphs @@ -159,10 +166,12 @@ export default class Markdown { } } }; + renderer.html_block = function(node) { this.lit(node.literal); if (is_multi_line(node) && node.next) this.lit('\n\n'); }; +*/ // convert MD links into console-friendly ' < http://foo >' style links // ...except given this function never gets called with links, it's useless. From f40af434bcfeec7e37015192993adc639b54d79e Mon Sep 17 00:00:00 2001 From: Matthew Hodgson
', }); + + // Trying to strip out the wrapping causes a lot more complication + // than it's worth, i think. For instance, this code will go and strip + // out any tag (no matter where it is in the tree) which doesn't + // contain \n's. + // On the flip side, s are quite opionated and restricted on where + // you can nest them. + // + // Let's try sending with s anyway for now, though. /* const real_paragraph = renderer.paragraph; From b0ff61f7ef3757dee9f6dc9ee0881b7868d6c015 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson
- {children}
{children}{children};
case 'underlined':
return {children};
From 294565c47e67eb207900e45cd7355f069f8ae888 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson {children};
case 'underlined':
return {children};
From eb25b63a35fa0bb2088184ef07d38f66b452dbf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= - {children}
{children}{children};
case 'link':
return {children};
case 'pill': {
From 6299e188a4bcd680087822b59dfa3d6ab9bb30e1 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson { _t('No Audio Outputs detected') }
; let microphoneDropdown ={ _t('No Microphones detected') }
; let webcamDropdown ={ _t('No Webcams detected') }
; @@ -1018,6 +1025,26 @@ module.exports = React.createClass({ label: _t('Default Device'), }; + const audioOutputs = this.state.mediaDevices.audiooutput.slice(0); + if (audioOutputs.length > 0) { + let defaultOutput = ''; + if (!audioOutputs.some((input) => input.deviceId === 'default')) { + audioOutputs.unshift(defaultOption); + } else { + defaultOutput = 'default'; + } + + speakerDropdown =
+
+ { this._mapWebRtcDevicesToSpans(audioOutputs) }
+
+
;
+ }
+
const audioInputs = this.state.mediaDevices.audioinput.slice(0);
if (audioInputs.length > 0) {
let defaultInput = '';
@@ -1059,8 +1086,9 @@ module.exports = React.createClass({
}
return { _t('Audio Output') }
+
- { microphoneDropdown }
- { webcamDropdown }
+ { speakerDropdown }
+ { microphoneDropdown }
+ { webcamDropdown }
;
},
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index b1bc4161fd..a222c29dda 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -201,6 +201,10 @@ export const SETTINGS = {
displayName: _td('Disable Peer-to-Peer for 1:1 calls'),
default: false,
},
+ "webrtc_audiooutput": {
+ supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
+ default: null,
+ },
"webrtc_audioinput": {
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
default: null,
From 689b00c6188802fd31de2cff4314a3a3d2df8372 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 26 May 2018 17:24:07 +0100
Subject: [PATCH 0106/1196] run gen-i18n and prune-i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/i18n/strings/de_DE.json | 5 +--
src/i18n/strings/en_EN.json | 64 ++++++++++++++++++-----------------
src/i18n/strings/eu.json | 9 +----
src/i18n/strings/fr.json | 8 -----
src/i18n/strings/hu.json | 10 +-----
src/i18n/strings/it.json | 3 --
src/i18n/strings/ru.json | 4 ---
src/i18n/strings/sv.json | 2 --
src/i18n/strings/zh_Hant.json | 5 +--
9 files changed, 37 insertions(+), 73 deletions(-)
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 4892b91b48..c2b1e56cc6 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1168,8 +1168,5 @@
"Collapse Reply Thread": "Antwort-Thread zusammenklappen",
"At this time it is not possible to reply with an emote.": "An dieser Stelle ist es nicht möglich mit einer Umschreibung zu antworten.",
"Enable widget screenshots on supported widgets": "Widget-Screenshots bei unterstützten Widgets aktivieren",
- "Send analytics data": "Analysedaten senden",
- "Help improve Riot by sending usage data? This will use a cookie. (See our
+ {}} // we need to give this, apparently
+ />
+
{ descriptor.desc }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index bf9e395bee..8698e6108f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -491,6 +491,7 @@
"To kick users, you must be a": "To kick users, you must be a",
"To ban users, you must be a": "To ban users, you must be a",
"To remove other users' messages, you must be a": "To remove other users' messages, you must be a",
+ "To notify everyone in the room, you must be a": "To notify everyone in the room, you must be a",
"No users have specific privileges in this room": "No users have specific privileges in this room",
"%(user)s is a %(userRole)s": "%(user)s is a %(userRole)s",
"Privileged Users": "Privileged Users",
From 929da30df8016926d1780ef0e04e42d366938eb6 Mon Sep 17 00:00:00 2001
From: Travis Ralston
Date: Sun, 27 May 2018 10:28:47 -0600
Subject: [PATCH 0115/1196] onEvent -> onStateEvent
Signed-off-by: Travis Ralston
---
src/components/views/rooms/PinnedEventsPanel.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/views/rooms/PinnedEventsPanel.js b/src/components/views/rooms/PinnedEventsPanel.js
index e75cbea817..50c40142da 100644
--- a/src/components/views/rooms/PinnedEventsPanel.js
+++ b/src/components/views/rooms/PinnedEventsPanel.js
@@ -39,16 +39,16 @@ module.exports = React.createClass({
componentDidMount: function() {
this._updatePinnedMessages();
- MatrixClientPeg.get().on("RoomState.events", this._onEvent);
+ MatrixClientPeg.get().on("RoomState.events", this._onStateEvent);
},
componentWillUnmount: function() {
if (MatrixClientPeg.get()) {
- MatrixClientPeg.get().removeListener("RoomState.events", this._onEvent);
+ MatrixClientPeg.get().removeListener("RoomState.events", this._onStateEvent);
}
},
- _onEvent: function(ev) {
+ _onStateEvent: function(ev) {
if (ev.getRoomId() === this.props.room.roomId && ev.getType() === "m.room.pinned_events") {
this._updatePinnedMessages();
}
From 65a30572f3976621d0cf577461e50c60873e609d Mon Sep 17 00:00:00 2001
From: Kenneth Larsson
Date: Fri, 25 May 2018 21:40:11 +0000
Subject: [PATCH 0116/1196] Translated using Weblate (Swedish)
Currently translated at 81.4% (968 of 1189 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
src/i18n/strings/sv.json | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 21f38169dc..4ab1413e4f 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -589,7 +589,7 @@
"Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Din epostadress verkar inte vara kopplad till något Matrix-ID på den här hemservern.",
"Restricted": "Begränsad",
"Who would you like to communicate with?": "Vem vill du kommunicera med?",
- "Failed to invite the following users to the %(roomName)s room:": "Misslyckades med att bjuda in följande användare till %(roomName)s-rummet:",
+ "Failed to invite the following users to the %(roomName)s room:": "Det gick inte att bjuda in följande användare till %(roomName)s-rummet:",
"Unable to create widget.": "Det går inte att skapa widget.",
"Ignored user": "Ignorerad användare",
"You are now ignoring %(userId)s": "Du ignorerar nu %(userId)s",
@@ -960,5 +960,14 @@
"The remote side failed to pick up": "Mottagaren kunde inte svara",
"Room name or alias": "Rumsnamn eller alias",
"Jump to read receipt": "Hoppa till läskvitto",
- "At this time it is not possible to reply with a file so this will be sent without being a reply.": "Just nu är det inte möjligt att svara med en fil så den kommer att skickas utan att vara ett svar."
+ "At this time it is not possible to reply with a file so this will be sent without being a reply.": "Just nu är det inte möjligt att svara med en fil så den kommer att skickas utan att vara ett svar.",
+ "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Denna process låter dig exportera nycklarna för meddelanden som du har fått i krypterade rum till en lokal fil. Du kommer sedan att kunna importera filen i en annan Matrix-klient i framtiden, så att den klienten också kan dekryptera meddelandena.",
+ "Unknown for %(duration)s": "Okänt i %(duration)s",
+ "Unknown": "Okänt",
+ "Reload widget": "Ladda om widget",
+ "e.g. %(exampleValue)s": "t.ex. %(exampleValue)s",
+ "Can't leave Server Notices room": "Kan inte lämna serveraviseringsrummet",
+ "This room is used for important messages from the Homeserver, so you cannot leave it.": "Detta rum används för viktiga meddelanden från hemservern, så du kan inte lämna det.",
+ "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Data från en äldre version av Riot has upptäckts. Detta ska ha orsakat att krypteringen inte fungerat i den äldre versionen. Krypterade meddelanden som nyligen har skickats medans den äldre versionen användes kanske inte kan dekrypteras i denna version. Detta kan även orsaka att meddelanden skickade med denna version inte fungerar. Om du upplever problem, logga ut och in igen. För att behålla meddelandehistoriken, exportera dina nycklar och importera dem igen.",
+ "Confirm Removal": "Bekräfta borttagning"
}
From 23162c86253cc5aca18f2a9a954ab56736055991 Mon Sep 17 00:00:00 2001
From: Travis Ralston
Date: Mon, 9 Oct 2017 18:50:08 -0600
Subject: [PATCH 0117/1196] Support third party integration managers in
AppPermission
Alternative integration managers may wish to also wrap widgets to supply a better user experience. With the previous code, it was not possible to use the integrations_widgets_urls configuration option (described in AppTile). AppPermission should use the same logic to determine if a widget is being wrapped, so it can display a helpful URL for the user (instead of the wrapper URL).
Signed-off-by: Travis Ralston
---
.../views/elements/AppPermission.js | 24 ++++++++++++-------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/components/views/elements/AppPermission.js b/src/components/views/elements/AppPermission.js
index c45006be3a..0ce7c2a45e 100644
--- a/src/components/views/elements/AppPermission.js
+++ b/src/components/views/elements/AppPermission.js
@@ -2,6 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import url from 'url';
import { _t } from '../../../languageHandler';
+import SdkConfig from '../../../SdkConfig';
export default class AppPermission extends React.Component {
constructor(props) {
@@ -34,14 +35,21 @@ export default class AppPermission extends React.Component {
}
isScalarWurl(wurl) {
- if (wurl && wurl.hostname && (
- wurl.hostname === 'scalar.vector.im' ||
- wurl.hostname === 'scalar-staging.riot.im' ||
- wurl.hostname === 'scalar-develop.riot.im' ||
- wurl.hostname === 'demo.riot.im' ||
- wurl.hostname === 'localhost'
- )) {
- return true;
+ // Exit early if we've been given bad data
+ if (!wurl) {
+ return false;
+ }
+
+ let scalarUrls = SdkConfig.get().integrations_widgets_urls;
+ if (!scalarUrls || scalarUrls.length == 0) {
+ scalarUrls = [SdkConfig.get().integrations_rest_url];
+ }
+
+ const url = wurl.format();
+ for (const scalarUrl of scalarUrls) {
+ if (url.startsWith(scalarUrl)) {
+ return true;
+ }
}
return false;
}
From 47ae19672fa76539854cab31d4dfff8da9267b3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?=
Date: Thu, 24 May 2018 18:12:29 +0000
Subject: [PATCH 0118/1196] Translated using Weblate (French)
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
src/i18n/strings/fr.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 274d13fa45..64093ebb0d 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1195,5 +1195,6 @@
"Please help improve Riot.im by sending anonymous usage data . This will use a cookie.": "Veuillez aider Riot.im à s'améliorer en envoyant des données d'utilisation anonymes . Cela utilisera un cookie.",
"Yes, I want to help!": "Oui, je veux aider !",
"Can't leave Server Notices room": "Impossible de quitter le salon des Annonces du serveur",
- "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ce salon est utilisé pour les messages importants du serveur d'accueil, donc vous ne pouvez pas en partir."
+ "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ce salon est utilisé pour les messages importants du serveur d'accueil, donc vous ne pouvez pas en partir.",
+ "To notify everyone in the room, you must be a": "Pour notifier tout le monde dans le salon, vous devez être"
}
From 98613748b63a338d21b800d41004f070562a0ffb Mon Sep 17 00:00:00 2001
From: Travis Ralston
Date: Sun, 27 May 2018 11:12:55 -0600
Subject: [PATCH 0119/1196] Move Scalar Widget URL check to WidgetUtils
Signed-off-by: Travis Ralston
---
src/WidgetUtils.js | 35 +++++++++++++++++++
.../views/elements/AppPermission.js | 23 ++----------
src/components/views/elements/AppTile.js | 35 +------------------
3 files changed, 38 insertions(+), 55 deletions(-)
diff --git a/src/WidgetUtils.js b/src/WidgetUtils.js
index 5f45a8c58c..10cd473904 100644
--- a/src/WidgetUtils.js
+++ b/src/WidgetUtils.js
@@ -15,6 +15,8 @@ limitations under the License.
*/
import MatrixClientPeg from './MatrixClientPeg';
+import SdkConfig from "./SdkConfig";
+import * as url from "url";
export default class WidgetUtils {
/* Returns true if user is able to send state events to modify widgets in this room
@@ -55,4 +57,37 @@ export default class WidgetUtils {
return room.currentState.maySendStateEvent('im.vector.modular.widgets', me);
}
+
+ /**
+ * Returns true if specified url is a scalar URL, typically https://scalar.vector.im/api
+ * @param {[type]} testUrlString URL to check
+ * @return {Boolean} True if specified URL is a scalar URL
+ */
+ static isScalarUrl(testUrlString) {
+ if (!testUrlString) {
+ console.error('Scalar URL check failed. No URL specified');
+ return false;
+ }
+
+ const testUrl = url.parse(testUrlString);
+
+ let scalarUrls = SdkConfig.get().integrations_widgets_urls;
+ if (!scalarUrls || scalarUrls.length === 0) {
+ scalarUrls = [SdkConfig.get().integrations_rest_url];
+ }
+
+ for (let i = 0; i < scalarUrls.length; i++) {
+ const scalarUrl = url.parse(scalarUrls[i]);
+ if (testUrl && scalarUrl) {
+ if (
+ testUrl.protocol === scalarUrl.protocol &&
+ testUrl.host === scalarUrl.host &&
+ testUrl.pathname.startsWith(scalarUrl.pathname)
+ ) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
}
diff --git a/src/components/views/elements/AppPermission.js b/src/components/views/elements/AppPermission.js
index 0ce7c2a45e..6af3148e21 100644
--- a/src/components/views/elements/AppPermission.js
+++ b/src/components/views/elements/AppPermission.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
import url from 'url';
import { _t } from '../../../languageHandler';
import SdkConfig from '../../../SdkConfig';
+import WidgetUtils from "../../../WidgetUtils";
export default class AppPermission extends React.Component {
constructor(props) {
@@ -20,7 +21,7 @@ export default class AppPermission extends React.Component {
const searchParams = new URLSearchParams(wurl.search);
- if (this.isScalarWurl(wurl) && searchParams && searchParams.get('url')) {
+ if (WidgetUtils.isScalarUrl(wurl) && searchParams && searchParams.get('url')) {
curl = url.parse(searchParams.get('url'));
if (curl) {
curl.search = curl.query = "";
@@ -34,26 +35,6 @@ export default class AppPermission extends React.Component {
return curlString;
}
- isScalarWurl(wurl) {
- // Exit early if we've been given bad data
- if (!wurl) {
- return false;
- }
-
- let scalarUrls = SdkConfig.get().integrations_widgets_urls;
- if (!scalarUrls || scalarUrls.length == 0) {
- scalarUrls = [SdkConfig.get().integrations_rest_url];
- }
-
- const url = wurl.format();
- for (const scalarUrl of scalarUrls) {
- if (url.startsWith(scalarUrl)) {
- return true;
- }
- }
- return false;
- }
-
render() {
let e2eWarningText;
if (this.props.isRoomEncrypted) {
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 5f3ed6eba1..0ec754e0c0 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -121,39 +121,6 @@ export default class AppTile extends React.Component {
return u.format();
}
- /**
- * Returns true if specified url is a scalar URL, typically https://scalar.vector.im/api
- * @param {[type]} testUrlString URL to check
- * @return {Boolean} True if specified URL is a scalar URL
- */
- isScalarUrl(testUrlString) {
- if (!testUrlString) {
- console.error('Scalar URL check failed. No URL specified');
- return false;
- }
-
- const testUrl = url.parse(testUrlString);
-
- let scalarUrls = SdkConfig.get().integrations_widgets_urls;
- if (!scalarUrls || scalarUrls.length == 0) {
- scalarUrls = [SdkConfig.get().integrations_rest_url];
- }
-
- for (let i = 0; i < scalarUrls.length; i++) {
- const scalarUrl = url.parse(scalarUrls[i]);
- if (testUrl && scalarUrl) {
- if (
- testUrl.protocol === scalarUrl.protocol &&
- testUrl.host === scalarUrl.host &&
- testUrl.pathname.startsWith(scalarUrl.pathname)
- ) {
- return true;
- }
- }
- }
- return false;
- }
-
isMixedContent() {
const parentContentProtocol = window.location.protocol;
const u = url.parse(this.props.url);
@@ -209,7 +176,7 @@ export default class AppTile extends React.Component {
setScalarToken() {
this.setState({initialising: true});
- if (!this.isScalarUrl(this.props.url)) {
+ if (!WidgetUtils.isScalarUrl(this.props.url)) {
console.warn('Non-scalar widget, not setting scalar token!', url);
this.setState({
error: null,
From 77bfce5f9af813ed0359568f5a011c5256b9e9ee Mon Sep 17 00:00:00 2001
From: Osoitz
Date: Sun, 27 May 2018 23:46:28 +0000
Subject: [PATCH 0120/1196] Translated using Weblate (Basque)
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
src/i18n/strings/eu.json | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 04d2e86664..c293ec135d 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1183,5 +1183,17 @@
"Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Matrix-eko mezuen ikusgaitasuna, e-mail mezuen antzekoa da. Zure mezuak ezabatzeak esan nahi du bidali dituzun mezuak ez direla erabiltzaile berriekin partekatuko, baina aurretik zure mezuak jaso dituzten erabiltzaile erregistratuek bere kopia izango dute.",
"To continue, please enter your password:": "Jarraitzeko, sartu zure pasahitza:",
"password": "pasahitza",
- "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Ezabatu bidali ditudan mezu guztiak nire kontua desaktibatzean. (Abisua: Etorkizuneko erabiltzaileek elkarrizketa partzialak ikusiko dituzte, esperientzia kaskarra sortuz)."
+ "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Ezabatu bidali ditudan mezu guztiak nire kontua desaktibatzean. (Abisua: Etorkizuneko erabiltzaileek elkarrizketa partzialak ikusiko dituzte, esperientzia kaskarra sortuz).",
+ "e.g. %(exampleValue)s": "adib. %(exampleValue)s",
+ "Reload widget": "Birkargatu trepeta",
+ "To notify everyone in the room, you must be a": "Gelan dauden guztiei jakinarazteko",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie (please see our Cookie Policy ).": "Hobetu Riot.im erabilera-datu anonimoak bidaliz. Honek coockie bat erabiliko du (Ikusi gure Cookie politika ).",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie.": "Hobetu Riot.im erabilera-datu anonimoak bidaliz. Honek cookie bat erabiliko du.",
+ "Yes, I want to help!": "Bai, lagundu nahi dut!",
+ "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Honek kontua behin betirako erabilgaitza bihurtuko du. Ezin izango duzu saioa hasi, eta ezin izango du beste inork ID hori erabili. Kontua dagoen gela guztietatik aterako da, eta kontuaren xehetasunak identitate-zerbitzaritik ezabatuko dira. Ekintza hau ezin da desegin.",
+ "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Kontua desaktibatzean ez dira zuk bidalitako mezuak ahaztuko. Mezuak ahaztea nahi baduzu markatu beheko kutxa.",
+ "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Matrix-eko mezuen ikusgaitasuna e-mail sistemaren antekoa da. Guk zure mezuak ahaztean ez dizkiogu erabiltzaile berriei edo izena eman ez dutenei erakutsiko, baina jada zure mezuak jaso diztuzten erregistratutako erabiltzaileen bere kopia izaten jarraituko dute.",
+ "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Ahaztu bidali ditudan mezu guztiak kontua desaktibatzean (Abisua: Honekin etorkizuneko erabiltzaileek elkarrizketaren bertsio ez oso bat ikusiko dute)",
+ "Can't leave Server Notices room": "Ezin zara Server Notices gelatik atera",
+ "This room is used for important messages from the Homeserver, so you cannot leave it.": "Gela hau mezu hasiera zerbitzariaren garrantzitsuak bidaltzeko erabiltzen da, eta ezin zara atera."
}
From 5a9c32a5a72e33092fa75838400ca16e33b61afe Mon Sep 17 00:00:00 2001
From: Brendan Abolivier
Date: Sun, 27 May 2018 18:17:29 +0000
Subject: [PATCH 0121/1196] Translated using Weblate (French)
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
src/i18n/strings/fr.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 64093ebb0d..0d8cf10f8d 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1196,5 +1196,5 @@
"Yes, I want to help!": "Oui, je veux aider !",
"Can't leave Server Notices room": "Impossible de quitter le salon des Annonces du serveur",
"This room is used for important messages from the Homeserver, so you cannot leave it.": "Ce salon est utilisé pour les messages importants du serveur d'accueil, donc vous ne pouvez pas en partir.",
- "To notify everyone in the room, you must be a": "Pour notifier tout le monde dans le salon, vous devez être"
+ "To notify everyone in the room, you must be a": "Pour notifier tout le monde dans le salon, vous devez être un"
}
From 9b86040856591c12a8b50ea99442360e220668af Mon Sep 17 00:00:00 2001
From: Jeff Huang
Date: Thu, 24 May 2018 23:50:05 +0000
Subject: [PATCH 0122/1196] Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
---
src/i18n/strings/zh_Hant.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index f545df95d3..80dce1cc2d 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1190,5 +1190,6 @@
"This room is used for important messages from the Homeserver, so you cannot leave it.": "這個聊天室是用於發佈從家伺服器而來的重要訊息，所以您不能離開它。",
"Terms and Conditions": "條款與細則",
"To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "要繼續使用 %(homeserverDomain)s 家伺服器，您必須審閱並同意我們的條款與細則。",
- "Review terms and conditions": "審閱條款與細則"
+ "Review terms and conditions": "審閱條款與細則",
+ "To notify everyone in the room, you must be a": "為了通知每個在聊天室裡的人，您必須為"
}
From 779579dea4a4578d696e338e000d8ce5105c25f6 Mon Sep 17 00:00:00 2001
From: Nathan van Beelen
Date: Mon, 28 May 2018 07:40:11 +0000
Subject: [PATCH 0123/1196] Translated using Weblate (Dutch)
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
---
src/i18n/strings/nl.json | 44 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 43 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 0df2cf1bd7..e71463564a 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1146,5 +1146,47 @@
"Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Debug logs bevatten applicatie-gebruik data inclusief je gebruikersnaam, de ID's of namen van de ruimtes en groepen die je hebt bezocht en de gebruikersnamen van andere gebruikers. Ze bevatten geen berichten.",
"Failed to send logs: ": "Het is niet gelukt om de logs te versturen: ",
"Notes:": "Constateringen:",
- "Preparing to send logs": "Voorbereiden om logs te versturen"
+ "Preparing to send logs": "Voorbereiden om logs te versturen",
+ "e.g. %(exampleValue)s": "bijv. %(exampleValue)s",
+ "Every page you use in the app": "Elke pagina die je in de applicatie gebruikt",
+ "e.g. ": "bijv. ",
+ "Your User Agent": "Je gebruikersagent",
+ "Your device resolution": "De resolutie van je apparaat",
+ "Reload widget": "Widget herladen",
+ "Missing roomId.": "roomId mist.",
+ "Always show encryption icons": "Altijd versleutelingsiconen weergeven",
+ "Send analytics data": "Statistische gegevens (analytics) versturen",
+ "Enable widget screenshots on supported widgets": "Widget schermafbeeldingen op ondersteunde widgets aanzetten",
+ "At this time it is not possible to reply with a file so this will be sent without being a reply.": "Op dit moment is het niet mogelijk om te reageren met een bestand het zal dus als een normaal bericht worden verstuurd.",
+ "Unable to reply": "Niet mogelijk om te reageren",
+ "At this time it is not possible to reply with an emote.": "Op dit moment is het niet mogelijk om met een emote te reageren.",
+ "To notify everyone in the room, you must be a": "Om iedereen in de ruimte te notificeren moet je het volgende zijn:",
+ "Muted Users": "Gedempte Gebruikers",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie (please see our Cookie Policy ).": "Help Riot.im te verbeteren door het versturen van anonieme gebruiksgegevens . Dit zal een cookie gebruiken (zie ons Cookiebeleid ).",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie.": "Help Riot.im te verbeteren door het versturen van anonieme gebruiksgegevens . Dit zal een cookie gebruiken.",
+ "Yes, I want to help!": "Ja, ik wil helpen!",
+ "Warning: This widget might use cookies.": "Waarschuwing: deze widget gebruikt misschien cookies.",
+ "Popout widget": "Opspringende widget",
+ "Picture": "Afbeelding",
+ "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Niet mogelijk om de gebeurtenis te laden waar op gereageerd was. Het kan zijn dat het niet bestaat of dat je niet toestemming hebt om het te bekijken.",
+ "Riot bugs are tracked on GitHub: create a GitHub issue.": "Riot fouten worden bijgehouden op GitHub: maak een GitHub melding.",
+ "Failed to indicate account erasure": "Niet gelukt om de accountverwijdering aan te geven",
+ "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Dit zal je account voorgoed onbruikbaar maken. Je zal niet meer in kunnen loggen en niemand anders zal met dezelfde gebruikers ID kunnen registreren. Dit zal er voor zorgen dat je account alle ruimtes verlaat waar het momenteel onderdeel van is en het verwijderd de accountgegevens van de identiteitsserver. Deze actie is onomkeerbaar.",
+ "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Het deactiveren van je account zal er niet standaard voor zorgen dat de berichten die je verzonden hebt vergeten worden. Als je wilt dat wij de berichten vergeten, klikt alsjeblieft op het vakje hieronder.",
+ "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "De zichtbaarheid van berichten in Matrix is hetzelfde als in e-mail. Het vergeten van je berichten betekent dat berichten die je hebt verstuurd niet meer gedeeld worden met nieuwe of ongeregistreerde gebruikers, maar geregistreerde gebruikers die al toegang hebben tot deze berichten zullen alsnog toegang hebben tot hun eigen kopie van het bericht.",
+ "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Vergeet alle berichten die ik heb verstuurd wanneer mijn account gedeactiveerd is (Waarschuwing: dit zal er voor zorgen dat toekomstige gebruikers een incompleet beeld krijgen van gesprekken)",
+ "To continue, please enter your password:": "Om verder te gaan, vul alsjeblieft je wachtwoord in:",
+ "password": "wachtwoord",
+ "Log out and remove encryption keys?": "Uitloggen en versleutelingssleutels verwijderen?",
+ "Clear Storage and Sign Out": "Leeg Opslag en Log Uit",
+ "Send Logs": "Logboek Versturen",
+ "Refresh": "Herladen",
+ "We encountered an error trying to restore your previous session.": "Er is een fout opgetreden tijdens het herstellen van je vorige sessie.",
+ "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Het opschonen van je browser's opslag zal het probleem misschien oplossen, maar zal je uitloggen en ervoor zorgen dat alle versleutelde chat geschiedenis onleesbaar wordt.",
+ "Collapse Reply Thread": "Reactieketting Inklappen",
+ "Can't leave Server Notices room": "Kan de Server Meldingen ruimte niet verlaten",
+ "This room is used for important messages from the Homeserver, so you cannot leave it.": "Deze ruimte wordt gebruikt voor belangrijke berichten van de thuisserver, dus je kan het niet verlaten.",
+ "Terms and Conditions": "Voorwaarden",
+ "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Om de %(homeserverDomain)s thuisserver te blijven gebruiken zal je de voorwaarden moeten lezen en ermee akkoord moeten gaan.",
+ "Review terms and conditions": "Voorwaarden lezen"
}
From cc241edb4b2fa4da8ab247c75534bd54eac418ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?=
Date: Mon, 28 May 2018 10:57:38 +0000
Subject: [PATCH 0124/1196] Added translation using Weblate (Icelandic)
---
src/i18n/strings/is.json | 1 +
1 file changed, 1 insertion(+)
create mode 100644 src/i18n/strings/is.json
diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/src/i18n/strings/is.json
@@ -0,0 +1 @@
+{}
From 181e5ee7d36c5c8c48179422fe9a4899cbd7b2be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?=
Date: Mon, 28 May 2018 11:27:58 +0000
Subject: [PATCH 0125/1196] Translated using Weblate (Icelandic)
Currently translated at 42.5% (506 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/is/
---
src/i18n/strings/is.json | 509 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 508 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index 0967ef424b..aa56456458 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -1 +1,508 @@
-{}
+{
+ "This email address is already in use": "Þetta tölvupóstfang er nú þegar í notkun",
+ "This phone number is already in use": "Þetta símanúmer er nú þegar í notkun",
+ "Failed to verify email address: make sure you clicked the link in the email": "Gat ekki sannprófað tölvupóstfang: gakktu úr skugga um að þú hafir smellt á tengilinn í tölvupóstinum",
+ "e.g. %(exampleValue)s": "t.d. %(exampleValue)s",
+ "e.g. ": "t.d. ",
+ "Your User Agent": "Kennisstrengur þinn",
+ "Your device resolution": "Skjáupplausn tækisins þíns",
+ "Analytics": "Greiningar",
+ "Call Anyway": "hringja samt",
+ "Answer Anyway": "Svara samt",
+ "Call": "Símtal",
+ "Answer": "Svara",
+ "The remote side failed to pick up": "Ekki var svarað á fjartengda endanum",
+ "VoIP is unsupported": "Enginn stuðningur við VoIP",
+ "Conference calls are not supported in encrypted rooms": "Símafundir eru ekki studdir í dulrituðum spjallrásum",
+ "Warning!": "Aðvörun!",
+ "Conference calling is in development and may not be reliable.": "Símafundir eru í þróun og gætu verið óáreiðanlegir.",
+ "Upload Failed": "Upphleðsla mistókst",
+ "Sun": "sun",
+ "Mon": "mán",
+ "Tue": "þri",
+ "Wed": "mið",
+ "Thu": "fim",
+ "Fri": "fös",
+ "Sat": "lau",
+ "Jan": "jan",
+ "Feb": "feb",
+ "Mar": "mar",
+ "Apr": "apr",
+ "May": "maí",
+ "Jun": "jún",
+ "Jul": "júl",
+ "Aug": "ágú",
+ "Sep": "sep",
+ "Oct": "okt",
+ "Nov": "nóv",
+ "Dec": "des",
+ "PM": "e.h.",
+ "AM": "f.h.",
+ "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+ "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
+ "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
+ "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
+ "Room name or alias": "Nafn eða samnefni spjallrásar",
+ "Default": "Sjálfgefið",
+ "Restricted": "Takmarkað",
+ "Moderator": "Umsjónarmaður",
+ "Admin": "Stjórnandi",
+ "Start a chat": "Hefja spjall",
+ "Email, name or matrix ID": "Tölvupóstfang, nafn eða Matrix-auðkenni",
+ "Start Chat": "Hefja spjall",
+ "Operation failed": "Aðgerð tókst ekki",
+ "You need to be logged in.": "Þú þarft að vera skráð/ur inn.",
+ "Unable to create widget.": "Gat ekki búið til viðmótshluta.",
+ "Failed to send request.": "Mistókst að senda beiðni.",
+ "This room is not recognised.": "Spjallrás er ekki þekkt.",
+ "Power level must be positive integer.": "Völd verða að vera jákvæð heiltala.",
+ "You are not in this room.": "Þú ert ekki á þessari spjallrás.",
+ "You do not have permission to do that in this room.": "Þú hefur ekki réttindi til þess að gera þetta á þessari spjallrás.",
+ "Missing room_id in request": "Vantar spjallrásarauðkenni í beiðni",
+ "Missing user_id in request": "Vantar notandaauðkenni í beiðni",
+ "Usage": "Notkun",
+ "Reason": "Ástæða",
+ "VoIP conference started.": "VoIP-símafundur hafinn.",
+ "VoIP conference finished.": "VoIP-símafundi lokið.",
+ "Someone": "Einhver",
+ "(not supported by this browser)": "(Ekki stutt af þessum vafra)",
+ "(no answer)": "(ekkert svar)",
+ "Send anyway": "Senda samt",
+ "Send": "Senda",
+ "Unnamed Room": "Nafnlaus spjallrás",
+ "Hide join/leave messages (invites/kicks/bans unaffected)": "Fela taka-þátt/hætta skilaboð (hefur ekki áhrif á boð/spörk/bönn)",
+ "Hide read receipts": "Fela leskvittanir",
+ "Show timestamps in 12 hour format (e.g. 2:30pm)": "Birta tímamerki á 12 stunda sniði (t.d. 2:30 fh)",
+ "Always show message timestamps": "Alltaf birta tímamerki skilaboða",
+ "Send analytics data": "Senda greiningargögn",
+ "Never send encrypted messages to unverified devices from this device": "Aldrei senda dulrituð skilaboð af þessu tæki til ósannvottaðra tækja",
+ "Never send encrypted messages to unverified devices in this room from this device": "Aldrei senda dulrituð skilaboð af þessu tæki til ósannvottaðra tækja á þessari spjallrás",
+ "Enable inline URL previews by default": "Sjálfgefið virkja forskoðun innfelldra vefslóða",
+ "Room Colour": "Litur spjallrásar",
+ "Collecting app version information": "Safna upplýsingum um útgáfu forrits",
+ "Collecting logs": "Safna atvikaskrám",
+ "Uploading report": "Sendi inn skýrslu",
+ "Waiting for response from server": "Bíð eftir svari frá vefþjóni",
+ "Messages containing my display name": "Skilaboð sem innihalda birtingarnafn mitt",
+ "Messages containing my user name": "Skilaboð sem innihalda notandanafn mitt",
+ "Messages in one-to-one chats": "Skilaboð í maður-á-mann spjalli",
+ "Messages in group chats": "Skilaboð í hópaspjalli",
+ "When I'm invited to a room": "Þegar mér er boðið á spjallrás",
+ "Call invitation": "Boð um þátttöku",
+ "Messages sent by bot": "Skilaboð send af vélmennum",
+ "unknown caller": "Óþekktur símnotandi",
+ "Incoming voice call from %(name)s": "Innhringing raddsamtals frá %(name)s",
+ "Incoming video call from %(name)s": "Innhringing myndsamtals frá %(name)s",
+ "Decline": "Hafna",
+ "Accept": "Samþykkja",
+ "Error": "Villa",
+ "Enter Code": "Settu inn kóða",
+ "Submit": "Senda inn",
+ "Phone": "Sími",
+ "Add phone number": "Bæta við símanúmeri",
+ "Add": "Bæta við",
+ "Continue": "Halda áfram",
+ "Export E2E room keys": "Flytja út E2E dulritunarlykla spjallrásar",
+ "Current password": "Núverandi lykilorð",
+ "Password": "Lykilorð",
+ "New Password": "Nýtt lykilorð",
+ "Confirm password": "Staðfestu lykilorðið",
+ "Change Password": "Breyta lykilorði",
+ "Authentication": "Auðkenning",
+ "Delete %(count)s devices|other": "Eyða %(count)s tækjum",
+ "Delete %(count)s devices|one": "Eyða tæki",
+ "Device ID": "Auðkenni tækis",
+ "Device Name": "Heiti tækis",
+ "Last seen": "Sást síðast",
+ "Enable Notifications": "Virkja tilkynningar",
+ "Error saving email notification preferences": "Villa við að vista valkosti pósttilkynninga",
+ "An error occurred whilst saving your email notification preferences.": "Villa kom upp við að vista valkosti tilkynninga í tölvupósti.",
+ "Keywords": "Stikkorð",
+ "Enter keywords separated by a comma:": "Settu inn stikkorð aðskilin með kommu:",
+ "OK": "Í lagi",
+ "Failed to change settings": "Mistókst að breyta stillingum",
+ "Can't update user notification settings": "Gat ekki uppfært stillingar á tilkynningum notandans",
+ "Failed to update keywords": "Mistókst að uppfæra stikkorð",
+ "Messages containing keywords": "Skilaboð sem innihalda kstikkorð",
+ "Notify for all other messages/rooms": "Senda tilkynningar fyrir öll önnur skilaboð/spjallrásir",
+ "Notify me for anything else": "Senda mér tilkynningar fyrir allt annað",
+ "Enable notifications for this account": "Virkja tilkynningar fyrir þennan notandaaðgang",
+ "Add an email address above to configure email notifications": "Settu inn tölvupóstfang hér fyrir ofan til að stilla tilkynningar með tölvupósti",
+ "Enable email notifications": "Virkja tilkynningar í tölvupósti",
+ "Notification targets": "Markmið tilkynninga",
+ "Advanced notification settings": "Ítarlegar stillingar á tilkynningum",
+ "Enable desktop notifications": "Virkja tilkynningar á skjáborði",
+ "Show message in desktop notification": "Birta tilkynningu í innbyggðu kerfistilkynningakerfi",
+ "Enable audible notifications in web client": "Virkja hljóðtilkynningar í vefviðmóti",
+ "Off": "Slökkt",
+ "On": "Kveikt",
+ "Noisy": "Hávært",
+ "Add a widget": "Bæta við viðmótshluta",
+ "Drop File Here": "Slepptu skrá hérna",
+ "Drop file here to upload": "Slepptu hér skrá til að senda inn",
+ " (unsupported)": "[óstutt]",
+ "%(senderName)s sent an image": "%(senderName)s sendi mynd",
+ "%(senderName)s sent a video": "%(senderName)s sendi myndskeið",
+ "%(senderName)s uploaded a file": "%(senderName)s sendi inn skrá",
+ "Options": "Valkostir",
+ "Unencrypted message": "Ódulrituð skilaboð",
+ "Blacklisted": "Á bannlista",
+ "Verified": "Sannreynt",
+ "Unverified": "Óstaðfest",
+ "device id: ": "Auðkenni tækis: ",
+ "Kick": "Sparka",
+ "Unban": "Afbanna",
+ "Ban": "Banna",
+ "Unban this user?": "Taka þennan notanda úr banni?",
+ "Ban this user?": "Banna þennan notanda?",
+ "Are you sure?": "Ertu viss?",
+ "Devices": "Tæki",
+ "Unignore": "Byrja að fylgjast með á ný",
+ "Ignore": "Hunsa",
+ "Mention": "Minnst á",
+ "Invite": "Bjóða",
+ "User Options": "User Options",
+ "Direct chats": "Beint spjall",
+ "Unmute": "Kveikja á hljóði",
+ "Mute": "Þagga hljóð",
+ "Make Moderator": "Gera að umsjónarmanni",
+ "Admin Tools": "Kerfisstjóratól",
+ "Level:": "Stig:",
+ "Invited": "Boðið",
+ "Filter room members": "Sía meðlimi spjallrásar",
+ "Attachment": "Viðhengi",
+ "Upload Files": "Senda inn skrár",
+ "Hangup": "Leggja á",
+ "Voice call": "Raddsamtal",
+ "Video call": "_Myndsímtal",
+ "Upload file": "Hlaða inn skrá",
+ "Send an encrypted message…": "Senda dulrituð skilaboð…",
+ "Send a message (unencrypted)…": "Senda skilaboð (ódulrituð)…",
+ "You do not have permission to post to this room": "Þú hefur ekki heimild til að senda skilaboð á þessa spjallrás",
+ "Server error": "Villa á þjóni",
+ "Command error": "Skipanavilla",
+ "bold": "feitletrað",
+ "italic": "skáletrað",
+ "strike": "yfirstrikað",
+ "underline": "undirstrikað",
+ "code": "kóði",
+ "quote": "tilvitnun",
+ "bullet": "áherslumerki",
+ "Loading...": "Hleð inn...",
+ "Online": "Nettengt",
+ "Idle": "Iðjulaust",
+ "Offline": "Ótengt",
+ "Unknown": "Óþekkt",
+ "No rooms to show": "Engar spjallrásir sem hægt er að birta",
+ "Unnamed room": "Nafnlaus spjallrás",
+ "World readable": "Lesanlegt öllum",
+ "Guests can join": "Gestir geta tekið þátt",
+ "Save": "Vista",
+ "Join Room": "Taka þátt í spjallrás",
+ "Settings": "Stillingar",
+ "Forget room": "Gleyma spjallrás",
+ "Search": "Leita",
+ "Invites": "Boðsgestir",
+ "Favourites": "Eftirlæti",
+ "People": "Fólk",
+ "Rooms": "Spjallrásir",
+ "Low priority": "Lítill forgangur",
+ "Historical": "Ferilskráning",
+ "Rejoin": "Taka þátt aftur",
+ "This room": "Þessi spjallrás",
+ "This is a preview of this room. Room interactions have been disabled": "Þetta er forskoðun á spjallrásinni. Samskipti spjallrásarinnar hafa verið gerð óvirk",
+ "Privacy warning": "Aðvörun vegna gagnaleyndar",
+ "unknown error code": "óþekktur villukóði",
+ "Failed to forget room %(errCode)s": "Mistókst að gleyma spjallrásinni %(errCode)s",
+ "Encryption is enabled in this room": "Dulritun er virk í þessari spjallrás",
+ "Encryption is not enabled in this room": "Dulritun er ekki virk í þessari spjallrás",
+ "Banned users": "Bannaðir notendur",
+ "Leave room": "Fara af spjallrás",
+ "Favourite": "Eftirlæti",
+ "Tagged as: ": "Merkt sem:",
+ "To link to a room it must have an address.": "Til að tengja við spjallrás verður hún að vera með vistfang.",
+ "Who can access this room?": "Hver hefur aðgang að þessari spjallrás?",
+ "Only people who have been invited": "Aðeins fólk sem hefur verið boðið",
+ "Anyone who knows the room's link, apart from guests": "Hver sá sem þekkir slóðina á spjallrásina, fyrir utan gesti",
+ "Anyone who knows the room's link, including guests": "Hver sá sem þekkir slóðina á spjallrásina, að gestum meðtöldum",
+ "Who can read history?": "Hver getur lesið ferilskráningu?",
+ "Anyone": "Hver sem er",
+ "Members only (since the point in time of selecting this option)": "Einungis meðlimir (síðan þessi kostur var valinn)",
+ "Members only (since they were invited)": "Einungis meðlimir (síðan þeim var boðið)",
+ "Members only (since they joined)": "Einungis meðlimir (síðan þeir skráðu sig)",
+ "Permissions": "Heimildir",
+ "Advanced": "Nánar",
+ "Search…": "Leita…",
+ "This Room": "Þessi spjallrás",
+ "All Rooms": "Allar spjallrásir",
+ "Cancel": "Hætta við",
+ "Jump to first unread message.": "Fara í fyrstu ólesin skilaboð.",
+ "Close": "Loka",
+ "Invalid alias format": "Ógilt snið samnefnis",
+ "not specified": "ekki tilgreint",
+ "not set": "ekki stillt",
+ "Addresses": "Vistföng",
+ "Invalid community ID": "Ógilt auðkenni samfélags",
+ "Flair": "Hlutverksmerki",
+ "This room is not showing flair for any communities": " Þessi spjallrás sýnir ekki hlutverksmerki fyrir nein samfélög",
+ "Sunday": "Sunnudagur",
+ "Monday": "Mánudagur",
+ "Tuesday": "Þriðjudagur",
+ "Wednesday": "Miðvikudagur",
+ "Thursday": "Fimmtudagur",
+ "Friday": "Föstudagur",
+ "Saturday": "Laugardagur",
+ "Today": "Í dag",
+ "Yesterday": "Í gær",
+ "Error decrypting attachment": "Villa við afkóðun viðhengis",
+ "Copied!": "Afritað",
+ "This Home Server would like to make sure you are not a robot": "Þessi heimavefþjónn vill ganga úr skugga um að þú sért ekki vélmenni",
+ "Custom Server Options": "Sérsniðnir valkostir vefþjóns",
+ "Dismiss": "Hunsa",
+ "To continue, please enter your password.": "Til að halda áfram, settu inn lykilorðið þitt.",
+ "Password:": "Lykilorð:",
+ "Please check your email to continue registration.": "Skoðaðu tölvupóstinn þinn til að geta haldið áfram með skráningu.",
+ "Code": "Kóði",
+ "powered by Matrix": "keyrt með Matrix",
+ "User name": "Notandanafn",
+ "Forgot your password?": "Gleymdirðu lykilorðinu?",
+ "Email address": "Tölvupóstfang",
+ "Sign in": "Skrá inn",
+ "Email address (optional)": "Tölvupóstfang (valfrjálst)",
+ "Register": "Nýskrá",
+ "Home server URL": "Slóð á heimaþjón",
+ "Identity server URL": "Slóð á auðkennisþjón",
+ "What does this mean?": "Hvað þýðir þetta?",
+ "Filter community members": "Sía meðlimi samfélags",
+ "Remove": "Fjarlægja",
+ "Something went wrong!": "Eitthvað fór úrskeiðis!",
+ "Filter community rooms": "Sía spjallrásir samfélags",
+ "Yes, I want to help!": "Já, ég vil hjálpa til",
+ "You are not receiving desktop notifications": "Þú færð ekki tilkynningar á skjáborði",
+ "Enable them now": "Virkja þetta núna",
+ "What's New": "Nýtt á döfinni",
+ "Update": "Uppfæra",
+ "What's new?": "Hvað er nýtt á döfinni?",
+ "A new version of Riot is available.": "Ný útgáfa af Riot er tiltæk.",
+ "Set Password": "Setja lykilorð",
+ "Error encountered (%(errorDetail)s).": "Villa fannst (%(errorDetail)s).",
+ "Checking for an update...": "Athuga með uppfærslu...",
+ "No update available.": "Engin uppfærsla tiltæk.",
+ "Downloading update...": "Sæki uppfærslu...",
+ "Warning": "Aðvörun",
+ "Allow": "Leyfa",
+ "Picture": "Mynd",
+ "Edit": "Breyta",
+ "Unblacklist": "Taka af bannlista",
+ "Blacklist": "Bannlisti",
+ "Unverify": "Afturkalla sannvottun",
+ "Verify...": "Sannreyna...",
+ "No results": "Engar niðurstöður",
+ "Delete": "Eyða",
+ "Communities": "Samfélög",
+ "Home": "Heim",
+ "You cannot delete this image. (%(code)s)": "Þú getur ekki eytt þessari mynd. (%(code)s)",
+ "Uploaded on %(date)s by %(user)s": "Sent inn %(date)s af %(user)s",
+ "Download this file": "Sækja þessa skrá",
+ "collapse": "fella saman",
+ "expand": "fletta út",
+ "In reply to ": "Sem svar til ",
+ "Room directory": "Skrá yfir spjallrásir",
+ "Start chat": "Hefja spjall",
+ "Add User": "Bæta við notanda",
+ "email address": "tölvupóstfang",
+ "Preparing to send logs": "Undirbý sendingu atvikaskráa",
+ "Logs sent": "Sendi atvikaskrár",
+ "Thank you!": "Takk fyrir!",
+ "Failed to send logs: ": "Mistókst að senda atvikaskrár: ",
+ "Submit debug logs": "Senda inn aflúsunarannála",
+ "GitHub issue link:": "Slóð villutilkynningar á GitHub:",
+ "Notes:": "Athugasemdir:",
+ "Send logs": "Senda atvikaskrá",
+ "Unavailable": "Ekki tiltækt",
+ "Changelog": "Breytingaskrá",
+ "Start new chat": "Hefja nýtt spjall",
+ "Start Chatting": "Hefja spjall",
+ "Confirm Removal": "Staðfesta fjarlægingu",
+ "Create Community": "Búa til samfélag",
+ "Community Name": "Heiti samfélags",
+ "Example": "Dæmi",
+ "Community ID": "Auðkenni samfélags",
+ "example": "dæmi",
+ "Create": "Búa til",
+ "Create Room": "Búa til spjallrás",
+ "Room name (optional)": "Heiti spjallrásar (valkvætt)",
+ "Advanced options": "Ítarlegir valkostir",
+ "Unknown error": "Óþekkt villa",
+ "Incorrect password": "Rangt lykilorð",
+ "Deactivate Account": "Gera notandaaðgang óvirkann",
+ "To continue, please enter your password:": "Til að halda áfram, settu inn lykilorðið þitt:",
+ "password": "lykilorð",
+ "Device name": "Heiti tækis",
+ "Device key": "Dulritunarlykill tækis",
+ "Verify device": "Sannreyna tæki",
+ "I verify that the keys match": "Ég staðfesti hvort dulritunarlyklarnir samsvari",
+ "Back": "Til baka",
+ "Send Account Data": "Senda upplýsingar um notandaaðgang",
+ "Filter results": "Sía niðurstöður",
+ "Toolbox": "Verkfærakassi",
+ "Developer Tools": "Forritunartól",
+ "An error has occurred.": "Villa kom upp.",
+ "Start verification": "Hefja sannvottun",
+ "Share without verifying": "Deila án sannvottunar",
+ "Ignore request": "Hunsa beiðni",
+ "Encryption key request": "Beiðni um dulritunarlykil",
+ "Sign out": "Skrá út",
+ "Send Logs": "Senda atvikaskrár",
+ "Refresh": "Endurlesa",
+ "Invalid Email Address": "Ógilt tölvupóstfang",
+ "Verification Pending": "Sannvottun í bið",
+ "Please check your email and click on the link it contains. Once this is done, click continue.": "Skoðaðu tölvupóstinn þinn og smelltu á tengilinn sem hann inniheldur. Þegar því er lokið skaltu smella á að halda áfram.",
+ "Skip": "Sleppa",
+ "User names may only contain letters, numbers, dots, hyphens and underscores.": "Notendanöfn mega einungis innihalda bókstafi, tölustafi, punkta, bandstrik eða undirstrik.",
+ "Username not available": "Notandanafnið er ekki tiltækt",
+ "Username available": "Notandanafnið er tiltækt",
+ "You have successfully set a password!": "Þér tókst að setja lykilorð!",
+ "You have successfully set a password and an email address!": "Þér tókst að setja lykilorð og tölvupóstfang!",
+ "Failed to change password. Is your password correct?": "Mistókst að breyta lykilorðinu. Er lykilorðið rétt?",
+ "(HTTP status %(httpStatus)s)": "(HTTP staða %(httpStatus)s)",
+ "Please set a password!": "Stilltu lykilorð!",
+ "Room contains unknown devices": "Spjallrás inniheldur óþekkt tæki",
+ "Unknown devices": "Óþekkt tæki",
+ "Custom": "Sérsniðið",
+ "Alias (optional)": "Samnefni (valfrjálst)",
+ "You cannot delete this message. (%(code)s)": "Þú getur ekki eytt þessum skilaboðum. (%(code)s)",
+ "Resend": "Endursenda",
+ "Cancel Sending": "Hætta við sendingu",
+ "Forward Message": "Áframsenda skeyti",
+ "Reply": "Svara",
+ "Pin Message": "Festa skeyti",
+ "View Source": "Skoða frumkóða",
+ "View Decrypted Source": "Skoða afkóðaða upprunaskrá",
+ "Unhide Preview": "Birta forskoðun",
+ "Permalink": "Varanlegur tengill",
+ "Quote": "Tilvitnun",
+ "Source URL": "Upprunaslóð",
+ "All messages (noisy)": "Öll skilaboð (hávært)",
+ "All messages": "Öll skilaboð",
+ "Mentions only": "Aðeins minnst á",
+ "Leave": "Fara út",
+ "Forget": "Gleyma",
+ "Reject": "Hafna",
+ "Low Priority": "Lítill forgangur",
+ "Direct Chat": "Beint spjall",
+ "View Community": "Skoða samfélag",
+ "Please install Chrome or Firefox for the best experience.": "Endilega settu upp Chrome eða Firefox til að þetta gangi sem best.",
+ "Safari and Opera work too.": "Safari og Opera virka líka ágætlega.",
+ "I understand the risks and wish to continue": "Ég skil áhættuna og vil halda áfram",
+ "Name": "Nafn",
+ "Topic": "Umfjöllunarefni",
+ "Failed to upload image": "Gat ekki sent inn mynd",
+ "Add rooms to this community": "Bæta spjallrásum í þetta samfélag",
+ "Featured Users:": "Notendur í sviðsljósinu:",
+ "Everyone": "Allir",
+ "Description": "Lýsing",
+ "Login": "Innskráning",
+ "Signed Out": "Skráð/ur út",
+ "Terms and Conditions": "Skilmálar og kvaðir",
+ "Logout": "Útskráning",
+ "Members": "Meðlimir",
+ "%(count)s Members|other": "%(count)s þátttakendur",
+ "%(count)s Members|one": "%(count)s þátttakandi",
+ "Invite to this room": "Bjóða inn á þessa spjallrás",
+ "Files": "Skrár",
+ "Notifications": "Tilkynningar",
+ "Hide panel": "Fela spjald",
+ "Invite to this community": "Bjóða í þetta samfélag",
+ "The server may be unavailable or overloaded": "Netþjónninn gæti verið undir miklu álagi eða ekki til taks",
+ "Room not found": "Spjallrás fannst ekki",
+ "Directory": "Efnisskrá",
+ "Search for a room": "Leita að spjallrás",
+ "#example": "#dæmi",
+ "Connectivity to the server has been lost.": "Tenging við vefþjón hefur rofnað.",
+ "Active call": "Virkt samtal",
+ "more": "meira",
+ "Failed to upload file": "Gat ekki sent inn skrá",
+ "Search failed": "Leit mistókst",
+ "Room": "Spjallrás",
+ "Fill screen": "Fylla skjáinn",
+ "Expand panel": "Fletta út spjaldi",
+ "Collapse panel": "Fella saman spjald",
+ "Filter room names": "Sía heiti spjallrása",
+ "Clear filter": "Hreinsa síu",
+ "Light theme": "Ljóst þema",
+ "Dark theme": "Dökkt þema",
+ "Success": "Tókst",
+ "Interface Language": "Tungumál notandaviðmóts",
+ "User Interface": "Notandaviðmót",
+ "Import E2E room keys": "Flytja inn E2E dulritunarlykla spjallrásar",
+ "Cryptography": "Dulritun",
+ "Device ID:": "Auðkenni tækis:",
+ "Device key:": "Dulritunarlykill tækis:",
+ "Ignored Users": "Hunsaðir notendur",
+ "Riot collects anonymous analytics to allow us to improve the application.": "Riot safnar nafnlausum greiningargögnum til að gera okkur kleift að bæta forritið.",
+ "Labs": "Tilraunir",
+ "Deactivate my account": "Gera notandaaðganginn minn óvirkann",
+ "Clear Cache": "Hreinsa skyndiminni",
+ "Updates": "Uppfærslur",
+ "Check for update": "Athuga með uppfærslu",
+ "Default Device": "Sjálfgefið tæki",
+ "Microphone": "Hljóðnemi",
+ "Camera": "Myndavél",
+ "VoIP": "VoIP",
+ "Email": "Tölvupóstur",
+ "Add email address": "Bæta við tölvupóstfangi",
+ "Profile": "Notandasnið",
+ "Display name": "Birtingarnafn",
+ "Account": "Notandaaðgangur",
+ "Logged in as:": "Skráð inn sem:",
+ "Access Token:": "Aðgangsteikn:",
+ "click to reveal": "smelltu til að birta",
+ "Identity Server is": "Auðkennisþjónn er",
+ "matrix-react-sdk version:": "Útgáfa matrix-react-sdk:",
+ "riot-web version:": "Útgáfa riot-web:",
+ "olm version:": "Útgáfa olm:",
+ "Failed to send email": "Mistókst að senda tölvupóst",
+ "The email address linked to your account must be entered.": "Það þarf að setja inn tölvupóstfangið sem tengt er notandaaðgangnum þínum.",
+ "A new password must be entered.": "Það verður að setja inn nýtt lykilorð.",
+ "New passwords must match each other.": "Nýju lykilorðin verða að vera þau sömu.",
+ "I have verified my email address": "Ég hef staðfest tölvupóstfangið mitt",
+ "Return to login screen": "Fara aftur í innskráningargluggann",
+ "To reset your password, enter the email address linked to your account": "Til að endursetja lykilorðið þitt, settu þá inn tölvupóstfangið sem tengt er notandaaðgangnum þínum",
+ "New password": "Nýtt lykilorð",
+ "Confirm your new password": "Staðfestu nýtt lykilorð",
+ "Send Reset Email": "Senda endurstillingarpóst",
+ "Create an account": "Stofna notandaaðgang",
+ "Incorrect username and/or password.": "Rangt notandanafn og/eða lykilorð.",
+ "Upload an avatar:": "Hlaða inn auðkennismynd:",
+ "Missing password.": "Lykilorð vantar.",
+ "Passwords don't match.": "Lykilorðin samsvara ekki.",
+ "This doesn't look like a valid email address.": "Þetta lítur ekki út eins og gilt tölvupóstfang.",
+ "This doesn't look like a valid phone number.": "Þetta lítur ekki út eins og gilt símanúmer.",
+ "An unknown error occurred.": "Óþekkt villa kom upp.",
+ "Commands": "Skipanir",
+ "Users": "Notendur",
+ "unknown device": "óþekkt tæki",
+ "NOT verified": "EKKI sannreynt",
+ "verified": "sannreynt",
+ "Verification": "Sannvottun",
+ "Ed25519 fingerprint": "Ed25519 fingrafar",
+ "User ID": "Notandaauðkenni",
+ "Curve25519 identity key": "Curve25519 auðkennislykill",
+ "none": "ekkert",
+ "Claimed Ed25519 fingerprint key": "Tilkynnti Ed25519 fingrafarslykil",
+ "Algorithm": "Reiknirit",
+ "unencrypted": "ódulritað",
+ "Decryption error": "Afkóðunarvilla",
+ "Session ID": "Auðkenni setu",
+ "End-to-end encryption information": "Enda-í-enda dulritunarupplýsingar",
+ "Event information": "Upplýsingar um viðburð",
+ "Sender device information": "Upplýsingar um tæki sendanda",
+ "Export room keys": "Flytja út dulritunarlykla spjallrásar",
+ "Enter passphrase": "Settu inn lykilsetningu (passphrase)",
+ "Confirm passphrase": "Staðfestu lykilsetningu",
+ "Export": "Flytja út",
+ "Import room keys": "Flytja inn dulritunarlykla spjallrásar",
+ "File to import": "Skrá til að flytja inn",
+ "Import": "Flytja inn"
+}
From b6e2815f228ea47048f0f6074b900fbe40328431 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?=
Date: Mon, 28 May 2018 11:43:18 +0000
Subject: [PATCH 0126/1196] Translated using Weblate (Icelandic)
Currently translated at 43.6% (520 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/is/
---
src/i18n/strings/is.json | 28 +++++++++++++++++++++-------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index aa56456458..3a8c98669d 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -9,7 +9,7 @@
"Analytics": "Greiningar",
"Call Anyway": "hringja samt",
"Answer Anyway": "Svara samt",
- "Call": "Símtal",
+ "Call": "Samtal",
"Answer": "Svara",
"The remote side failed to pick up": "Ekki var svarað á fjartengda endanum",
"VoIP is unsupported": "Enginn stuðningur við VoIP",
@@ -140,7 +140,7 @@
"Add a widget": "Bæta við viðmótshluta",
"Drop File Here": "Slepptu skrá hérna",
"Drop file here to upload": "Slepptu hér skrá til að senda inn",
- " (unsupported)": "[óstutt]",
+ " (unsupported)": " (óstutt)",
"%(senderName)s sent an image": "%(senderName)s sendi mynd",
"%(senderName)s sent a video": "%(senderName)s sendi myndskeið",
"%(senderName)s uploaded a file": "%(senderName)s sendi inn skrá",
@@ -191,7 +191,7 @@
"Loading...": "Hleð inn...",
"Online": "Nettengt",
"Idle": "Iðjulaust",
- "Offline": "Ótengt",
+ "Offline": "Ónettengt",
"Unknown": "Óþekkt",
"No rooms to show": "Engar spjallrásir sem hægt er að birta",
"Unnamed room": "Nafnlaus spjallrás",
@@ -244,7 +244,7 @@
"Addresses": "Vistföng",
"Invalid community ID": "Ógilt auðkenni samfélags",
"Flair": "Hlutverksmerki",
- "This room is not showing flair for any communities": " Þessi spjallrás sýnir ekki hlutverksmerki fyrir nein samfélög",
+ "This room is not showing flair for any communities": "Þessi spjallrás sýnir ekki hlutverksmerki fyrir nein samfélög",
"Sunday": "Sunnudagur",
"Monday": "Mánudagur",
"Tuesday": "Þriðjudagur",
@@ -450,7 +450,7 @@
"Microphone": "Hljóðnemi",
"Camera": "Myndavél",
"VoIP": "VoIP",
- "Email": "Tölvupóstur",
+ "Email": "Tölvupóstfang",
"Add email address": "Bæta við tölvupóstfangi",
"Profile": "Notandasnið",
"Display name": "Birtingarnafn",
@@ -496,7 +496,7 @@
"Decryption error": "Afkóðunarvilla",
"Session ID": "Auðkenni setu",
"End-to-end encryption information": "Enda-í-enda dulritunarupplýsingar",
- "Event information": "Upplýsingar um viðburð",
+ "Event information": "Upplýsingar um atburð",
"Sender device information": "Upplýsingar um tæki sendanda",
"Export room keys": "Flytja út dulritunarlykla spjallrásar",
"Enter passphrase": "Settu inn lykilsetningu (passphrase)",
@@ -504,5 +504,19 @@
"Export": "Flytja út",
"Import room keys": "Flytja inn dulritunarlykla spjallrásar",
"File to import": "Skrá til að flytja inn",
- "Import": "Flytja inn"
+ "Import": "Flytja inn",
+ "The platform you're on": "Stýrikerfið sem þú ert á",
+ "The version of Riot.im": "Útgáfan af Riot.im",
+ "Your language of choice": "Tungumálið þitt",
+ "Your homeserver's URL": "Vefslóð á heimaþjóninn þinn",
+ "Your identity server's URL": "Vefslóð á auðkenningarþjóninn þinn",
+ "Review Devices": "Yfirfara tæki",
+ "Call Timeout": "Tímamörk hringingar",
+ "Unable to capture screen": "Get ekki tekið skjámynd",
+ "Name or matrix ID": "Nafn eða Matrix-auðkenni",
+ "Invite to Community": "Bjóða í samfélag",
+ "Add rooms to the community": "Bæta spjallrásum í þetta samfélag",
+ "Add to community": "Bæta í samfélag",
+ "Unable to enable Notifications": "Tekst ekki að virkja tilkynningar",
+ "This email address was not found": "Tölvupóstfangið fannst ekki"
}
From 4a3c7bc6e44dbff14935935e7270a53ec7a8504e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?=
Date: Mon, 28 May 2018 15:42:49 +0000
Subject: [PATCH 0127/1196] Translated using Weblate (Icelandic)
Currently translated at 54.2% (645 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/is/
---
src/i18n/strings/is.json | 131 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 128 insertions(+), 3 deletions(-)
diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index 3a8c98669d..4d48e32cf3 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -219,7 +219,7 @@
"Banned users": "Bannaðir notendur",
"Leave room": "Fara af spjallrás",
"Favourite": "Eftirlæti",
- "Tagged as: ": "Merkt sem:",
+ "Tagged as: ": "Merkt sem: ",
"To link to a room it must have an address.": "Til að tengja við spjallrás verður hún að vera með vistfang.",
"Who can access this room?": "Hver hefur aðgang að þessari spjallrás?",
"Only people who have been invited": "Aðeins fólk sem hefur verið boðið",
@@ -341,7 +341,7 @@
"Device name": "Heiti tækis",
"Device key": "Dulritunarlykill tækis",
"Verify device": "Sannreyna tæki",
- "I verify that the keys match": "Ég staðfesti hvort dulritunarlyklarnir samsvari",
+ "I verify that the keys match": "Ég staðfesti að dulritunarlyklarnir samsvari",
"Back": "Til baka",
"Send Account Data": "Senda upplýsingar um notandaaðgang",
"Filter results": "Sía niðurstöður",
@@ -518,5 +518,130 @@
"Add rooms to the community": "Bæta spjallrásum í þetta samfélag",
"Add to community": "Bæta í samfélag",
"Unable to enable Notifications": "Tekst ekki að virkja tilkynningar",
- "This email address was not found": "Tölvupóstfangið fannst ekki"
+ "This email address was not found": "Tölvupóstfangið fannst ekki",
+ "Existing Call": "Fyrirliggjandi samtal",
+ "You are already in a call.": "Þú ert nú þegar í samtali.",
+ "Failed to set up conference call": "Mistókst að setja upp símafund",
+ "Invite new community members": "Bjóða nýjum meðlimum í samfélag",
+ "Which rooms would you like to add to this community?": "Hvaða spjallrásum myndir þú vilja bæta í þetta samfélag?",
+ "Invite new room members": "Bjóða nýjum meðlimum á spjallrás",
+ "Who would you like to add to this room?": "Hverjum myndir þú vilja bæta á þessa spjallrás?",
+ "Send Invites": "Senda boðskort",
+ "Failed to invite user": "Mistókst að bjóða notanda",
+ "Failed to invite": "Mistókst að bjóða",
+ "Reload widget": "Endurlesa viðmótshluta",
+ "Missing roomId.": "Vantar spjallrásarauðkenni.",
+ "/ddg is not a command": "/ddg er ekki skipun",
+ "Ignored user": "Hunsaður notandi",
+ "Device already verified!": "Tæki er þegar sannreynt!",
+ "Verified key": "Staðfestur dulritunarlykill",
+ "Unrecognised command:": "Óþekkt skipun:",
+ "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s breytti umræðuefninu í \"%(topic)s\".",
+ "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s fjarlægði heiti spjallrásarinnar.",
+ "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s breytti heiti spjallrásarinnar í %(roomName)s.",
+ "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sendi mynd.",
+ "%(senderName)s answered the call.": "%(senderName)s svaraði símtalinu.",
+ "Disinvite": "Taka boð til baka",
+ "Unknown Address": "Óþekkt vistfang",
+ "Delete Widget": "Eyða viðmótshluta",
+ "Delete widget": "Eyða viðmótshluta",
+ "Create new room": "Búa til nýja spjallrás",
+ "were invited %(count)s times|one": "var boðið",
+ "was invited %(count)s times|one": "var boðið",
+ "And %(count)s more...|other": "Og %(count)s til viðbótar...",
+ "ex. @bob:example.com": "t.d. @jon:netfang.is",
+ "Matrix ID": "Matrix-auðkenni",
+ "Matrix Room ID": "Matrix-auðkenni spjallrásar",
+ "Start chatting": "Hefja spjall",
+ "This setting cannot be changed later!": "Ekki er hægt að breyta þessari stillingu síðar!",
+ "Send Custom Event": "Senda sérsniðið atvik",
+ "Event sent!": "Atvik sent!",
+ "State Key": "Stöðulykill",
+ "Explore Room State": "Skoða stöðu spjallrásar",
+ "Explore Account Data": "Skoða aðgangsgögn",
+ "You added a new device '%(displayName)s', which is requesting encryption keys.": "Þú bættir við nýju tæki '%(displayName)s', sem er að krefjast dulritunarlykla.",
+ "Your unverified device '%(displayName)s' is requesting encryption keys.": "ósannvottaða tækið þitt '%(displayName)s' er að krefjast dulritunarlykla.",
+ "Loading device info...": "Hleð inn upplýsingum um tæki...",
+ "Log out and remove encryption keys?": "Skrá út og fjarlægja dulritunarlykla?",
+ "Clear Storage and Sign Out": "Hreinsa gagnageymslu og skrá út",
+ "Unable to restore session": "Tókst ekki að endurheimta setu",
+ "This doesn't appear to be a valid email address": "Þetta lítur ekki út eins og gilt tölvupóstfang",
+ "Unable to add email address": "Get ekki bætt við tölvupóstfangi",
+ "Unable to verify email address.": "Get ekki sannreynt tölvupóstfang.",
+ "Username invalid: %(errMessage)s": "Notandanafn er ógilt: %(errMessage)s",
+ "An error occurred: %(error_string)s": "Villa kom upp: %(error_string)s",
+ "To get started, please pick a username!": "Til að komast í gang, veldu fyrst notandanafn!",
+ "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" inniheldur tæki sem þú hefur ekki séð áður.",
+ "Private Chat": "Einkaspjall",
+ "Public Chat": "Opinbert spjall",
+ "Collapse Reply Thread": "Fella saman svarþráð",
+ "Sorry, your browser is not able to run Riot.": "Því miður, vafrinn þinn getur ekki keyrt Riot.",
+ "Make this room private": "Gera þessa spjallrás einka",
+ "Encrypt room": "Dulrita spjallrás",
+ "Add a Room": "Bæta við spjallrás",
+ "Add a User": "Bæta við notanda",
+ "Unable to accept invite": "Mistókst að þiggja boð",
+ "Unable to reject invite": "Mistókst að hafna boði",
+ "Unable to join community": "Tókst ekki að ganga í samfélag",
+ "Leave Community": "Hætta í samfélagi",
+ "Leave %(groupName)s?": "Hætta í %(groupName)s?",
+ "Unable to leave community": "Tókst ekki að hætta í samfélagi",
+ "Community Settings": "Samfélagsstillingar",
+ "Featured Rooms:": "Spjallrásir í sviðsljósinu:",
+ "%(inviter)s has invited you to join this community": "%(inviter)s hefur boðið þér að taka þátt í þessu samfélagi",
+ "Join this community": "Taka þátt í þessu samfélagi",
+ "Leave this community": "Hætta í þessu samfélagi",
+ "You are an administrator of this community": "Þú ert kerfisstjóri í þessu samfélagi",
+ "You are a member of this community": "Þú ert meðlimur í þessum hópi",
+ "Who can join this community?": "Hverjir geta tekið þátt í þessu samfélagi?",
+ "Long Description (HTML)": "Tæmandi lýsing (HTML)",
+ "Failed to load %(groupId)s": "Mistókst að hlaða inn %(groupId)s",
+ "Couldn't load home page": "Gat ekki hlaðið inn heimasíðu",
+ "Reject invitation": "Hafna boði",
+ "Are you sure you want to reject the invitation?": "Ertu viss um að þú viljir hafna þessu boði?",
+ "Failed to reject invitation": "Mistókst að hafna boði",
+ "Scroll to bottom of page": "Skruna neðst á síðu",
+ "No more results": "Ekki fleiri niðurstöður",
+ "Unknown room %(roomId)s": "Óþekkt spjallrás %(roomId)s",
+ "Failed to save settings": "Mistókst að vista stillingar",
+ "Failed to reject invite": "Mistókst að hafna boði",
+ "Click to unmute video": "Smelltu til að virkja hljóð í myndskeiði",
+ "Click to mute video": "Smelltu til að þagga niður í myndskeiði",
+ "Click to unmute audio": "Smelltu til að virkja hljóð",
+ "Click to mute audio": "Smelltu til að þagga niður hljóð",
+ "Failed to load timeline position": "Mistókst að hlaða inn staðsetningu á tímalínu",
+ "Uploading %(filename)s and %(count)s others|other": "Sendi inn %(filename)s og %(count)s til viðbótar",
+ "Uploading %(filename)s and %(count)s others|zero": "Sendi inn %(filename)s",
+ "Uploading %(filename)s and %(count)s others|one": "Sendi inn %(filename)s og %(count)s til viðbótar",
+ "Status.im theme": "Status.im þema",
+ "Can't load user settings": "Gat ekki hlaði inn notandastillingum",
+ "Server may be unavailable or overloaded": "Netþjónninn gæti verið undir miklu álagi eða ekki til taks",
+ "Remove Contact Information?": "Fjarlægja upplýsingar um tengilið?",
+ "Remove %(threePid)s?": "Fjarlægja %(threePid)s?",
+ "Unable to remove contact information": "Ekki tókst að fjarlægja upplýsingar um tengilið",
+ "Refer a friend to Riot:": "Mæla með Riot við vin:",
+ "Autocomplete Delay (ms):": "Töf við sjálfvirka klárun (msek):",
+ "": "",
+ "These are experimental features that may break in unexpected ways": "Þetta eru eiginleikar á tilraunastigi sem gætu bilað á óvæntan hátt",
+ "Use with caution": "Notist með varúð",
+ "Clear Cache and Reload": "Hreinsa skyndiminni og endurhlaða",
+ "No Microphones detected": "Engir hljóðnemar fundust",
+ "No Webcams detected": "Engar vefmyndavélar fundust",
+ "Homeserver is": "Heimanetþjónn er",
+ "Login as guest": "Skrá inn sem gestur",
+ "Sign in to get started": "Skráðu þig inn til að komast í gang",
+ "Failed to fetch avatar URL": "Ekki tókst að sækja slóð á auðkennismynd",
+ "Set a display name:": "Stilltu birtingarnafn",
+ "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Lykilorð er of stutt (lágmark %(MIN_PASSWORD_LENGTH)s).",
+ "You need to enter a user name.": "Þú þarft að setja inn notandanafn.",
+ "I already have an account": "Ég er nú þegar með notandaaðgang",
+ "Displays action": "Birtir aðgerð",
+ "Changes your display nickname": "Breytir birtu gælunafni þínu",
+ "Searches DuckDuckGo for results": "Leitar í DuckDuckGo að niðurstöðum",
+ "Results from DuckDuckGo": "Leitarniðurstöður frá DuckDuckGo",
+ "Emoji": "Tjáningartáknmynd",
+ "Notify the whole room": "Tilkynna öllum á spjallrásinni",
+ "Room Notification": "Tilkynning á spjallrás",
+ "Passphrases must match": "Lykilfrasar verða að stemma",
+ "Passphrase must not be empty": "Lykilfrasi má ekki vera auður"
}
From 254e8c358aaf5cd7c20d7c005dccd805c1697ee8 Mon Sep 17 00:00:00 2001
From: Travis Ralston
Date: Mon, 28 May 2018 11:38:09 -0600
Subject: [PATCH 0128/1196] Remove unused imports
Signed-off-by: Travis Ralston
---
src/components/views/elements/AppPermission.js | 1 -
src/components/views/elements/AppTile.js | 1 -
2 files changed, 2 deletions(-)
diff --git a/src/components/views/elements/AppPermission.js b/src/components/views/elements/AppPermission.js
index 6af3148e21..231ed52364 100644
--- a/src/components/views/elements/AppPermission.js
+++ b/src/components/views/elements/AppPermission.js
@@ -2,7 +2,6 @@ import React from 'react';
import PropTypes from 'prop-types';
import url from 'url';
import { _t } from '../../../languageHandler';
-import SdkConfig from '../../../SdkConfig';
import WidgetUtils from "../../../WidgetUtils";
export default class AppPermission extends React.Component {
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 0ec754e0c0..429b5941b9 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -25,7 +25,6 @@ import PlatformPeg from '../../../PlatformPeg';
import ScalarAuthClient from '../../../ScalarAuthClient';
import WidgetMessaging from '../../../WidgetMessaging';
import TintableSvgButton from './TintableSvgButton';
-import SdkConfig from '../../../SdkConfig';
import Modal from '../../../Modal';
import { _t, _td } from '../../../languageHandler';
import sdk from '../../../index';
From f23f5614c104844f28771eb473288bfd7003dfc0 Mon Sep 17 00:00:00 2001
From: Nathan van Beelen
Date: Mon, 28 May 2018 17:35:26 +0000
Subject: [PATCH 0129/1196] Translated using Weblate (Dutch)
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
---
src/i18n/strings/nl.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index e71463564a..a6df7d69b2 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1172,7 +1172,7 @@
"Riot bugs are tracked on GitHub: create a GitHub issue.": "Riot fouten worden bijgehouden op GitHub: maak een GitHub melding.",
"Failed to indicate account erasure": "Niet gelukt om de accountverwijdering aan te geven",
"This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Dit zal je account voorgoed onbruikbaar maken. Je zal niet meer in kunnen loggen en niemand anders zal met dezelfde gebruikers ID kunnen registreren. Dit zal er voor zorgen dat je account alle ruimtes verlaat waar het momenteel onderdeel van is en het verwijderd de accountgegevens van de identiteitsserver. Deze actie is onomkeerbaar.",
- "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Het deactiveren van je account zal er niet standaard voor zorgen dat de berichten die je verzonden hebt vergeten worden. Als je wilt dat wij de berichten vergeten, klikt alsjeblieft op het vakje hieronder.",
+ "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Het deactiveren van je account zal er niet standaard voor zorgen dat de berichten die je verzonden hebt vergeten worden. Als je wilt dat wij de berichten vergeten, klik alsjeblieft op het vakje hieronder.",
"Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "De zichtbaarheid van berichten in Matrix is hetzelfde als in e-mail. Het vergeten van je berichten betekent dat berichten die je hebt verstuurd niet meer gedeeld worden met nieuwe of ongeregistreerde gebruikers, maar geregistreerde gebruikers die al toegang hebben tot deze berichten zullen alsnog toegang hebben tot hun eigen kopie van het bericht.",
"Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Vergeet alle berichten die ik heb verstuurd wanneer mijn account gedeactiveerd is (Waarschuwing: dit zal er voor zorgen dat toekomstige gebruikers een incompleet beeld krijgen van gesprekken)",
"To continue, please enter your password:": "Om verder te gaan, vul alsjeblieft je wachtwoord in:",
From f885def74819a19061bf9c77336625ec83d232cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?=
Date: Mon, 28 May 2018 06:49:16 +0000
Subject: [PATCH 0130/1196] Translated using Weblate (French)
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
src/i18n/strings/fr.json | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 0d8cf10f8d..8dd45192e6 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -714,17 +714,17 @@
"To change the topic, you must be a": "Pour changer le sujet, vous devez être un",
"To modify widgets in the room, you must be a": "Pour modifier les widgets, vous devez être un",
"Banned by %(displayName)s": "Banni par %(displayName)s",
- "To send messages, you must be a": "Pour envoyer des messages, vous devez être un",
+ "To send messages, you must be a": "Pour envoyer des messages, vous devez être un(e)",
"%(senderName)s changed the pinned messages for the room.": "%(senderName)s a changé les messages épinglés du salon.",
"%(names)s and %(count)s others are typing|other": "%(names)s et %(count)s autres écrivent",
"Jump to read receipt": "Aller à l'accusé de lecture",
"World readable": "Lisible publiquement",
"Guests can join": "Les invités peuvent rejoindre le salon",
- "To invite users into the room, you must be a": "Pour inviter des utilisateurs dans le salon, vous devez être un",
- "To configure the room, you must be a": "Pour configurer le salon, vous devez être un",
- "To kick users, you must be a": "Pour exclure des utilisateurs, vous devez être un",
- "To ban users, you must be a": "Pour bannir des utilisateurs, vous devez être un",
- "To remove other users' messages, you must be a": "Pour supprimer les messages d'autres utilisateurs, vous devez être un",
+ "To invite users into the room, you must be a": "Pour inviter des utilisateurs dans le salon, vous devez être un(e)",
+ "To configure the room, you must be a": "Pour configurer le salon, vous devez être un(e)",
+ "To kick users, you must be a": "Pour exclure des utilisateurs, vous devez être un(e)",
+ "To ban users, you must be a": "Pour bannir des utilisateurs, vous devez être un(e)",
+ "To remove other users' messages, you must be a": "Pour supprimer les messages d'autres utilisateurs, vous devez être un(e)",
"To send events of type
Date: Sun, 27 May 2018 19:14:49 +0000
Subject: [PATCH 0131/1196] Translated using Weblate (Hungarian)
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
src/i18n/strings/hu.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index f15c8893b8..6b52958ea6 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1195,5 +1195,6 @@
"Please help improve Riot.im by sending anonymous usage data . This will use a cookie.": "Kérlek segíts javítani a Riot.im-et azzal, hogy anonim felhasználási adatokat küldesz. Ez szütit (cookie) fog használni.",
"Yes, I want to help!": "Igen, segítek!",
"Can't leave Server Notices room": "Nem lehet elhagyni a Szerver Üzenetek szobát",
- "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ez a szoba fontos szerverüzenetek közlésére jött létre, nem tudsz kilépni belőle."
+ "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ez a szoba fontos szerverüzenetek közlésére jött létre, nem tudsz kilépni belőle.",
+ "To notify everyone in the room, you must be a": "Hogy mindenkinek tudj üzenni ahhoz ilyen szinten kell lenned:"
}
From 6f6d28d4eecf32e2281cbed9cb60f8cf7938e68a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?=
Date: Mon, 28 May 2018 15:45:16 +0000
Subject: [PATCH 0132/1196] Translated using Weblate (Icelandic)
Currently translated at 54.2% (645 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/is/
---
src/i18n/strings/is.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index 4d48e32cf3..d901c52f60 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -631,7 +631,7 @@
"Login as guest": "Skrá inn sem gestur",
"Sign in to get started": "Skráðu þig inn til að komast í gang",
"Failed to fetch avatar URL": "Ekki tókst að sækja slóð á auðkennismynd",
- "Set a display name:": "Stilltu birtingarnafn",
+ "Set a display name:": "Stilltu birtingarnafn:",
"Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Lykilorð er of stutt (lágmark %(MIN_PASSWORD_LENGTH)s).",
"You need to enter a user name.": "Þú þarft að setja inn notandanafn.",
"I already have an account": "Ég er nú þegar með notandaaðgang",
From e968ccb24ce999c02a1210b2bfb0ed1dbb052cba Mon Sep 17 00:00:00 2001
From: random
Date: Mon, 28 May 2018 09:45:04 +0000
Subject: [PATCH 0133/1196] Translated using Weblate (Italian)
Currently translated at 99.4% (1183 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
---
src/i18n/strings/it.json | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 068ad01ff1..fa22725f78 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1165,5 +1165,24 @@
"Clear Storage and Sign Out": "Elimina lo storage e disconnetti",
"Send Logs": "Invia i log",
"Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Eliminare lo storage del browser potrebbe risolvere il problema, ma verrai disconnesso e la cronologia delle chat criptate sarà illeggibile.",
- "Collapse Reply Thread": "Riduci finestra di risposta"
+ "Collapse Reply Thread": "Riduci finestra di risposta",
+ "e.g. %(exampleValue)s": "es. %(exampleValue)s",
+ "Reload widget": "Ricarica widget",
+ "To notify everyone in the room, you must be a": "Per notificare chiunque nella stanza, devi essere un",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie (please see our Cookie Policy ).": "Per favore aiuta a migliorare Riot.im inviando dati di utilizzo anonimi . Verrà usato un cookie (vedi la nostra politica sui cookie ).",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie.": "Per favore aiutaci a migliorare Riot.im inviando dati di utilizzo anonimi . Verrà usato un cookie.",
+ "Yes, I want to help!": "Sì, voglio aiutare!",
+ "Warning: This widget might use cookies.": "Attenzione: questo widget potrebbe usare cookie.",
+ "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Il tuo account sarà permanentemente inutilizzabile. Non potrai accedere e nessuno potrà ri-registrare lo stesso ID utente. Il tuo account abbandonerà tutte le stanze a cui partecipa e i dettagli del tuo account saranno rimossi dal server di identità. Questa azione è irreversibile.",
+ "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Disattivare il tuo account non eliminerà in modo predefinito i messaggi che hai inviato. Se vuoi che noi dimentichiamo i tuoi messaggi, seleziona la casella sotto.",
+ "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "La visibilità dei messaggi in Matrix è simile alle email. Se dimentichiamo i messaggi significa che quelli che hai inviato non verranno condivisi con alcun utente nuovo o non registrato, ma gli utenti registrati che avevano già accesso ai messaggi avranno ancora accesso alla loro copia.",
+ "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Per favore dimenticate tutti i messaggi che ho inviato quando il mio account viene disattivato (Attenzione: gli utenti futuri vedranno un elenco incompleto di conversazioni)",
+ "To continue, please enter your password:": "Per continuare, inserisci la tua password:",
+ "password": "password",
+ "Can't leave Server Notices room": "Impossibile abbandonare la stanza Notifiche Server",
+ "This room is used for important messages from the Homeserver, so you cannot leave it.": "Questa stanza viene usata per messaggi importanti dall'homeserver, quindi non puoi lasciarla.",
+ "Terms and Conditions": "Termini e condizioni",
+ "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Per continuare a usare l'homeserver %(homeserverDomain)s devi leggere e accettare i nostri termini e condizioni.",
+ "Review terms and conditions": "Leggi i termini e condizioni",
+ "Muted Users": "Utenti silenziati"
}
From 6467349921e98d8c5602156043c123c90e22e469 Mon Sep 17 00:00:00 2001
From: Andrey
Date: Sun, 27 May 2018 17:14:29 +0000
Subject: [PATCH 0134/1196] Translated using Weblate (Russian)
Currently translated at 99.6% (1186 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
src/i18n/strings/ru.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index e77cb76aff..0a254736b8 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1187,5 +1187,6 @@
"Please help improve Riot.im by sending anonymous usage data . This will use a cookie (please see our Cookie Policy ).": "Пожалуйста, помогите улучшить Riot.im, отправляя анонимные данные использования . При этом будут использоваться cookie (ознакомьтесь с нашейПолитикой cookie ).",
"Please help improve Riot.im by sending anonymous usage data . This will use a cookie.": "Пожалуйста, помогите улучшить Riot.im, отправляя анонимные данные использования . При этом будут использоваться cookie.",
"Yes, I want to help!": "Да, я хочу помочь!",
- "Reload widget": "Перезагрузить виджет"
+ "Reload widget": "Перезагрузить виджет",
+ "To notify everyone in the room, you must be a": "Для уведомления всех в комнате, вы должны быть"
}
From 16ebef81f2fa234bc74fcc5c0ed20cfd25f6d9c5 Mon Sep 17 00:00:00 2001
From: Kenneth Larsson
Date: Mon, 28 May 2018 15:21:34 +0000
Subject: [PATCH 0135/1196] Translated using Weblate (Swedish)
Currently translated at 84.4% (1005 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
src/i18n/strings/sv.json | 69 ++++++++++++++++++++++++++++++----------
1 file changed, 53 insertions(+), 16 deletions(-)
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 4ab1413e4f..a9c9bfade2 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -35,7 +35,7 @@
"Are you sure you want to leave the room '%(roomName)s'?": "Vill du lämna rummet '%(roomName)s'?",
"Are you sure you want to upload the following files?": "Vill du ladda upp följande filer?",
"Autoplay GIFs and videos": "Spela automatiskt upp GIFar och videor",
- "Are you sure you want to reject the invitation?": "Vill du avvisa inbjudan?",
+ "Are you sure you want to reject the invitation?": "Är du säker på att du vill avböja inbjudan?",
"Bulk Options": "Volymhandlingar",
"Blacklisted": "Svartlistad",
"%(senderName)s banned %(targetName)s.": "%(senderName)s bannade %(targetName)s.",
@@ -150,7 +150,7 @@
"Admin Tools": "Admin-verktyg",
"Alias (optional)": "Alias (valfri)",
"Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Det gick inte att ansluta till servern - kontrollera anslutningen, försäkra att din hemservers TLS-certifikat är betrott, och att inget webbläsartillägg blockerar förfrågningar.",
- "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ändrade maktnivån av %(powerLevelDiffText)s.",
+ "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ändrade behörighetsnivå för %(powerLevelDiffText)s.",
"Click here to join the discussion!": "Klicka här för att gå med i diskussionen!",
"Close": "Stäng",
"%(count)s new messages|one": "%(count)s nytt meddelande",
@@ -185,8 +185,8 @@
"Hide Text Formatting Toolbar": "Göm textformatteringsverktygsfältet",
"Historical": "Historiska",
"Home": "Hem",
- "Homeserver is": "Hemservern är",
- "Identity Server is": "Identitetsservern är",
+ "Homeserver is": "Hemserver är",
+ "Identity Server is": "Identitetsserver är",
"I have verified my email address": "Jag har verifierat min epostadress",
"Import": "Importera",
"Import E2E room keys": "Importera rumskrypteringsnycklar",
@@ -226,7 +226,7 @@
"Logged in as:": "Inloggad som:",
"Login as guest": "Logga in som gäst",
"Logout": "Logga ut",
- "Low priority": "Lågprioritet",
+ "Low priority": "Låg prioritet",
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar från att de bjöds in.",
"%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar fr.o.m. att de gick med som medlem.",
"%(senderName)s made future room history visible to all room members.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar.",
@@ -289,7 +289,7 @@
"Refer a friend to Riot:": "Hänvisa en vän till Riot:",
"Register": "Registrera",
"%(targetName)s rejected the invitation.": "%(targetName)s avvisade inbjudan.",
- "Reject invitation": "Avvisa inbjudan",
+ "Reject invitation": "Avböj inbjudan",
"Rejoin": "Gå med tillbaka",
"Remote addresses for this room:": "Fjärradresser för det här rummet:",
"Remove Contact Information?": "Ta bort kontaktuppgifter?",
@@ -504,7 +504,7 @@
"I understand the risks and wish to continue": "Jag förstår riskerna och vill fortsätta",
"Direct Chat": "Direkt-chatt",
"The server may be unavailable or overloaded": "Servern kan vara överbelastad eller inte tillgänglig",
- "Reject": "Avvisa",
+ "Reject": "Avböj",
"Failed to set Direct Message status of room": "Det gick inte att ställa in direktmeddelandestatus för rummet",
"Monday": "måndag",
"Remove from Directory": "Ta bort från katalogen",
@@ -653,18 +653,18 @@
"%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (nivå %(powerLevelNumber)s)",
"Unknown Address": "Okänd adress",
"%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
- "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s har gått med %(count)s gånger",
+ "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)sgick med %(count)s gånger",
"%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)sgick med",
- "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s har gått med %(count)s gånger",
+ "%(oneUser)sjoined %(count)s times|other": "%(oneUser)sgick med %(count)s gånger",
"%(oneUser)sjoined %(count)s times|one": "%(oneUser)sgick med",
- "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)shar lämnat %(count)s gånger",
+ "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)slämnade %(count)s gånger",
"%(severalUsers)sleft %(count)s times|one": "%(severalUsers)slämnade",
- "%(oneUser)sleft %(count)s times|other": "%(oneUser)shar lämnat %(count)s gånger",
+ "%(oneUser)sleft %(count)s times|other": "%(oneUser)slämnade %(count)s gånger",
"%(oneUser)sleft %(count)s times|one": "%(oneUser)slämnade",
- "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)shar gått med och lämnat %(count)s gånger",
- "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)shar gått med och lämnat",
- "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)shar gått med och lämnat %(count)s gånger",
- "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)shar gått med och lämnat",
+ "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)sgick med och lämnade %(count)s gånger",
+ "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)sgick med och lämnade",
+ "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)sgick med och lämnade %(count)s gånger",
+ "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sgick med och lämnade",
"And %(count)s more...|other": "Och %(count)s till...",
"ex. @bob:example.com": "t.ex. @kalle:exempel.com",
"Add User": "Lägg till användare",
@@ -969,5 +969,42 @@
"Can't leave Server Notices room": "Kan inte lämna serveraviseringsrummet",
"This room is used for important messages from the Homeserver, so you cannot leave it.": "Detta rum används för viktiga meddelanden från hemservern, så du kan inte lämna det.",
"Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Data från en äldre version av Riot has upptäckts. Detta ska ha orsakat att krypteringen inte fungerat i den äldre versionen. Krypterade meddelanden som nyligen har skickats medans den äldre versionen användes kanske inte kan dekrypteras i denna version. Detta kan även orsaka att meddelanden skickade med denna version inte fungerar. Om du upplever problem, logga ut och in igen. För att behålla meddelandehistoriken, exportera dina nycklar och importera dem igen.",
- "Confirm Removal": "Bekräfta borttagning"
+ "Confirm Removal": "Bekräfta borttagning",
+ "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Det gick inte att kontrollera att adressen den här inbjudan skickades till matchar en som är kopplad till ditt konto.",
+ "You may wish to login with a different account, or add this email to this account.": "Du kanske vill logga in med ett annat konto, eller lägga till e-postadressen till detta konto.",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie (please see our Cookie Policy ).": "Vänligen hjälp till att förbättra Riot.im genom att skicka anonyma användardata . Detta kommer att använda en cookie (se vår Cookiepolicy ).",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie.": "Vänligen hjälp till att förbättra Riot.im genom att skicka anonyma användardata . Detta kommer att använda en cookie.",
+ "Yes, I want to help!": "Ja, jag vill hjälpa till!",
+ "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s aktiverade kryptering (algoritm %(algorithm)s).",
+ "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)slämnade och gick med igen %(count)s gånger",
+ "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)slämnade och gick med igen",
+ "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)slämnade och gick med igen %(count)s gånger",
+ "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)slämnade och gick med igen",
+ "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)savböjde sina inbjudningar %(count)s gånger",
+ "Unable to reject invite": "Det gick inte att avböja inbjudan",
+ "Reject all %(invitedRooms)s invites": "Avböj alla %(invitedRooms)s inbjudningar",
+ "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)savböjde sina inbjudningar",
+ "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)savböjde sin inbjudan %(count)s gånger",
+ "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)savböjde sin inbjudan",
+ "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)sfick sina inbjudningar tillbakadragna %(count)s gånger",
+ "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)sfick sina inbjudningar tillbakadragna",
+ "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)sfick sin inbjudan tillbakadragen %(count)s gånger",
+ "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)sfick sin inbjudan tillbakadragen",
+ "were invited %(count)s times|other": "blev inbjudna %(count)s gånger",
+ "were invited %(count)s times|one": "blev inbjudna",
+ "was invited %(count)s times|other": "blev inbjuden %(count)s gånger",
+ "was invited %(count)s times|one": "blev inbjuden",
+ "were banned %(count)s times|other": "blev bannade %(count)s gånger",
+ "were banned %(count)s times|one": "blev bannade",
+ "was banned %(count)s times|other": "blev bannad %(count)s gånger",
+ "was banned %(count)s times|one": "blev bannad",
+ "Ban this user?": "Banna användaren?",
+ "were kicked %(count)s times|other": "blev kickade %(count)s gånger",
+ "were kicked %(count)s times|one": "blev kickade",
+ "was kicked %(count)s times|other": "blev kickad %(count)s gånger",
+ "was kicked %(count)s times|one": "blev kickad",
+ "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)sbytte namn %(count)s gånger",
+ "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)sbytte namn",
+ "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sbytte namn %(count)s gånger",
+ "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sbytte namn"
}
From 05357b9f8cef27502ff7ad09f6f9461c7b7685f1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Tue, 29 May 2018 12:07:56 +0100
Subject: [PATCH 0136/1196] improve comment
---
src/components/structures/UserSettings.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 4ee4f1a427..d88a477932 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -287,6 +287,7 @@ module.exports = React.createClass({
_refreshMediaDevices: function(stream) {
if (stream) {
// kill stream so that we don't leave it lingering around with webcam enabled etc
+ // as here we called gUM to ask user for permission to their device names only
stream.getTracks().forEach((track) => track.stop());
}
From da9fe9917bfeff2f670296648c6a5b76fb71224b Mon Sep 17 00:00:00 2001
From: Luke Barnard
Date: Tue, 29 May 2018 13:16:39 +0100
Subject: [PATCH 0137/1196] Fix click on faded left/right/middle panel -> close
settings
- implement generic dispatch to close user/room/group settings
- use dispatch to allow clicks on disabled left/right/middle panel to
close settings
A much more maintainable approach would be to use dedicate routing
instead of doing different things depending on what page of the app is
currently being viewed. At the very least we could make the concept of a
settings page generic.
---
src/components/structures/GroupView.js | 23 ++++++--
src/components/structures/LoggedInView.js | 20 ++++++-
src/components/structures/MatrixChat.js | 69 ++++++++++++++---------
src/components/structures/RoomView.js | 20 ++-----
src/stores/RoomViewStore.js | 16 ++++++
5 files changed, 100 insertions(+), 48 deletions(-)
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index ce79ccadfa..c7610219f7 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -432,11 +432,14 @@ export default React.createClass({
this._changeAvatarComponent = null;
this._initGroupStore(this.props.groupId, true);
+
+ this._dispatcherRef = dis.register(this._onAction);
},
componentWillUnmount: function() {
this._unmounted = true;
this._matrixClient.removeListener("Group.myMembership", this._onGroupMyMembership);
+ dis.unregister(this._dispatcherRef);
},
componentWillReceiveProps: function(newProps) {
@@ -563,12 +566,22 @@ export default React.createClass({
this._closeSettings();
},
+ _onAction(payload) {
+ switch (payload.action) {
+ // NOTE: close_settings is an app-wide dispatch; as it is dispatched from MatrixChat
+ case 'close_settings':
+ this.setState({
+ editing: false,
+ profileForm: null,
+ });
+ break;
+ default:
+ break;
+ }
+ },
+
_closeSettings() {
- this.setState({
- editing: false,
- profileForm: null,
- });
- dis.dispatch({action: 'panel_disable'});
+ dis.dispatch({action: 'close_settings'});
},
_onNameChange: function(value) {
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 2dd5a75c47..5dca359f32 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -255,6 +255,22 @@ const LoggedInView = React.createClass({
), true);
},
+ _onClick: function(ev) {
+ // When the panels are disabled, clicking on them results in a mouse event
+ // which bubbles to certain elements in the tree. When this happens, close
+ // any settings page that is currently open (user/room/group).
+ if (this.props.leftDisabled &&
+ this.props.rightDisabled &&
+ (
+ ev.target.className === 'mx_MatrixChat' ||
+ ev.target.className === 'mx_MatrixChat_middlePanel' ||
+ ev.target.className === 'mx_RoomView'
+ )
+ ) {
+ dis.dispatch({ action: 'close_settings' });
+ }
+ },
+
render: function() {
const LeftPanel = sdk.getComponent('structures.LeftPanel');
const RightPanel = sdk.getComponent('structures.RightPanel');
@@ -295,7 +311,7 @@ const LoggedInView = React.createClass({
case PageTypes.UserSettings:
page_element =
+
Date: Tue, 12 Jun 2018 11:15:00 +0100
Subject: [PATCH 0163/1196] link to ShareDialog from GroupView, RoomView,
UserSettings & MemberInfo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/GroupView.js | 13 +++++++++++++
src/components/structures/UserSettings.js | 15 +++++++++++++--
src/components/views/rooms/MemberInfo.js | 14 +++++++++++++-
src/components/views/rooms/RoomHeader.js | 16 ++++++++++++++++
4 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index c7610219f7..a343d1c971 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -562,6 +562,13 @@ export default React.createClass({
});
},
+ _onShareClick: function() {
+ const ShareDialog = sdk.getComponent("dialogs.ShareDialog");
+ Modal.createTrackedDialog('share community dialog', '', ShareDialog, {
+ target: this._matrixClient.getGroup(this.props.groupId),
+ });
+ },
+
_onCancelClick: function() {
this._closeSettings();
},
@@ -1207,6 +1214,7 @@ export default React.createClass({
shortDescNode = { summary.profile.short_description };
}
}
+
if (this.state.editing) {
rightButtons.push(
,
);
}
+ rightButtons.push(
+
+ ,
+ );
if (this.props.collapsedRhs) {
rightButtons.push(
;
},
+ onSelfShareClick: function() {
+ const cli = MatrixClientPeg.get();
+ const ShareDialog = sdk.getComponent("dialogs.ShareDialog");
+ Modal.createTrackedDialog('share self dialog', '', ShareDialog, {
+ target: cli.getUser(this._me),
+ });
+ },
+
_showSpoiler: function(event) {
const target = event.target;
target.innerHTML = target.getAttribute('data-spoiler');
@@ -1295,10 +1303,13 @@ module.exports = React.createClass({
{ topBar }
;
}
}
-export function createMenu(ElementClass, props) {
+export function createMenu(ElementClass, props, hasBackground=true) {
const closeMenu = function(...args) {
ReactDOM.unmountComponentAtNode(getOrCreateContainer());
@@ -175,8 +179,8 @@ export function createMenu(ElementClass, props) {
// We only reference closeMenu once per call to createMenu
const menu =
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 46c1113a1d..c1c757a65a 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -560,6 +560,27 @@ export default React.createClass({
this._setPage(PageTypes.UserSettings);
this.notifyNewScreen('settings');
break;
+ case 'close_settings':
+ this.setState({
+ leftDisabled: false,
+ rightDisabled: false,
+ middleDisabled: false,
+ });
+ if (this.state.page_type === PageTypes.UserSettings) {
+ // We do this to get setPage and notifyNewScreen
+ if (this.state.currentRoomId) {
+ this._viewRoom({
+ room_id: this.state.currentRoomId,
+ });
+ } else if (this.state.currentGroupId) {
+ this._viewGroup({
+ group_id: this.state.currentGroupId,
+ });
+ } else {
+ this._viewHome();
+ }
+ }
+ break;
case 'view_create_room':
this._createRoom();
break;
@@ -577,19 +598,10 @@ export default React.createClass({
this.notifyNewScreen('groups');
break;
case 'view_group':
- {
- const groupId = payload.group_id;
- this.setState({
- currentGroupId: groupId,
- currentGroupIsNew: payload.group_is_new,
- });
- this._setPage(PageTypes.GroupView);
- this.notifyNewScreen('group/' + groupId);
- }
+ this._viewGroup(payload);
break;
case 'view_home_page':
- this._setPage(PageTypes.HomePage);
- this.notifyNewScreen('home');
+ this._viewHome();
break;
case 'view_set_mxid':
this._setMxId(payload);
@@ -632,7 +644,8 @@ export default React.createClass({
middleDisabled: payload.middleDisabled || false,
rightDisabled: payload.rightDisabled || payload.sideDisabled || false,
});
- break; }
+ break;
+ }
case 'set_theme':
this._onSetTheme(payload.value);
break;
@@ -848,6 +861,21 @@ export default React.createClass({
});
},
+ _viewGroup: function(payload) {
+ const groupId = payload.group_id;
+ this.setState({
+ currentGroupId: groupId,
+ currentGroupIsNew: payload.group_is_new,
+ });
+ this._setPage(PageTypes.GroupView);
+ this.notifyNewScreen('group/' + groupId);
+ },
+
+ _viewHome: function() {
+ this._setPage(PageTypes.HomePage);
+ this.notifyNewScreen('home');
+ },
+
_setMxId: function(payload) {
const SetMxIdDialog = sdk.getComponent('views.dialogs.SetMxIdDialog');
const close = Modal.createTrackedDialog('Set MXID', '', SetMxIdDialog, {
@@ -1606,19 +1634,8 @@ export default React.createClass({
this._setPageSubtitle(subtitle);
},
- onUserSettingsClose: function() {
- // XXX: use browser history instead to find the previous room?
- // or maintain a this.state.pageHistory in _setPage()?
- if (this.state.currentRoomId) {
- dis.dispatch({
- action: 'view_room',
- room_id: this.state.currentRoomId,
- });
- } else {
- dis.dispatch({
- action: 'view_home_page',
- });
- }
+ onCloseAllSettings() {
+ dis.dispatch({ action: 'close_settings' });
},
onServerConfigChange(config) {
@@ -1677,7 +1694,7 @@ export default React.createClass({
return (
{
this.setState({
uploadingRoomSettings: false,
- editingRoomSettings: false,
});
+ dis.dispatch({ action: 'close_settings' });
}).done();
},
onCancelClick: function() {
console.log("updateTint from onCancelClick");
this.updateTint();
- this.setState({
- editingRoomSettings: false,
- });
+ dis.dispatch({ action: 'close_settings' });
if (this.state.forwardingEvent) {
dis.dispatch({
action: 'forward_event',
@@ -1406,13 +1403,6 @@ module.exports = React.createClass({
});*/
},
- showSettings: function(show) {
- // XXX: this is a bit naughty; we should be doing this via props
- if (show) {
- this.setState({editingRoomSettings: true});
- }
- },
-
/**
* called by the parent component when PageUp/Down/etc is pressed.
*
diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index 1e7e50eae0..923c073065 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -44,6 +44,8 @@ const INITIAL_STATE = {
forwardingEvent: null,
quotingEvent: null,
+
+ isEditingSettings: false,
};
/**
@@ -116,6 +118,16 @@ class RoomViewStore extends Store {
replyingToEvent: payload.event,
});
break;
+ case 'open_room_settings':
+ this._setState({
+ isEditingSettings: true,
+ });
+ break;
+ case 'close_settings':
+ this._setState({
+ isEditingSettings: false,
+ });
+ break;
}
}
@@ -301,6 +313,10 @@ class RoomViewStore extends Store {
return this._state.replyingToEvent;
}
+ isEditingSettings() {
+ return this._state.isEditingSettings;
+ }
+
shouldPeek() {
return this._state.shouldPeek;
}
From 404c071f2aa94796098608d74df8dd7a787ff581 Mon Sep 17 00:00:00 2001
From: Luke Barnard
Date: Tue, 29 May 2018 13:19:56 +0100
Subject: [PATCH 0138/1196] Remove lie from docs
---
src/components/structures/MatrixChat.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index c1c757a65a..0b2396ddff 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -794,7 +794,6 @@ export default React.createClass({
// @param {string=} roomInfo.room_id ID of the room to join. One of room_id or room_alias must be given.
// @param {string=} roomInfo.room_alias Alias of the room to join. One of room_id or room_alias must be given.
// @param {boolean=} roomInfo.auto_join If true, automatically attempt to join the room if not already a member.
- // @param {boolean=} roomInfo.show_settings Makes RoomView show the room settings dialog.
// @param {string=} roomInfo.event_id ID of the event in this room to show: this will cause a switch to the
// context of that particular event.
// @param {boolean=} roomInfo.highlighted If true, add event_id to the hash of the URL
From 577b2564c0e36110d1516721e2b46665abb5a9bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?=
Date: Fri, 25 May 2018 09:52:21 +0000
Subject: [PATCH 0139/1196] Translated using Weblate (Slovak)
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
---
src/i18n/strings/sk.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 2cab64ca49..daa9cfc9b6 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -1187,5 +1187,6 @@
"This room is used for important messages from the Homeserver, so you cannot leave it.": "Táto miestnosť je určená na dôležité oznamy a správy od správcov domovského servera, preto ju nie je možné opustiť.",
"Terms and Conditions": "Zmluvné podmienky",
"To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Ak chcete aj naďalej používať domovský server %(homeserverDomain)s, mali by ste si prečítať a odsúhlasiť naše zmluvné podmienky.",
- "Review terms and conditions": "Prečítať zmluvné podmienky"
+ "Review terms and conditions": "Prečítať zmluvné podmienky",
+ "To notify everyone in the room, you must be a": "Aby ste mohli upozorňovať všetkých členov v miestnosti, musíte byť"
}
From 56541c7ea7c068244e18b021a1524d19658a4ede Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev
Date: Tue, 29 May 2018 16:59:37 +0000
Subject: [PATCH 0140/1196] Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
---
src/i18n/strings/bg.json | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 4911ad970e..6295c7e934 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1167,5 +1167,26 @@
"Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Изчистване на запазените данни в браузъра може да поправи проблема, но ще Ви изкара от профила и ще направи шифрованите съобщения нечетими.",
"Collapse Reply Thread": "Свий отговорите",
"Enable widget screenshots on supported widgets": "Включи скрийншоти за поддържащи ги приспособления",
- "Riot bugs are tracked on GitHub: create a GitHub issue.": "Бъговете по Riot се следят в GitHub: създайте проблем в GitHub."
+ "Riot bugs are tracked on GitHub: create a GitHub issue.": "Бъговете по Riot се следят в GitHub: създайте проблем в GitHub.",
+ "e.g. %(exampleValue)s": "напр. %(exampleValue)s",
+ "Reload widget": "Презареди приспособлението",
+ "Send analytics data": "Изпращане на статистически данни",
+ "To notify everyone in the room, you must be a": "За да уведомите всички в стаята, трябва да бъдете",
+ "Muted Users": "Заглушени потребители",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie (please see our Cookie Policy ).": "Моля, помогнете за подобряването на Riot.im като изпращате анонимни данни за ползване . Това ще използва бисквитка (моля, вижте нашата политика за бисквитки ).",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie.": "Моля, помогнете за подобряването на Riot.im като изпращате анонимни данни за ползване . Това ще използва бисквитка.",
+ "Yes, I want to help!": "Да, искам да помогна!",
+ "Warning: This widget might use cookies.": "Внимание: това приспособление може да използва бисквитки.",
+ "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Това ще направи акаунта Ви неизползваем завинаги. Няма да можете да влезете пак, а регистрирането повторно на същия потребителски идентификатор няма да е възможно. Акаунтът Ви да напусне всички стаи, в които участва. Ще бъдат премахнати и данните за акаунта Ви от сървъра за самоличност. Действието е необратимо.",
+ "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Деактивирането на акаунта Ви по подразбиране не прави така, че изпратените съобщения да бъдат забравени. Ако искате да забравим съобщенията Ви, моля отбележете с отметка по-долу.",
+ "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Видимостта на съобщенията в Matrix е подобно на имейл системата. Нашето забравяне означава, че: изпратените от Вас съобщения няма да бъдат споделяни с нови или нерегистрирани потребители, но регистрираните потребители имащи достъп до тях ще продължат да имат достъп до своето копие.",
+ "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Моля, забравете всички изпратени съобщения от мен съобщения, когато акаунта ми се деактивира (Внимание: това ще направи бъдещите потребители да имат само частичен поглед върху кореспонденцията)",
+ "To continue, please enter your password:": "За да продължите, моля въведете паролата си:",
+ "password": "парола",
+ "Can't leave Server Notices room": "Не може да напуснете стая \"Server Notices\"",
+ "This room is used for important messages from the Homeserver, so you cannot leave it.": "Тази стая се използва за важни съобщения от сървъра, така че не можете да я напуснете.",
+ "Terms and Conditions": "Правила и условия",
+ "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "За да продължите да ползвате %(homeserverDomain)s е необходимо да прегледате и да се съгласите с правилата и условията за ползване.",
+ "Review terms and conditions": "Прегледай правилата и условията",
+ "Failed to indicate account erasure": "Неуспешно указване на желанието за изтриване на акаунта"
}
From 7053302f7799b66f93b512c991cd90224e67bcc9 Mon Sep 17 00:00:00 2001
From: Krombel
Date: Thu, 31 May 2018 16:01:23 +0000
Subject: [PATCH 0141/1196] Translated using Weblate (German)
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
src/i18n/strings/de_DE.json | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 4892b91b48..d3787a15a3 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1171,5 +1171,25 @@
"Send analytics data": "Analysedaten senden",
"Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies ).": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden. (Siehe unsere Datenschutzerklärung ).",
"Help improve Riot by sending usage data? This will use a cookie.": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden.",
- "Yes please": "Ja, bitte"
+ "Yes please": "Ja, bitte",
+ "e.g. %(exampleValue)s": "z.B. %(exampleValue)s",
+ "Reload widget": "Widget neu laden",
+ "To notify everyone in the room, you must be a": "Notwendiges Berechtigungslevel, um jeden im Raum zu benachrichten:",
+ "Muted Users": "Stummgeschaltete Benutzer",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie (please see our Cookie Policy ).": "Bitte helfe uns Riot.im zu verbessern, in dem du anonyme Nutzungsdaten schickst. Dies wird ein Cookie benutzen (bitte beachte auch unsere Cookie-Richtlinie ).",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie.": "Bitte helfe uns Riot.im zu verbessern, in dem du anonyme Nutzungsdaten schickst. Dies wird ein Cookie benutzen.",
+ "Yes, I want to help!": "Ja, ich möchte helfen!",
+ "Warning: This widget might use cookies.": "Warnung: Diese Widget mag Cookies verwenden.",
+ "Failed to indicate account erasure": "Fehler beim Signalisieren der Account-Löschung",
+ "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Dies wird deinen Account permanent unbenutzbar machen. Du wirst nicht in der Lage sein, dich anzumelden und keiner wird dieselbe Benutzer-ID erneut registrieren können. Alle Räume, in denen der Account ist, werden verlassen und deine Account-Daten werden vom Identitätsserver gelöscht. Diese Aktion ist irreversibel!",
+ "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Standardmäßig werden die von dir gesendeten Nachrichten beim Deaktiveren nicht gelöscht. Wenn du dies von uns möchtest, aktivere das Auswalfeld unten.",
+ "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Sie Sichtbarkeit der Nachrichten in Matrix ist vergleichbar mit E-Mails: Wenn wir deine Nachrichten vergessen heißt das, dass diese nicht mit neuen oder nicht registrierten Nutzern teilen werden, aber registrierte Nutzer, die bereits zugriff haben, werden Zugriff auf ihre Kopie behalten.",
+ "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Bitte vergesst alle Nachrichten, die ich gesendet habe, wenn mein Account deaktiviert wird. (Warnung: Zukünftige Nutzer werden eine unvollständige Konversation sehen)",
+ "To continue, please enter your password:": "Um fortzufahren, bitte Password eingeben:",
+ "password": "Passwort",
+ "Can't leave Server Notices room": "Du kannst den Raum für Server-Notizen nicht verlassen",
+ "This room is used for important messages from the Homeserver, so you cannot leave it.": "Du kannst diesen Raum nicht verlassen, da dieser Raum für wichtige Nachrichten vom Heimserver verwendet wird.",
+ "Terms and Conditions": "Geschäftsbedingungen",
+ "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Um den %(homeserverDomain)s -Heimserver weiter zu verwenden, musst du die Geschäftsbedingungen sichten und ihnen zustimmen.",
+ "Review terms and conditions": "Geschäftsbedingungen anzeigen"
}
From f5892b8c6174c018ee2e616e15c2437cbaf39987 Mon Sep 17 00:00:00 2001
From: Kenneth Larsson
Date: Sun, 3 Jun 2018 22:33:00 +0000
Subject: [PATCH 0142/1196] Translated using Weblate (Swedish)
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
src/i18n/strings/sv.json | 220 +++++++++++++++++++++++++++++++++++----
1 file changed, 202 insertions(+), 18 deletions(-)
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index a9c9bfade2..8e5d8e2f21 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -40,7 +40,7 @@
"Blacklisted": "Svartlistad",
"%(senderName)s banned %(targetName)s.": "%(senderName)s bannade %(targetName)s.",
"Banned users": "Bannade användare",
- "Bans user with given id": "Bannar användaren med givet id",
+ "Bans user with given id": "Bannar användare med givet id",
"Ban": "Banna",
"Attachment": "Bilaga",
"Call Timeout": "Samtalstimeout",
@@ -78,14 +78,14 @@
"Cryptography": "Kryptografi",
"Current password": "Nuvarande lösenord",
"Curve25519 identity key": "Curve25519 -identitetsnyckel",
- "Custom level": "Egen nivå",
+ "Custom level": "Anpassad nivå",
"/ddg is not a command": "/ddg är inte ett kommando",
- "Deactivate Account": "Deaktivera konto",
+ "Deactivate Account": "Inaktivera konto",
"Deactivate my account": "Deaktivera mitt konto",
"Decrypt %(text)s": "Dekryptera %(text)s",
"Decryption error": "Dekrypteringsfel",
"Delete": "Radera",
- "Deops user with given id": "Degraderar användaren med givet id",
+ "Deops user with given id": "Degraderar användare med givet id",
"Default": "Standard",
"Device already verified!": "Enheten är redan verifierad!",
"Device ID": "Enhets-ID",
@@ -94,11 +94,11 @@
"Device key:": "Enhetsnyckel:",
"Devices": "Enheter",
"Devices will not yet be able to decrypt history from before they joined the room": "Enheter kan inte ännu dekryptera meddelandehistorik från före de gick med i rummet",
- "Direct chats": "Direkta chattar",
+ "Direct chats": "Direkt-chattar",
"Disinvite": "Häv inbjudan",
"Display name": "Namn",
"Displays action": "Visar åtgärd",
- "Don't send typing notifications": "Sänd inte \"skriver\"-status",
+ "Don't send typing notifications": "Skicka inte \"skriver\"-status",
"Download %(text)s": "Ladda ner %(text)s",
"Drop here to tag %(section)s": "Dra hit för att tagga %(section)s",
"Ed25519 fingerprint": "Ed25519-fingeravtryck",
@@ -122,7 +122,7 @@
"Export E2E room keys": "Exportera krypteringsrumsnycklar",
"Failed to ban user": "Det gick inte att banna användaren",
"Failed to change password. Is your password correct?": "Det gick inte att byta lösenord. Är lösenordet rätt?",
- "Failed to change power level": "Det gick inte att ändra maktnivå",
+ "Failed to change power level": "Det gick inte att ändra behörighetsnivå",
"Failed to forget room %(errCode)s": "Det gick inte att glömma bort rummet %(errCode)s",
"Failed to join room": "Det gick inte att gå med i rummet",
"Failed to kick": "Det gick inte att kicka",
@@ -165,7 +165,7 @@
"Encrypted by an unverified device": "Krypterat av en overifierad enhet",
"Encryption is enabled in this room": "Kryptering är aktiverat i det här rummet",
"Encryption is not enabled in this room": "Kryptering är inte aktiverat i det här rummet",
- "Enter passphrase": "Ge lösenfras",
+ "Enter passphrase": "Ange lösenfras",
"Error: Problem communicating with the given homeserver.": "Fel: Det gick inte att kommunicera med den angivna hemservern.",
"Failed to fetch avatar URL": "Det gick inte att hämta avatar-URL",
"Failed to upload profile picture!": "Det gick inte att ladda upp profilbild!",
@@ -204,7 +204,7 @@
"Invite new room members": "Bjud in nya rumsmedlemmar",
"Invited": "Inbjuden",
"Invites": "Inbjudningar",
- "Invites user with given id to current room": "Bjuder in användaren med det givna ID:t till det nuvarande rummet",
+ "Invites user with given id to current room": "Bjuder in användare med givet id till nuvarande rum",
"'%(alias)s' is not a valid format for an address": "'%(alias)s' är inte ett giltigt format för en adress",
"'%(alias)s' is not a valid format for an alias": "'%(alias)s' är inte ett giltigt format för ett alias",
"%(displayName)s is typing": "%(displayName)s skriver",
@@ -216,7 +216,7 @@
"Jump to first unread message.": "Hoppa till första olästa meddelande.",
"%(senderName)s kicked %(targetName)s.": "%(senderName)s kickade %(targetName)s.",
"Kick": "Kicka",
- "Kicks user with given id": "Kickar användaren med givet ID",
+ "Kicks user with given id": "Kickar användaren med givet id",
"Labs": "Labb",
"Last seen": "Senast sedd",
"Leave room": "Lämna rummet",
@@ -276,7 +276,7 @@
"Phone": "Telefon",
"%(senderName)s placed a %(callType)s call.": "%(senderName)s startade ett %(callType)ssamtal.",
"Please check your email and click on the link it contains. Once this is done, click continue.": "Öppna meddelandet i din epost och klicka på länken i meddelandet. När du har gjort detta, klicka vidare.",
- "Power level must be positive integer.": "Maktnivån måste vara ett positivt heltal.",
+ "Power level must be positive integer.": "Behörighetsnivå måste vara ett positivt heltal.",
"Press to start a chat with someone": "Tryck på för att starta en chatt med någon",
"Privacy warning": "Integritetsvarning",
"Private Chat": "Privatchatt",
@@ -358,7 +358,7 @@
"Cannot add any more widgets": "Det går inte att lägga till fler widgets",
"Changes colour scheme of current room": "Ändrar färgschema för nuvarande rum",
"Delete widget": "Ta bort widget",
- "Define the power level of a user": "Definiera anseende för en användare",
+ "Define the power level of a user": "Definiera behörighetsnivå för en användare",
"Do you want to load widget from URL:": "Vill du ladda widgeten från URL:",
"Edit": "Ändra",
"Enable automatic language detection for syntax highlighting": "Aktivera automatisk språkdetektering för syntaxmarkering",
@@ -415,7 +415,7 @@
"Nov": "nov",
"Dec": "dec",
"Name or matrix ID": "Namn eller matrix ID",
- "Invite to Community": "",
+ "Invite to Community": "Bjud in till community",
"Unable to enable Notifications": "Det går inte att aktivera aviseringar",
"Failed to invite user": "Det gick inte att bjuda in användaren",
"The information being sent to us to help make Riot.im better includes:": "Informationen som skickas till oss för att hjälpa Riot.im att bli bättre inkluderar:",
@@ -436,7 +436,7 @@
"Sunday": "söndag",
"Messages sent by bot": "Meddelanden från bottar",
"Notification targets": "Aviseringsmål",
- "Failed to set direct chat tag": "Det gick inte att markera rummet som direkt chatt",
+ "Failed to set direct chat tag": "Det gick inte att markera rummet som direkt-chatt",
"Today": "idag",
"Failed to get protocol list from Home Server": "Det gick inte att hämta protokollistan från hemservern",
"You are not receiving desktop notifications": "Du får inte skrivbordsaviseringar",
@@ -481,7 +481,7 @@
"Filter results": "Filtrera resultaten",
"Members": "Medlemmar",
"No update available.": "Ingen uppdatering tillgänglig.",
- "Resend": "Sänd igen",
+ "Resend": "Skicka igen",
"Files": "Filer",
"Collecting app version information": "Samlar in appversionsinformation",
"Delete the room alias %(alias)s and remove %(name)s from the directory?": "Radera rumsadressen %(alias)s och ta bort %(name)s från katalogen?",
@@ -516,8 +516,8 @@
"All Rooms": "Alla rum",
"Wednesday": "onsdag",
"You cannot delete this message. (%(code)s)": "Du kan inte radera det här meddelandet. (%(code)s)",
- "Send": "Sänd",
- "Send logs": "Sänd loggar",
+ "Send": "Skicka",
+ "Send logs": "Skicka loggar",
"All messages": "Alla meddelanden",
"Call invitation": "Inbjudan till samtal",
"Downloading update...": "Laddar ned uppdatering...",
@@ -1006,5 +1006,189 @@
"%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)sbytte namn %(count)s gånger",
"%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)sbytte namn",
"%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sbytte namn %(count)s gånger",
- "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sbytte namn"
+ "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sbytte namn",
+ "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)sändrade sin avatar %(count)s gånger",
+ "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)sändrade sin avatar",
+ "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)ssändrade sin avatar %(count)s gånger",
+ "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)ssändrade sin avatar",
+ "%(items)s and %(count)s others|other": "%(items)s och %(count)s andra",
+ "%(items)s and %(count)s others|one": "%(items)s och en annan",
+ "collapse": "fäll ihop",
+ "expand": "fäll ut",
+ "Custom of %(powerLevel)s": "Anpassad på %(powerLevel)s",
+ "In reply to ": "Som svar på ",
+ "Who would you like to add to this community?": "Vem vill du lägga till i denna community?",
+ "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Varning: En person du lägger till i en community kommer att vara synlig för alla som känner till community-ID:t",
+ "Invite new community members": "Bjud in nya community-medlemmar",
+ "Which rooms would you like to add to this community?": "Vilka rum vill du lägga till i denna community?",
+ "Show these rooms to non-members on the community page and room list?": "Vissa dessa rum och icke-medlemmar på community-sidan och -rumslistan?",
+ "Add rooms to the community": "Lägg till rum i communityn",
+ "Add to community": "Lägg till i community",
+ "Failed to invite users to community": "Det gick inte att bjuda in användare till communityn",
+ "Message Replies": "Meddelandesvar",
+ "Mirror local video feed": "Spegelvänd lokal video",
+ "Disable Community Filter Panel": "Inaktivera community-filterpanel",
+ "Community Invites": "Community-inbjudningar",
+ "Invalid community ID": "Ogiltigt community-ID",
+ "'%(groupId)s' is not a valid community ID": "%(groupId)s är inte ett giltigt community-ID",
+ "New community ID (e.g. +foo:%(localDomain)s)": "Nytt community-ID (t.ex. +foo:%(localDomain)s)",
+ "Remove from community": "Ta bort från community",
+ "Disinvite this user from community?": "Ta bort användarens inbjudan till community?",
+ "Remove this user from community?": "Ta bort användaren från community?",
+ "Failed to remove user from community": "Det gick inte att ta bort användaren från community",
+ "Filter community members": "Filtrera community-medlemmar",
+ "Removing a room from the community will also remove it from the community page.": "Om du tar bort ett rum från communityn tas det även bort från communityns sida.",
+ "Failed to remove room from community": "Det gick inte att ta bort rum från community",
+ "Only visible to community members": "Endast synlig för community-medlemmar",
+ "Filter community rooms": "Filtrera community-rum",
+ "Community IDs cannot not be empty.": "Community-ID kan inte vara tomt.",
+ "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Community-ID får endast innehålla tecknen a-z, 0-9 och '=_-./'",
+ "Something went wrong whilst creating your community": "Något gick fel när din community skapades",
+ "Create Community": "Skapa community",
+ "Community Name": "Community-namn",
+ "Community ID": "Community-ID",
+ "View Community": "Visa community",
+ "name and avatar might not be seen by other users for up to 30 minutes.": "Ändringar på namn och avatar som gjorts i din community kommer eventuellt inte synas för andra användare i upp till 30 minuter.",
+ "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Dessa rum visas för community-medlemmar på community-sidan. Community-medlemmar kan gå med i rummen genom att klicka på dem.",
+ "Add rooms to this community": "Lägg till rum i denna community",
+ "%(inviter)s has invited you to join this community": "%(inviter)s har bjudit in dig till denna community",
+ "Join this community": "Gå med i denna community",
+ "Leave this community": "Lämna denna community",
+ "You are an administrator of this community": "Du är administratör för denna community",
+ "You are a member of this community": "Du är medlem i denna community",
+ "Who can join this community?": "Vem kan gå med i denna community?",
+ "Your community hasn't got a Long Description, a HTML page to show to community members.
Click here to open settings and give it one!": "Din community har ingen lång beskrivning eller HTML-sida att visa för medlemmar.
Klicka här för att öppna inställningar och lägga till det!", + "Community %(groupId)s not found": "Community %(groupId)s hittades inte", + "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "För att skapa ett filter, dra en community-avatar till filterpanelen längst till vänster på skärmen. Du kan när som helst klicka på en avatar i filterpanelen för att bara se rum och personer som är associerade med den communityn.", + "Create a new community": "Skapa en ny community", + "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Skapa en community för att gruppera användare och rum! Bygg en anpassad hemsida för att markera er plats i Matrix-universumet.", + "Join an existing community": "Gå med i en befintlig community", + "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "För att gå med i en befintlig gemenskap behöver du ha community-ID; det ser ut som något i stil med +exempel:matrix.org.", + "Invite to this community": "Bjud in till denna community", + "Something went wrong when trying to get your communities.": "Något gick fel vid hämtning av dina communityn.", + "You're not currently a member of any communities.": "Du är för närvarande inte medlem i någon community.", + "Communities": "Communityn", + "This Home server does not support communities": "Denna hemserver stöder inte communityn", + "Your Communities": "Dina communityn", + "Did you know: you can use communities to filter your Riot.im experience!": "Visste du att: du kan använda communityn för att filtrera din Riot.im-upplevelse!", + "Error whilst fetching joined communities": "Fel vid hämtning av anslutna communityn", + "Featured Rooms:": "Utvalda rum:", + "Featured Users:": "Utvalda användare:", + "Everyone": "Alla", + "To notify everyone in the room, you must be a": "För att meddela alla i rummet, måste du vara", + "Long Description (HTML)": "Lång beskrivning (HTML)", + "Description": "Beskrivning", + "Failed to load %(groupId)s": "Det gick inte att ladda %(groupId)s", + "Failed to withdraw invitation": "Det gick inte att ta bort inbjudan", + "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Är du säker på att du vill ta bort %(roomName)s från %(groupId)s?", + "Failed to remove '%(roomName)s' from %(groupId)s": "Det gick inte att ta bort %(roomName)s från %(groupId)s", + "Something went wrong!": "Något gick fel!", + "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Synligheten för '%(roomName)s' i %(groupId)s kunde inte uppdateras.", + "Visibility in Room List": "Synlighet i rumslistan", + "Visible to everyone": "Synlig för alla", + "Please select the destination room for this message": "Välj vilket rum meddelandet ska skickas till", + "Disinvite this user?": "Ta bort användarens inbjudan?", + "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Du kommer inte att kunna ångra den här ändringen eftersom du sänker din egen behörighetsnivå, om du är den sista privilegierade användaren i rummet blir det omöjligt att ändra behörigheter.", + "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du kommer inte att kunna ångra den här ändringen eftersom du höjer användaren till samma behörighetsnivå som dig själv.", + "User Options": "Användaralternativ", + "unknown caller": "okänd uppringare", + "At this time it is not possible to reply with an emote.": "Det är för närvarande inte möjligt att svara med en emoji.", + "To use it, just wait for autocomplete results to load and tab through them.": "För att använda detta, vänta på att autokompletteringen laddas och tabba igenom resultatet.", + "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "VARNING: NYCKELVERIFIERINGEN MISSLYCKADES! Signeringsnyckeln för %(userId)s och enhet %(deviceId)s är \"%(fprint)s\" som inte matchar den angivna nyckeln \"%(fingerprint)s\". Detta kan betyda att dina kommunikationer avlyssnas!", + "Hide join/leave messages (invites/kicks/bans unaffected)": "Dölj \"gå med\"/lämna-meddelanden (inbjudningar/kickningar/banningar opåverkat)", + "Disable Peer-to-Peer for 1:1 calls": "Inaktivera enhet-till-enhet-kommunikation för direktsamtal (mellan två personer)", + "Enable inline URL previews by default": "Aktivera URL-förhandsvisning som standard", + "Enable URL previews for this room (only affects you)": "Aktivera URL-förhandsvisning för detta rum (påverkar bara dig)", + "Enable URL previews by default for participants in this room": "Aktivera URL-förhandsvisning som standard för deltagare i detta rum", + "You have enabled URL previews by default.": "Du har aktiverat URL-förhandsvisning som standard.", + "You have disabled URL previews by default.": "Du har inaktiverat URL-förhandsvisning som standard.", + "URL previews are enabled by default for participants in this room.": "URL-förhandsvisning är aktiverat som standard för deltagare i detta rum.", + "URL previews are disabled by default for participants in this room.": "URL-förhandsvisning är inaktiverat som standard för deltagare i detta rum.", + "URL Previews": "URL-förhandsvisning", + "Which rooms would you like to add to this summary?": "Vilka rum vill du lägga till i översikten?", + "Add to summary": "Lägg till i översikt", + "Failed to add the following rooms to the summary of %(groupId)s:": "Det gick inte att lägga till följande rum i översikten för %(groupId)s:", + "Add a Room": "Lägg till ett rum", + "Failed to remove the room from the summary of %(groupId)s": "Det gick inte att ta bort rummet från översikten i %(groupId)s", + "The room '%(roomName)s' could not be removed from the summary.": "Rummet '%(roomName)s' kunde inte tas bort från översikten.", + "Who would you like to add to this summary?": "Vem vill du lägga till i översikten?", + "Failed to add the following users to the summary of %(groupId)s:": "Det gick inte att lägga till följande användare i översikten för %(groupId)s:", + "Add a User": "Lägg till en användare", + "Failed to remove a user from the summary of %(groupId)s": "Det gick inte att ta bort en användare från översikten i %(groupId)s", + "The user '%(displayName)s' could not be removed from the summary.": "Användaren '%(displayName)s' kunde inte tas bort från översikten.", + "Unable to accept invite": "Det gick inte att acceptera inbjudan", + "Leave %(groupName)s?": "Lämna %(groupName)s?", + "Enable widget screenshots on supported widgets": "Aktivera widget-skärmdumpar för widgets som stöder det", + "Your key share request has been sent - please check your other devices for key share requests.": "Din nyckeldelningsbegäran har skickats - kolla efter nyckeldelningsbegäran på dina andra enheter.", + "Undecryptable": "Odekrypterbar", + "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Nyckeldelningsbegäran skickas automatiskt till dina andra enheter. Om du avvisat nyckelbegäran på dina andra enheter, klicka här för att begära nycklarna till den här sessionen igen.", + "If your other devices do not have the key for this message you will not be able to decrypt them.": "Om dina andra enheter inte har nyckeln till detta meddelande kommer du du att kunna dekryptera det.", + "Key request sent.": "Nyckelbegäran skickad.", + "Re-request encryption keys from your other devices.": "Begär krypteringsnycklar igen från dina andra enheter.",
+ "Unban": "Avbanna",
+ "Unban this user?": "Avbanna användaren?",
+ "Unmute": "Ta bort dämpning",
+ "You don't currently have any stickerpacks enabled": "Du har för närvarande inga dekalpaket aktiverade",
+ "Add a stickerpack": "Lägg till dekalpaket",
+ "Stickerpack": "Dekalpaket",
+ "Hide Stickers": "Dölj dekaler",
+ "Show Stickers": "Visa dekaler",
+ "Error decrypting audio": "Det gick inte att dekryptera ljud",
+ "Error decrypting image": "Det gick inte att dekryptera bild",
+ "Error decrypting video": "Det gick inte att dekryptera video",
+ "Add an Integration": "Lägg till integration",
+ "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Du skickas till en tredjepartswebbplats så att du kan autentisera ditt konto för användning med %(integrationsUrl)s. Vill du fortsätta?",
+ "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Du kan använda de anpassade serverinställningar för att logga in på andra Matrix-servrar genom att ange en annan hemserver-URL.",
+ "This allows you to use this app with an existing Matrix account on a different home server.": "Det gör det möjligt att använda denna app med ett befintligt Matrix-konto på en annan hemserver.",
+ "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Du kan även ange en anpassad identitetsserver men det förhindrar vanligtvis interaktion med användare baserat på e-postadress.",
+ "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Om du inte anger en epostadress, kan du inte återställa ditt lösenord. Är du säker?",
+ "You are registering with %(SelectedTeamName)s": "Du registrerar dig med %(SelectedTeamName)s",
+ "Warning: This widget might use cookies.": "Varning: Denna widget kan använda cookies.",
+ "Popout widget": "Poppa ut widget",
+ "were unbanned %(count)s times|other": "blev avbannade %(count)s gånger",
+ "were unbanned %(count)s times|one": "blev avbannade",
+ "was unbanned %(count)s times|other": "blev avbannad %(count)s gånger",
+ "was unbanned %(count)s times|one": "blev avbannad",
+ "Failed to indicate account erasure": "Det gick inte att ange kontoradering",
+ "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Detta kommer att göra ditt konto permanent oanvändbart. Du kommer inte att kunna logga in, och ingen kommer att kunna registrera samma användar-ID. Ditt konto kommer att lämna alla rum som det deltar i, och dina kontouppgifter kommer att raderas från identitetsservern. Denna åtgärd går inte att ångra.",
+ "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Att du inaktiverar ditt konto gör inte att meddelanden som du skickat glöms automatiskt. Om du vill att vi ska glömma dina meddelanden, kryssa i rutan nedan.",
+ "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Meddelandesynlighet i Matrix liknar email. Att vi glömmer dina meddelanden innebär att meddelanden som du skickat inte delas med några nya eller oregistrerade användare, men registrerade användare som redan har tillgång till meddelandena kommer fortfarande ha tillgång till sin kopia.",
+ "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Glöm alla meddelanden som jag har skickat när mitt konto inaktiveras (Varning: detta kommer att göra så att framtida användare får se ofullständiga konversationer)",
+ "To continue, please enter your password:": "För att fortsätta, ange ditt lösenord:",
+ "password": "lösenord",
+ "Debug Logs Submission": "Inlämning av felsökningsloggar",
+ "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Om du har anmält en bugg via GitHub, kan felsökningsloggar hjälpa oss spåra problemet. Felsökningsloggarna innehåller användningsdata för applikationen inklusive ditt användarnamn, ID eller alias för rum och grupper du besökt och användarnamn för andra användare. De innehåller inte meddelanden.",
+ "Riot collects anonymous analytics to allow us to improve the application.": "Riot samlar in anonym analysdata för att vi ska kunna förbättra applikationen.",
+ "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Integritet är viktig för oss, så vi samlar inte in några personliga eller identifierbara uppgifter för våra analyser.",
+ "Learn more about how we use analytics.": "Läs mer om hur vi använder analysdata.",
+ "Analytics": "Analysdata",
+ "Send analytics data": "Skicka analysdata",
+ "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "Du har loggats ut från alla enheter och kommer inte längre att få push-meddelanden. För att återaktivera det, logga in på varje enhet igen",
+ "Passphrases must match": "Passfraser måste matcha",
+ "Passphrase must not be empty": "Lösenfras får inte vara tom",
+ "Confirm passphrase": "Bekräfta lösenfrasen",
+ "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ändrade fastnålade meddelanden för rummet.",
+ "Message Pinning": "Nåla fast meddelanden",
+ "Unpin Message": "Ta bort fastnålning",
+ "No pinned messages.": "Inga fastnålade meddelanden.",
+ "Pinned Messages": "Fastnålade meddelanden",
+ "Pin Message": "Nåla fast meddelande",
+ "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Den exporterade filen kommer att låta någon som kan läsa den att dekryptera alla krypterade meddelanden som du kan se, så du bör vara noga med att hålla den säker. För att hjälpa till med detta, bör du ange en lösenfras nedan, som kommer att användas för att kryptera exporterad data. Det kommer bara vara möjligt att importera data genom att använda samma lösenfras.",
+ "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Denna process möjliggör import av krypteringsnycklar som tidigare exporterats från en annan Matrix-klient. Du kommer då kunna dekryptera alla meddelanden som den andra klienten kunde dekryptera.",
+ "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Den exporterade filen kommer vara skyddad med en lösenfras. Du måste ange lösenfrasen här, för att dekryptera filen.",
+ "Tag Panel": "Tagg-panel",
+ "Flair": "Emblem",
+ "Showing flair for these communities:": "Visar emblem för dessa communityn:",
+ "This room is not showing flair for any communities": "Detta rum visar inte emblem för några communityn",
+ "Flair will appear if enabled in room settings": "Emblem kommer visas om det är aktiverat i rumsinställningarna",
+ "Flair will not appear": "Emblem kommer inte att visas",
+ "Display your community flair in rooms configured to show it.": "Visa ditt community-emblem i rum som är konfigurerade för att visa det."
}
From 6a317569d798a5d79e0cc2ef511864a15cb73c0c Mon Sep 17 00:00:00 2001
From: Luke Barnard
Date: Mon, 4 Jun 2018 09:38:21 +0100
Subject: [PATCH 0143/1196] Add null-guard to support browsers that don't
support performance
Like Tor.
Fixes https://github.com/vector-im/riot-web/issues/6781
---
src/components/structures/MatrixChat.js | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 46c1113a1d..e1c9e33055 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -398,6 +398,9 @@ export default React.createClass({
},
startPageChangeTimer() {
+ // Tor doesn't support performance
+ if (!performance || !performance.mark) return null;
+
// This shouldn't happen because componentWillUpdate and componentDidUpdate
// are used.
if (this._pageChanging) {
@@ -409,6 +412,9 @@ export default React.createClass({
},
stopPageChangeTimer() {
+ // Tor doesn't support performance
+ if (!performance || !performance.mark) return null;
+
if (!this._pageChanging) {
console.warn('MatrixChat.stopPageChangeTimer: timer not started');
return;
From 8f135c650e9894da580a9d3debc26fa8e73bbc63 Mon Sep 17 00:00:00 2001
From: Osoitz
Date: Sat, 2 Jun 2018 12:31:10 +0000
Subject: [PATCH 0144/1196] Translated using Weblate (Basque)
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
src/i18n/strings/eu.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index c293ec135d..909b466da3 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -893,7 +893,7 @@
"Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Trepeta ezabatzean gelako kide guztientzat kentzen da. Ziur trepeta ezabatu nahi duzula?",
"%(nameList)s %(transitionList)s": "%(nameList)s%(transitionList)s",
"%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s %(count)s aldiz elkartu dira",
- "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s elkartu da",
+ "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s elkartu dira",
"%(oneUser)sjoined %(count)s times|other": "%(oneUser)s%(count)s aldiz elkartu da",
"%(oneUser)sjoined %(count)s times|one": "%(oneUser)s elkartu da",
"%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s%(count)s aldiz atera dira",
@@ -904,7 +904,7 @@
"%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s elkartu eta atera da",
"%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s elkartu eta atera da %(count)s aldiz",
"%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s elkartu eta atera da",
- "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s atera eta berriz elkartu da %(count)s aldiz",
+ "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s atera eta berriz elkartu dira %(count)s aldiz",
"%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s atera eta berriz elkartu da",
"%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s atera eta berriz elkartu da %(count)s aldiz",
"%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s atera eta berriz elkartu da",
@@ -1192,7 +1192,7 @@
"Yes, I want to help!": "Bai, lagundu nahi dut!",
"This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Honek kontua behin betirako erabilgaitza bihurtuko du. Ezin izango duzu saioa hasi, eta ezin izango du beste inork ID hori erabili. Kontua dagoen gela guztietatik aterako da, eta kontuaren xehetasunak identitate-zerbitzaritik ezabatuko dira. Ekintza hau ezin da desegin.",
"Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Kontua desaktibatzean ez dira zuk bidalitako mezuak ahaztuko. Mezuak ahaztea nahi baduzu markatu beheko kutxa.",
- "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Matrix-eko mezuen ikusgaitasuna e-mail sistemaren antekoa da. Guk zure mezuak ahaztean ez dizkiogu erabiltzaile berriei edo izena eman ez dutenei erakutsiko, baina jada zure mezuak jaso diztuzten erregistratutako erabiltzaileen bere kopia izaten jarraituko dute.",
+ "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Matrix-eko mezuen ikusgaitasuna e-mail sistemaren antekoa da. Guk zure mezuak ahaztean ez dizkiogu erabiltzaile berriei edo izena eman ez dutenei erakutsiko, baina jada zure mezuak jaso dituzten erregistratutako erabiltzaileen bere kopia izaten jarraituko dute.",
"Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Ahaztu bidali ditudan mezu guztiak kontua desaktibatzean (Abisua: Honekin etorkizuneko erabiltzaileek elkarrizketaren bertsio ez oso bat ikusiko dute)",
"Can't leave Server Notices room": "Ezin zara Server Notices gelatik atera",
"This room is used for important messages from the Homeserver, so you cannot leave it.": "Gela hau mezu hasiera zerbitzariaren garrantzitsuak bidaltzeko erabiltzen da, eta ezin zara atera."
From 195d596c896fc6da1730300e4a594db00f74ba43 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev
Date: Wed, 30 May 2018 12:53:39 +0000
Subject: [PATCH 0145/1196] Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
---
src/i18n/strings/bg.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 6295c7e934..d157f4dff8 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -269,7 +269,7 @@
"Enable Notifications": "Включване на известия",
"Cannot add any more widgets": "Не могат да се добавят повече приспособления",
"The maximum permitted number of widgets have already been added to this room.": "Максимално разрешеният брой приспособления е вече добавен към тази стая.",
- "Add a widget": "Добавяне на приспособление",
+ "Add a widget": "Добави приспособление",
"Drop File Here": "Пусни файла тук",
"Drop file here to upload": "Пуснете файла тук, за да се качи",
" (unsupported)": " (не се поддържа)",
@@ -1180,7 +1180,7 @@
"This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Това ще направи акаунта Ви неизползваем завинаги. Няма да можете да влезете пак, а регистрирането повторно на същия потребителски идентификатор няма да е възможно. Акаунтът Ви да напусне всички стаи, в които участва. Ще бъдат премахнати и данните за акаунта Ви от сървъра за самоличност. Действието е необратимо.",
"Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Деактивирането на акаунта Ви по подразбиране не прави така, че изпратените съобщения да бъдат забравени. Ако искате да забравим съобщенията Ви, моля отбележете с отметка по-долу.",
"Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Видимостта на съобщенията в Matrix е подобно на имейл системата. Нашето забравяне означава, че: изпратените от Вас съобщения няма да бъдат споделяни с нови или нерегистрирани потребители, но регистрираните потребители имащи достъп до тях ще продължат да имат достъп до своето копие.",
- "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Моля, забравете всички изпратени съобщения от мен съобщения, когато акаунта ми се деактивира (Внимание: това ще направи бъдещите потребители да имат само частичен поглед върху кореспонденцията)",
+ "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Моля, забравете всички изпратени от мен съобщения, когато акаунта ми се деактивира (Внимание: това ще направи бъдещите потребители да имат само частичен поглед върху кореспонденцията)",
"To continue, please enter your password:": "За да продължите, моля въведете паролата си:",
"password": "парола",
"Can't leave Server Notices room": "Не може да напуснете стая \"Server Notices\"",
From 3c204f1eb8a827d62c932c9300f1d60139585778 Mon Sep 17 00:00:00 2001
From: Nathan van Beelen
Date: Sat, 2 Jun 2018 18:54:14 +0000
Subject: [PATCH 0146/1196] Translated using Weblate (Dutch)
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
---
src/i18n/strings/nl.json | 74 ++++++++++++++++++++--------------------
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index a6df7d69b2..f09c63118e 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -4,7 +4,7 @@
"%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s heeft de uitnodiging voor %(displayName)s geaccepteerd.",
"Account": "Account",
"Access Token:": "Toegangstoken:",
- "Add email address": "Voeg een email address toe",
+ "Add email address": "Voeg een e-mailadres toe",
"Add phone number": "Voeg een telefoonnummer toe",
"Admin": "Beheerder",
"Advanced": "Geavanceerd",
@@ -18,8 +18,8 @@
"A new password must be entered.": "Er moet een nieuw wachtwoord worden ingevoerd.",
"%(senderName)s answered the call.": "%(senderName)s heeft deelgenomen aan het audiogesprek.",
"An error has occurred.": "Er is een fout opgetreden.",
- "Anyone who knows the room's link, apart from guests": "Iedereen die de kamerlink weet, behalve gasten",
- "Anyone who knows the room's link, including guests": "Iedereen die de kamerlink weet, inclusief gasten",
+ "Anyone who knows the room's link, apart from guests": "Iedereen die de link van de ruimte weet, behalve gasten",
+ "Anyone who knows the room's link, including guests": "Iedereen die link van de ruimte weet, inclusief gasten",
"Are you sure?": "Weet je het zeker?",
"Are you sure you want to reject the invitation?": "Weet je zeker dat je de uitnodiging wilt weigeren?",
"Attachment": "Bijlage",
@@ -36,13 +36,13 @@
"Change Password": "Wachtwoord veranderen",
"%(senderName)s changed their profile picture.": "%(senderName)s heeft zijn of haar profielfoto veranderd.",
"%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s heeft het machtsniveau van %(powerLevelDiffText)s gewijzigd.",
- "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s heeft de kamernaam van %(roomName)s gewijzigd.",
+ "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s heeft de ruimtenaam van %(roomName)s gewijzigd.",
"%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s heeft het onderwerp gewijzigd naar \"%(topic)s\".",
"Changes to who can read history will only apply to future messages in this room": "Veranderingen aan wie de geschiedenis kan lezen worden alleen maar toegepast op toekomstige berichten in deze ruimte",
"Changes your display nickname": "Verandert jouw weergavenaam",
"Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Het veranderen van het wachtwoord zal op het moment alle eind-tot-eind encryptie sleutels resetten, wat alle versleutelde gespreksgeschiedenis onleesbaar zou maken, behalve als je eerst je ruimtesleutels exporteert en achteraf opnieuw importeert. Dit zal worden verbeterd in de toekomst.",
- "Clear Cache and Reload": "Legen cache en herlaad",
- "Clear Cache": "Legen cache",
+ "Clear Cache and Reload": "Cache Legen en Herladen",
+ "Clear Cache": "Cache Legen",
"Click here to fix": "Klik hier om op te lossen",
"Click to mute audio": "Klik om audio te dempen",
"Click to mute video": "Klik om de video te dempen",
@@ -53,7 +53,7 @@
"Commands": "Opdrachten",
"Conference call failed.": "Conferentiegesprek mislukt.",
"Conference calling is in development and may not be reliable.": "Conferentiegesprekken zijn nog in ontwikkelingen en kunnen onbetrouwbaar zijn.",
- "Conference calls are not supported in encrypted rooms": "Conferentiegesprekken worden niet ondersteunt in versleutelde kamers",
+ "Conference calls are not supported in encrypted rooms": "Conferentiegesprekken worden niet ondersteunt in versleutelde ruimtes",
"Conference calls are not supported in this client": "Conferentiegesprekken worden niet ondersteunt in deze client",
"Confirm password": "Bevestigen wachtwoord",
"Confirm your new password": "Bevestig je nieuwe wachtwoord",
@@ -93,7 +93,7 @@
"Operation failed": "Actie mislukt",
"powered by Matrix": "mogelijk gemaakt door Matrix",
"Remove": "Verwijderen",
- "Room directory": "Kamerlijst",
+ "Room directory": "Ruimtelijst",
"Settings": "Instellingen",
"Start chat": "Gesprek starten",
"unknown error code": "onbekende foutcode",
@@ -267,7 +267,7 @@
"Hangup": "Ophangen",
"Hide read receipts": "Leesbewijzen verbergen",
"Hide Text Formatting Toolbar": "Tekstopmaakgereedschapsbalk verbergen",
- "Historical": "Historische",
+ "Historical": "Historisch",
"Home": "Home",
"Homeserver is": "Thuisserver is",
"Identity Server is": "Identiteitsserver is",
@@ -295,7 +295,7 @@
"Sign in with": "Inloggen met",
"Join as voice or video .": "Toetreden als spraak of video .",
"Join Room": "Ruimte toetreden",
- "%(targetName)s joined the room.": "%(targetName)s is aan de ruimte toegevoegd.",
+ "%(targetName)s joined the room.": "%(targetName)s is tot de ruimte toegetreden.",
"Joins room with given alias": "Treed de ruimte toe met een gegeven naam",
"Jump to first unread message.": "Spring naar het eerste ongelezen bericht.",
"Labs": "Labs",
@@ -308,9 +308,9 @@
"Login as guest": "Als gast inloggen",
"Logout": "Uitloggen",
"Low priority": "Lage prioriteit",
- "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s heeft de toekomstige ruimtegeschiedenis zichtbaar gemaakt voor alle kamerleden, vanaf het moment dat ze uitgenodigt zijn.",
- "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor alle kamerleden, vanaf het moment dat ze toegetreden zijn.",
- "%(senderName)s made future room history visible to all room members.": "%(senderName)s heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor alle kamerleden.",
+ "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s heeft de toekomstige ruimtegeschiedenis zichtbaar gemaakt voor alle ruimte deelnemers, vanaf het moment dat ze uitgenodigd zijn.",
+ "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor alle ruimte deelnemers, vanaf het moment dat ze toegetreden zijn.",
+ "%(senderName)s made future room history visible to all room members.": "%(senderName)s heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor alle ruimte deelnemers.",
"%(senderName)s made future room history visible to anyone.": "%(senderName)s heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor iedereen.",
"%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor onbekend (%(visibility)s).",
"Manage Integrations": "Integraties beheren",
@@ -349,7 +349,7 @@
"Room name (optional)": "Ruimtenaam (optioneel)",
"%(roomName)s does not exist.": "%(roomName)s bestaat niet.",
"%(roomName)s is not accessible at this time.": "%(roomName)s is niet toegankelijk op dit moment.",
- "Rooms": "Kamers",
+ "Rooms": "Ruimtes",
"Save": "Opslaan",
"Scroll to bottom of page": "Scroll naar de onderkant van de pagina",
"Scroll to unread messages": "Scroll naar ongelezen berichten",
@@ -562,8 +562,8 @@
"Device name": "Apparaat naam",
"Device Name": "Apparaat Naam",
"Device key": "Apparaat sleutel",
- "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Als het overeenkomt, druk op de verifiëren knop hieronder. Als het niet overeenkomt, dan is er iemand anders die dit apparaat onderschept en dan zal je waarschijnlijk in plaats daarvan op de 'buitensluiten' knop willen drukken.",
- "Blacklist": "Buitensluiten",
+ "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Als het overeenkomt, druk op de verifiëren knop hieronder. Als het niet overeenkomt, dan is er iemand anders die dit apparaat onderschept en dan zal je waarschijnlijk in plaats daarvan op de 'blokkeren' knop willen drukken.",
+ "Blacklist": "Blokkeren",
"You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Je bent momenteel geverifieerde apparaten aan het buitensluiten; om berichten naar deze apparaten te versturen moet je ze verifiëren.",
"Unblacklist": "Niet buitensluiten",
"In future this verification process will be more sophisticated.": "In de toekomst zal dit verificatie proces meer geraffineerd zijn.",
@@ -674,17 +674,17 @@
"Copied!": "Gekopieerd!",
"Failed to copy": "Kopiëren mislukt",
"Unpin Message": "Maak pin los",
- "Add rooms to this community": "Voeg kamers toe aan deze community",
+ "Add rooms to this community": "Voeg ruimtes toe aan deze gemeenschap",
"Call Failed": "Oproep mislukt",
"Call": "Bel",
"Answer": "Antwoord",
"Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Opgepast: elke persoon die je toevoegt aan een community zal publiek zichtbaar zijn voor iedereen die het community ID kent",
"Invite new community members": "Nodig nieuwe community leden uit",
"Name or matrix ID": "Naam of Matrix ID",
- "Which rooms would you like to add to this community?": "Welke kamers wil je toevoegen aan deze community?",
+ "Which rooms would you like to add to this community?": "Welke ruimtes wil je toevoegen aan deze community?",
"Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Een widget verwijderen doet dat voor alle gebruikers in deze ruimte. Ben je zeker dat je het widget wil verwijderen?",
"Delete Widget": "Widget verwijderen",
- "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Er zijn onbekende toestellen in deze kamer: als je verder gaat zonder ze te verifieren zal het mogelijk zijn dat iemand je oproep afluistert.",
+ "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Er zijn onbekende toestellen in deze ruimte: als je verder gaat zonder ze te verifiëren zal het mogelijk zijn dat iemand je oproep afluistert.",
"Review Devices": "Toestellen nakijken",
"Call Anyway": "Bel toch",
"Answer Anyway": "Antwoord toch",
@@ -1014,7 +1014,7 @@
"Expand panel": "Paneel uitklappen",
"On": "Aan",
"%(count)s Members|other": "%(count)s Deelnemers",
- "Filter room names": "Filter kamernamen",
+ "Filter room names": "Filter ruimtenamen",
"Changelog": "Logboek van wijzigingen",
"Waiting for response from server": "Wachten op antwoord van de server",
"Send Custom Event": "Verzend aangepast evenement",
@@ -1026,7 +1026,7 @@
"Hide panel": "Paneel verbergen",
"You cannot delete this image. (%(code)s)": "Je kunt deze afbeelding niet verwijderen. (%(code)s)",
"Cancel Sending": "Versturen annuleren",
- "This Room": "Deze kamer",
+ "This Room": "Deze Ruimte",
"The Home Server may be too old to support third party networks": "De thuisserver is misschien te oud om netwerken van derde partijen te ondersteunen",
"Resend": "Opnieuw verzenden",
"Error saving email notification preferences": "Fout bij het opslaan van de meldingsvoorkeuren voor e-mail",
@@ -1035,7 +1035,7 @@
"Unavailable": "Niet beschikbaar",
"View Decrypted Source": "Bekijk ontsleutelde bron",
"Failed to update keywords": "Trefwoorden bijwerken mislukt",
- "remove %(name)s from the directory.": "verwijder %(name)s uit de kamerlijst.",
+ "remove %(name)s from the directory.": "verwijder %(name)s uit de ruimtelijst.",
"Notifications on the following keywords follow rules which can’t be displayed here:": "Meldingen op de volgende trefwoorden volgen regels die hier niet kunnen worden getoond:",
"Safari and Opera work too.": "Safari en Opera werken ook.",
"Please set a password!": "Stel een wachtwoord in!",
@@ -1050,31 +1050,31 @@
"Noisy": "Luidruchtig",
"Failed to get protocol list from Home Server": "Protocollijst ophalen van de homeserver mislukt",
"Collecting app version information": "App-versieinformatie verzamelen",
- "Delete the room alias %(alias)s and remove %(name)s from the directory?": "De alias %(alias)s verwijderen en %(name)s uit de kamerlijst verwijderen?",
+ "Delete the room alias %(alias)s and remove %(name)s from the directory?": "De alias %(alias)s verwijderen en %(name)s uit de ruimtelijst verwijderen?",
"This will allow you to return to your account after signing out, and sign in on other devices.": "Hiermee kunt u naar uw account terugkeren nadat u zich heeft afgemeld, en u aanmelden op andere apparaten.",
"Keywords": "Trefwoorden",
"Enable notifications for this account": "Meldingen voor dit account aanzetten",
- "Directory": "Kamerlijst",
+ "Directory": "Ruimtelijst",
"Invite to this community": "Nodig uit in deze community",
- "Search for a room": "Een kamer opzoeken",
+ "Search for a room": "Een ruimte opzoeken",
"Messages containing keywords": "Berichten die trefwoorden bevatten",
- "Room not found": "De kamer is niet gevonden",
+ "Room not found": "De ruimte is niet gevonden",
"Tuesday": "Dinsdag",
"Enter keywords separated by a comma:": "Voeg trefwoorden toe, gescheiden door een komma:",
"Search…": "Zoeken…",
"You have successfully set a password and an email address!": "Het instellen van een wachtwoord en e-mailadres is geslaagd!",
- "Remove %(name)s from the directory?": "%(name)s uit de kamerlijst verwijderen?",
+ "Remove %(name)s from the directory?": "%(name)s uit de ruimtelijst verwijderen?",
"Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot gebrukt veel geavanceerde browserfuncties, waarvan enkele niet (of experimenteel) in uw webbrowser beschikbaar zijn.",
"Developer Tools": "Ontwikkelaarsgereedschap",
"Enable desktop notifications": "Desktopmeldingen aanzetten",
"Explore Account Data": "Bekijk account informatie",
- "Remove from Directory": "Uit de kamerlijst verwijderen",
+ "Remove from Directory": "Uit de ruimtelijst verwijderen",
"Saturday": "Zaterdag",
"Remember, you can always set an email address in user settings if you change your mind.": "Onthoud dat u altijd een e-mailadres in kan stellen in de gebruikersinstellingen als u zich bedenkt.",
"Direct Chat": "Privégesprek",
"The server may be unavailable or overloaded": "De server is misschien niet beschikbaar of overbelast",
"Reject": "Afwijzen",
- "Failed to set Direct Message status of room": "Het is mislukt om de directe-berichtenstatus van de kamer in te stellen",
+ "Failed to set Direct Message status of room": "Het is niet gelukt om de privéchat status van de ruimte in te stellen",
"Monday": "Maandag",
"All messages (noisy)": "Alle berichten (luid)",
"Enable them now": "Deze nu aanzetten",
@@ -1084,9 +1084,9 @@
"more": "meer",
"You must specify an event type!": "Je moet een event-type specificeren!",
"(HTTP status %(httpStatus)s)": "(HTTP-status %(httpStatus)s)",
- "Invite to this room": "Uitnodigen voor deze kamer",
+ "Invite to this room": "Uitnodigen voor deze ruimte",
"Please install Chrome or Firefox for the best experience.": "Installeer alstublieft Chrome of Firefox voor de beste gebruikerservaring.",
- "Failed to get public room list": "Lijst met publieke kamers ophalen mislukt",
+ "Failed to get public room list": "Lijst met publieke ruimtes ophalen mislukt",
"Send logs": "Logboeken versturen",
"All messages": "Alle berichten",
"Call invitation": "Oproep-uitnodiging",
@@ -1095,12 +1095,12 @@
"Failed to send custom event.": "Aangepast Event verzenden mislukt.",
"What's new?": "Wat is er nieuw?",
"Notify me for anything else": "Stuur een melding voor al het andere",
- "When I'm invited to a room": "Wanneer ik uitgenodigd word voor een kamer",
+ "When I'm invited to a room": "Wanneer ik uitgenodigd word voor een ruimte",
"Can't update user notification settings": "Het is niet gelukt om de meldingsinstellingen van de gebruiker bij te werken",
- "Notify for all other messages/rooms": "Stuur een melding voor alle andere berichten/kamers",
- "Unable to look up room ID from server": "Het is mislukt om de kamer-ID op te halen van de server",
- "Couldn't find a matching Matrix room": "Het is niet gelukt om een bijbehorende Matrix-kamer te vinden",
- "All Rooms": "Alle kamers",
+ "Notify for all other messages/rooms": "Stuur een melding voor alle andere berichten/ruimtes",
+ "Unable to look up room ID from server": "Het is mislukt om het ruimte-ID op te halen van de server",
+ "Couldn't find a matching Matrix room": "Het is niet gelukt om een bijbehorende Matrix-ruimte te vinden",
+ "All Rooms": "Alle Ruimtes",
"You cannot delete this message. (%(code)s)": "Je kunt dit bericht niet verwijderen. (%(code)s)",
"Thursday": "Donderdag",
"Forward Message": "Bericht doorsturen",
@@ -1122,7 +1122,7 @@
"Enable audible notifications in web client": "Geluidsmeldingen in de webclient aanzetten",
"Permalink": "Permanente link",
"Off": "Uit",
- "Riot does not know how to join a room on this network": "Riot weet niet hoe het moet deelnemen in een kamer op dit netwerk",
+ "Riot does not know how to join a room on this network": "Riot weet niet hoe het moet deelnemen in een ruimte op dit netwerk",
"Mentions only": "Alleen vermeldingen",
"Wednesday": "Woensdag",
"You can now return to your account after signing out, and sign in on other devices.": "U kunt nu terugkeren naar uw account nadat u bent afgemeld, en u aanmelden op andere apparaten.",
From c792ae1c6fba7bf93ee079ba06d630da8d2f74c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?=
Date: Tue, 29 May 2018 15:48:56 +0000
Subject: [PATCH 0147/1196] Translated using Weblate (Slovak)
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
---
src/i18n/strings/sk.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index daa9cfc9b6..ed07ff5c09 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -735,7 +735,7 @@
"Enable automatic language detection for syntax highlighting": "Povoliť automatickú detegciu jazyka pre zvýrazňovanie syntaxe",
"Automatically replace plain text Emoji": "Automaticky nahrádzať textové Emoji",
"Disable Emoji suggestions while typing": "Zakázať návrhy Emoji počas písania",
- "Hide avatars in user and room mentions": "Skryť avatarov pri zmienkach miestností a používateľov",
+ "Hide avatars in user and room mentions": "Skryť profilové obrázky pri zmienkach miestností a používateľov",
"Disable big emoji in chat": "Zakázať veľké Emoji v konverzácii",
"Mirror local video feed": "Zrkadliť lokálne video",
"Disable Peer-to-Peer for 1:1 calls": "Zakázať P2P počas priamych volaní",
From bf0d03bce364521e760e37ec8ccdf2b0b16a114e Mon Sep 17 00:00:00 2001
From: Akihiko Odaki
Date: Wed, 6 Jun 2018 16:30:24 +0900
Subject: [PATCH 0148/1196] Import react as React in
src/components/views/elements/DNDTagTile.js
Signed-off-by: Akihiko Odaki
---
src/components/views/elements/DNDTagTile.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/components/views/elements/DNDTagTile.js b/src/components/views/elements/DNDTagTile.js
index 9d8ecc1da6..7aa642986b 100644
--- a/src/components/views/elements/DNDTagTile.js
+++ b/src/components/views/elements/DNDTagTile.js
@@ -17,6 +17,7 @@ limitations under the License.
import TagTile from './TagTile';
+import React from 'react';
import { Draggable } from 'react-beautiful-dnd';
export default function DNDTagTile(props) {
From 03d67988e86a9100a1463e3464fa5a35408bb1f0 Mon Sep 17 00:00:00 2001
From: Walter
Date: Wed, 6 Jun 2018 13:40:48 +0000
Subject: [PATCH 0149/1196] Translated using Weblate (Russian)
Currently translated at 99.8% (1188 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
src/i18n/strings/ru.json | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 0a254736b8..9d7f8901ab 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1188,5 +1188,7 @@
"Please help improve Riot.im by sending anonymous usage data . This will use a cookie.": "Пожалуйста, помогите улучшить Riot.im, отправляя анонимные данные использования . При этом будут использоваться cookie.",
"Yes, I want to help!": "Да, я хочу помочь!",
"Reload widget": "Перезагрузить виджет",
- "To notify everyone in the room, you must be a": "Для уведомления всех в комнате, вы должны быть"
+ "To notify everyone in the room, you must be a": "Для уведомления всех в комнате, вы должны быть",
+ "Can't leave Server Notices room": "Невозможно покинуть комнату для сервера по заметкам",
+ "This room is used for important messages from the Homeserver, so you cannot leave it.": "Эта комната для важных сообщений от сервера, потому ее не возможно покинуть."
}
From 881e9a8070ea368482a59895619cb0bc23f7b8d4 Mon Sep 17 00:00:00 2001
From: David Baker
Date: Wed, 6 Jun 2018 16:00:16 +0100
Subject: [PATCH 0150/1196] js-sdk rc.1
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 96c37a61c8..6722cfc3c3 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
"linkifyjs": "^2.1.3",
"lodash": "^4.13.1",
"lolex": "2.3.2",
- "matrix-js-sdk": "0.10.3",
+ "matrix-js-sdk": "0.10.4-rc.1",
"optimist": "^0.6.1",
"pako": "^1.0.5",
"prop-types": "^15.5.8",
From c8bf74350677f1b21e94dc1310437baa960b4eec Mon Sep 17 00:00:00 2001
From: David Baker
Date: Wed, 6 Jun 2018 16:06:44 +0100
Subject: [PATCH 0151/1196] Prepare changelog for v0.12.7-rc.1
---
CHANGELOG.md | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1951875ee..ae8f535cb6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,22 @@
+Changes in [0.12.7-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.7-rc.1) (2018-06-06)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.6...v0.12.7-rc.1)
+
+ * Update from Weblate.
+ [\#1944](https://github.com/matrix-org/matrix-react-sdk/pull/1944)
+ * Import react as React in src/components/views/elements/DNDTagTile.js
+ [\#1943](https://github.com/matrix-org/matrix-react-sdk/pull/1943)
+ * Fix click on faded left/right/middle panel -> close settings
+ [\#1940](https://github.com/matrix-org/matrix-react-sdk/pull/1940)
+ * Add null-guard to support browsers that don't support performance
+ [\#1942](https://github.com/matrix-org/matrix-react-sdk/pull/1942)
+ * Support third party integration managers in AppPermission
+ [\#1455](https://github.com/matrix-org/matrix-react-sdk/pull/1455)
+ * Update pinned messages in real time
+ [\#1934](https://github.com/matrix-org/matrix-react-sdk/pull/1934)
+ * Expose at-room power level setting
+ [\#1938](https://github.com/matrix-org/matrix-react-sdk/pull/1938)
+
Changes in [0.12.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.6) (2018-05-25)
=====================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.6-rc.1...v0.12.6)
From 4834816a0625e0215e5f6a2bf8ba660e5f261cf1 Mon Sep 17 00:00:00 2001
From: David Baker
Date: Wed, 6 Jun 2018 16:06:45 +0100
Subject: [PATCH 0152/1196] v0.12.7-rc.1
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 6722cfc3c3..6add75f972 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "matrix-react-sdk",
- "version": "0.12.6",
+ "version": "0.12.7-rc.1",
"description": "SDK for matrix.org using React",
"author": "matrix.org",
"repository": {
From c91e6cb530b3e1050b2248b831da23a0dc548060 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 7 Jun 2018 01:02:34 +0100
Subject: [PATCH 0153/1196] make click to insert nick work on join/parts, /me's
etc
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
res/css/_components.scss | 1 +
res/css/views/elements/_TextForEvent.scss | 19 +++
src/TextForEvent.js | 158 +++++++++++++---------
3 files changed, 113 insertions(+), 65 deletions(-)
create mode 100644 res/css/views/elements/_TextForEvent.scss
diff --git a/res/css/_components.scss b/res/css/_components.scss
index 2734939ae3..3f36b6bbdf 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -59,6 +59,7 @@
@import "./views/elements/_RoleButton.scss";
@import "./views/elements/_Spinner.scss";
@import "./views/elements/_SyntaxHighlight.scss";
+@import "./views/elements/_TextForEvent.scss";
@import "./views/elements/_ToolTipButton.scss";
@import "./views/globals/_MatrixToolbar.scss";
@import "./views/groups/_GroupPublicityToggle.scss";
diff --git a/res/css/views/elements/_TextForEvent.scss b/res/css/views/elements/_TextForEvent.scss
new file mode 100644
index 0000000000..8d46cbf84c
--- /dev/null
+++ b/res/css/views/elements/_TextForEvent.scss
@@ -0,0 +1,19 @@
+/*
+Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_TextForEvent_username {
+ cursor: pointer;
+}
diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 712150af4d..0cdaaac4ab 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -17,11 +17,28 @@ import MatrixClientPeg from './MatrixClientPeg';
import CallHandler from './CallHandler';
import { _t } from './languageHandler';
import * as Roles from './Roles';
+import dis from "./dispatcher";
+import React from 'react';
+
+function onUsernameClick(e) {
+ dis.dispatch({
+ action: 'insert_mention',
+ user_id: e.target.id,
+ });
+}
+
+function makeUsernameSpan(mxid, text) {
+ return { text };
+}
function textForMemberEvent(ev) {
// XXX: SYJS-16 "sender is sometimes null for join messages"
const senderName = ev.sender ? ev.sender.name : ev.getSender();
const targetName = ev.target ? ev.target.name : ev.getStateKey();
+
+ const sender = makeUsernameSpan(ev.getSender(), senderName);
+ const target = makeUsernameSpan(ev.getStateKey(), targetName);
+
const prevContent = ev.getPrevContent();
const content = ev.getContent();
@@ -32,47 +49,48 @@ function textForMemberEvent(ev) {
const threePidContent = content.third_party_invite;
if (threePidContent) {
if (threePidContent.display_name) {
- return _t('%(targetName)s accepted the invitation for %(displayName)s.', {
- targetName,
+ return _t(' accepted the invitation for %(displayName)s.', {
displayName: threePidContent.display_name,
+ }, {
+ target,
});
} else {
- return _t('%(targetName)s accepted an invitation.', {targetName});
+ return _t(' accepted an invitation.', {}, {target});
}
} else {
if (ConferenceHandler && ConferenceHandler.isConferenceUser(ev.getStateKey())) {
- return _t('%(senderName)s requested a VoIP conference.', {senderName});
+ return _t(' requested a VoIP conference.', {}, {sender});
} else {
- return _t('%(senderName)s invited %(targetName)s.', {senderName, targetName});
+ return _t(' invited .', {}, {sender, target});
}
}
}
case 'ban':
- return _t('%(senderName)s banned %(targetName)s.', {senderName, targetName}) + ' ' + reason;
+ return _t(' banned .', {}, {sender, target}) + ' ' + reason;
case 'join':
if (prevContent && prevContent.membership === 'join') {
if (prevContent.displayname && content.displayname && prevContent.displayname !== content.displayname) {
- return _t('%(oldDisplayName)s changed their display name to %(displayName)s.', {
- oldDisplayName: prevContent.displayname,
- displayName: content.displayname,
+ return _t(' changed their display name to .', {}, {
+ oldDisplayName: makeUsernameSpan(ev.getStateKey(), prevContent.displayname),
+ displayName: makeUsernameSpan(ev.getStateKey(), content.displayname),
});
} else if (!prevContent.displayname && content.displayname) {
- return _t('%(senderName)s set their display name to %(displayName)s.', {
- senderName: ev.getSender(),
- displayName: content.displayname,
+ return _t(' set their display name to .', {}, {
+ sender,
+ displayName: makeUsernameSpan(ev.getSender(), content.displayname),
});
} else if (prevContent.displayname && !content.displayname) {
- return _t('%(senderName)s removed their display name (%(oldDisplayName)s).', {
- senderName,
- oldDisplayName: prevContent.displayname,
+ return _t(' removed their display name ().', {
+ sender,
+ oldDisplayName: makeUsernameSpan(ev.getSender(), prevContent.displayname),
});
} else if (prevContent.avatar_url && !content.avatar_url) {
- return _t('%(senderName)s removed their profile picture.', {senderName});
+ return _t(' removed their profile picture.', {}, {sender});
} else if (prevContent.avatar_url && content.avatar_url &&
prevContent.avatar_url !== content.avatar_url) {
- return _t('%(senderName)s changed their profile picture.', {senderName});
+ return _t(' changed their profile picture.', {}, {sender});
} else if (!prevContent.avatar_url && content.avatar_url) {
- return _t('%(senderName)s set a profile picture.', {senderName});
+ return _t(' set a profile picture.', {}, {sender});
} else {
// suppress null rejoins
return '';
@@ -82,7 +100,7 @@ function textForMemberEvent(ev) {
if (ConferenceHandler && ConferenceHandler.isConferenceUser(ev.getStateKey())) {
return _t('VoIP conference started.');
} else {
- return _t('%(targetName)s joined the room.', {targetName});
+ return _t(' joined the room.', {}, {target});
}
}
case 'leave':
@@ -90,42 +108,42 @@ function textForMemberEvent(ev) {
if (ConferenceHandler && ConferenceHandler.isConferenceUser(ev.getStateKey())) {
return _t('VoIP conference finished.');
} else if (prevContent.membership === "invite") {
- return _t('%(targetName)s rejected the invitation.', {targetName});
+ return _t(' rejected the invitation.', {}, {target});
} else {
- return _t('%(targetName)s left the room.', {targetName});
+ return _t(' left the room.', {}, {target});
}
} else if (prevContent.membership === "ban") {
- return _t('%(senderName)s unbanned %(targetName)s.', {senderName, targetName});
+ return _t(' unbanned .', {}, {sender, target});
} else if (prevContent.membership === "join") {
- return _t('%(senderName)s kicked %(targetName)s.', {senderName, targetName}) + ' ' + reason;
+ return _t(' kicked .', {}, {sender, target}) + ' ' + reason;
} else if (prevContent.membership === "invite") {
- return _t('%(senderName)s withdrew %(targetName)s\'s invitation.', {
- senderName,
- targetName,
- }) + ' ' + reason;
+ return _t(' withdrew \'s invitation.', {}, {sender, target}) + ' ' + reason;
} else {
- return _t('%(targetName)s left the room.', {targetName});
+ return _t(' left the room.', {}, {target});
}
}
}
function textForTopicEvent(ev) {
const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
- return _t('%(senderDisplayName)s changed the topic to "%(topic)s".', {
- senderDisplayName,
+ return _t(' changed the topic to "%(topic)s".', {
topic: ev.getContent().topic,
+ }, {
+ sender: makeUsernameSpan(ev.getSender(), senderDisplayName),
});
}
function textForRoomNameEvent(ev) {
const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
+ const sender = makeUsernameSpan(ev.getSender(), senderDisplayName);
if (!ev.getContent().name || ev.getContent().name.trim().length === 0) {
- return _t('%(senderDisplayName)s removed the room name.', {senderDisplayName});
+ return _t(' removed the room name.', {}, {sender});
}
- return _t('%(senderDisplayName)s changed the room name to %(roomName)s.', {
- senderDisplayName,
+ return _t(' changed the room name to %(roomName)s.', {
roomName: ev.getContent().name,
+ }, {
+ sender,
});
}
@@ -135,7 +153,9 @@ function textForMessageEvent(ev) {
if (ev.getContent().msgtype === "m.emote") {
message = "* " + senderDisplayName + " " + message;
} else if (ev.getContent().msgtype === "m.image") {
- message = _t('%(senderDisplayName)s sent an image.', {senderDisplayName});
+ message = _t(' sent an image.', {}, {
+ sender: makeUsernameSpan(ev.getSender(), senderDisplayName),
+ });
}
return message;
}
@@ -143,7 +163,9 @@ function textForMessageEvent(ev) {
function textForCallAnswerEvent(event) {
const senderName = event.sender ? event.sender.name : _t('Someone');
const supported = MatrixClientPeg.get().supportsVoip() ? '' : _t('(not supported by this browser)');
- return _t('%(senderName)s answered the call.', {senderName}) + ' ' + supported;
+ return _t(' answered the call.', {}, {
+ sender: makeUsernameSpan(event.getSender(), senderName),
+ }) + ' ' + supported;
}
function textForCallHangupEvent(event) {
@@ -161,11 +183,14 @@ function textForCallHangupEvent(event) {
reason = _t('(unknown failure: %(reason)s)', {reason: eventContent.reason});
}
}
- return _t('%(senderName)s ended the call.', {senderName}) + ' ' + reason;
+ return _t(' ended the call.', {}, {
+ sender: makeUsernameSpan(event.getSender(), senderName),
+ }) + ' ' + reason;
}
function textForCallInviteEvent(event) {
const senderName = event.sender ? event.sender.name : _t('Someone');
+ const sender = makeUsernameSpan(event.getSender(), senderName);
// FIXME: Find a better way to determine this from the event?
let callType = "voice";
if (event.getContent().offer && event.getContent().offer.sdp &&
@@ -173,43 +198,47 @@ function textForCallInviteEvent(event) {
callType = "video";
}
const supported = MatrixClientPeg.get().supportsVoip() ? "" : _t('(not supported by this browser)');
- return _t('%(senderName)s placed a %(callType)s call.', {senderName, callType}) + ' ' + supported;
+ return _t(' placed a %(callType)s call.', {callType}, {sender}) + ' ' + supported;
}
function textForThreePidInviteEvent(event) {
const senderName = event.sender ? event.sender.name : event.getSender();
- return _t('%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.', {
- senderName,
+ return _t(' sent an invitation to %(targetDisplayName)s to join the room.', {
targetDisplayName: event.getContent().display_name,
+ }, {
+ sender: makeUsernameSpan(event.getSender(), senderName),
});
}
function textForHistoryVisibilityEvent(event) {
const senderName = event.sender ? event.sender.name : event.getSender();
+ const sender = makeUsernameSpan(event.getSender(), senderName);
switch (event.getContent().history_visibility) {
case 'invited':
- return _t('%(senderName)s made future room history visible to all room members, '
- + 'from the point they are invited.', {senderName});
+ return _t(' made future room history visible to all room members, '
+ + 'from the point they are invited.', {}, {sender});
case 'joined':
- return _t('%(senderName)s made future room history visible to all room members, '
- + 'from the point they joined.', {senderName});
+ return _t(' made future room history visible to all room members, '
+ + 'from the point they joined.', {}, {sender});
case 'shared':
- return _t('%(senderName)s made future room history visible to all room members.', {senderName});
+ return _t(' made future room history visible to all room members.', {}, {sender});
case 'world_readable':
- return _t('%(senderName)s made future room history visible to anyone.', {senderName});
+ return _t(' made future room history visible to anyone.', {}, {sender});
default:
- return _t('%(senderName)s made future room history visible to unknown (%(visibility)s).', {
- senderName,
+ return _t(' made future room history visible to unknown (%(visibility)s).', {
visibility: event.getContent().history_visibility,
+ }, {
+ sender,
});
}
}
function textForEncryptionEvent(event) {
const senderName = event.sender ? event.sender.name : event.getSender();
- return _t('%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).', {
- senderName,
+ return _t(' turned on end-to-end encryption (algorithm %(algorithm)s).', {
algorithm: event.getContent().algorithm,
+ }, {
+ sender: makeUsernameSpan(event.getSender(), senderName),
});
}
@@ -241,10 +270,11 @@ function textForPowerEvent(event) {
const to = event.getContent().users[userId];
if (to !== from) {
diff.push(
- _t('%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s', {
- userId,
+ _t(' from %(fromPowerLevel)s to %(toPowerLevel)s', {
fromPowerLevel: Roles.textualPowerLevel(from, userDefault),
toPowerLevel: Roles.textualPowerLevel(to, userDefault),
+ }, {
+ user: makeUsernameSpan(userId, userId),
}),
);
}
@@ -252,19 +282,23 @@ function textForPowerEvent(event) {
if (!diff.length) {
return '';
}
- return _t('%(senderName)s changed the power level of %(powerLevelDiffText)s.', {
- senderName,
+ return _t(' changed the power level of %(powerLevelDiffText)s.', {
powerLevelDiffText: diff.join(", "),
+ }, {
+ sender: makeUsernameSpan(event.getSender(), senderName),
});
}
function textForPinnedEvent(event) {
- const senderName = event.getSender();
- return _t("%(senderName)s changed the pinned messages for the room.", {senderName});
+ const senderName = event.sender ? event.sender.name : event.getSender();
+ const sender = makeUsernameSpan(event.getSender(), senderName);
+ return _t(" changed the pinned messages for the room.", {}, {sender});
}
function textForWidgetEvent(event) {
- const senderName = event.getSender();
+ const senderName = event.sender ? event.sender.name : event.getSender();
+ const sender = makeUsernameSpan(event.getSender(), senderName);
+
const {name: prevName, type: prevType, url: prevUrl} = event.getPrevContent();
const {name, type, url} = event.getContent() || {};
@@ -278,18 +312,12 @@ function textForWidgetEvent(event) {
// equivalent to that condition.
if (url) {
if (prevUrl) {
- return _t('%(widgetName)s widget modified by %(senderName)s', {
- widgetName, senderName,
- });
+ return _t('%(widgetName)s widget modified by ', {widgetName}, {sender});
} else {
- return _t('%(widgetName)s widget added by %(senderName)s', {
- widgetName, senderName,
- });
+ return _t('%(widgetName)s widget added by ', {widgetName}, {sender});
}
} else {
- return _t('%(widgetName)s widget removed by %(senderName)s', {
- widgetName, senderName,
- });
+ return _t('%(widgetName)s widget removed by ', {widgetName}, {sender});
}
}
From 89b927e2784e592dcc022e0454a3a7cf22021143 Mon Sep 17 00:00:00 2001
From: Silvano
Date: Thu, 7 Jun 2018 15:27:19 +0000
Subject: [PATCH 0154/1196] Translated using Weblate (Italian)
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
---
src/i18n/strings/it.json | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index fa22725f78..bb931e17ea 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1184,5 +1184,12 @@
"Terms and Conditions": "Termini e condizioni",
"To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Per continuare a usare l'homeserver %(homeserverDomain)s devi leggere e accettare i nostri termini e condizioni.",
"Review terms and conditions": "Leggi i termini e condizioni",
- "Muted Users": "Utenti silenziati"
+ "Muted Users": "Utenti silenziati",
+ "Message Replies": "Risposte",
+ "Message Pinning": "Messaggi appuntati",
+ "Mirror local video feed": "Feed video dai ripetitori locali",
+ "Replying": "Rispondere",
+ "Popout widget": "Oggetto a comparsa",
+ "Failed to indicate account erasure": "Impossibile indicare la cancellazione dell'account",
+ "Bulk Options": "Opzioni applicate in massa"
}
From 0b9b03c9ee4a357b4756dfe55d9343e131641e4a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 7 Jun 2018 22:01:27 +0100
Subject: [PATCH 0155/1196] re-run checkIfAlone if a member change occurred in
the active room
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/RoomView.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index c5f6a75cc5..0c62f5a874 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -672,6 +672,7 @@ module.exports = React.createClass({
}
this._updateRoomMembers();
+ this._checkIfAlone(this.state.room);
},
onRoomMemberMembership: function(ev, member, oldMembership) {
From 92c146bcacb578b2ee73c9e633d5d819c4208d25 Mon Sep 17 00:00:00 2001
From: Yao Wei
Date: Thu, 7 Jun 2018 08:29:20 +0000
Subject: [PATCH 0156/1196] Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
---
src/i18n/strings/zh_Hant.json | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 80dce1cc2d..3677b78ec9 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -152,7 +152,7 @@
"Server unavailable, overloaded, or something else went wrong.": "伺服器可能不可用、超載，或者其他東西出錯了.",
"Session ID": "會話 ID",
"%(senderName)s set a profile picture.": "%(senderName)s 設置了頭像。.",
- "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s 將暱稱改為了 %(displayName)s。.",
+ "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s 將他的暱稱改成 %(displayName)s。.",
"Settings": "設定",
"Show panel": "顯示側邊欄",
"Show timestamps in 12 hour format (e.g. 2:30pm)": "用12小時制顯示時間戳 （如：下午 2:30）",
@@ -193,11 +193,11 @@
"%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s 更改了聊天室 %(roomName)s 圖像",
"Cancel": "取消",
"Custom Server Options": "自訂伺服器選項",
- "Dismiss": "無視",
+ "Dismiss": "關閉",
"Mute": "靜音",
"Notifications": "通知",
"Operation failed": "操作失敗",
- "powered by Matrix": "由 Matrix 架設",
+ "powered by Matrix": "由 Matrix 提供",
"Remove": "移除",
"unknown error code": "未知的錯誤代碼",
"OK": "確定",
@@ -250,7 +250,7 @@
"Are you sure you want to leave the room '%(roomName)s'?": "您確定您要想要離開房間 '%(roomName)s' 嗎？",
"Bans user with given id": "禁止有指定 ID 的使用者",
"Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "無法連線到家伺服器 - 請檢查您的連線，確保您的家伺服器的 SSL 憑證可被信任，而瀏覽器擴充套件也沒有阻擋請求。",
- "%(senderName)s changed their profile picture.": "%(senderName)s 已經變更了他們的基本資料圖片。",
+ "%(senderName)s changed their profile picture.": "%(senderName)s 已經變更了他的基本資料圖片。",
"%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s 變更了 %(powerLevelDiffText)s 權限等級。",
"%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s 將房間名稱變更為 %(roomName)s。",
"%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s 已經移除了房間名稱。",
@@ -381,8 +381,8 @@
"Rejoin": "重新加入",
"Remote addresses for this room:": "此房間的遠端地址：",
"Remove Contact Information?": "移除聯絡人資訊？",
- "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s 移除了他們的顯示名稱 (%(oldDisplayName)s)。",
- "%(senderName)s removed their profile picture.": "%(senderName)s 移除了他們的基本資寮圖片。",
+ "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s 移除了他的顯示名稱 (%(oldDisplayName)s)。",
+ "%(senderName)s removed their profile picture.": "%(senderName)s 移除了他的基本資料圖片。",
"Remove %(threePid)s?": "移除 %(threePid)s？",
"%(senderName)s requested a VoIP conference.": "%(senderName)s 請求了一次 VoIP 會議。",
"Results from DuckDuckGo": "DuckDuckGo 的結果",
@@ -962,7 +962,7 @@
"Community IDs cannot not be empty.": "社群 ID 不能為空。",
"Show devices , send anyway or cancel .": "顯示裝置 、無論如何都要傳送 或取消 。",
"In reply to ": "回覆給 ",
- "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s 變更了他們的顯示名稱為 %(displayName)s 。",
+ "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s 變更了他的顯示名稱為 %(displayName)s 。",
"Failed to set direct chat tag": "設定直接聊天標籤失敗",
"Failed to remove tag %(tagName)s from room": "從聊天室移除標籤 %(tagName)s 失敗",
"Failed to add tag %(tagName)s to room": "新增標籤 %(tagName)s 到聊天室失敗",
From b8cc438cb363c74e646efbeb1df2037de66e03ce Mon Sep 17 00:00:00 2001
From: Andrey
Date: Wed, 6 Jun 2018 15:35:30 +0000
Subject: [PATCH 0157/1196] Translated using Weblate (Russian)
Currently translated at 99.8% (1188 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
src/i18n/strings/ru.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 9d7f8901ab..dcde72d23a 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1189,6 +1189,6 @@
"Yes, I want to help!": "Да, я хочу помочь!",
"Reload widget": "Перезагрузить виджет",
"To notify everyone in the room, you must be a": "Для уведомления всех в комнате, вы должны быть",
- "Can't leave Server Notices room": "Невозможно покинуть комнату для сервера по заметкам",
- "This room is used for important messages from the Homeserver, so you cannot leave it.": "Эта комната для важных сообщений от сервера, потому ее не возможно покинуть."
+ "Can't leave Server Notices room": "Невозможно покинуть комнату сервера уведомлений",
+ "This room is used for important messages from the Homeserver, so you cannot leave it.": "Эта комната используется для важных сообщений от сервера, поэтому вы не можете ее покинуть."
}
From 62978b7a2b49747999927d52e5123d8dee5a432a Mon Sep 17 00:00:00 2001
From: Kenneth Larsson
Date: Thu, 7 Jun 2018 13:57:55 +0000
Subject: [PATCH 0158/1196] Translated using Weblate (Swedish)
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
src/i18n/strings/sv.json | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 8e5d8e2f21..14940ed1c3 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -149,7 +149,7 @@
"Add": "Lägg till",
"Admin Tools": "Admin-verktyg",
"Alias (optional)": "Alias (valfri)",
- "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Det gick inte att ansluta till servern - kontrollera anslutningen, försäkra att din hemservers TLS-certifikat är betrott, och att inget webbläsartillägg blockerar förfrågningar.",
+ "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Det gick inte att ansluta till hemservern - kontrollera anslutningen, se till att hemserverns SSL-certifikat är betrott, och att inget webbläsartillägg blockerar förfrågningar.",
"%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ändrade behörighetsnivå för %(powerLevelDiffText)s.",
"Click here to join the discussion!": "Klicka här för att gå med i diskussionen!",
"Close": "Stäng",
@@ -290,7 +290,7 @@
"Register": "Registrera",
"%(targetName)s rejected the invitation.": "%(targetName)s avvisade inbjudan.",
"Reject invitation": "Avböj inbjudan",
- "Rejoin": "Gå med tillbaka",
+ "Rejoin": "Gå med igen",
"Remote addresses for this room:": "Fjärradresser för det här rummet:",
"Remove Contact Information?": "Ta bort kontaktuppgifter?",
"%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s tog bort sitt visningsnamn (%(oldDisplayName)s).",
@@ -326,7 +326,7 @@
"%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s bjöd in %(targetDisplayName)s med i rummet.",
"Server error": "Serverfel",
"Server may be unavailable or overloaded": "Servern kan vara otillgänglig eller överbelastad",
- "Server may be unavailable, overloaded, or search timed out :(": "Servern kan vara otillgänglig, överbelastad, eller så timade sökningen ut :(",
+ "Server may be unavailable, overloaded, or search timed out :(": "Servern kan vara otillgänglig, överbelastad, eller så tog sökningen för lång tid :(",
"Server may be unavailable, overloaded, or the file too big": "Servern kan vara otillgänglig, överbelastad, eller så är filen för stor",
"Server may be unavailable, overloaded, or you hit a bug.": "Servern kan vara otillgänglig, överbelastad, eller så stötte du på en bugg.",
"Server unavailable, overloaded, or something else went wrong.": "Servern är otillgänglig, överbelastad, eller så gick något annat fel.",
@@ -347,7 +347,7 @@
"Start Chat": "Starta en chatt",
"Cancel": "Avbryt",
"Create new room": "Skapa nytt rum",
- "Custom Server Options": "Egna serverinställningar",
+ "Custom Server Options": "Anpassade serverinställningar",
"Dismiss": "Avvisa",
"powered by Matrix": "drivs av Matrix",
"Room directory": "Rumskatalog",
@@ -380,7 +380,7 @@
"The email address linked to your account must be entered.": "Epostadressen som är kopplad till ditt konto måste anges.",
"The file '%(fileName)s' exceeds this home server's size limit for uploads": "Filen '%(fileName)s' överskrider serverns största tillåtna filstorlek",
"The file '%(fileName)s' failed to upload": "Filen '%(fileName)s' kunde inte laddas upp",
- "Online": "Aktiv",
+ "Online": "Online",
"Unnamed room": "Namnlöst rum",
"World readable": "Alla kan läsa",
"Guests can join": "Gäster kan bli medlem i rummet",
@@ -467,7 +467,7 @@
"Room not found": "Rummet hittades inte",
"Messages containing my display name": "Meddelanden som innehåller mitt namn",
"Messages in one-to-one chats": "Meddelanden i privata chattar",
- "Unavailable": "Inte tillgänglig",
+ "Unavailable": "Otillgänglig",
"View Decrypted Source": "Visa dekrypterad källa",
"Failed to update keywords": "Det gick inte att uppdatera nyckelorden",
"remove %(name)s from the directory.": "ta bort %(name)s från katalogen.",
@@ -503,7 +503,7 @@
"Saturday": "lördag",
"I understand the risks and wish to continue": "Jag förstår riskerna och vill fortsätta",
"Direct Chat": "Direkt-chatt",
- "The server may be unavailable or overloaded": "Servern kan vara överbelastad eller inte tillgänglig",
+ "The server may be unavailable or overloaded": "Servern kan vara otillgänglig eller överbelastad",
"Reject": "Avböj",
"Failed to set Direct Message status of room": "Det gick inte att ställa in direktmeddelandestatus för rummet",
"Monday": "måndag",
@@ -561,7 +561,7 @@
"View Source": "Visa källa",
"Thank you!": "Tack!",
"Quote": "Citera",
- "Collapse panel": "Kollapsa panel",
+ "Collapse panel": "Dölj panel",
"With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Med din nuvarande webbläsare kan appens utseende vara helt fel, och vissa eller alla egenskaper kommer nödvändigtvis inte att fungera. Om du ändå vill försöka så kan du fortsätta, men gör det på egen risk!",
"Checking for an update...": "Letar efter uppdateringar...",
"There are advanced notifications which are not shown here": "Det finns avancerade aviseringar som inte visas här",
@@ -638,7 +638,7 @@
"%(duration)sm": "%(duration)sm",
"%(duration)sh": "%(duration)sh",
"%(duration)sd": "%(duration)sd",
- "Online for %(duration)s": "Aktiv i %(duration)s",
+ "Online for %(duration)s": "Online i %(duration)s",
"Idle for %(duration)s": "Inaktiv i %(duration)s",
"Offline for %(duration)s": "Offline i %(duration)s",
"Idle": "Inaktiv",
@@ -854,7 +854,7 @@
"Drop here to demote": "Släpp här för att göra till låg prioritet",
"You're not in any rooms yet! Press to make a room or to browse the directory": "Du är inte i något rum ännu! Tryck för att skapa ett rum eller för att bläddra i katalogen",
"Would you like to accept or decline this invitation?": "Vill du acceptera eller avböja denna inbjudan?",
- "You have been invited to join this room by %(inviterName)s": "Du har blivit inbjuden att gå med i rummet av %(inviterName)s",
+ "You have been invited to join this room by %(inviterName)s": "Du har blivit inbjuden till rummet av %(inviterName)s",
"Kick this user?": "Kicka användaren?",
"To send messages, you must be a": "För att skicka meddelanden, måste du vara",
"To invite users into the room, you must be a": "För att bjuda in användare i rummet, måste du vara",
@@ -1056,7 +1056,7 @@
"Leave Community": "Lämna community",
"Unable to leave community": "Det gick inte att lämna community",
"Community Settings": "Community-inställningar",
- "Changes made to your community name and avatar might not be seen by other users for up to 30 minutes.": "Ändringar på namn och avatar som gjorts i din community kommer eventuellt inte synas för andra användare i upp till 30 minuter.",
+ "Changes made to your community name and avatar might not be seen by other users for up to 30 minutes.": "Det kan dröja upp till 30 minuter innan ändringar på communityns namn och avatar blir synliga för andra användare.",
"These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Dessa rum visas för community-medlemmar på community-sidan. Community-medlemmar kan gå med i rummen genom att klicka på dem.",
"Add rooms to this community": "Lägg till rum i denna community",
"%(inviter)s has invited you to join this community": "%(inviter)s har bjudit in dig till denna community",
From 074051297aece72b773f6945f45dafb62997b430 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Jun 2018 11:11:43 +0100
Subject: [PATCH 0159/1196] add a ShareDialog for sharing users,groups and
rooms
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
package.json | 1 +
res/img/icons-share.svg | 6 +
res/img/matrix-m.svg | 15 ++
res/img/social/email-1.png | Bin 0 -> 2510 bytes
res/img/social/facebook.png | Bin 0 -> 1201 bytes
res/img/social/linkedin.png | Bin 0 -> 1366 bytes
res/img/social/reddit.png | Bin 0 -> 2279 bytes
res/img/social/twitter-2.png | Bin 0 -> 1519 bytes
src/components/views/dialogs/ShareDialog.js | 211 ++++++++++++++++++++
9 files changed, 233 insertions(+)
create mode 100644 res/img/icons-share.svg
create mode 100644 res/img/matrix-m.svg
create mode 100644 res/img/social/email-1.png
create mode 100644 res/img/social/facebook.png
create mode 100644 res/img/social/linkedin.png
create mode 100644 res/img/social/reddit.png
create mode 100644 res/img/social/twitter-2.png
create mode 100644 src/components/views/dialogs/ShareDialog.js
diff --git a/package.json b/package.json
index 96c37a61c8..15080456fe 100644
--- a/package.json
+++ b/package.json
@@ -80,6 +80,7 @@
"optimist": "^0.6.1",
"pako": "^1.0.5",
"prop-types": "^15.5.8",
+ "qrcode-react": "^0.1.16",
"querystring": "^0.2.0",
"react": "^15.6.0",
"react-addons-css-transition-group": "15.3.2",
diff --git a/res/img/icons-share.svg b/res/img/icons-share.svg
new file mode 100644
index 0000000000..b27616d5d5
--- /dev/null
+++ b/res/img/icons-share.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/res/img/matrix-m.svg b/res/img/matrix-m.svg
new file mode 100644
index 0000000000..ccb1df0fc5
--- /dev/null
+++ b/res/img/matrix-m.svg
@@ -0,0 +1,15 @@
+
+
+
diff --git a/res/img/social/email-1.png b/res/img/social/email-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..193cb659da5d4adff51376f3fc75cc8609c803fd
GIT binary patch
literal 2510
zcmV;<2{HDGP)HtMRhk?0buDKu#&buo5IY}eF4AYO)9Jd1n2=li0!+-J|d^Tv3N
zbTszZ@4j=+J733CzuoBXMFZC_b?x4zEDZw
zLKRx~X6DZ_-)m8LI*N#E$nr@RgZ!HLXUr%47PQ7k4~R2wXWq)Zrb348X6|G@#GLeF
z!GI5I)HCm5?q}XxLFGxTy;t08m$>&8HNb<+z0BWYZlKwt264|`A;YX2U^(-v%tu6$
zyHeCBWO!91*jX_ElG~fi8))tjWO-f4R#5{W{(dSF-dv-&knNdD7yxDJN6b&s+^3yF
z)`(v?Ajtf4QPZo19uO5`6LXDKx%wM2u)&yA4)EecQV!F#z$IyX_ET#>PFGEaXW&C%=Qc}f)~%f0PE(O3LM1qxrw
ze8P_!-!d;q8yjosp2o=g%9ct+*8Oj6h{Ho^O0Y4?AT(6BFb|Y!fIkZl(53~U8hWHT
zMw=JcQlO@M@A=1Ao(>G8=wC@~L%;*>D8&GXnZvqw3A3`FYl_mgW%DQ=lxu!ATcq<7
zMLLtVC+OwuEzQw@r>DRpzQ;y5`oD~>c-urXf2eT)@;dUf20b0?j?T%bQ*
znxI#h`_qLPbHxT;F|Hkbck8Q3tG&1f>q+}I?5y2J<}GqDW7GH
zJ5DF*$WZypn_jf#tua>uM4q{6K}g37w#$IfRvqEKu`+J#kX89d|2?kc@}&^)z>_`W
zbP+(oLLJNNbgIl&XAZboXOe>wcl%ZLgtx2ra!EBCLSG*b8JR!KzpUWgG0fFrgcTgj
z6zT1B-T+5d!teXuNztBFaU0IKYf*%L|E`k3*9e_Yng+OE$Mqk(HfH%3~eRk0cQd(f$lOx07+q;
z%9Riv@YYJt4`n=YJ9ZoRAQn^)Rw#TXWycNhvfN~y0lG~35PQ~eR>=#Xa|6tFr>amJ
zIrgo}Twql9;yF1wLwxRIe4wK|Xee870iLn^B;y2oo>>>yI^wt!SG6kp&LaD;<(KEP
zQdG8%cjfC`CBilG(sqQsrfVc;gwI0$r+uySX{|$%Gajh%G<${hf31~Bfm)RffLL=1
z`HH0ELFsRLD31q&34Yl=J}o>7u;7n<%=HvIeaQsg^&)nzJF#e?8g+dSSAXh1m!;@%
z8E1N#4*eOq0YWuC^w`|O1W56C$%)5hF1ntxzO0M;2{$)Zx3{h95yM_Nz*$B|@)_<9E8XGZu|m+Cuq6`VSYq%hWQ70kF1LX?IY0e!kzyLieS2+7|DCVT$Y(d&R-g9-W%awny
z#v3MwC8cg>OUzbbfI!hLYEmDHdbjFy#@dRuNs<>5k_?*e{$QOk@I-Tia(W*(R3?H$
zE^&qvTIXL~$i6>6c)Vq5%f4(a@<3C@`jSPGoLyG)X{lTM}b*jCaa_L(COxMDixI~iz3xQxz%^0&Zfjh71~>~e
zDs*)j0KU6l2}W@&fBCfglomMQ==Jpm(9wN10Qp5@)Ljbgw>E&j9FGH}VE!kY%OQCk
zJC`xQ(M*X9Lynskgz0w16&So?cIb0XaUGA#9*}s1G@cE@ZauXs?i!dnOBveYAvT0{
zGK5(mps^F|AiO?#V#JSN)1A_~=!sL~^w*J`A4`?|
zhzyBxc!D$^iA4hZG~;;Sew{eRh67FmM0NS2JmTmUS>H3=3llgneWBbtqbvM)L)eJz
zMeHJVY#irtIzSZQHBN=Q8EPZ;lZ8n?W51pG$Fe`n^v1{m<}Xoo)AyNoOg9spjvi+|
zTE)sA6*`cv0RZ(LV*XtfD*v*Oz3hjj(WGzkilI45ko7(xJC$ny(+KS%o~j|{+e=Yi
z#Q-Ml5R1>nmMx6#zIx0kM<;+KRBw+WeO
zwhUnHtI=HSA;l9WA6nWy;@+L*EEMo*7k1OshIA)A^
zhi@ZkJcA@r`X!ordHOZK1+AHd*XNr=XNkwsRtkee$o*(uLX@r^5zh(H!3|eZxc>_<
Y02w!UWX_nGYybcN07*qoM6N<$f{u#A1poj5
literal 0
HcmV?d00001
diff --git a/res/img/social/facebook.png b/res/img/social/facebook.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a29e3820aa997e5bc06d42995891ce570defd25
GIT binary patch
literal 1201
zcmV;i1Wx;jP){WFb!?3z7NA68<|~E&O{8>Ez#ZokqHl4&r9Wg
z0N0RH$a_dDXa_6TImI?;F2Et=81fkhxp*OqZ5ZPKtBC*<+&&^tfPO%>d|=yz3PAmD
zkOQ9HkjA!kiV%Q?sXk;g=pT)2t3|D0(1d)!V|t>XhDV5MSgM)o15E>MB&5ic5OeG{5w+(Z%-Cd{(H5AqNFk!8kff%pI7bhof;DhdlLDra^`dG%oNEQ0
zpk6+emkUrQGNsMjo2nN9tn6#hFlZN5qm+~c$!1g7d;Y9%z~EaKIH$jXd-=C$5y;mL
zc?+M=ZYvcl)iMIf&YwKE9dD<@k
z1%(nY9>`}a2~Y{fMJ0^_g(6DsY(534Ddwo|55&sqIy7~>5h*~SBuW4^@a3yV_-G)3
z*o_QDn3?|}x{A#fkS(I*WV7;3r@4h?;b}5inJ%JaTJ=$i&+|*71xS-XpKJW^eQ5=L
z{#p|*fT->9ptZawE#c={6zwVMYYl1vUNA1aB!I{00xTFviI1Ru?F^3dht{_NxoPUzm{UjYUHqC(z?^D_)0
P00000NkvXXu0mjf5Z)l0
literal 0
HcmV?d00001
diff --git a/res/img/social/linkedin.png b/res/img/social/linkedin.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b868a585ba59ca2f716f0a21254ccbdb3c95438
GIT binary patch
literal 1366
zcmV-c1*!UpP)b&2Be0RqO@45R0W~Mz9=g~i=y;FTI@p~6pB_*
z2nv=^U$UiG`cT>;6hc$dSOQVWmXsx_t+iFtXzH3pV-nMzGdUyU?##OLx4EZ`
za+Aj4e2}>eXnsK>$hXKZk$oZy5JK)j#*vK<)*EBKj~qa@BhMf+PE;;AP)8Vf2zeEG
z++pXl(a86>%J&S$6kUhxHxRaYLMA?QO?qG`|0CjHt
z$aNqN$d*fNo2vp)`#Z-So@fZMZ719ifQG3KuFby?6y~-+v&Q2vPRwr9vVgo-brnEUqkv6R$TzYfV%Uf=I`7
zZb`U8#7Jn>>klNI9Q$ZN3u*b}lwtx7J;kC;*{}ow)2>Y5NK-^3%iT*zzGclEOp3c!V
z!4c0EpczcA{YaA$l%Asy2>x+XXp+2==jz?)WTq4EA$_kdUX0-7-O
zsS)rR_z$nDO@KOum=6UYpCcr|2JkO7P#@4>rDVtU7O0qOyq>b{^B+zBzZ3{4>2z#i
z71YfSK~M@nZPh$wWEswkWY*VP!q_A
zAixj54_mrMpy5@XW9c<#hDxPH5McU0<7;;xOg^!EP_iz-O)qqI_a>*@sCI+|NclJw
z9wGq-d@MlH?-7t90lIuFKo`|y%}41cu~By{>vfKD|LA|!k$Ktd}(ug^Ne6#M+x
zdx3Tz3DB;c3#d3PN?PnP((G%F05mB&=>q{yYA1k_&c)FZc78PbAqRB67kCFsV{eci
z-qnV`UIeIpL3ar{-<|EekpP6vDWG(UoaCc=X#rLS?d)kh^pu!`
Y0BLR|kwK3)O8@`>07*qoM6N<$f)AK>P5=M^
literal 0
HcmV?d00001
diff --git a/res/img/social/reddit.png b/res/img/social/reddit.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd6131186f990ad2902c6d76165f5bf7e6457244
GIT binary patch
literal 2279
zcmVAGR
zp+O)Z${7Muj+U!jg-U75B}dC?p+c=td_Ued?6jTT&au1Q?Mq%}I-U8x_uluu-#cbD
z>~7ktpBX+>N=9x{hOnI2E+gWx5Las
zDR>C798j|P)d1Lk%N5`S8#Pg~edP}WAWSV`evg8mW++)Be3b`;Gp|%JJyhrw6(J@u
z-*M^z^FvH|jm9h49c_UmD>>#ju6{bZFvIlsG=2kluU+oCO(0ByR6rot(2Z-WPqeP0Y1>FgP!jx+)GqmCfi}cy8?ba7|at>
zdF46VEh!?p@|V?_ld5CDKtFeKJk)Q>;Vyeo0LpLpmgt!jqAml3HM({|wvN5d5_Hbd
z4DeFm)04&$^6n}5kN0~4ev3aM>Nl3CRcE4#a-w2|6Spgz6ihi<7(|1kk6#oGa|v1l
zsUiHsop|M2)VvSzy|hGD_2Nl6o;&8xB|x{iFAM-bykZN%u^-#T$=}Gx^0rBq25Q-X
zhv)DXGgtttI^q8EGWS@K?F>+!#X7W!=uaN^)(yD^uj$-R#s{6}WT_~J=)ZD1Mra8G
zB&tq|c|z=cl7X~E+p5>$j{DYd;@MG*qtT_)L?`$2%AR7^Epi*lXj`<37Eg)pD^UW3
z9HC%08|@-d{{*538diM{A(<1sJ70BA4IF&{*DrKWx+s|NJVSu58&^b&N|2twy>
zCOVpF2c;EA@>c0Fl9e7;)r&AD3<_`PJz8X{xJi_eYPL4eC>0yX(<}G
zEQdb;8ffP-xAKV32v7KX^Fj$*PL*u%Cgz$jo4n0jgcN
zlA(_Oifx27m_?J3?kxc-=Kh!ySL%atQ{=xAkag
ziMug@o?Ts#Ru7cg{*0&)2FSB#yEBrYfRL^Rnve$|?qmBE7up>q*S-f};{0qmfAlFS
zWQ+)18>G+LYMCJ*`>-kA6Pw2-s;HFhq$iLM1K3a9kf*~7An4O?N@%Q6ImSo}8wC`U
zY8K_)rE$;8T$>Gg)^lnLgCb7=_(2Byl%OrS`}GYGO`ZksqF-Rt06`ZB`F`GZX?9jed{led3lxlLUwKXE`)`I&%kFjrO6Ub(
zWgsY&&tAcbWJ-nTsrdn8X}tq)Jp*_d>H`=J28EZw+nmv0q;&dMW5+D_2C5U<+%ST+
zx=2*e&O+X9t#>cD0*{FsE*&Cm+hALq&2y?efIm*}0iX|rU5MJms8x=38_DHzD~IF?KnMUV
zIpHL}d!sac0T>*w#{)+-UXQyBZb+s2OR0M0jSK+7%eEc$Q28B7H>%A5pk(sV_xM3V
zWlAS9Yk+)D4}>Tsdn)?8#in1F)9Zoq=}H%}Y5>qX%o!o9e1_72>>2<4yqQduVTY;sdbN&o`(!1Ht=6#9-wiHO#l`2U%nTHjsySn*+Q-j<
zHh{i>>cl*Y?6%p>cXDQ_xl(=MePMq3^*DNr`1lIV`&b_+{Ts=Tr}y|;(69jfd>&t*
z;9Grkox3T6L{QBxbgl|r`D#DsstT^ypThkwzyNr(v=B#;25kTU002ovPDHLkV1ko1
BJN^Iw
literal 0
HcmV?d00001
diff --git a/res/img/social/twitter-2.png b/res/img/social/twitter-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..84f8033a30c5cef33bb14ee59b5b8d5398b9162f
GIT binary patch
literal 1519
zcmVeqY
zO9dhH4@opc3o1&nPzZ!p18Iw=v9U2GwXM;_%UyaVX?jU~@A5XDm+fVDXLfJbe(-U}
z-QMhb-@ci7Z)VQ7qiYasMk(?!WDT+!Sz*lx+cCL|#C?g$#mo2=YBIunmq2P>DQ+Jj#PywouA8oZnq0jU3V@_^?y1lYFs>=1yasW#-R;C?i*t*WePFb8>z=X9^&Ii4Z5
zA!kJ+;GoBx*RYvw7wQ5b4k@pqiG8rt1sae?jNYkwWiC8hQJj1w3|zei9}kVgP<$ra
zA{^nmqT7rB<=pQL4J1$BQ3x+om4M>=_p|lE0=RcoJ{;tlY-$ID!iHZ*Em>2HQh)6iqk#t|Hq!xR6bRJMu$t<
zY(_z&o&X`Zc@Rn$U<25@lH)eivd@c&&`vw=c5AL5Iv=eRZf7zv2j?fIp>sHz%rqqw
zOubqJJmrPQMzaZJnEUTv16%GCUJiUh>jE?=)O#s@DY<&SG6;7U3T2q&bC3ksJE&OOO87aR-l~KLPMi&V{=kUT-TR1m91qQ~!
zB(|3q!|t^uZi$4jHV6_v^x>u$3&<^DV|4WD0%!MTWV9nh|2f`lHC!LTnjEu%157Al5JU2#6_t1C-(C6U38
zeg4nBK&wcLZNH8~Vt(GS_@%DYu-bAR*P2=jX!t-REv9Aaj|L--cH$>*UuorMG4^$d
z08|tm5;5rO%M-H7R70q;wkCKewE$Ffz7%?l@1GxaOoYUo=`I&Zf5?i?1ude*(YrtW
z3CA5c7Bd((y(ZX_{($w$H0mGSB8Jg}X&v|r-s$@TYlZ8!3Gn45QzCb#_Weu(5MGk8
zP|`Ct39t2DP7aQ=DkKXeFwHt=B9n&ee)eezd>Q^SLmQ@_$b4e7k?~MT0o)Z(p;*m<
z)p;u*VB+)$tqD>h)G-t_8~(eH9eQ76S`(xn(7_^Ur$%V1l(4I77Kd--e5Nj-;T0`q
z^eEcd2e2vt9W>sJJnli~Pq6L6ho$MP>$Xf`L^EUlUaQDN!Pyf9B){oJ3!T)~al*_ZwiU;t$x
VVe!_=*FFFM002ovPDHLkV1goAzuW)-
literal 0
HcmV?d00001
diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js
new file mode 100644
index 0000000000..8bfa0ad931
--- /dev/null
+++ b/src/components/views/dialogs/ShareDialog.js
@@ -0,0 +1,211 @@
+/*
+Copyright 2018 Vector Creations Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import {Room, User, Group, RoomMember} from 'matrix-js-sdk';
+import sdk from '../../../index';
+import { _t } from '../../../languageHandler';
+import QRCode from 'qrcode-react';
+import {makeEventPermalink, makeGroupPermalink, makeRoomPermalink, makeUserPermalink} from "../../../matrix-to";
+import * as ContextualMenu from "../../structures/ContextualMenu";
+
+const socials = [
+ {
+ name: 'Facebook',
+ img: 'img/social/facebook.png',
+ url: (url) => `https://www.facebook.com/sharer/sharer.php?u=${url}`,
+ }, {
+ name: 'Twitter',
+ img: 'img/social/twitter-2.png',
+ url: (url) => `https://twitter.com/home?status=${url}`,
+ }, /* // icon missing
+ name: 'Google Plus',
+ img: 'img/social/',
+ url: (url) => `https://plus.google.com/share?url=${url}`,
+ },*/ {
+ name: 'Linked In',
+ img: 'img/social/linkedin.png',
+ url: (url) => `https://www.linkedin.com/shareArticle?mini=true&url=${url}`,
+ }, {
+ name: 'Reddit',
+ img: 'img/social/reddit.png',
+ url: (url) => `http://www.reddit.com/submit?url=${url}`,
+ }, {
+ name: 'email',
+ img: 'img/social/email-1.png',
+ url: (url) => `mailto:?body=${url}`,
+ },
+];
+
+export default class ShareDialog extends React.Component {
+ static propTypes = {
+ onFinished: PropTypes.func.isRequired,
+ target: PropTypes.oneOfType([
+ PropTypes.instanceOf(Room),
+ PropTypes.instanceOf(User),
+ PropTypes.instanceOf(Group),
+ PropTypes.instanceOf(RoomMember),
+ // PropTypes.instanceOf(MatrixEvent),
+ ]).isRequired,
+ };
+
+ constructor(props) {
+ super(props);
+
+ this.onCopyClick = this.onCopyClick.bind(this);
+ this.onCheckboxClick = this.onCheckboxClick.bind(this);
+
+ this.state = {
+ ticked: false,
+ };
+ }
+
+ static _selectText(target) {
+ const range = document.createRange();
+ range.selectNodeContents(target);
+
+ const selection = window.getSelection();
+ selection.removeAllRanges();
+ selection.addRange(range);
+ }
+
+ static onLinkClick(e) {
+ e.preventDefault();
+ const {target} = e;
+ ShareDialog._selectText(target);
+ }
+
+ onCopyClick(e) {
+ e.preventDefault();
+
+ ShareDialog._selectText(this.refs.link);
+
+ let successful;
+ try {
+ successful = document.execCommand('copy');
+ } catch (err) {
+ console.error('Failed to copy: ', err);
+ }
+
+ const GenericTextContextMenu = sdk.getComponent('context_menus.GenericTextContextMenu');
+ const buttonRect = e.target.getBoundingClientRect();
+
+ // The window X and Y offsets are to adjust position when zoomed in to page
+ const x = buttonRect.right + window.pageXOffset;
+ const y = (buttonRect.top + (buttonRect.height / 2) + window.pageYOffset) - 19;
+ const {close} = ContextualMenu.createMenu(GenericTextContextMenu, {
+ chevronOffset: 10,
+ left: x,
+ top: y,
+ message: successful ? _t('Copied!') : _t('Failed to copy'),
+ }, false);
+ e.target.onmouseleave = close;
+ }
+
+ onCheckboxClick() {
+ this.setState({
+ ticked: !this.state.ticked,
+ });
+ }
+
+ render() {
+ let title;
+ let matrixToUrl;
+
+ let checkbox;
+
+ if (this.props.target instanceof Room) {
+ title = _t('Share Room');
+
+ const events = this.props.target.getLiveTimeline().getEvents();
+ if (events.length > 0) {
+ checkbox =
+ ;
+ }
+}
From e7a4a0b2e0f78138f0bc91e98420a720783b3aef Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Jun 2018 11:12:12 +0100
Subject: [PATCH 0160/1196] allow context-menus/tooltips to work over modals
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
res/css/structures/_ContextualMenu.scss | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/res/css/structures/_ContextualMenu.scss b/res/css/structures/_ContextualMenu.scss
index a0191b92cf..7474c3d107 100644
--- a/res/css/structures/_ContextualMenu.scss
+++ b/res/css/structures/_ContextualMenu.scss
@@ -16,7 +16,7 @@ limitations under the License.
.mx_ContextualMenu_wrapper {
position: fixed;
- z-index: 2000;
+ z-index: 5000;
}
.mx_ContextualMenu_background {
@@ -26,7 +26,7 @@ limitations under the License.
width: 100%;
height: 100%;
opacity: 1.0;
- z-index: 2000;
+ z-index: 5000;
}
.mx_ContextualMenu {
@@ -37,7 +37,7 @@ limitations under the License.
position: absolute;
padding: 6px;
font-size: 14px;
- z-index: 2001;
+ z-index: 5001;
}
.mx_ContextualMenu.mx_ContextualMenu_right {
From e3c455e5997fe5874d98b833ad4317735e876d1f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Jun 2018 11:12:26 +0100
Subject: [PATCH 0161/1196] Style the ShareDialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
res/css/_components.scss | 1 +
res/css/views/dialogs/_ShareDialog.scss | 89 +++++++++++++++++++++++++
2 files changed, 90 insertions(+)
create mode 100644 res/css/views/dialogs/_ShareDialog.scss
diff --git a/res/css/_components.scss b/res/css/_components.scss
index 2734939ae3..173939e143 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -42,6 +42,7 @@
@import "./views/dialogs/_SetEmailDialog.scss";
@import "./views/dialogs/_SetMxIdDialog.scss";
@import "./views/dialogs/_SetPasswordDialog.scss";
+@import "./views/dialogs/_ShareDialog.scss";
@import "./views/dialogs/_UnknownDeviceDialog.scss";
@import "./views/directory/_NetworkDropdown.scss";
@import "./views/elements/_AccessibleButton.scss";
diff --git a/res/css/views/dialogs/_ShareDialog.scss b/res/css/views/dialogs/_ShareDialog.scss
new file mode 100644
index 0000000000..ab340ad758
--- /dev/null
+++ b/res/css/views/dialogs/_ShareDialog.scss
@@ -0,0 +1,89 @@
+/*
+Copyright 2018 New Vector Ltd.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_ShareDialog {
+ // this is to center the content
+ padding-right: 58px;
+}
+
+.mx_ShareDialog hr {
+ margin-top: 25px;
+ margin-bottom: 10px;
+ border-color: $light-fg-color;
+}
+
+.mx_ShareDialog_content {
+ margin: 10px 0;
+}
+
+.mx_ShareDialog_matrixto {
+ display: flex;
+ justify-content: space-between;
+ border-radius: 5px;
+ border: solid 1px $light-fg-color;
+ margin-bottom: 10px;
+ margin-top: 30px;
+ padding: 10px;
+}
+
+.mx_ShareDialog_matrixto a {
+ text-decoration: none;
+}
+
+.mx_ShareDialog_matrixto_link {
+ flex-shrink: 1;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
+.mx_ShareDialog_matrixto_copy {
+ flex-shrink: 0;
+ cursor: pointer;
+ margin-left: 20px;
+ display: inherit;
+}
+.mx_ShareDialog_matrixto_copy > div {
+ background-image: url($copy-button-url);
+ margin-left: 5px;
+ width: 20px;
+ height: 20px;
+}
+
+.mx_ShareDialog_split {
+ display: flex;
+ flex-wrap: wrap;
+}
+
+.mx_ShareDialog_qrcode_container {
+ float: left;
+ background-color: #ffffff;
+ padding: 5px; // makes qr code more readable in dark theme
+ border-radius: 5px;
+ height: 256px;
+ width: 256px;
+ margin-right: 64px;
+}
+
+.mx_ShareDialog_social_container {
+ display: flex;
+ flex-wrap: wrap;
+ width: 299px;
+}
+
+.mx_ShareDialog_social_icon {
+ margin-right: 10px;
+ margin-bottom: 10px;
+}
From 64bcf6fd7e20f562a6553742a8e9c0489fabea91 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Jun 2018 11:13:04 +0100
Subject: [PATCH 0162/1196] allow ContextualMenu to run without background, for
tooltips & fix copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/ContextualMenu.js | 24 ++++++++++++--------
src/components/views/messages/TextualBody.js | 4 ++--
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js
index daac294d12..d6a11ca974 100644
--- a/src/components/structures/ContextualMenu.js
+++ b/src/components/structures/ContextualMenu.js
@@ -1,5 +1,6 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 Vector Creations Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,12 +16,10 @@ limitations under the License.
*/
-'use strict';
-
-const classNames = require('classnames');
-const React = require('react');
-const ReactDOM = require('react-dom');
+import React from 'react';
+import ReactDOM from 'react-dom';
import PropTypes from 'prop-types';
+import classNames from 'classnames';
// Shamelessly ripped off Modal.js. There's probably a better way
// of doing reusable widgets like dialog boxes & menus where we go and
@@ -61,7 +60,12 @@ export default class ContextualMenu extends React.Component {
// If true, insert an invisible screen-sized element behind the
// menu that when clicked will close it.
hasBackground: PropTypes.bool,
- }
+
+ // The component to render as the context menu
+ elementClass: PropTypes.element.isRequired,
+ // on resize callback
+ windowResize: PropTypes.func
+ };
render() {
const position = {};
@@ -112,7 +116,7 @@ export default class ContextualMenu extends React.Component {
`;
}
- const chevron = ;
+ const chevron = ;
const className = 'mx_ContextualMenu_wrapper';
const menuClasses = classNames({
@@ -158,13 +162,13 @@ export default class ContextualMenu extends React.Component {
{ chevron }
- { props.hasBackground && }
+ { props.hasBackground && }
HTML for your community's page
\n\n Use the long description to introduce new members to the community, or distribute\n some important links\n
\n\n You can even use 'img' tags\n
\n": "HTML för din community-sida
\n\n Använd den långa beskrivningen för att introducera nya medlemmar till communityn, eller dela\n några viktiga länkar\n
\n\n Du kan även använda 'img'-taggar\n
\n", + "Add rooms to the community summary": "Lägg till rum i community-översikten", + "Add users to the community summary": "Lägg till användare i community-översikten", + "Failed to update community": "Det gick inte att uppdatera community", + "Unable to join community": "Det gick inte att gå med i communityn", + "Leave Community": "Lämna community", + "Unable to leave community": "Det gick inte att lämna community", + "Community Settings": "Community-inställningar", + "Changes made to your communityClick here to open settings and give it one!": "Din community har ingen lång beskrivning eller HTML-sida att visa för medlemmar.
Klicka här för att öppna inställningar och lägga till det!", + "Community %(groupId)s not found": "Community %(groupId)s hittades inte", + "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "För att skapa ett filter, dra en community-avatar till filterpanelen längst till vänster på skärmen. Du kan när som helst klicka på en avatar i filterpanelen för att bara se rum och personer som är associerade med den communityn.", + "Create a new community": "Skapa en ny community", + "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Skapa en community för att gruppera användare och rum! Bygg en anpassad hemsida för att markera er plats i Matrix-universumet.", + "Join an existing community": "Gå med i en befintlig community", + "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "För att gå med i en befintlig gemenskap behöver du ha community-ID; det ser ut som något i stil med +exempel:matrix.org.", + "Invite to this community": "Bjud in till denna community", + "Something went wrong when trying to get your communities.": "Något gick fel vid hämtning av dina communityn.", + "You're not currently a member of any communities.": "Du är för närvarande inte medlem i någon community.", + "Communities": "Communityn", + "This Home server does not support communities": "Denna hemserver stöder inte communityn", + "Your Communities": "Dina communityn", + "Did you know: you can use communities to filter your Riot.im experience!": "Visste du att: du kan använda communityn för att filtrera din Riot.im-upplevelse!", + "Error whilst fetching joined communities": "Fel vid hämtning av anslutna communityn", + "Featured Rooms:": "Utvalda rum:", + "Featured Users:": "Utvalda användare:", + "Everyone": "Alla", + "To notify everyone in the room, you must be a": "För att meddela alla i rummet, måste du vara", + "Long Description (HTML)": "Lång beskrivning (HTML)", + "Description": "Beskrivning", + "Failed to load %(groupId)s": "Det gick inte att ladda %(groupId)s", + "Failed to withdraw invitation": "Det gick inte att ta bort inbjudan", + "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Är du säker på att du vill ta bort %(roomName)s från %(groupId)s?", + "Failed to remove '%(roomName)s' from %(groupId)s": "Det gick inte att ta bort %(roomName)s från %(groupId)s", + "Something went wrong!": "Något gick fel!", + "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Synligheten för '%(roomName)s' i %(groupId)s kunde inte uppdateras.", + "Visibility in Room List": "Synlighet i rumslistan", + "Visible to everyone": "Synlig för alla", + "Please select the destination room for this message": "Välj vilket rum meddelandet ska skickas till", + "Disinvite this user?": "Ta bort användarens inbjudan?", + "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Du kommer inte att kunna ångra den här ändringen eftersom du sänker din egen behörighetsnivå, om du är den sista privilegierade användaren i rummet blir det omöjligt att ändra behörigheter.", + "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du kommer inte att kunna ångra den här ändringen eftersom du höjer användaren till samma behörighetsnivå som dig själv.", + "User Options": "Användaralternativ", + "unknown caller": "okänd uppringare", + "At this time it is not possible to reply with an emote.": "Det är för närvarande inte möjligt att svara med en emoji.", + "To use it, just wait for autocomplete results to load and tab through them.": "För att använda detta, vänta på att autokompletteringen laddas och tabba igenom resultatet.", + "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "VARNING: NYCKELVERIFIERINGEN MISSLYCKADES! Signeringsnyckeln för %(userId)s och enhet %(deviceId)s är \"%(fprint)s\" som inte matchar den angivna nyckeln \"%(fingerprint)s\". Detta kan betyda att dina kommunikationer avlyssnas!", + "Hide join/leave messages (invites/kicks/bans unaffected)": "Dölj \"gå med\"/lämna-meddelanden (inbjudningar/kickningar/banningar opåverkat)", + "Disable Peer-to-Peer for 1:1 calls": "Inaktivera enhet-till-enhet-kommunikation för direktsamtal (mellan två personer)", + "Enable inline URL previews by default": "Aktivera URL-förhandsvisning som standard", + "Enable URL previews for this room (only affects you)": "Aktivera URL-förhandsvisning för detta rum (påverkar bara dig)", + "Enable URL previews by default for participants in this room": "Aktivera URL-förhandsvisning som standard för deltagare i detta rum", + "You have enabled URL previews by default.": "Du har aktiverat URL-förhandsvisning som standard.", + "You have disabled URL previews by default.": "Du har inaktiverat URL-förhandsvisning som standard.", + "URL previews are enabled by default for participants in this room.": "URL-förhandsvisning är aktiverat som standard för deltagare i detta rum.", + "URL previews are disabled by default for participants in this room.": "URL-förhandsvisning är inaktiverat som standard för deltagare i detta rum.", + "URL Previews": "URL-förhandsvisning", + "Which rooms would you like to add to this summary?": "Vilka rum vill du lägga till i översikten?", + "Add to summary": "Lägg till i översikt", + "Failed to add the following rooms to the summary of %(groupId)s:": "Det gick inte att lägga till följande rum i översikten för %(groupId)s:", + "Add a Room": "Lägg till ett rum", + "Failed to remove the room from the summary of %(groupId)s": "Det gick inte att ta bort rummet från översikten i %(groupId)s", + "The room '%(roomName)s' could not be removed from the summary.": "Rummet '%(roomName)s' kunde inte tas bort från översikten.", + "Who would you like to add to this summary?": "Vem vill du lägga till i översikten?", + "Failed to add the following users to the summary of %(groupId)s:": "Det gick inte att lägga till följande användare i översikten för %(groupId)s:", + "Add a User": "Lägg till en användare", + "Failed to remove a user from the summary of %(groupId)s": "Det gick inte att ta bort en användare från översikten i %(groupId)s", + "The user '%(displayName)s' could not be removed from the summary.": "Användaren '%(displayName)s' kunde inte tas bort från översikten.", + "Unable to accept invite": "Det gick inte att acceptera inbjudan", + "Leave %(groupName)s?": "Lämna %(groupName)s?", + "Enable widget screenshots on supported widgets": "Aktivera widget-skärmdumpar för widgets som stöder det", + "Your key share request has been sent - please check your other devices for key share requests.": "Din nyckeldelningsbegäran har skickats - kolla efter nyckeldelningsbegäran på dina andra enheter.", + "Undecryptable": "Odekrypterbar", + "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Nyckeldelningsbegäran skickas automatiskt till dina andra enheter. Om du avvisat nyckelbegäran på dina andra enheter, klicka här för att begära nycklarna till den här sessionen igen.", + "If your other devices do not have the key for this message you will not be able to decrypt them.": "Om dina andra enheter inte har nyckeln till detta meddelande kommer du du att kunna dekryptera det.", + "Key request sent.": "Nyckelbegäran skickad.", + "
+
+
+
;
+ }
+
+ if (this.state.ticked) {
+ matrixToUrl = makeEventPermalink(this.props.target.roomId, events[events.length - 1].getId());
+ } else {
+ matrixToUrl = makeRoomPermalink(this.props.target.roomId);
+ }
+ } else if (this.props.target instanceof User || this.props.target instanceof RoomMember) {
+ title = _t('Share User');
+ matrixToUrl = makeUserPermalink(this.props.target.userId);
+ } else if (this.props.target instanceof Group) {
+ title = _t('Share Community');
+ matrixToUrl = makeGroupPermalink(this.props.target.groupId);
+ }
+
+ const encodedUrl = encodeURIComponent(matrixToUrl);
+
+ const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+ return
+
+ { checkbox }
+
+ +
+ + +
+
+
+
+ QR Code
+
+
+
+
+ Social
+
+ {
+ socials.map((social) =>
+ 
+ )
+ }
+
+
- { _t("Logged in as:") } { this._me }
+ { _t("Logged in as:") + ' ' }
+
+ { this._me }
+
- { _t('Access Token:') }
+ { _t('Access Token:') + ' ' }
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 2789c0e4cd..20c0fb8414 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -632,6 +632,13 @@ module.exports = withMatrixClient(React.createClass({
);
},
+ onShareUserClick: function() {
+ const ShareDialog = sdk.getComponent("dialogs.ShareDialog");
+ Modal.createTrackedDialog('share room member dialog', '', ShareDialog, {
+ target: this.props.member,
+ });
+ },
+
_renderUserOptions: function() {
const cli = this.props.matrixClient;
const member = this.props.member;
@@ -705,13 +712,18 @@ module.exports = withMatrixClient(React.createClass({
}
}
- if (!ignoreButton && !readReceiptButton && !insertPillButton && !inviteUserButton) return null;
+ const shareUserButton = (
+
+ { _t('Share Link to User') }
+
+ );
return (
{ _t("User Options") }
{ readReceiptButton }
+ { shareUserButton }
{ insertPillButton }
{ ignoreButton }
{ inviteUserButton }
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 1851e03383..e40c715052 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -149,6 +149,13 @@ module.exports = React.createClass({
dis.dispatch({ action: 'show_right_panel' });
},
+ onShareRoomClick: function(ev) {
+ const ShareDialog = sdk.getComponent("dialogs.ShareDialog");
+ Modal.createTrackedDialog('share room dialog', '', ShareDialog, {
+ target: this.props.room,
+ });
+ },
+
_hasUnreadPins: function() {
const currentPinEvent = this.props.room.currentState.getStateEvents("m.room.pinned_events", '');
if (!currentPinEvent) return false;
@@ -379,6 +386,14 @@ module.exports = React.createClass({
;
}
+ let shareRoomButton;
+ if (this.props.inRoom) {
+ shareRoomButton =
+
+ ;
+ }
+
let rightPanelButtons;
if (this.props.collapsedRhs) {
rightPanelButtons =
@@ -400,6 +415,7 @@ module.exports = React.createClass({
{ settingsButton }
{ pinnedEventsButton }
+ { shareRoomButton }
{ manageIntegsButton }
{ forgetButton }
{ searchButton }
From d8a1feb501ad10102da8d4fee0e7a553de8dfde5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Jun 2018 11:15:30 +0100
Subject: [PATCH 0164/1196] fix Modal typo and refactor BaseDialog to fix "
undefined" className
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/dialogs/BaseDialog.js | 23 ++++++++++++-------
.../views/dialogs/ChatCreateOrReuseDialog.js | 2 +-
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index 71a5da224c..8ec417a59b 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -18,6 +18,7 @@ limitations under the License.
import React from 'react';
import FocusTrap from 'focus-trap-react';
import PropTypes from 'prop-types';
+import classNames from 'classnames';
import { MatrixClient } from 'matrix-js-sdk';
@@ -64,7 +65,10 @@ export default React.createClass({
// Id of content element
// If provided, this is used to add a aria-describedby attribute
- contentId: React.PropTypes.string,
+ contentId: PropTypes.string,
+
+ // optional additional class for the title element
+ titleClass: PropTypes.string,
},
getDefaultProps: function() {
@@ -105,25 +109,28 @@ export default React.createClass({
render: function() {
const TintableSvg = sdk.getComponent("elements.TintableSvg");
+ let cancelButton;
+ if (this.props.hasCancel) {
+ cancelButton =
+ ;
+ }
+
return (
- { this.props.hasCancel ?
- : null }
-
+ { cancelButton }
+ cookie and privacy policies ).": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden. (Siehe unsere Datenschutzerklärung ).",
- "Help improve Riot by sending usage data? This will use a cookie.": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden.",
- "Yes please": "Ja, bitte",
"e.g. %(exampleValue)s": "z.B. %(exampleValue)s",
"Reload widget": "Widget neu laden",
"To notify everyone in the room, you must be a": "Notwendiges Berechtigungslevel, um jeden im Raum zu benachrichten:",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8698e6108f..76d0cb6f33 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -42,6 +42,10 @@
"The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
"The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
"Upload Failed": "Upload Failed",
+ "Failure to create room": "Failure to create room",
+ "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+ "Send anyway": "Send anyway",
+ "Send": "Send",
"Sun": "Sun",
"Mon": "Mon",
"Tue": "Tue",
@@ -81,6 +85,7 @@
"Failed to invite users to community": "Failed to invite users to community",
"Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
"Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
+ "Unnamed Room": "Unnamed Room",
"Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
"Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
"Unable to enable Notifications": "Unable to enable Notifications",
@@ -104,7 +109,6 @@
"You need to be logged in.": "You need to be logged in.",
"You need to be able to invite users to do that.": "You need to be able to invite users to do that.",
"Unable to create widget.": "Unable to create widget.",
- "Reload widget": "Reload widget",
"Missing roomId.": "Missing roomId.",
"Failed to send request.": "Failed to send request.",
"This room is not recognised.": "This room is not recognised.",
@@ -180,11 +184,6 @@
"%(names)s and %(count)s others are typing|other": "%(names)s and %(count)s others are typing",
"%(names)s and %(count)s others are typing|one": "%(names)s and one other is typing",
"%(names)s and %(lastPerson)s are typing": "%(names)s and %(lastPerson)s are typing",
- "Failure to create room": "Failure to create room",
- "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
- "Send anyway": "Send anyway",
- "Send": "Send",
- "Unnamed Room": "Unnamed Room",
"Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
"Not a valid Riot keyfile": "Not a valid Riot keyfile",
"Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
@@ -298,6 +297,29 @@
"Off": "Off",
"On": "On",
"Noisy": "Noisy",
+ "Invalid alias format": "Invalid alias format",
+ "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
+ "Invalid address format": "Invalid address format",
+ "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
+ "not specified": "not specified",
+ "not set": "not set",
+ "Remote addresses for this room:": "Remote addresses for this room:",
+ "Addresses": "Addresses",
+ "The main address for this room is": "The main address for this room is",
+ "Local addresses for this room:": "Local addresses for this room:",
+ "This room has no local addresses": "This room has no local addresses",
+ "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
+ "Invalid community ID": "Invalid community ID",
+ "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
+ "Flair": "Flair",
+ "Showing flair for these communities:": "Showing flair for these communities:",
+ "This room is not showing flair for any communities": "This room is not showing flair for any communities",
+ "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
+ "You have enabled URL previews by default.": "You have enabled URL previews by default.",
+ "You have disabled URL previews by default.": "You have disabled URL previews by default.",
+ "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
+ "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
+ "URL Previews": "URL Previews",
"Cannot add any more widgets": "Cannot add any more widgets",
"The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
"Add a widget": "Add a widget",
@@ -347,6 +369,7 @@
"Jump to read receipt": "Jump to read receipt",
"Mention": "Mention",
"Invite": "Invite",
+ "Share Link to User": "Share Link to User",
"User Options": "User Options",
"Direct chats": "Direct chats",
"Unmute": "Unmute",
@@ -394,11 +417,11 @@
"numbullet": "numbullet",
"Markdown is disabled": "Markdown is disabled",
"Markdown is enabled": "Markdown is enabled",
- "Unpin Message": "Unpin Message",
- "Jump to message": "Jump to message",
"No pinned messages.": "No pinned messages.",
"Loading...": "Loading...",
"Pinned Messages": "Pinned Messages",
+ "Unpin Message": "Unpin Message",
+ "Jump to message": "Jump to message",
"%(duration)ss": "%(duration)ss",
"%(duration)sm": "%(duration)sm",
"%(duration)sh": "%(duration)sh",
@@ -428,6 +451,7 @@
"Settings": "Settings",
"Forget room": "Forget room",
"Search": "Search",
+ "Share room": "Share room",
"Show panel": "Show panel",
"Drop here to favourite": "Drop here to favourite",
"Drop here to tag direct chat": "Drop here to tag direct chat",
@@ -531,29 +555,6 @@
"Scroll to unread messages": "Scroll to unread messages",
"Jump to first unread message.": "Jump to first unread message.",
"Close": "Close",
- "Invalid alias format": "Invalid alias format",
- "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
- "Invalid address format": "Invalid address format",
- "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
- "not specified": "not specified",
- "not set": "not set",
- "Remote addresses for this room:": "Remote addresses for this room:",
- "Addresses": "Addresses",
- "The main address for this room is": "The main address for this room is",
- "Local addresses for this room:": "Local addresses for this room:",
- "This room has no local addresses": "This room has no local addresses",
- "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
- "Invalid community ID": "Invalid community ID",
- "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
- "Flair": "Flair",
- "Showing flair for these communities:": "Showing flair for these communities:",
- "This room is not showing flair for any communities": "This room is not showing flair for any communities",
- "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
- "You have enabled URL previews by default.": "You have enabled URL previews by default.",
- "You have disabled URL previews by default.": "You have disabled URL previews by default.",
- "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
- "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
- "URL Previews": "URL Previews",
"Sunday": "Sunday",
"Monday": "Monday",
"Tuesday": "Tuesday",
@@ -664,6 +665,7 @@
"Delete widget": "Delete widget",
"Revoke widget access": "Revoke widget access",
"Minimize apps": "Minimize apps",
+ "Reload widget": "Reload widget",
"Popout widget": "Popout widget",
"Picture": "Picture",
"Edit": "Edit",
@@ -856,6 +858,11 @@
"(HTTP status %(httpStatus)s)": "(HTTP status %(httpStatus)s)",
"Please set a password!": "Please set a password!",
"This will allow you to return to your account after signing out, and sign in on other devices.": "This will allow you to return to your account after signing out, and sign in on other devices.",
+ "Share Room": "Share Room",
+ "Link to most recent message": "Link to most recent message",
+ "Share User": "Share User",
+ "Share Community": "Share Community",
+ "COPY": "COPY",
"You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.",
"We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.",
"Room contains unknown devices": "Room contains unknown devices",
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 909b466da3..fe9d3db424 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1170,20 +1170,13 @@
"Enable widget screenshots on supported widgets": "Gaitu trepeten pantaila-argazkiak onartzen duten trepetetan",
"Send analytics data": "Bidali datu analitikoak",
"Muted Users": "Mutututako erabiltzaileak",
- "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies ).": "Riot hobetzen lagundu nahi erabilera datuak bidaliz? Honek cookie bat erabiliko du. (Ikusi gure Cookie eta pribatutasun politikak ).",
- "Help improve Riot by sending usage data? This will use a cookie.": "Riot hobetzen lagundu nahi erabilera datuak bidaliz? Honek cookie bat erabiliko du.",
- "Yes please": "Bai mesedez",
"Warning: This widget might use cookies.": "Abisua: Trepeta honek cookie-ak erabili litzake.",
"Terms and Conditions": "Termino eta baldintzak",
"To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "%(homeserverDomain)s hasiera-zerbitzaria erabiltzen jarraitzeko gure termino eta baldintzak irakurri eta onartu behar dituzu.",
"Review terms and conditions": "Irakurri termino eta baldintzak",
"Failed to indicate account erasure": "Ezin izan da kontuaren ezabaketa jakinarazi",
- "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This action is irreversible.": "Honek zure kontua betiko erabilgaitz bihurtuko du. Ezin izango duzu saioa hasi, eta beste inork ezin izango du erabiltzaile ID bera erabili. Ez dago ekintza hau desegiterik.",
- "Deactivating your account does not by default erase messages you have sent. If you would like to erase your messages, please tick the box below.": "Zure kontua desaktibatzean ez dira lehenetsita zuk bidalitako mezuak ezabatuko. Zuk bidalitako mezuak ezabatu nahi badituzu, markatu beheko kutxa.",
- "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Matrix-eko mezuen ikusgaitasuna, e-mail mezuen antzekoa da. Zure mezuak ezabatzeak esan nahi du bidali dituzun mezuak ez direla erabiltzaile berriekin partekatuko, baina aurretik zure mezuak jaso dituzten erabiltzaile erregistratuek bere kopia izango dute.",
"To continue, please enter your password:": "Jarraitzeko, sartu zure pasahitza:",
"password": "pasahitza",
- "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Ezabatu bidali ditudan mezu guztiak nire kontua desaktibatzean. (Abisua: Etorkizuneko erabiltzaileek elkarrizketa partzialak ikusiko dituzte, esperientzia kaskarra sortuz).",
"e.g. %(exampleValue)s": "adib. %(exampleValue)s",
"Reload widget": "Birkargatu trepeta",
"To notify everyone in the room, you must be a": "Gelan dauden guztiei jakinarazteko",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 8dd45192e6..367e89d2b6 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1169,25 +1169,17 @@
"Collapse Reply Thread": "Dévoiler le fil de réponse",
"Enable widget screenshots on supported widgets": "Activer les captures d'écran des widgets pris en charge",
"Send analytics data": "Envoyer les données analytiques",
- "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies ).": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie. (Voir nos politiques de cookie et de confidentialité ).",
- "Help improve Riot by sending usage data? This will use a cookie.": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie.",
- "Yes please": "Oui, s'il vous plaît",
"Muted Users": "Utilisateurs ignorés",
"Warning: This widget might use cookies.": "Avertissement : ce widget utilise peut-être des cookies.",
"Terms and Conditions": "Conditions générales",
"To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Pour continuer à utiliser le serveur d'accueil %(homeserverDomain)s, vous devez lire et accepter nos conditions générales.",
"Review terms and conditions": "Voir les conditions générales",
"Failed to indicate account erasure": "Échec de notification de la suppression du compte",
- "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This action is irreversible.": "Cela rendra votre compte inutilisable de façon permanente. Vous ne pourrez plus vous connecter et ne pourrez plus vous enregistrer avec le même identifiant d'utilisateur. Cette action est irréversible.",
- "Deactivating your account does not by default erase messages you have sent. If you would like to erase your messages, please tick the box below.": "Désactiver votre compte ne supprime pas les messages que vous avez envoyés par défaut. Si vous souhaitez supprimer vos messages, cochez la case ci-dessous.",
- "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Supprimer vos messages signifie que les messages que vous avez envoyés ne seront pas partagés avec de nouveaux utilisateurs ou les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à vos messages continueront d'en avoir une copie.",
"To continue, please enter your password:": "Pour continuer, veuillez renseigner votre mot de passe :",
"password": "mot de passe",
- "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Veuillez supprimer tous les messages que j'ai envoyé quand mon compte est désactivé. (Attention : les futurs utilisateurs verront alors des conversations incomplètes, ce qui est une mauvaise expérience).",
"This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Votre compte sera inutilisable de façon permanente. Vous ne pourrez plus vous reconnecter et personne ne pourra se réenregistrer avec le même identifiant d'utilisateur. Votre compte quittera tous les salons auxquels il participe et tous ses détails seront supprimés du serveur d'identité. Cette action est irréversible.",
"Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "La désactivation du compte ne nous fait pas oublier les messages que vous avez envoyés par défaut. Si vous souhaitez que nous les oubliions, cochez la case ci-dessous.",
"e.g. %(exampleValue)s": "par ex. %(exampleValue)s",
- "Help improve Riot by sending usage data ? This will use a cookie. (See our cookie and privacy policies ).": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Cela utilisera un cookie. (Voir nos politiques de cookie et de confidentialité ).",
"Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Quand nous oublions vos messages, cela signifie que les messages que vous avez envoyés ne seront partagés avec aucun nouvel utilisateur ou avec les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à ces messages en conserveront leur propre copie.",
"Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Veuillez oublier tous les messages que j'ai envoyé quand mon compte sera désactivé (Avertissement : les futurs utilisateurs verront des conversations incomplètes)",
"Reload widget": "Recharger le widget",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 6b52958ea6..3d8100d8f1 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1169,27 +1169,19 @@
"Collapse Reply Thread": "Beszélgetés szál becsukása",
"Enable widget screenshots on supported widgets": "Ahol az a kisalkalmazásban támogatott ott képernyőkép készítés engedélyezése",
"Send analytics data": "Analitikai adatok küldése",
- "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies ).": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ. (Nézd meg a sütikről és titoktartási irányelvekről szóló leírást).",
- "Help improve Riot by sending usage data? This will use a cookie.": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ.",
- "Yes please": "Igen, kérlek",
"Muted Users": "Elnémított felhasználók",
"Warning: This widget might use cookies.": "Figyelmeztetés: Ez a kisalkalmazás sütiket (cookies) használhat.",
"Terms and Conditions": "Általános Szerződési Feltételek",
"To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "A %(homeserverDomain)s szerver használatának folytatásához el kell olvasnod és el kell fogadnod az általános szerződési feltételeket.",
"Review terms and conditions": "Általános Szerződési Feltételek elolvasása",
"Failed to indicate account erasure": "A fiók törlésének jelzése sikertelen",
- "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This action is irreversible.": "Ezzel a felhasználói fiókod végleg használhatatlanná válik. Nem tudsz bejelentkezni, és senki más sem fog tudni újra regisztrálni ugyanezzel az azonosítóval. Ez a művelet visszafordíthatatlan.",
- "Deactivating your account does not by default erase messages you have sent. If you would like to erase your messages, please tick the box below.": "A felhasználói fiók felfüggesztése alapértelmezetten nem töröli semelyik általad küldött üzenetet. Ha az elküldött üzeneteidet törölni szeretnéd pipáld be a jelölőnégyzetet alul.",
- "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban olyan mint az e-mail. Az üzeneted törlése azt jelenti, hogy amit elküldtél már nem lesz megosztva új- vagy vendég felhasználóval, de azok a regisztrált felhasználók akik már látták az üzenetet továbbra is hozzáférnek a saját példányukhoz.",
"To continue, please enter your password:": "Folytatáshoz add meg a jelszavad:",
"password": "jelszó",
- "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Töröld az összes üzenetet amit küldtem amikor felfüggeszted a felhasználói fiókomat. (Figyelem: ezzel a jövőbeni felhasználók csak részleges beszélgetést láthatnak majd, ami rosszul eshet).",
"This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Ez végleg használhatatlanná teszi a fiókodat. Ezután nem fogsz tudni bejelentkezni, és más sem tud majd ezzel az azonosítóval fiókot létrehozni. Minden szobából amibe beléptél ki fogsz lépni, és törölni fogja minden fiók adatod az \"identity\" szerverről. Ez a művelet visszafordíthatatlan.",
"Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "A fiókod felfüggesztése nem jelenti alapértelmezetten azt, hogy az általad küldött üzenetek elfelejtődnek. Ha törölni szeretnéd az általad küldött üzeneteket, pipáld be a jelölőnégyzetet alul.",
"Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban hasonlít az emailhez. Az általad küldött üzenet törlése azt jelenti, hogy nem osztjuk meg új-, vagy vendég felhasználóval de a már regisztrált felhasználók akik már hozzáfértek az üzenethez továbbra is elérik a saját másolatukat.",
"Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Kérlek töröld az összes általam küldött üzenetet amikor a fiókomat felfüggesztem (Figyelem: ez azt eredményezheti, hogy a jövőbeni felhasználók csak részleges beszélgetést látnak majd)",
"e.g. %(exampleValue)s": "pl. %(exampleValue)s",
- "Help improve Riot by sending usage data ? This will use a cookie. (See our cookie and privacy policies ).": "Segítesz jobbá tenni a Riotot használati adat küldésével? Ez sütit (cookie) fog használni. (Nézd meg az Általános Szerződési Feltételeket ).",
"Reload widget": "Kisalkalmazás újratöltése",
"Please help improve Riot.im by sending anonymous usage data . This will use a cookie (please see our Cookie Policy ).": "Kérlek segíts javítani a Riot.im-et azzal, hogy anonim felhasználási adatokat küldesz. Ez szütit (cookie) fog használni (lásd a sütire vonatkozó szabályozásunkat ).",
"Please help improve Riot.im by sending anonymous usage data . This will use a cookie.": "Kérlek segíts javítani a Riot.im-et azzal, hogy anonim felhasználási adatokat küldesz. Ez szütit (cookie) fog használni.",
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index fa22725f78..c73dc8b60d 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1159,9 +1159,6 @@
"Refresh": "Aggiorna",
"We encountered an error trying to restore your previous session.": "Abbiamo riscontrato un errore tentando di ripristinare la tua sessione precedente.",
"Send analytics data": "Invia dati statistici",
- "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies ).": "Aiutare a migliorare Riot inviando statistiche d'uso? Verrà usato un cookie. (Vedi la nostra politica sui cookie e sulla privacy ).",
- "Help improve Riot by sending usage data? This will use a cookie.": "Aiutare a migliorare Riot inviando statistiche d'uso? Verrà usato un cookie.",
- "Yes please": "Sì grazie",
"Clear Storage and Sign Out": "Elimina lo storage e disconnetti",
"Send Logs": "Invia i log",
"Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Eliminare lo storage del browser potrebbe risolvere il problema, ma verrai disconnesso e la cronologia delle chat criptate sarà illeggibile.",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 9d7f8901ab..2bdce2fe4f 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1167,16 +1167,12 @@
"Enable widget screenshots on supported widgets": "Включить скриншоты виджета в поддерживаемых виджетах",
"Collapse Reply Thread": "Ответить с цитированием",
"Send analytics data": "Отправить данные аналитики",
- "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies ).": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie. (См. наши политики cookie и конфиденциальности ).",
- "Help improve Riot by sending usage data? This will use a cookie.": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie.",
- "Yes please": "Да, пожалуйста",
"Muted Users": "Приглушенные пользователи",
"Warning: This widget might use cookies.": "Внимание: этот виджет может использовать cookie.",
"Terms and Conditions": "Условия и положения",
"To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Для продолжения использования сервера %(homeserverDomain)s вы должны ознакомиться и принять условия и положения.",
"Review terms and conditions": "Просмотр условий и положений",
"e.g. %(exampleValue)s": "напр. %(exampleValue)s",
- "Help improve Riot by sending usage data ? This will use a cookie. (See our cookie and privacy policies ).": "Помогите улучшить Riot, отправляя данные использования ? Будут использоваться файлы cookie. (Смотрите наши политики cookie и конфиденциальности ).",
"Failed to indicate account erasure": "Не удается удалить учетную запись",
"This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Это навсегда сделает вашу учетную запись невозможной для использования. Вы не сможете войти в систему, и никто не сможет перерегистрировать тот же идентификатор пользователя. Это приведет к тому, что ваша учетная запись выйдет из всех комнат, в которые она входит, и будут удалены данные вашей учетной записи с сервера идентификации. Это действие необратимо.",
"Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "По умолчанию деактивация вашей учетной записи не приведет к удалению всех ваших сообщений. Если вы хотите, чтобы мы удалили ваши сообщения, поставьте отметку в поле ниже.",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 8e5d8e2f21..ff64f1a8e6 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -901,8 +901,6 @@
"This setting cannot be changed later!": "Den här inställningen kan inte ändras senare!",
"Unknown error": "Okänt fel",
"Incorrect password": "Felaktigt lösenord",
- "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Detta kommer att göra ditt konto permanent oanvändbart. Du kommer inte att kunna registrera samma användar-ID igen.",
- "This action is irreversible.": "Denna åtgärd går inte att ångra.",
"To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "För att verifiera att denna enhet kan litas på, vänligen kontakta ägaren på annat sätt (t ex personligen eller med ett telefonsamtal) och fråga om nyckeln ägaren har i sina användarinställningar för enheten matchar nyckeln nedan:",
"Device name": "Enhetsnamn",
"Device key": "Enhetsnyckel",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 80dce1cc2d..95424eaefb 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1170,9 +1170,6 @@
"Enable widget screenshots on supported widgets": "在支援的小工具上啟用小工具螢幕快照",
"Send analytics data": "傳送分析資料",
"Muted Users": "已靜音的使用者",
- "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies ).": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。（參見我們的 cookie 與隱私政策 ）。",
- "Help improve Riot by sending usage data? This will use a cookie.": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。",
- "Yes please": "好的，請",
"e.g. %(exampleValue)s": "範例：%(exampleValue)s",
"Reload widget": "重新載入小工具",
"Please help improve Riot.im by sending anonymous usage data . This will use a cookie (please see our Cookie Policy ).": "請透過傳送匿名使用資料 來協助改善 Riot.im。這將會使用 cookie（請參見我們的 Cookie 政策 ）。",
From 18546dbe06b86955b89a27dca5b29a3d3621bf11 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Jun 2018 11:33:38 +0100
Subject: [PATCH 0166/1196] QR Code align [m] logo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/dialogs/ShareDialog.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js
index 8bfa0ad931..a88052ee6d 100644
--- a/src/components/views/dialogs/ShareDialog.js
+++ b/src/components/views/dialogs/ShareDialog.js
@@ -186,7 +186,7 @@ export default class ShareDialog extends React.Component {
;
+ directMessageIndicator = ;
}
return
diff --git a/src/components/views/rooms/RoomTooltip.js b/src/components/views/rooms/RoomTooltip.js
index b17f54ef3c..bce0922637 100644
--- a/src/components/views/rooms/RoomTooltip.js
+++ b/src/components/views/rooms/RoomTooltip.js
@@ -14,11 +14,10 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-'use strict';
-var React = require('react');
-var ReactDOM = require('react-dom');
-var dis = require('../../../dispatcher');
+import React from 'react';
+import ReactDOM from 'react-dom';
+import dis from '../../../dispatcher';
import classNames from 'classnames';
const MIN_TOOLTIP_HEIGHT = 25;
@@ -77,25 +76,21 @@ module.exports = React.createClass({
},
_renderTooltip: function() {
- var label = this.props.room ? this.props.room.name : this.props.label;
-
// Add the parent's position to the tooltips, so it's correctly
// positioned, also taking into account any window zoom
// NOTE: The additional 6 pixels for the left position, is to take account of the
// tooltips chevron
- var parent = ReactDOM.findDOMNode(this).parentNode;
- var style = {};
+ const parent = ReactDOM.findDOMNode(this).parentNode;
+ let style = {};
style = this._updatePosition(style);
style.display = "block";
- const tooltipClasses = classNames(
- "mx_RoomTooltip", this.props.tooltipClassName,
- );
+ const tooltipClasses = classNames("mx_RoomTooltip", this.props.tooltipClassName);
- var tooltip = (
-
{ this.props.title }
{ this.props.children }
diff --git a/src/components/views/dialogs/ChatCreateOrReuseDialog.js b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
index e2387064cf..95fd8848ba 100644
--- a/src/components/views/dialogs/ChatCreateOrReuseDialog.js
+++ b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
@@ -187,7 +187,7 @@ export default class ChatCreateOrReuseDialog extends React.Component {
}
}
-ChatCreateOrReuseDialog.propTyps = {
+ChatCreateOrReuseDialog.propTypes = {
userId: PropTypes.string.isRequired,
// Called when clicking outside of the dialog
onFinished: PropTypes.func.isRequired,
From f9b3f0f9d1ff039fc608181138c6a771e94a7709 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Jun 2018 11:15:52 +0100
Subject: [PATCH 0165/1196] run gen-i18n and prune-i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/i18n/strings/de_DE.json | 3 --
src/i18n/strings/en_EN.json | 69 +++++++++++++++++++----------------
src/i18n/strings/eu.json | 7 ----
src/i18n/strings/fr.json | 8 ----
src/i18n/strings/hu.json | 8 ----
src/i18n/strings/it.json | 3 --
src/i18n/strings/ru.json | 4 --
src/i18n/strings/sv.json | 2 -
src/i18n/strings/zh_Hant.json | 3 --
9 files changed, 38 insertions(+), 69 deletions(-)
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index d3787a15a3..8f75b71689 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1169,9 +1169,6 @@
"At this time it is not possible to reply with an emote.": "An dieser Stelle ist es nicht möglich mit einer Umschreibung zu antworten.",
"Enable widget screenshots on supported widgets": "Widget-Screenshots bei unterstützten Widgets aktivieren",
"Send analytics data": "Analysedaten senden",
- "Help improve Riot by sending usage data? This will use a cookie. (See our QR Code
-
From 093400681700c7c441cde55f3a22900a5ebb5635 Mon Sep 17 00:00:00 2001
From: Luke Barnard
Date: Tue, 12 Jun 2018 14:13:09 +0100
Subject: [PATCH 0167/1196] Track decryption success/failure rate with piwik
Emit a piwik event when a decryption occurs in the category "E2E" with
the action "Decryption result" and the name either "failure" or
"success".
NB: This will cause Riot to a lot of networking when decrypting many
events. One HTTP request per decrypted event should be expected.
---
src/components/structures/MatrixChat.js | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index bd8f66163f..d4969a8bf9 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1308,6 +1308,15 @@ export default React.createClass({
}
});
+ // XXX: This will do a HTTP request for each Event.decrypted event
+ cli.on("Event.decrypted", (e) => {
+ if (e.isDecryptionFailure()) {
+ Analytics.trackEvent('E2E', 'Decryption result', 'failure');
+ } else {
+ Analytics.trackEvent('E2E', 'Decryption result', 'success');
+ }
+ });
+
const krh = new KeyRequestHandler(cli);
cli.on("crypto.roomKeyRequest", (req) => {
krh.handleKeyRequest(req);
From 334dccbdc78597aa071762267a55447a61686dcd Mon Sep 17 00:00:00 2001
From: David Baker
Date: Tue, 12 Jun 2018 14:14:14 +0100
Subject: [PATCH 0168/1196] Released js-sdk
---
package-lock.json | 2 +-
package.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index f183f1635d..bb77fcb92b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "matrix-react-sdk",
- "version": "0.12.2",
+ "version": "0.12.7-rc.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 6add75f972..581d25688a 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
"linkifyjs": "^2.1.3",
"lodash": "^4.13.1",
"lolex": "2.3.2",
- "matrix-js-sdk": "0.10.4-rc.1",
+ "matrix-js-sdk": "0.10.4",
"optimist": "^0.6.1",
"pako": "^1.0.5",
"prop-types": "^15.5.8",
From 0ad738d51044d9c92e73777d0dd79ded32118a23 Mon Sep 17 00:00:00 2001
From: David Baker
Date: Tue, 12 Jun 2018 14:21:30 +0100
Subject: [PATCH 0169/1196] Prepare changelog for v0.12.7
---
CHANGELOG.md | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae8f535cb6..3b97251604 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [0.12.7](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.7) (2018-06-12)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.7-rc.1...v0.12.7)
+
+ * No changes since rc.1
+
Changes in [0.12.7-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.7-rc.1) (2018-06-06)
===============================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.6...v0.12.7-rc.1)
From ef1f580abbdb96446cf112f8206d776bdeb3e9c6 Mon Sep 17 00:00:00 2001
From: David Baker
Date: Tue, 12 Jun 2018 14:21:30 +0100
Subject: [PATCH 0170/1196] v0.12.7
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 581d25688a..2984679bed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "matrix-react-sdk",
- "version": "0.12.7-rc.1",
+ "version": "0.12.7",
"description": "SDK for matrix.org using React",
"author": "matrix.org",
"repository": {
From 9b6c3f44ec03974665e4af77085f1a6b287237a1 Mon Sep 17 00:00:00 2001
From: Silke
Date: Mon, 11 Jun 2018 20:27:41 +0000
Subject: [PATCH 0171/1196] Translated using Weblate (Dutch)
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
---
src/i18n/strings/nl.json | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index f09c63118e..130be0d344 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -64,7 +64,7 @@
"Active call (%(roomName)s)": "Actief gesprek (%(roomName)s)",
"Add": "Toevoegen",
"Add a topic": "Een onderwerp toevoegen",
- "Admin Tools": "Beheerhulpmiddelen",
+ "Admin Tools": "Beheerdershulpmiddelen",
"VoIP": "VoiP",
"Missing Media Permissions, click here to request.": "Ontbrekende mediatoestemmingen, klik hier om aan te vragen.",
"No Microphones detected": "Geen microfoons gevonden",
@@ -410,7 +410,7 @@
"Tried to load a specific point in this room's timeline, but was unable to find it.": "Het is niet gelukt om een specifiek punt in de tijdlijn van deze ruimte te laden.",
"Turn Markdown off": "Zet Markdown uit",
"Turn Markdown on": "Zet Markdown aan",
- "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s heeft eind-tot-eind versleuteling aangezet (algoritme %(algorithm)s).",
+ "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s heeft end-to-endbeveiliging aangezet (algoritme %(algorithm)s).",
"Unable to add email address": "Niet mogelijk om e-mailadres toe te voegen",
"Unable to remove contact information": "Niet mogelijk om contactinformatie te verwijderen",
"Unable to verify email address.": "Niet mogelijk om het e-mailadres te verifiëren.",
@@ -581,7 +581,7 @@
"Add User": "Gebruiker Toevoegen",
"This Home Server would like to make sure you are not a robot": "Deze thuisserver wil er zeker van zijn dat je geen robot bent",
"Sign in with CAS": "Inloggen met CAS",
- "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Je kan de aangepaste server opties gebruiken om bij andere Matrix-servers in te loggen door een andere thuisserver-URL te specificeren.",
+ "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Je kan de alternatieve-serverinstellingen gebruiken om bij andere Matrix-servers in te loggen door een andere thuisserver-URL te specificeren.",
"This allows you to use this app with an existing Matrix account on a different home server.": "Dit maakt het mogelijk om deze applicatie te gebruiken met een bestaand Matrix-account op een andere thuisserver.",
"You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Je kan ook een aangepaste identiteitsserver instellen maar dit zal waarschijnlijk interactie met gebruikers gebaseerd op een e-mailadres voorkomen.",
"Please check your email to continue registration.": "Bekijk je e-mail om door te gaan met de registratie.",
@@ -590,7 +590,7 @@
"If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Als je geen e-mailadres specificeert zal je niet je wachtwoord kunnen resetten. Weet je het zeker?",
"You are registering with %(SelectedTeamName)s": "Je registreert je met %(SelectedTeamName)s",
"Default server": "Standaardserver",
- "Custom server": "Aangepaste server",
+ "Custom server": "Alternatieve server",
"Home server URL": "Thuisserver-URL",
"Identity server URL": "Identiteitsserver-URL",
"What does this mean?": "Wat betekent dit?",
@@ -603,7 +603,7 @@
"URL Previews": "URL-Voorvertoningen",
"Drop file here to upload": "Bestand hier laten vallen om te uploaden",
" (unsupported)": " (niet ondersteund)",
- "Ongoing conference call%(supportedText)s.": "Lopend vergaderingsgesprek %(supportedText)s.",
+ "Ongoing conference call%(supportedText)s.": "Lopend groepsgesprek%(supportedText)s.",
"Online": "Online",
"Idle": "Afwezig",
"Offline": "Offline",
@@ -759,7 +759,7 @@
"World readable": "Leesbaar voor iedereen",
"Guests can join": "Gasten kunnen toetreden",
"Remove avatar": "Avatar verwijderen",
- "To change the room's avatar, you must be a": "Om de avatar van de ruimte te verwijderen, moet het volgende zijn:",
+ "To change the room's avatar, you must be a": "Om de avatar van de ruimte te verwijderen, moet je het volgende zijn:",
"Drop here to favourite": "Hier laten vallen om aan favorieten toe te voegen",
"Drop here to tag direct chat": "Hier laten vallen om als privégesprek te markeren",
"Drop here to restore": "Hier laten vallen om te herstellen",
@@ -923,7 +923,7 @@
"This Home server does not support communities": "Deze Thuisserver ondersteunt geen gemeenschappen",
"Failed to load %(groupId)s": "Het is niet gelukt om %(groupId)s te laden",
"Old cryptography data detected": "Oude cryptografie gegevens gedetecteerd",
- "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Er zijn gegevens van een oudere versie van Riot gedetecteerd. Dit zal eind-tot-eind versleuteling laten storen in de oudere versie. Eind-tot-eind berichten dat recent zijn uitgewisseld zal misschien niet ontsleutelbaar zijn in deze versie. Dit zou er misschien ook voor kunnen zorgen dat berichten die zijn uitgewisseld in deze versie falen. Indien je problemen ervaart, log opnieuw in. Om de berichtgeschiedenis te behouden, exporteer de sleutels en importeer ze achteraf weer.",
+ "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Er zijn gegevens van een oudere versie van Riot gedetecteerd. Dit verstoorde end-to-endbeveiliging in de oude versie. End-to-endbeveiligde berichten die recent uitgewisseld zijn met de oude versie zijn wellicht niet te ontsleutelen in deze versie. Dit zou er ook voor kunnen zorgen dat berichten die zijn uitgewisseld in deze versie falen. Log opnieuw in als je problemen ervaart. Exporteer de sleutels en importeer ze achteraf weer om de berichtgeschiedenis te behouden.",
"Your Communities": "Jouw Gemeenschappen",
"Error whilst fetching joined communities": "Er is een fout opgetreden tijdens het ophalen van de gemeenschappen waar je lid van bent",
"Create a new community": "Maak een nieuwe gemeenschap aan",
@@ -1166,7 +1166,7 @@
"Please help improve Riot.im by sending anonymous usage data . This will use a cookie.": "Help Riot.im te verbeteren door het versturen van anonieme gebruiksgegevens . Dit zal een cookie gebruiken.",
"Yes, I want to help!": "Ja, ik wil helpen!",
"Warning: This widget might use cookies.": "Waarschuwing: deze widget gebruikt misschien cookies.",
- "Popout widget": "Opspringende widget",
+ "Popout widget": "Widget in nieuw venster openen",
"Picture": "Afbeelding",
"Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Niet mogelijk om de gebeurtenis te laden waar op gereageerd was. Het kan zijn dat het niet bestaat of dat je niet toestemming hebt om het te bekijken.",
"Riot bugs are tracked on GitHub: create a GitHub issue.": "Riot fouten worden bijgehouden op GitHub: maak een GitHub melding.",
From 848052bb808d82885ec7993e5b351f39c6af4de8 Mon Sep 17 00:00:00 2001
From: strix aluco
Date: Sun, 10 Jun 2018 02:40:40 +0000
Subject: [PATCH 0172/1196] Translated using Weblate (Ukrainian)
Currently translated at 23.6% (281 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
---
src/i18n/strings/uk.json | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 74bf855d22..b454c02884 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -94,7 +94,7 @@
"Register": "Зарегіструватись",
"Rooms": "Кімнати",
"Add rooms to this community": "Добавити кімнати в це суспільство",
- "This email address is already in use": "Ця адреса елект. почти вже використовується",
+ "This email address is already in use": "Ця е-пошта вже використовується",
"This phone number is already in use": "Цей телефонний номер вже використовується",
"Fetching third party location failed": "Не вдалось отримати стороннє місцеперебування",
"Messages in one-to-one chats": "Повідомлення у чатах \"сам на сам\"",
@@ -270,5 +270,15 @@
"Your language of choice": "Обрана мова",
"Which officially provided instance you are using, if any": "Яким офіційно наданим примірником ви користуєтесь (якщо користуєтесь)",
"Whether or not you're using the Richtext mode of the Rich Text Editor": "Чи використовуєте ви режим Richtext у редакторі Rich Text Editor",
- "Your homeserver's URL": "URL адреса вашого домашнього серверу"
+ "Your homeserver's URL": "URL адреса вашого домашнього серверу",
+ "Failed to verify email address: make sure you clicked the link in the email": "Не вдалось перевірити адресу е-пошти: переконайтесь, що ви перейшли за посиланням у листі",
+ "The platform you're on": "Використовувана платформа",
+ "Your identity server's URL": "URL адреса серверу ідентифікації",
+ "e.g. %(exampleValue)s": "напр. %(exampleValue)s",
+ "Every page you use in the app": "Кожна використовувана у застосунку сторінка",
+ "e.g. ": "напр. ",
+ "Your User Agent": "Ваш користувацький агент",
+ "Your device resolution": "Роздільність вашого пристрою",
+ "Analytics": "Аналітика",
+ "The information being sent to us to help make Riot.im better includes:": "Надсилана інформація, що допомагає нам покращити Riot.im, вміщує:"
}
From c820836bcc1c95d0fb292f47ecb377e602f5b9ee Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Jun 2018 15:22:45 +0100
Subject: [PATCH 0173/1196] make RoomTooltip generic and add
ContextMenu&Tooltip to GroupInviteTile
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
.../GroupInviteTileContextMenu.js | 87 ++++++++++++++++
.../views/groups/GroupInviteTile.js | 98 +++++++++++++++++--
src/components/views/rooms/RoomList.js | 3 +-
src/components/views/rooms/RoomTile.js | 4 +-
src/components/views/rooms/RoomTooltip.js | 25 ++---
5 files changed, 189 insertions(+), 28 deletions(-)
create mode 100644 src/components/views/context_menus/GroupInviteTileContextMenu.js
diff --git a/src/components/views/context_menus/GroupInviteTileContextMenu.js b/src/components/views/context_menus/GroupInviteTileContextMenu.js
new file mode 100644
index 0000000000..844845ea82
--- /dev/null
+++ b/src/components/views/context_menus/GroupInviteTileContextMenu.js
@@ -0,0 +1,87 @@
+/*
+Copyright 2018 Vector Creations Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import classNames from 'classnames';
+import PropTypes from 'prop-types';
+import sdk from '../../../index';
+import { _t, _td } from '../../../languageHandler';
+import Modal from '../../../Modal';
+import {Group} from 'matrix-js-sdk';
+import GroupStore from "../../../stores/GroupStore";
+
+export default class GroupInviteTileContextMenu extends React.Component {
+ static propTypes = {
+ group: PropTypes.instanceOf(Group).isRequired,
+ /* callback called when the menu is dismissed */
+ onFinished: PropTypes.func,
+ };
+
+ constructor(props, context) {
+ super(props, context);
+
+ this._onClickReject = this._onClickReject.bind(this);
+ }
+
+ componentWillMount() {
+ this._unmounted = false;
+ }
+
+ componentWillUnmount() {
+ this._unmounted = true;
+ }
+
+ _onClickReject() {
+ const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
+ Modal.createTrackedDialog('Reject community invite', '', QuestionDialog, {
+ title: _t('Reject invitation'),
+ description: _t('Are you sure you want to reject the invitation?'),
+ onFinished: async (shouldLeave) => {
+ if (!shouldLeave) return;
+
+ // FIXME: controller shouldn't be loading a view :(
+ const Loader = sdk.getComponent("elements.Spinner");
+ const modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner');
+
+ try {
+ await GroupStore.leaveGroup(this.props.group.groupId);
+ } catch (e) {
+ console.error(e);
+ const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+ Modal.createTrackedDialog('Error rejecting invite', '', ErrorDialog, {
+ title: _t("Error"),
+ description: _t("Unable to reject invite"),
+ });
+ }
+ modal.close();
+ },
+ });
+
+ // Close the context menu
+ if (this.props.onFinished) {
+ this.props.onFinished();
+ }
+ }
+
+ render() {
+ return
+ const nameClasses = classNames({
+ 'mx_RoomTile_name': true,
+ 'mx_RoomTile_invite': this.props.isInvite,
+ 'mx_RoomTile_badgeShown': this.state.badgeHover || this.state.menuDisplayed,
+ });
+
+ const label =
{ groupName }
;
- const badge =
+
+ { tooltip }
);
},
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index fc1872249f..2722bad88b 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -589,8 +589,7 @@ module.exports = React.createClass({
const GroupInviteTile = sdk.getComponent('groups.GroupInviteTile');
for (const group of MatrixClientPeg.get().getGroups()) {
if (group.myMembership !== 'invite') continue;
-
- ret.push(
+
;
+ }
+}
diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index d97464e8ca..65e8a07d5a 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -1,5 +1,5 @@
/*
-Copyright 2017 New Vector Ltd
+Copyright 2017, 2018 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,6 +20,8 @@ import { MatrixClient } from 'matrix-js-sdk';
import sdk from '../../../index';
import dis from '../../../dispatcher';
import AccessibleButton from '../elements/AccessibleButton';
+import * as ContextualMenu from "../../structures/ContextualMenu";
+import classNames from 'classnames';
export default React.createClass({
displayName: 'GroupInviteTile',
@@ -32,6 +34,15 @@ export default React.createClass({
matrixClient: PropTypes.instanceOf(MatrixClient),
},
+ getInitialState: function() {
+ return ({
+ hover: false,
+ badgeHover: false,
+ menuDisplayed: false,
+ selected: this.props.group.groupId === null, // XXX: this needs linking to LoggedInView/GroupView state
+ });
+ },
+
onClick: function(e) {
dis.dispatch({
action: 'view_group',
@@ -39,6 +50,56 @@ export default React.createClass({
});
},
+ onMouseEnter: function() {
+ const state = {hover: true};
+ // Only allow non-guests to access the context menu
+ if (!this.context.matrixClient.isGuest()) {
+ state.badgeHover = true;
+ }
+ this.setState(state);
+ },
+
+ onMouseLeave: function() {
+ this.setState({
+ badgeHover: false,
+ hover: false,
+ });
+ },
+
+ onBadgeClicked: function(e) {
+ // Prevent the RoomTile onClick event firing as well
+ e.stopPropagation();
+
+ // Only allow none guests to access the context menu
+ if (this.context.matrixClient.isGuest()) return;
+
+ // If the badge is clicked, then no longer show tooltip
+ if (this.props.collapsed) {
+ this.setState({ hover: false });
+ }
+
+ const RoomTileContextMenu = sdk.getComponent('context_menus.GroupInviteTileContextMenu');
+ const elementRect = e.target.getBoundingClientRect();
+
+ // The window X and Y offsets are to adjust position when zoomed in to page
+ const x = elementRect.right + window.pageXOffset + 3;
+ const chevronOffset = 12;
+ let y = (elementRect.top + (elementRect.height / 2) + window.pageYOffset);
+ y = y - (chevronOffset + 8); // where 8 is half the height of the chevron
+
+ ContextualMenu.createMenu(RoomTileContextMenu, {
+ chevronOffset: chevronOffset,
+ left: x,
+ top: y,
+ group: this.props.group,
+ onFinished: () => {
+ this.setState({ menuDisplayed: false });
+ // this.props.refreshSubList();
+ },
+ });
+ this.setState({ menuDisplayed: true });
+ },
+
render: function() {
const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
const EmojiText = sdk.getComponent('elements.EmojiText');
@@ -49,19 +110,37 @@ export default React.createClass({
const av =
+ 
+ { _t('Reject') }
+
+
+ { _t('Reject') }
+ !
;
+ const badgeEllipsis = this.state.badgeHover || this.state.menuDisplayed;
+ const badgeClasses = classNames('mx_RoomSubList_badge mx_RoomSubList_badgeHighlight', {
+ 'mx_RoomTile_badgeButton': badgeEllipsis,
+ });
+
+ const badgeContent = badgeEllipsis ? '\u00B7\u00B7\u00B7' : '!';
+ const badge = { badgeContent }
;
+
+ let tooltip;
+ if (this.props.collapsed && this.state.hover) {
+ const RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
+ tooltip =
{ av }
@@ -69,6 +148,7 @@ export default React.createClass({
{ label }
{ badge }
;
+ directMessageIndicator = ;
}
return
-
- { label }
+ const tooltip = (
+
-
+
+
+ { this.props.label }
);
From 9dd2184b33720b44c34b29f8039652df02eb66ce Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Jun 2018 15:29:05 +0100
Subject: [PATCH 0174/1196] remove unused imports
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
.../views/context_menus/GroupInviteTileContextMenu.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/components/views/context_menus/GroupInviteTileContextMenu.js b/src/components/views/context_menus/GroupInviteTileContextMenu.js
index 844845ea82..bbdc3a4244 100644
--- a/src/components/views/context_menus/GroupInviteTileContextMenu.js
+++ b/src/components/views/context_menus/GroupInviteTileContextMenu.js
@@ -15,10 +15,9 @@ limitations under the License.
*/
import React from 'react';
-import classNames from 'classnames';
import PropTypes from 'prop-types';
import sdk from '../../../index';
-import { _t, _td } from '../../../languageHandler';
+import { _t } from '../../../languageHandler';
import Modal from '../../../Modal';
import {Group} from 'matrix-js-sdk';
import GroupStore from "../../../stores/GroupStore";
From ed779cabc403145107110def3e3d5b29d432ebbb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Jun 2018 15:34:35 +0100
Subject: [PATCH 0175/1196] add mx_filterFlipColor to mx_MemberInfo_cancel img
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/groups/GroupMemberInfo.js | 2 +-
src/components/views/rooms/MemberInfo.js | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/components/views/groups/GroupMemberInfo.js b/src/components/views/groups/GroupMemberInfo.js
index 4fed293bec..ca59075912 100644
--- a/src/components/views/groups/GroupMemberInfo.js
+++ b/src/components/views/groups/GroupMemberInfo.js
@@ -187,7 +187,7 @@ module.exports = React.createClass({
return (
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 2789c0e4cd..75e6990120 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -902,7 +902,9 @@ module.exports = withMatrixClient(React.createClass({
return (
-
+
+
+
Date: Tue, 12 Jun 2018 16:14:24 +0100
Subject: [PATCH 0176/1196] Keep context menus that extend downwards vertically
on screen
This fixes https://github.com/vector-im/riot-web/issues/3429 in the case
of RoomList context menus *and* EventTile context menus.
This was mostly stolen from #1903 and it would be good to factor things
out at a later date such that #1903 is replaced with similar logic
within ContextualMenu.
---
src/components/structures/ContextualMenu.js | 37 +++++++++++++++++++--
1 file changed, 35 insertions(+), 2 deletions(-)
diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js
index daac294d12..3e867ad384 100644
--- a/src/components/structures/ContextualMenu.js
+++ b/src/components/structures/ContextualMenu.js
@@ -63,6 +63,24 @@ export default class ContextualMenu extends React.Component {
hasBackground: PropTypes.bool,
}
+ constructor() {
+ super();
+ this.state = {
+ contextMenuRect: null,
+ };
+
+ this.collectContextMenuRect = this.collectContextMenuRect.bind(this);
+ }
+
+ collectContextMenuRect(element) {
+ // We don't need to clean up when unmounting, so ignore
+ if (!element) return;
+
+ this.setState({
+ contextMenuRect: element.getBoundingClientRect(),
+ });
+ }
+
render() {
const position = {};
let chevronFace = null;
@@ -83,6 +101,9 @@ export default class ContextualMenu extends React.Component {
chevronFace = 'right';
}
+ const contextMenuRect = this.state.contextMenuRect || null;
+ const padding = 10;
+
const chevronOffset = {};
if (props.chevronFace) {
chevronFace = props.chevronFace;
@@ -90,7 +111,19 @@ export default class ContextualMenu extends React.Component {
if (chevronFace === 'top' || chevronFace === 'bottom') {
chevronOffset.left = props.chevronOffset;
} else {
- chevronOffset.top = props.chevronOffset;
+ const target = position.top;
+
+ // By default, no adjustment is made
+ let adjusted = target;
+
+ // If we know the dimensions of the context menu, adjust its position
+ // such that it does not leave the (padded) window.
+ if (contextMenuRect) {
+ adjusted = Math.min(position.top, document.body.clientHeight - contextMenuRect.height - padding);
+ }
+
+ position.top = adjusted;
+ chevronOffset.top = Math.max(props.chevronOffset, props.chevronOffset + target - adjusted);
}
// To override the default chevron colour, if it's been set
@@ -154,7 +187,7 @@ export default class ContextualMenu extends React.Component {
// FIXME: If a menu uses getDefaultProps it clobbers the onFinished
// property set here so you can't close the menu from a button click!
return
+
-
+
Date: Tue, 12 Jun 2018 13:44:07 +0000
Subject: [PATCH 0177/1196] Translated using Weblate (Russian)
Currently translated at 99.8% (1188 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
src/i18n/strings/ru.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index bc6b51a269..bed1cb3a21 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1189,5 +1189,6 @@
"Reload widget": "Перезагрузить виджет",
"To notify everyone in the room, you must be a": "Для уведомления всех в комнате, вы должны быть",
"Can't leave Server Notices room": "Невозможно покинуть комнату сервера уведомлений",
- "This room is used for important messages from the Homeserver, so you cannot leave it.": "Эта комната используется для важных сообщений от сервера, поэтому вы не можете ее покинуть."
+ "This room is used for important messages from the Homeserver, so you cannot leave it.": "Эта комната используется для важных сообщений от сервера, поэтому вы не можете ее покинуть.",
+ "Try the app first": "Сначала попробуйте приложение"
}
From 175f1aa15cc51f28d376d550cc76520830535806 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Jun 2018 16:43:54 +0100
Subject: [PATCH 0178/1196] don't set the displayname on registration as
Synapse now does it
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/MatrixChat.js | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index bd8f66163f..50a1f70496 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1143,11 +1143,6 @@ export default React.createClass({
} else if (this._is_registered) {
this._is_registered = false;
- // Set the display name = user ID localpart
- MatrixClientPeg.get().setDisplayName(
- MatrixClientPeg.get().getUserIdLocalpart(),
- );
-
if (this.props.config.welcomeUserId && getCurrentLanguage().startsWith("en")) {
createRoom({
dmUserId: this.props.config.welcomeUserId,
From c1d375c3fd76b252b0e12a0e9636dde96d15d8b4 Mon Sep 17 00:00:00 2001
From: Osoitz
Date: Sat, 2 Jun 2018 12:31:10 +0000
Subject: [PATCH 0179/1196] Translated using Weblate (Basque)
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
src/i18n/strings/eu.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index ac2187456e..b8ebdde7e4 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1194,5 +1194,6 @@
"Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Matrix-eko mezuen ikusgaitasuna e-mail sistemaren antekoa da. Guk zure mezuak ahaztean ez dizkiogu erabiltzaile berriei edo izena eman ez dutenei erakutsiko, baina jada zure mezuak jaso dituzten erregistratutako erabiltzaileen bere kopia izaten jarraituko dute.",
"Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Ahaztu bidali ditudan mezu guztiak kontua desaktibatzean (Abisua: Honekin etorkizuneko erabiltzaileek elkarrizketaren bertsio ez oso bat ikusiko dute)",
"Can't leave Server Notices room": "Ezin zara Server Notices gelatik atera",
- "This room is used for important messages from the Homeserver, so you cannot leave it.": "Gela hau mezu hasiera zerbitzariaren garrantzitsuak bidaltzeko erabiltzen da, eta ezin zara atera."
+ "This room is used for important messages from the Homeserver, so you cannot leave it.": "Gela hau mezu hasiera zerbitzariaren garrantzitsuak bidaltzeko erabiltzen da, eta ezin zara atera.",
+ "Try the app first": "Probatu aplikazioa aurretik"
}
From 18d542965de969331c527e6543a2fa60b91e5f6f Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev
Date: Wed, 30 May 2018 12:53:39 +0000
Subject: [PATCH 0180/1196] Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
---
src/i18n/strings/bg.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index e1709f1e0a..e9482f9b59 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1187,5 +1187,6 @@
"Terms and Conditions": "Правила и условия",
"To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "За да продължите да ползвате %(homeserverDomain)s е необходимо да прегледате и да се съгласите с правилата и условията за ползване.",
"Review terms and conditions": "Прегледай правилата и условията",
- "Failed to indicate account erasure": "Неуспешно указване на желанието за изтриване на акаунта"
+ "Failed to indicate account erasure": "Неуспешно указване на желанието за изтриване на акаунта",
+ "Try the app first": "Първо пробвайте приложението"
}
From b477d1d976a84d8a93090d7ed7ed6847b6c1bcd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?=
Date: Mon, 28 May 2018 06:49:16 +0000
Subject: [PATCH 0181/1196] Translated using Weblate (French)
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
src/i18n/strings/fr.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index c3cfdef5fc..4518b92c61 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1195,5 +1195,6 @@
"Yes, I want to help!": "Oui, je veux aider !",
"Can't leave Server Notices room": "Impossible de quitter le salon des Annonces du serveur",
"This room is used for important messages from the Homeserver, so you cannot leave it.": "Ce salon est utilisé pour les messages importants du serveur d'accueil, donc vous ne pouvez pas en partir.",
- "To notify everyone in the room, you must be a": "Pour notifier tout le monde dans le salon, vous devez être un(e)"
+ "To notify everyone in the room, you must be a": "Pour notifier tout le monde dans le salon, vous devez être un(e)",
+ "Try the app first": "Essayer d'abord l'application"
}
From 22bec0d67d6928afedeaca9be43b45c924d3f639 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 13 Jun 2018 09:13:32 +0100
Subject: [PATCH 0182/1196] allow CreateRoom to scale properly horizontally
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
res/css/views/dialogs/_CreateRoomDialog.scss | 5 +++++
src/components/views/dialogs/CreateRoomDialog.js | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/res/css/views/dialogs/_CreateRoomDialog.scss b/res/css/views/dialogs/_CreateRoomDialog.scss
index 888f147d21..05d5bfcebf 100644
--- a/res/css/views/dialogs/_CreateRoomDialog.scss
+++ b/res/css/views/dialogs/_CreateRoomDialog.scss
@@ -23,6 +23,10 @@ limitations under the License.
padding-bottom: 12px;
}
+.mx_CreateRoomDialog_input_container {
+ padding-right: 20px;
+}
+
.mx_CreateRoomDialog_input {
font-size: 15px;
border-radius: 3px;
@@ -30,4 +34,5 @@ limitations under the License.
padding: 9px;
color: $primary-fg-color;
background-color: $primary-bg-color;
+ width: 100%;
}
diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index 51693a19c9..3b5369e8f6 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -52,8 +52,8 @@ export default React.createClass({
-
{ chevron }
From 6a382aa57c10bc8ef8817f054beac45ca34b72a1 Mon Sep 17 00:00:00 2001
From: Andrey
-
+
From 846c14062a424544d1aa9345c85778c17c6ba92f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 13 Jun 2018 09:28:35 +0100 Subject: [PATCH 0183/1196] show redacted stickers like other redacted messages Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/messages/MessageEvent.js | 3 ++- src/components/views/rooms/EventTile.js | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js index 38f55c9d70..babe1bbf29 100644 --- a/src/components/views/messages/MessageEvent.js +++ b/src/components/views/messages/MessageEvent.js @@ -69,7 +69,8 @@ module.exports = React.createClass({ if (msgtype && bodyTypes[msgtype]) { BodyType = bodyTypes[msgtype]; } else if (this.props.mxEvent.getType() === 'm.sticker') { - BodyType = sdk.getComponent('messages.MStickerBody'); + // if sticker is redacted, show UnknownBody otherwise it'll fall through to elif + BodyType = this.props.mxEvent.isRedacted() ? UnknownBody : sdk.getComponent('messages.MStickerBody'); } else if (content.url) { // Fallback to MFileBody if there's a content URL BodyType = bodyTypes['m.file']; diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js index 589524bb9e..c43ddaad11 100644 --- a/src/components/views/rooms/EventTile.js +++ b/src/components/views/rooms/EventTile.js @@ -490,7 +490,7 @@ module.exports = withMatrixClient(React.createClass({ } const isSending = (['sending', 'queued', 'encrypting'].indexOf(this.props.eventSendStatus) !== -1); - const isRedacted = (eventType === 'm.room.message') && this.props.isRedacted; + const isRedacted = isMessageEvent(this.props.mxEvent) && this.props.isRedacted; const isEncryptionFailure = this.props.mxEvent.isDecryptionFailure(); const classes = classNames({ @@ -715,9 +715,15 @@ module.exports = withMatrixClient(React.createClass({ }, })); +// XXX this'll eventually be dynamic based on the fields once we have extensible event types +const messageTypes = ['m.room.message', 'm.sticker']; +function isMessageEvent(ev) { + return (messageTypes.includes(ev.getType())); +} + module.exports.haveTileForEvent = function(e) { // Only messages have a tile (black-rectangle) if redacted - if (e.isRedacted() && e.getType() !== 'm.room.message') return false; + if (e.isRedacted() && !isMessageEvent(e)) return false; const handler = getHandlerTile(e); if (handler === undefined) return false; From 20caea47f81aaa46ae04d9408b15da5b28374aa8 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 13 Jun 2018 09:32:21 +0100 Subject: [PATCH 0184/1196] make more generic Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/messages/MessageEvent.js | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js index babe1bbf29..c4d29257ff 100644 --- a/src/components/views/messages/MessageEvent.js +++ b/src/components/views/messages/MessageEvent.js @@ -62,18 +62,24 @@ module.exports = React.createClass({ 'm.audio': sdk.getComponent('messages.MAudioBody'), 'm.video': sdk.getComponent('messages.MVideoBody'), }; + const evTypes = { + 'm.sticker': sdk.getComponent('messages.MStickerBody'), + }; const content = this.props.mxEvent.getContent(); + const type = this.props.mxEvent.getType(); const msgtype = content.msgtype; let BodyType = UnknownBody; - if (msgtype && bodyTypes[msgtype]) { - BodyType = bodyTypes[msgtype]; - } else if (this.props.mxEvent.getType() === 'm.sticker') { - // if sticker is redacted, show UnknownBody otherwise it'll fall through to elif - BodyType = this.props.mxEvent.isRedacted() ? UnknownBody : sdk.getComponent('messages.MStickerBody'); - } else if (content.url) { - // Fallback to MFileBody if there's a content URL - BodyType = bodyTypes['m.file']; + if (!this.props.mxEvent.isRedacted()) { + // only resolve BodyType if event is not redacted + if (msgtype && bodyTypes[msgtype]) { + BodyType = bodyTypes[msgtype]; + } else if (type && evTypes[type]) { + BodyType = evTypes[type]; + } else if (content.url) { + // Fallback to MFileBody if there's a content URL + BodyType = bodyTypes['m.file']; + } } return
Date: Wed, 13 Jun 2018 09:38:23 +0100
Subject: [PATCH 0185/1196] Only track decryption failures
---
src/components/structures/MatrixChat.js | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index d4969a8bf9..b5c5efa230 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1311,9 +1311,7 @@ export default React.createClass({
// XXX: This will do a HTTP request for each Event.decrypted event
cli.on("Event.decrypted", (e) => {
if (e.isDecryptionFailure()) {
- Analytics.trackEvent('E2E', 'Decryption result', 'failure');
- } else {
- Analytics.trackEvent('E2E', 'Decryption result', 'success');
+ Analytics.trackEvent('E2E', 'Decryption failure');
}
});
From 230de44071196151fbc247f0a90a9b9954286d38 Mon Sep 17 00:00:00 2001
From: Luke Barnard
Date: Wed, 13 Jun 2018 09:38:57 +0100
Subject: [PATCH 0186/1196] Adjust comment
---
src/components/structures/MatrixChat.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index b5c5efa230..c94baa63ef 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1309,6 +1309,7 @@ export default React.createClass({
});
// XXX: This will do a HTTP request for each Event.decrypted event
+ // if the decryption was a failure
cli.on("Event.decrypted", (e) => {
if (e.isDecryptionFailure()) {
Analytics.trackEvent('E2E', 'Decryption failure');
From 8136069046db911f231d41f56b8d657a6cde94d2 Mon Sep 17 00:00:00 2001
From: Osoitz
Date: Tue, 12 Jun 2018 21:55:54 +0000
Subject: [PATCH 0187/1196] Translated using Weblate (Basque)
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
src/i18n/strings/eu.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index b8ebdde7e4..1be59bdbd5 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -844,8 +844,8 @@
"were unbanned %(count)s times|one": "debekua kendu zaie",
"was unbanned %(count)s times|other": "%(count)s aldiz kendu zaio debekua",
"was unbanned %(count)s times|one": "debekua kendu zaio",
- "were kicked %(count)s times|other": "%(count)s kanporatu zaie",
- "were kicked %(count)s times|one": "kanporatu zaie",
+ "were kicked %(count)s times|other": "%(count)s aldiz kanporatu zaie",
+ "were kicked %(count)s times|one": "(r) kanporatu zaie",
"was kicked %(count)s times|other": "%(count)s aldiz kanporatu zaio",
"was kicked %(count)s times|one": "kanporatu zaio",
"%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s erabiltzaileek bere izena aldatu dute %(count)s aldiz",
From 41be46a7120075b5792194bcdf2c56f6e9b240fa Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 13 Jun 2018 09:51:35 +0100
Subject: [PATCH 0188/1196] apply roomlist searchFilter to aliases if it begins
with a `#`
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/RoomSubList.js | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index fb82ee067b..17daa8553b 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -105,8 +105,15 @@ var RoomSubList = React.createClass({
applySearchFilter: function(list, filter) {
if (filter === "") return list;
+ const lcFilter = filter.toLowerCase();
return list.filter((room) => {
- return room.name && room.name.toLowerCase().indexOf(filter.toLowerCase()) >= 0
+ if (room.name && room.name.toLowerCase().includes(lcFilter)) return true;
+ // only apply search filter to aliases if it looks like an alias (starts with `#`)
+ // to prevent loads of false positives with server names, e.g `matrix`
+ if (filter[0] === '#' && room.getAliases().some((alias) => {
+ return alias.toLowerCase().startsWith(lcFilter);
+ })) return true;
+ return false;
});
},
From 1cb794753e4114c86132de7058d13a920fafe448 Mon Sep 17 00:00:00 2001
From: David Baker
Date: Wed, 13 Jun 2018 10:39:52 +0100
Subject: [PATCH 0189/1196] Simplify & refactor some widget stuff
* ScalarMessaging onMessage was getting the current room ID by listening
for view_and remembering the room id or alias, and so having to look up
the alias if it was alias. We have RoomViewStore for this.
* Move waitForUserWidget into WidgetUtils
* s/require/import/
---
src/ScalarMessaging.js | 193 +++++++++++++----------------------------
src/WidgetUtils.js | 46 ++++++++++
2 files changed, 106 insertions(+), 133 deletions(-)
diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 9457e6ccfb..dd3975dfe5 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -1,6 +1,7 @@
/*
Copyright 2016 OpenMarket Ltd
Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -231,11 +232,12 @@ Example:
}
*/
-const SdkConfig = require('./SdkConfig');
-const MatrixClientPeg = require("./MatrixClientPeg");
-const MatrixEvent = require("matrix-js-sdk").MatrixEvent;
-const dis = require("./dispatcher");
-const Widgets = require('./utils/widgets');
+import SdkConfig from './SdkConfig';
+import MatrixClientPeg from './MatrixClientPeg';
+import { MatrixEvent } from 'matrix-js-sdk';
+import dis from './dispatcher';
+import Widgets from './utils/widgets';
+import RoomViewStore from './stores/RoomViewStore';
import { _t } from './languageHandler';
function sendResponse(event, res) {
@@ -286,51 +288,6 @@ function inviteUser(event, roomId, userId) {
});
}
-/**
- * Returns a promise that resolves when a widget with the given
- * ID has been added as a user widget (ie. the accountData event
- * arrives) or rejects after a timeout
- *
- * @param {string} widgetId The ID of the widget to wait for
- * @param {boolean} add True to wait for the widget to be added,
- * false to wait for it to be deleted.
- * @returns {Promise} that resolves when the widget is available
- */
-function waitForUserWidget(widgetId, add) {
- return new Promise((resolve, reject) => {
- const currentAccountDataEvent = MatrixClientPeg.get().getAccountData('m.widgets');
-
- // Tests an account data event, returning true if it's in the state
- // we're waiting for it to be in
- function eventInIntendedState(ev) {
- if (!ev || !currentAccountDataEvent.getContent()) return false;
- if (add) {
- return ev.getContent()[widgetId] !== undefined;
- } else {
- return ev.getContent()[widgetId] === undefined;
- }
- }
-
- if (eventInIntendedState(currentAccountDataEvent)) {
- resolve();
- return;
- }
-
- function onAccountData(ev) {
- if (eventInIntendedState(currentAccountDataEvent)) {
- MatrixClientPeg.get().removeListener('accountData', onAccountData);
- clearTimeout(timerId);
- resolve();
- }
- }
- const timerId = setTimeout(() => {
- MatrixClientPeg.get().removeListener('accountData', onAccountData);
- reject(new Error("Timed out waiting for widget ID " + widgetId + " to appear"));
- }, 10000);
- MatrixClientPeg.get().on('accountData', onAccountData);
- });
-}
-
function setWidget(event, roomId) {
const widgetId = event.data.widget_id;
const widgetType = event.data.type;
@@ -637,19 +594,6 @@ function returnStateEvent(event, roomId, eventType, stateKey) {
sendResponse(event, stateEvent.getContent());
}
-let currentRoomId = null;
-let currentRoomAlias = null;
-
-// Listen for when a room is viewed
-dis.register(onAction);
-function onAction(payload) {
- if (payload.action !== "view_room") {
- return;
- }
- currentRoomId = payload.room_id;
- currentRoomAlias = payload.room_alias;
-}
-
const onMessage = function(event) {
if (!event.origin) { // stupid chrome
event.origin = event.originalEvent.origin;
@@ -700,80 +644,63 @@ const onMessage = function(event) {
return;
}
}
- let promise = Promise.resolve(currentRoomId);
- if (!currentRoomId) {
- if (!currentRoomAlias) {
- sendError(event, _t('Must be viewing a room'));
- return;
- }
- // no room ID but there is an alias, look it up.
- console.log("Looking up alias " + currentRoomAlias);
- promise = MatrixClientPeg.get().getRoomIdForAlias(currentRoomAlias).then((res) => {
- return res.room_id;
- });
+
+ if (roomId !== RoomViewStore.getRoomId()) {
+ sendError(event, _t('Room %(roomId)s not visible', {roomId: roomId}));
+ return;
}
- promise.then((viewingRoomId) => {
- if (roomId !== viewingRoomId) {
- sendError(event, _t('Room %(roomId)s not visible', {roomId: roomId}));
- return;
- }
+ // Get and set room-based widgets
+ if (event.data.action === "get_widgets") {
+ getWidgets(event, roomId);
+ return;
+ } else if (event.data.action === "set_widget") {
+ setWidget(event, roomId);
+ return;
+ }
- // Get and set room-based widgets
- if (event.data.action === "get_widgets") {
- getWidgets(event, roomId);
- return;
- } else if (event.data.action === "set_widget") {
- setWidget(event, roomId);
- return;
- }
+ // These APIs don't require userId
+ if (event.data.action === "join_rules_state") {
+ getJoinRules(event, roomId);
+ return;
+ } else if (event.data.action === "set_plumbing_state") {
+ setPlumbingState(event, roomId, event.data.status);
+ return;
+ } else if (event.data.action === "get_membership_count") {
+ getMembershipCount(event, roomId);
+ return;
+ } else if (event.data.action === "get_room_enc_state") {
+ getRoomEncState(event, roomId);
+ return;
+ } else if (event.data.action === "can_send_event") {
+ canSendEvent(event, roomId);
+ return;
+ }
- // These APIs don't require userId
- if (event.data.action === "join_rules_state") {
- getJoinRules(event, roomId);
- return;
- } else if (event.data.action === "set_plumbing_state") {
- setPlumbingState(event, roomId, event.data.status);
- return;
- } else if (event.data.action === "get_membership_count") {
- getMembershipCount(event, roomId);
- return;
- } else if (event.data.action === "get_room_enc_state") {
- getRoomEncState(event, roomId);
- return;
- } else if (event.data.action === "can_send_event") {
- canSendEvent(event, roomId);
- return;
- }
-
- if (!userId) {
- sendError(event, _t('Missing user_id in request'));
- return;
- }
- switch (event.data.action) {
- case "membership_state":
- getMembershipState(event, roomId, userId);
- break;
- case "invite":
- inviteUser(event, roomId, userId);
- break;
- case "bot_options":
- botOptions(event, roomId, userId);
- break;
- case "set_bot_options":
- setBotOptions(event, roomId, userId);
- break;
- case "set_bot_power":
- setBotPower(event, roomId, userId, event.data.level);
- break;
- default:
- console.warn("Unhandled postMessage event with action '" + event.data.action +"'");
- break;
- }
- }, (err) => {
- console.error(err);
- sendError(event, _t('Failed to lookup current room') + '.');
- });
+ if (!userId) {
+ sendError(event, _t('Missing user_id in request'));
+ return;
+ }
+ switch (event.data.action) {
+ case "membership_state":
+ getMembershipState(event, roomId, userId);
+ break;
+ case "invite":
+ inviteUser(event, roomId, userId);
+ break;
+ case "bot_options":
+ botOptions(event, roomId, userId);
+ break;
+ case "set_bot_options":
+ setBotOptions(event, roomId, userId);
+ break;
+ case "set_bot_power":
+ setBotPower(event, roomId, userId, event.data.level);
+ break;
+ default:
+ console.warn("Unhandled postMessage event with action '" + event.data.action +"'");
+ break;
+ }
};
let listenerCount = 0;
diff --git a/src/WidgetUtils.js b/src/WidgetUtils.js
index 10cd473904..c6816d28b6 100644
--- a/src/WidgetUtils.js
+++ b/src/WidgetUtils.js
@@ -1,5 +1,6 @@
/*
Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -90,4 +91,49 @@ export default class WidgetUtils {
}
return false;
}
+
+ /**
+ * Returns a promise that resolves when a widget with the given
+ * ID has been added as a user widget (ie. the accountData event
+ * arrives) or rejects after a timeout
+ *
+ * @param {string} widgetId The ID of the widget to wait for
+ * @param {boolean} add True to wait for the widget to be added,
+ * false to wait for it to be deleted.
+ * @returns {Promise} that resolves when the widget is available
+ */
+ static waitForUserWidget(widgetId, add) {
+ return new Promise((resolve, reject) => {
+ const currentAccountDataEvent = MatrixClientPeg.get().getAccountData('m.widgets');
+
+ // Tests an account data event, returning true if it's in the state
+ // we're waiting for it to be in
+ function eventInIntendedState(ev) {
+ if (!ev || !currentAccountDataEvent.getContent()) return false;
+ if (add) {
+ return ev.getContent()[widgetId] !== undefined;
+ } else {
+ return ev.getContent()[widgetId] === undefined;
+ }
+ }
+
+ if (eventInIntendedState(currentAccountDataEvent)) {
+ resolve();
+ return;
+ }
+
+ function onAccountData(ev) {
+ if (eventInIntendedState(currentAccountDataEvent)) {
+ MatrixClientPeg.get().removeListener('accountData', onAccountData);
+ clearTimeout(timerId);
+ resolve();
+ }
+ }
+ const timerId = setTimeout(() => {
+ MatrixClientPeg.get().removeListener('accountData', onAccountData);
+ reject(new Error("Timed out waiting for widget ID " + widgetId + " to appear"));
+ }, 10000);
+ MatrixClientPeg.get().on('accountData', onAccountData);
+ });
+ }
}
From e98112254d7061e3ab913a3c7e2d0edbf078cec2 Mon Sep 17 00:00:00 2001
From: Akihiko Odaki
Date: Mon, 21 May 2018 19:37:07 +0900
Subject: [PATCH 0190/1196] Update lolex to 2.7.0
Signed-off-by: Akihiko Odaki
---
package-lock.json | 379 +++++-----------------------------------------
package.json | 2 +-
2 files changed, 41 insertions(+), 340 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 97ed7b5dea..433ed3ea4a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "matrix-react-sdk",
- "version": "0.12.4",
+ "version": "0.12.7",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -52,17 +52,6 @@
"integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
"dev": true
},
- "ajv": {
- "version": "5.5.2",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
- "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
- "requires": {
- "co": "^4.6.0",
- "fast-deep-equal": "^1.0.0",
- "fast-json-stable-stringify": "^2.0.0",
- "json-schema-traverse": "^0.3.0"
- }
- },
"ajv-keywords": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz",
@@ -86,11 +75,6 @@
"integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
"dev": true
},
- "another-json": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/another-json/-/another-json-0.2.0.tgz",
- "integrity": "sha1-tfQBnJc7bdXGUGotk0acttMq7tw="
- },
"ansi-escapes": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
@@ -205,11 +189,6 @@
"resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
"integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
},
- "asn1": {
- "version": "0.2.3",
- "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
- "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
- },
"assert": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
@@ -219,11 +198,6 @@
"util": "0.10.3"
}
},
- "assert-plus": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
- "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
- },
"async": {
"version": "0.9.2",
"resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
@@ -236,21 +210,6 @@
"integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
"dev": true
},
- "asynckit": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
- "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
- },
- "aws-sign2": {
- "version": "0.7.0",
- "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
- "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
- },
- "aws4": {
- "version": "1.7.0",
- "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz",
- "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="
- },
"babel-cli": {
"version": "6.26.0",
"resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.26.0.tgz",
@@ -1145,15 +1104,6 @@
"integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
"dev": true
},
- "bcrypt-pbkdf": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
- "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
- "optional": true,
- "requires": {
- "tweetnacl": "^0.14.3"
- }
- },
"better-assert": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
@@ -1321,11 +1271,6 @@
"integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
"dev": true
},
- "caseless": {
- "version": "0.12.0",
- "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
- "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
- },
"center-align": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
@@ -1420,7 +1365,8 @@
"co": {
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
- "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+ "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+ "dev": true
},
"code-point-at": {
"version": "1.1.0",
@@ -1443,14 +1389,6 @@
"lodash": "^4.5.0"
}
},
- "combined-stream": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
- "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
- "requires": {
- "delayed-stream": "~1.0.0"
- }
- },
"commander": {
"version": "2.11.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
@@ -1538,7 +1476,8 @@
"content-type": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
- "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
+ "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+ "dev": true
},
"convert-source-map": {
"version": "1.5.0",
@@ -1611,14 +1550,6 @@
"es5-ext": "^0.10.9"
}
},
- "dashdash": {
- "version": "1.14.1",
- "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
- "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
- "requires": {
- "assert-plus": "^1.0.0"
- }
- },
"date-names": {
"version": "0.1.10",
"resolved": "https://registry.npmjs.org/date-names/-/date-names-0.1.10.tgz",
@@ -1676,11 +1607,6 @@
"rimraf": "^2.2.8"
}
},
- "delayed-stream": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
- "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
- },
"depd": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
@@ -1805,15 +1731,6 @@
"resolved": "https://registry.npmjs.org/draft-js-utils/-/draft-js-utils-1.2.0.tgz",
"integrity": "sha1-9csj6xZzJf/tPXmIL9wxdyHS/RI="
},
- "ecc-jsbn": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
- "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
- "optional": true,
- "requires": {
- "jsbn": "~0.1.0"
- }
- },
"ee-first": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -2382,21 +2299,6 @@
"is-extglob": "^1.0.0"
}
},
- "extsprintf": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
- "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
- },
- "fast-deep-equal": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
- "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
- },
- "fast-json-stable-stringify": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
- "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
- },
"fast-levenshtein": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
@@ -2610,21 +2512,6 @@
"integrity": "sha1-VQKYfchxS+M5IJfzLgBxyd7gfPY=",
"dev": true
},
- "forever-agent": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
- "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
- },
- "form-data": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
- "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
- "requires": {
- "asynckit": "^0.4.0",
- "combined-stream": "1.0.6",
- "mime-types": "^2.1.12"
- }
- },
"fs-access": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
@@ -2669,8 +2556,8 @@
"dev": true,
"optional": true,
"requires": {
- "co": "4.6.0",
- "json-stable-stringify": "1.0.1"
+ "co": "^4.6.0",
+ "json-stable-stringify": "^1.0.1"
}
},
"ansi-regex": {
@@ -2750,7 +2637,6 @@
"version": "2.10.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"hoek": "2.x.x"
}
@@ -2988,8 +2874,8 @@
"dev": true,
"optional": true,
"requires": {
- "ajv": "4.11.8",
- "har-schema": "1.0.5"
+ "ajv": "^4.9.1",
+ "har-schema": "^1.0.5"
}
},
"has-unicode": {
@@ -3004,17 +2890,16 @@
"dev": true,
"optional": true,
"requires": {
- "boom": "2.10.1",
- "cryptiles": "2.0.5",
- "hoek": "2.16.3",
- "sntp": "1.0.9"
+ "boom": "2.x.x",
+ "cryptiles": "2.x.x",
+ "hoek": "2.x.x",
+ "sntp": "1.x.x"
}
},
"hoek": {
"version": "2.16.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"http-signature": {
"version": "1.1.1",
@@ -3197,8 +3082,8 @@
"dev": true,
"optional": true,
"requires": {
- "abbrev": "1.1.0",
- "osenv": "0.1.4"
+ "abbrev": "1",
+ "osenv": "^0.1.4"
}
},
"npmlog": {
@@ -3294,10 +3179,10 @@
"dev": true,
"optional": true,
"requires": {
- "deep-extend": "0.4.2",
- "ini": "1.3.4",
- "minimist": "1.2.0",
- "strip-json-comments": "2.0.1"
+ "deep-extend": "~0.4.0",
+ "ini": "~1.3.0",
+ "minimist": "^1.2.0",
+ "strip-json-comments": "~2.0.1"
},
"dependencies": {
"minimist": {
@@ -3389,7 +3274,7 @@
"dev": true,
"optional": true,
"requires": {
- "hoek": "2.16.3"
+ "hoek": "2.x.x"
}
},
"sshpk": {
@@ -3422,9 +3307,9 @@
"bundled": true,
"dev": true,
"requires": {
- "code-point-at": "1.1.0",
- "is-fullwidth-code-point": "1.0.0",
- "strip-ansi": "3.0.1"
+ "code-point-at": "^1.0.0",
+ "is-fullwidth-code-point": "^1.0.0",
+ "strip-ansi": "^3.0.0"
}
},
"string_decoder": {
@@ -3432,7 +3317,7 @@
"bundled": true,
"dev": true,
"requires": {
- "safe-buffer": "5.0.1"
+ "safe-buffer": "^5.0.1"
}
},
"stringstream": {
@@ -3446,7 +3331,7 @@
"bundled": true,
"dev": true,
"requires": {
- "ansi-regex": "2.1.1"
+ "ansi-regex": "^2.0.0"
}
},
"strip-json-comments": {
@@ -3487,7 +3372,7 @@
"dev": true,
"optional": true,
"requires": {
- "punycode": "1.4.1"
+ "punycode": "^1.4.1"
}
},
"tunnel-agent": {
@@ -3496,7 +3381,7 @@
"dev": true,
"optional": true,
"requires": {
- "safe-buffer": "5.0.1"
+ "safe-buffer": "^5.0.1"
}
},
"tweetnacl": {
@@ -3558,10 +3443,6 @@
"resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-2.7.4.tgz",
"integrity": "sha1-luQg/efvARrEnCWKYhMU/ldlNvk="
},
- "gemini-scrollbar": {
- "version": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b",
- "from": "gemini-scrollbar@github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
- },
"generate-function": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
@@ -3577,14 +3458,6 @@
"is-property": "^1.0.0"
}
},
- "getpass": {
- "version": "0.1.7",
- "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
- "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
- "requires": {
- "assert-plus": "^1.0.0"
- }
- },
"gfm.css": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/gfm.css/-/gfm.css-1.1.2.tgz",
@@ -3663,20 +3536,6 @@
"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
"dev": true
},
- "har-schema": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
- "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
- },
- "har-validator": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
- "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
- "requires": {
- "ajv": "^5.1.0",
- "har-schema": "^2.0.0"
- }
- },
"has": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
@@ -3785,16 +3644,6 @@
"requires-port": "1.x.x"
}
},
- "http-signature": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
- "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
- "requires": {
- "assert-plus": "^1.0.0",
- "jsprim": "^1.2.2",
- "sshpk": "^1.7.0"
- }
- },
"https-browserify": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
@@ -4108,11 +3957,6 @@
"integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
"dev": true
},
- "is-typedarray": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
- "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
- },
"isarray": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -4148,15 +3992,11 @@
"whatwg-fetch": ">=0.10.0"
}
},
- "isstream": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
- "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
- },
"jquery": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz",
- "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c="
+ "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c=",
+ "optional": true
},
"js-tokens": {
"version": "3.0.2",
@@ -4173,12 +4013,6 @@
"esprima": "^4.0.0"
}
},
- "jsbn": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
- "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
- "optional": true
- },
"jsesc": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
@@ -4191,16 +4025,6 @@
"integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
"dev": true
},
- "json-schema": {
- "version": "0.2.3",
- "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
- "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
- },
- "json-schema-traverse": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
- "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
- },
"json-stable-stringify": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
@@ -4210,11 +4034,6 @@
"jsonify": "~0.0.0"
}
},
- "json-stringify-safe": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
- "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
- },
"json3": {
"version": "3.3.2",
"resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
@@ -4239,17 +4058,6 @@
"integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
"dev": true
},
- "jsprim": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
- "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
- "requires": {
- "assert-plus": "1.0.0",
- "extsprintf": "1.3.0",
- "json-schema": "0.2.3",
- "verror": "1.10.0"
- }
- },
"jsx-ast-utils": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz",
@@ -4532,9 +4340,9 @@
}
},
"lolex": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz",
- "integrity": "sha512-A5pN2tkFj7H0dGIAM6MFvHKMJcPnjZsOMvR7ujCjfgW5TbV6H9vb1PgxLtHvjqNZTHsUolz+6/WEO0N1xNx2ng=="
+ "version": "2.7.0",
+ "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.0.tgz",
+ "integrity": "sha512-uJkH2e0BVfU5KOJUevbTOtpDduooSarH5PopO+LfM/vZf8Z9sJzODqKev804JYM2i++ktJfUmC1le4LwFQ1VMg=="
},
"longest": {
"version": "1.0.1",
@@ -4556,19 +4364,6 @@
"integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=",
"dev": true
},
- "matrix-js-sdk": {
- "version": "0.10.2",
- "resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.10.2.tgz",
- "integrity": "sha512-7o9a+4wWmxoW4cfdGVLGjZgTFLpWf/I0UqyicIzdV73qotYIO/q6k1bLf1+G0hgwZ/umwke4CB7GemxvvvxMcA==",
- "requires": {
- "another-json": "^0.2.0",
- "babel-runtime": "^6.26.0",
- "bluebird": "^3.5.0",
- "browser-request": "^0.3.3",
- "content-type": "^1.0.2",
- "request": "^2.53.0"
- }
- },
"matrix-mock-request": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/matrix-mock-request/-/matrix-mock-request-1.2.1.tgz",
@@ -4645,12 +4440,14 @@
"mime-db": {
"version": "1.30.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
- "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE="
+ "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
+ "dev": true
},
"mime-types": {
"version": "2.1.17",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
"integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+ "dev": true,
"requires": {
"mime-db": "~1.30.0"
}
@@ -4877,11 +4674,6 @@
"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
"dev": true
},
- "oauth-sign": {
- "version": "0.8.2",
- "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
- "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
- },
"object-assign": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -5242,7 +5034,8 @@
"punycode": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
- "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+ "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+ "dev": true
},
"qjobs": {
"version": "1.1.5",
@@ -5253,7 +5046,8 @@
"qs": {
"version": "6.5.1",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
- "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
+ "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
+ "dev": true
},
"querystring": {
"version": "0.2.0",
@@ -5389,13 +5183,6 @@
"prop-types": "^15.5.10"
}
},
- "react-gemini-scrollbar": {
- "version": "github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9",
- "from": "react-gemini-scrollbar@github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9",
- "requires": {
- "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
- }
- },
"react-motion": {
"version": "0.5.2",
"resolved": "https://registry.npmjs.org/react-motion/-/react-motion-0.5.2.tgz",
@@ -5592,33 +5379,6 @@
"is-finite": "^1.0.0"
}
},
- "request": {
- "version": "2.87.0",
- "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
- "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
- "requires": {
- "aws-sign2": "~0.7.0",
- "aws4": "^1.6.0",
- "caseless": "~0.12.0",
- "combined-stream": "~1.0.5",
- "extend": "~3.0.1",
- "forever-agent": "~0.6.1",
- "form-data": "~2.3.1",
- "har-validator": "~5.0.3",
- "http-signature": "~1.2.0",
- "is-typedarray": "~1.0.0",
- "isstream": "~0.1.2",
- "json-stringify-safe": "~5.0.1",
- "mime-types": "~2.1.17",
- "oauth-sign": "~0.8.2",
- "performance-now": "^2.1.0",
- "qs": "~6.5.1",
- "safe-buffer": "^5.1.1",
- "tough-cookie": "~2.3.3",
- "tunnel-agent": "^0.6.0",
- "uuid": "^3.1.0"
- }
- },
"require-json": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/require-json/-/require-json-0.0.1.tgz",
@@ -6049,21 +5809,6 @@
"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.1.tgz",
"integrity": "sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw="
},
- "sshpk": {
- "version": "1.14.1",
- "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz",
- "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=",
- "requires": {
- "asn1": "~0.2.3",
- "assert-plus": "^1.0.0",
- "bcrypt-pbkdf": "^1.0.0",
- "dashdash": "^1.12.0",
- "ecc-jsbn": "~0.1.1",
- "getpass": "^0.1.1",
- "jsbn": "~0.1.0",
- "tweetnacl": "~0.14.0"
- }
- },
"statuses": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
@@ -6288,14 +6033,6 @@
"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
"dev": true
},
- "tough-cookie": {
- "version": "2.3.4",
- "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
- "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
- "requires": {
- "punycode": "^1.4.1"
- }
- },
"trim-right": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
@@ -6314,20 +6051,6 @@
"integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
"dev": true
},
- "tunnel-agent": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
- "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
- "requires": {
- "safe-buffer": "^5.0.1"
- }
- },
- "tweetnacl": {
- "version": "0.14.5",
- "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
- "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
- "optional": true
- },
"type-check": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -6462,11 +6185,6 @@
"integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
"dev": true
},
- "uuid": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
- "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
- },
"v8flags": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
@@ -6476,23 +6194,6 @@
"user-home": "^1.1.1"
}
},
- "velocity-vector": {
- "version": "github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f",
- "from": "velocity-vector@github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f",
- "requires": {
- "jquery": ">= 1.4.3"
- }
- },
- "verror": {
- "version": "1.10.0",
- "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
- "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
- "requires": {
- "assert-plus": "^1.0.0",
- "core-util-is": "1.0.2",
- "extsprintf": "^1.2.0"
- }
- },
"vm-browserify": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
diff --git a/package.json b/package.json
index 1fed55748c..885d37d754 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
"isomorphic-fetch": "^2.2.1",
"linkifyjs": "^2.1.3",
"lodash": "^4.13.1",
- "lolex": "2.3.2",
+ "lolex": "^2.7.0",
"matrix-js-sdk": "0.10.4",
"optimist": "^0.6.1",
"pako": "^1.0.5",
From 3cadbd3974a4ccc7aae395c96f63332dced9ff72 Mon Sep 17 00:00:00 2001
From: Luke Barnard
Date: Wed, 13 Jun 2018 11:21:26 +0100
Subject: [PATCH 0191/1196] Include decryption error in decryption failure
metrics
---
src/components/structures/MatrixChat.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index c94baa63ef..da729a1a2d 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1312,7 +1312,7 @@ export default React.createClass({
// if the decryption was a failure
cli.on("Event.decrypted", (e) => {
if (e.isDecryptionFailure()) {
- Analytics.trackEvent('E2E', 'Decryption failure');
+ Analytics.trackEvent('E2E', 'Decryption failure', 'ev.content.body: ' + e.getContent().body);
}
});
From d4b2f06a63a65e4897d6cbbb6a46df22be933b83 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 13 Jun 2018 13:51:04 +0100
Subject: [PATCH 0192/1196] fix message appears unencrypted while in flight
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
res/img/e2e-pending.svg | 12 ++++++++++++
src/components/views/rooms/EventTile.js | 24 ++++++++++++++----------
2 files changed, 26 insertions(+), 10 deletions(-)
create mode 100644 res/img/e2e-pending.svg
diff --git a/res/img/e2e-pending.svg b/res/img/e2e-pending.svg
new file mode 100644
index 0000000000..469611cc8d
--- /dev/null
+++ b/res/img/e2e-pending.svg
@@ -0,0 +1,12 @@
+
+
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 589524bb9e..50fe0928b0 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -34,6 +34,7 @@ const ContextualMenu = require('../../structures/ContextualMenu');
import dis from '../../../dispatcher';
import {makeEventPermalink} from "../../../matrix-to";
import SettingsStore from "../../../settings/SettingsStore";
+import {EventStatus} from 'matrix-js-sdk';
const ObjectUtils = require('../../../ObjectUtils');
@@ -442,7 +443,6 @@ module.exports = withMatrixClient(React.createClass({
const ev = this.props.mxEvent;
const props = {onClick: this.onCryptoClicked};
-
if (ev.getContent().msgtype === 'm.bad.encrypted') {
return
Date: Wed, 13 Jun 2018 15:50:19 +0100
Subject: [PATCH 0193/1196] Fix widgets re-appearing after being deleted
Widgets would sometimes briefly re-appear after having been deleted.
This was because of the following race:
* User presses delete, send POST req, we set `deleting`. Widget hides.
* POST request completes, we unset `deleting` so widget unhides.
* State event comes down sync so widget hides again.
This fixes this by introducing `waitForRoomWidget` and using it to
wait until the state event comes down the sync until clearing the
`deleting` flag.
Since we now have `waitForRoomWidget`, this also uses it when adding
a widget so the 'widget saved' appears at the same time the widget
does.
---
src/ScalarMessaging.js | 9 ++--
src/WidgetUtils.js | 60 ++++++++++++++++++++++--
src/components/views/elements/AppTile.js | 4 +-
3 files changed, 64 insertions(+), 9 deletions(-)
diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index dd3975dfe5..f80162e635 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -237,6 +237,7 @@ import MatrixClientPeg from './MatrixClientPeg';
import { MatrixEvent } from 'matrix-js-sdk';
import dis from './dispatcher';
import Widgets from './utils/widgets';
+import WidgetUtils from './WidgetUtils';
import RoomViewStore from './stores/RoomViewStore';
import { _t } from './languageHandler';
@@ -362,7 +363,7 @@ function setWidget(event, roomId) {
// wait for this, the action will complete but if the user is fast enough,
// the widget still won't actually be there.
client.setAccountData('m.widgets', userWidgets).then(() => {
- return waitForUserWidget(widgetId, widgetUrl !== null);
+ return WidgetUtils.waitForUserWidget(widgetId, widgetUrl !== null);
}).then(() => {
sendResponse(event, {
success: true,
@@ -382,9 +383,9 @@ function setWidget(event, roomId) {
}
// TODO - Room widgets need to be moved to 'm.widget' state events
// https://docs.google.com/document/d/1uPF7XWY_dXTKVKV7jZQ2KmsI19wn9-kFRgQ1tFQP7wQ/edit?usp=sharing
- client.sendStateEvent(roomId, "im.vector.modular.widgets", content, widgetId).done(() => {
- // XXX: We should probably wait for the echo of the state event to come back from the server,
- // as we do with user widgets.
+ client.sendStateEvent(roomId, "im.vector.modular.widgets", content, widgetId).then(() => {
+ return WidgetUtils.waitForRoomWidget(widgetId, roomId, widgetUrl !== null);
+ }).then(() => {
sendResponse(event, {
success: true,
});
diff --git a/src/WidgetUtils.js b/src/WidgetUtils.js
index c6816d28b6..14fe3f59bd 100644
--- a/src/WidgetUtils.js
+++ b/src/WidgetUtils.js
@@ -104,12 +104,10 @@ export default class WidgetUtils {
*/
static waitForUserWidget(widgetId, add) {
return new Promise((resolve, reject) => {
- const currentAccountDataEvent = MatrixClientPeg.get().getAccountData('m.widgets');
-
// Tests an account data event, returning true if it's in the state
// we're waiting for it to be in
function eventInIntendedState(ev) {
- if (!ev || !currentAccountDataEvent.getContent()) return false;
+ if (!ev || !ev.getContent()) return false;
if (add) {
return ev.getContent()[widgetId] !== undefined;
} else {
@@ -117,12 +115,14 @@ export default class WidgetUtils {
}
}
- if (eventInIntendedState(currentAccountDataEvent)) {
+ const startingAccountDataEvent = MatrixClientPeg.get().getAccountData('m.widgets');
+ if (eventInIntendedState(startingAccountDataEvent)) {
resolve();
return;
}
function onAccountData(ev) {
+ const currentAccountDataEvent = MatrixClientPeg.get().getAccountData('m.widgets');
if (eventInIntendedState(currentAccountDataEvent)) {
MatrixClientPeg.get().removeListener('accountData', onAccountData);
clearTimeout(timerId);
@@ -136,4 +136,56 @@ export default class WidgetUtils {
MatrixClientPeg.get().on('accountData', onAccountData);
});
}
+
+ /**
+ * Returns a promise that resolves when a widget with the given
+ * ID has been added as a room widget in the given room (ie. the
+ * room state event arrives) or rejects after a timeout
+ *
+ * @param {string} widgetId The ID of the widget to wait for
+ * @param {string} roomId The ID of the room to wait for the widget in
+ * @param {boolean} add True to wait for the widget to be added,
+ * false to wait for it to be deleted.
+ * @returns {Promise} that resolves when the widget is available
+ */
+ static waitForRoomWidget(widgetId, roomId, add) {
+ return new Promise((resolve, reject) => {
+ // Tests a list of state events, returning true if it's in the state
+ // we're waiting for it to be in
+ function eventsInIntendedState(evList) {
+ const widgetPresent = evList.some((ev) => {
+ return ev.getContent() && ev.getContent()['id'] === widgetId;
+ });
+ if (add) {
+ return widgetPresent;
+ } else {
+ return !widgetPresent;
+ }
+ }
+
+ const room = MatrixClientPeg.get().getRoom(roomId);
+ const startingWidgetEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
+ if (eventsInIntendedState(startingWidgetEvents)) {
+ resolve();
+ return;
+ }
+
+ function onRoomStateEvents(ev) {
+ if (ev.getRoomId() !== roomId) return;
+
+ const currentWidgetEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
+
+ if (eventsInIntendedState(currentWidgetEvents)) {
+ MatrixClientPeg.get().removeListener('RoomState.events', onRoomStateEvents);
+ clearTimeout(timerId);
+ resolve();
+ }
+ }
+ const timerId = setTimeout(() => {
+ MatrixClientPeg.get().removeListener('RoomState.events', onRoomStateEvents);
+ reject(new Error("Timed out waiting for widget ID " + widgetId + " to appear"));
+ }, 10000);
+ MatrixClientPeg.get().on('RoomState.events', onRoomStateEvents);
+ });
+ }
}
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 429b5941b9..70b5bd651e 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -324,7 +324,9 @@ export default class AppTile extends React.Component {
'im.vector.modular.widgets',
{}, // empty content
this.props.id,
- ).catch((e) => {
+ ).then(() => {
+ return WidgetUtils.waitForRoomWidget(this.props.id, this.props.room.roomId, false);
+ }).catch((e) => {
console.error('Failed to delete widget', e);
}).finally(() => {
this.setState({deleting: false});
From 5cc2361737608ec7875b46151ea84c5989e6e8d3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 13 Jun 2018 15:52:50 +0100
Subject: [PATCH 0194/1196] change not_sent e2e lock to match colour of text
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
.../{e2e-pending.svg => e2e-encrypting.svg} | 0
res/img/e2e-not_sent.svg | 12 ++++++
src/components/views/rooms/EventTile.js | 38 +++++++++++--------
3 files changed, 34 insertions(+), 16 deletions(-)
rename res/img/{e2e-pending.svg => e2e-encrypting.svg} (100%)
create mode 100644 res/img/e2e-not_sent.svg
diff --git a/res/img/e2e-pending.svg b/res/img/e2e-encrypting.svg
similarity index 100%
rename from res/img/e2e-pending.svg
rename to res/img/e2e-encrypting.svg
diff --git a/res/img/e2e-not_sent.svg b/res/img/e2e-not_sent.svg
new file mode 100644
index 0000000000..fca79ae547
--- /dev/null
+++ b/res/img/e2e-not_sent.svg
@@ -0,0 +1,12 @@
+
+
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 50fe0928b0..9863a1c60a 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -443,25 +443,27 @@ module.exports = withMatrixClient(React.createClass({
const ev = this.props.mxEvent;
const props = {onClick: this.onCryptoClicked};
+ // event could not be decrypted
if (ev.getContent().msgtype === 'm.bad.encrypted') {
return cookie and privacy policies ).": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden. (Siehe unsere Datenschutzerklärung ).",
- "Help improve Riot by sending usage data? This will use a cookie.": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden.",
- "Yes please": "Ja, bitte",
"e.g. %(exampleValue)s": "z.B. %(exampleValue)s",
"Reload widget": "Widget neu laden",
"To notify everyone in the room, you must be a": "Notwendiges Berechtigungslevel, um jeden im Raum zu benachrichten:",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f182ecdbad..1a761c2c5c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -42,6 +42,10 @@
"The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
"The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
"Upload Failed": "Upload Failed",
+ "Failure to create room": "Failure to create room",
+ "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+ "Send anyway": "Send anyway",
+ "Send": "Send",
"Sun": "Sun",
"Mon": "Mon",
"Tue": "Tue",
@@ -81,6 +85,7 @@
"Failed to invite users to community": "Failed to invite users to community",
"Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
"Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
+ "Unnamed Room": "Unnamed Room",
"Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
"Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
"Unable to enable Notifications": "Unable to enable Notifications",
@@ -104,7 +109,6 @@
"You need to be logged in.": "You need to be logged in.",
"You need to be able to invite users to do that.": "You need to be able to invite users to do that.",
"Unable to create widget.": "Unable to create widget.",
- "Reload widget": "Reload widget",
"Missing roomId.": "Missing roomId.",
"Failed to send request.": "Failed to send request.",
"This room is not recognised.": "This room is not recognised.",
@@ -180,11 +184,6 @@
"%(names)s and %(count)s others are typing|other": "%(names)s and %(count)s others are typing",
"%(names)s and %(count)s others are typing|one": "%(names)s and one other is typing",
"%(names)s and %(lastPerson)s are typing": "%(names)s and %(lastPerson)s are typing",
- "Failure to create room": "Failure to create room",
- "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
- "Send anyway": "Send anyway",
- "Send": "Send",
- "Unnamed Room": "Unnamed Room",
"Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
"Not a valid Riot keyfile": "Not a valid Riot keyfile",
"Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
@@ -298,6 +297,29 @@
"Off": "Off",
"On": "On",
"Noisy": "Noisy",
+ "Invalid alias format": "Invalid alias format",
+ "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
+ "Invalid address format": "Invalid address format",
+ "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
+ "not specified": "not specified",
+ "not set": "not set",
+ "Remote addresses for this room:": "Remote addresses for this room:",
+ "Addresses": "Addresses",
+ "The main address for this room is": "The main address for this room is",
+ "Local addresses for this room:": "Local addresses for this room:",
+ "This room has no local addresses": "This room has no local addresses",
+ "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
+ "Invalid community ID": "Invalid community ID",
+ "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
+ "Flair": "Flair",
+ "Showing flair for these communities:": "Showing flair for these communities:",
+ "This room is not showing flair for any communities": "This room is not showing flair for any communities",
+ "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
+ "You have enabled URL previews by default.": "You have enabled URL previews by default.",
+ "You have disabled URL previews by default.": "You have disabled URL previews by default.",
+ "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
+ "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
+ "URL Previews": "URL Previews",
"Cannot add any more widgets": "Cannot add any more widgets",
"The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
"Add a widget": "Add a widget",
@@ -316,6 +338,8 @@
"Key request sent.": "Key request sent.",
"Re-request encryption keys from your other devices.": "Re-request encryption keys from your other devices.",
"Undecryptable": "Undecryptable",
+ "Encrypting": "Encrypting",
+ "Encrypted, not sent": "Encrypted, not sent",
"Encrypted by a verified device": "Encrypted by a verified device",
"Encrypted by an unverified device": "Encrypted by an unverified device",
"Unencrypted message": "Unencrypted message",
@@ -394,11 +418,11 @@
"numbullet": "numbullet",
"Markdown is disabled": "Markdown is disabled",
"Markdown is enabled": "Markdown is enabled",
- "Unpin Message": "Unpin Message",
- "Jump to message": "Jump to message",
"No pinned messages.": "No pinned messages.",
"Loading...": "Loading...",
"Pinned Messages": "Pinned Messages",
+ "Unpin Message": "Unpin Message",
+ "Jump to message": "Jump to message",
"%(duration)ss": "%(duration)ss",
"%(duration)sm": "%(duration)sm",
"%(duration)sh": "%(duration)sh",
@@ -531,29 +555,6 @@
"Scroll to unread messages": "Scroll to unread messages",
"Jump to first unread message.": "Jump to first unread message.",
"Close": "Close",
- "Invalid alias format": "Invalid alias format",
- "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
- "Invalid address format": "Invalid address format",
- "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
- "not specified": "not specified",
- "not set": "not set",
- "Remote addresses for this room:": "Remote addresses for this room:",
- "Addresses": "Addresses",
- "The main address for this room is": "The main address for this room is",
- "Local addresses for this room:": "Local addresses for this room:",
- "This room has no local addresses": "This room has no local addresses",
- "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
- "Invalid community ID": "Invalid community ID",
- "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
- "Flair": "Flair",
- "Showing flair for these communities:": "Showing flair for these communities:",
- "This room is not showing flair for any communities": "This room is not showing flair for any communities",
- "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
- "You have enabled URL previews by default.": "You have enabled URL previews by default.",
- "You have disabled URL previews by default.": "You have disabled URL previews by default.",
- "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
- "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
- "URL Previews": "URL Previews",
"Sunday": "Sunday",
"Monday": "Monday",
"Tuesday": "Tuesday",
@@ -664,6 +665,7 @@
"Delete widget": "Delete widget",
"Revoke widget access": "Revoke widget access",
"Minimize apps": "Minimize apps",
+ "Reload widget": "Reload widget",
"Popout widget": "Popout widget",
"Picture": "Picture",
"Edit": "Edit",
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index ac2187456e..af04f66fa6 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1169,20 +1169,13 @@
"Enable widget screenshots on supported widgets": "Gaitu trepeten pantaila-argazkiak onartzen duten trepetetan",
"Send analytics data": "Bidali datu analitikoak",
"Muted Users": "Mutututako erabiltzaileak",
- "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies ).": "Riot hobetzen lagundu nahi erabilera datuak bidaliz? Honek cookie bat erabiliko du. (Ikusi gure Cookie eta pribatutasun politikak ).",
- "Help improve Riot by sending usage data? This will use a cookie.": "Riot hobetzen lagundu nahi erabilera datuak bidaliz? Honek cookie bat erabiliko du.",
- "Yes please": "Bai mesedez",
"Warning: This widget might use cookies.": "Abisua: Trepeta honek cookie-ak erabili litzake.",
"Terms and Conditions": "Termino eta baldintzak",
"To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "%(homeserverDomain)s hasiera-zerbitzaria erabiltzen jarraitzeko gure termino eta baldintzak irakurri eta onartu behar dituzu.",
"Review terms and conditions": "Irakurri termino eta baldintzak",
"Failed to indicate account erasure": "Ezin izan da kontuaren ezabaketa jakinarazi",
- "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This action is irreversible.": "Honek zure kontua betiko erabilgaitz bihurtuko du. Ezin izango duzu saioa hasi, eta beste inork ezin izango du erabiltzaile ID bera erabili. Ez dago ekintza hau desegiterik.",
- "Deactivating your account does not by default erase messages you have sent. If you would like to erase your messages, please tick the box below.": "Zure kontua desaktibatzean ez dira lehenetsita zuk bidalitako mezuak ezabatuko. Zuk bidalitako mezuak ezabatu nahi badituzu, markatu beheko kutxa.",
- "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Matrix-eko mezuen ikusgaitasuna, e-mail mezuen antzekoa da. Zure mezuak ezabatzeak esan nahi du bidali dituzun mezuak ez direla erabiltzaile berriekin partekatuko, baina aurretik zure mezuak jaso dituzten erabiltzaile erregistratuek bere kopia izango dute.",
"To continue, please enter your password:": "Jarraitzeko, sartu zure pasahitza:",
"password": "pasahitza",
- "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Ezabatu bidali ditudan mezu guztiak nire kontua desaktibatzean. (Abisua: Etorkizuneko erabiltzaileek elkarrizketa partzialak ikusiko dituzte, esperientzia kaskarra sortuz).",
"e.g. %(exampleValue)s": "adib. %(exampleValue)s",
"Reload widget": "Birkargatu trepeta",
"To notify everyone in the room, you must be a": "Gelan dauden guztiei jakinarazteko",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index c3cfdef5fc..9f276f4699 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1168,25 +1168,17 @@
"Collapse Reply Thread": "Dévoiler le fil de réponse",
"Enable widget screenshots on supported widgets": "Activer les captures d'écran des widgets pris en charge",
"Send analytics data": "Envoyer les données analytiques",
- "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies ).": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie. (Voir nos politiques de cookie et de confidentialité ).",
- "Help improve Riot by sending usage data? This will use a cookie.": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie.",
- "Yes please": "Oui, s'il vous plaît",
"Muted Users": "Utilisateurs ignorés",
"Warning: This widget might use cookies.": "Avertissement : ce widget utilise peut-être des cookies.",
"Terms and Conditions": "Conditions générales",
"To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Pour continuer à utiliser le serveur d'accueil %(homeserverDomain)s, vous devez lire et accepter nos conditions générales.",
"Review terms and conditions": "Voir les conditions générales",
"Failed to indicate account erasure": "Échec de notification de la suppression du compte",
- "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This action is irreversible.": "Cela rendra votre compte inutilisable de façon permanente. Vous ne pourrez plus vous connecter et ne pourrez plus vous enregistrer avec le même identifiant d'utilisateur. Cette action est irréversible.",
- "Deactivating your account does not by default erase messages you have sent. If you would like to erase your messages, please tick the box below.": "Désactiver votre compte ne supprime pas les messages que vous avez envoyés par défaut. Si vous souhaitez supprimer vos messages, cochez la case ci-dessous.",
- "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Supprimer vos messages signifie que les messages que vous avez envoyés ne seront pas partagés avec de nouveaux utilisateurs ou les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à vos messages continueront d'en avoir une copie.",
"To continue, please enter your password:": "Pour continuer, veuillez renseigner votre mot de passe :",
"password": "mot de passe",
- "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Veuillez supprimer tous les messages que j'ai envoyé quand mon compte est désactivé. (Attention : les futurs utilisateurs verront alors des conversations incomplètes, ce qui est une mauvaise expérience).",
"This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Votre compte sera inutilisable de façon permanente. Vous ne pourrez plus vous reconnecter et personne ne pourra se réenregistrer avec le même identifiant d'utilisateur. Votre compte quittera tous les salons auxquels il participe et tous ses détails seront supprimés du serveur d'identité. Cette action est irréversible.",
"Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "La désactivation du compte ne nous fait pas oublier les messages que vous avez envoyés par défaut. Si vous souhaitez que nous les oubliions, cochez la case ci-dessous.",
"e.g. %(exampleValue)s": "par ex. %(exampleValue)s",
- "Help improve Riot by sending usage data ? This will use a cookie. (See our cookie and privacy policies ).": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Cela utilisera un cookie. (Voir nos politiques de cookie et de confidentialité ).",
"Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Quand nous oublions vos messages, cela signifie que les messages que vous avez envoyés ne seront partagés avec aucun nouvel utilisateur ou avec les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à ces messages en conserveront leur propre copie.",
"Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Veuillez oublier tous les messages que j'ai envoyé quand mon compte sera désactivé (Avertissement : les futurs utilisateurs verront des conversations incomplètes)",
"Reload widget": "Recharger le widget",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index aa1904d0bf..0be5087d55 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1168,27 +1168,19 @@
"Collapse Reply Thread": "Beszélgetés szál becsukása",
"Enable widget screenshots on supported widgets": "Ahol az a kisalkalmazásban támogatott ott képernyőkép készítés engedélyezése",
"Send analytics data": "Analitikai adatok küldése",
- "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies ).": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ. (Nézd meg a sütikről és titoktartási irányelvekről szóló leírást).",
- "Help improve Riot by sending usage data? This will use a cookie.": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ.",
- "Yes please": "Igen, kérlek",
"Muted Users": "Elnémított felhasználók",
"Warning: This widget might use cookies.": "Figyelmeztetés: Ez a kisalkalmazás sütiket (cookies) használhat.",
"Terms and Conditions": "Általános Szerződési Feltételek",
"To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "A %(homeserverDomain)s szerver használatának folytatásához el kell olvasnod és el kell fogadnod az általános szerződési feltételeket.",
"Review terms and conditions": "Általános Szerződési Feltételek elolvasása",
"Failed to indicate account erasure": "A fiók törlésének jelzése sikertelen",
- "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This action is irreversible.": "Ezzel a felhasználói fiókod végleg használhatatlanná válik. Nem tudsz bejelentkezni, és senki más sem fog tudni újra regisztrálni ugyanezzel az azonosítóval. Ez a művelet visszafordíthatatlan.",
- "Deactivating your account does not by default erase messages you have sent. If you would like to erase your messages, please tick the box below.": "A felhasználói fiók felfüggesztése alapértelmezetten nem töröli semelyik általad küldött üzenetet. Ha az elküldött üzeneteidet törölni szeretnéd pipáld be a jelölőnégyzetet alul.",
- "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban olyan mint az e-mail. Az üzeneted törlése azt jelenti, hogy amit elküldtél már nem lesz megosztva új- vagy vendég felhasználóval, de azok a regisztrált felhasználók akik már látták az üzenetet továbbra is hozzáférnek a saját példányukhoz.",
"To continue, please enter your password:": "Folytatáshoz add meg a jelszavad:",
"password": "jelszó",
- "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Töröld az összes üzenetet amit küldtem amikor felfüggeszted a felhasználói fiókomat. (Figyelem: ezzel a jövőbeni felhasználók csak részleges beszélgetést láthatnak majd, ami rosszul eshet).",
"This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Ez végleg használhatatlanná teszi a fiókodat. Ezután nem fogsz tudni bejelentkezni, és más sem tud majd ezzel az azonosítóval fiókot létrehozni. Minden szobából amibe beléptél ki fogsz lépni, és törölni fogja minden fiók adatod az \"identity\" szerverről. Ez a művelet visszafordíthatatlan.",
"Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "A fiókod felfüggesztése nem jelenti alapértelmezetten azt, hogy az általad küldött üzenetek elfelejtődnek. Ha törölni szeretnéd az általad küldött üzeneteket, pipáld be a jelölőnégyzetet alul.",
"Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban hasonlít az emailhez. Az általad küldött üzenet törlése azt jelenti, hogy nem osztjuk meg új-, vagy vendég felhasználóval de a már regisztrált felhasználók akik már hozzáfértek az üzenethez továbbra is elérik a saját másolatukat.",
"Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Kérlek töröld az összes általam küldött üzenetet amikor a fiókomat felfüggesztem (Figyelem: ez azt eredményezheti, hogy a jövőbeni felhasználók csak részleges beszélgetést látnak majd)",
"e.g. %(exampleValue)s": "pl. %(exampleValue)s",
- "Help improve Riot by sending usage data ? This will use a cookie. (See our cookie and privacy policies ).": "Segítesz jobbá tenni a Riotot használati adat küldésével? Ez sütit (cookie) fog használni. (Nézd meg az Általános Szerződési Feltételeket ).",
"Reload widget": "Kisalkalmazás újratöltése",
"Please help improve Riot.im by sending anonymous usage data . This will use a cookie (please see our Cookie Policy ).": "Kérlek segíts javítani a Riot.im-et azzal, hogy anonim felhasználási adatokat küldesz. Ez szütit (cookie) fog használni (lásd a sütire vonatkozó szabályozásunkat ).",
"Please help improve Riot.im by sending anonymous usage data . This will use a cookie.": "Kérlek segíts javítani a Riot.im-et azzal, hogy anonim felhasználási adatokat küldesz. Ez szütit (cookie) fog használni.",
diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index d901c52f60..234def7dba 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -628,7 +628,6 @@
"No Microphones detected": "Engir hljóðnemar fundust",
"No Webcams detected": "Engar vefmyndavélar fundust",
"Homeserver is": "Heimanetþjónn er",
- "Login as guest": "Skrá inn sem gestur",
"Sign in to get started": "Skráðu þig inn til að komast í gang",
"Failed to fetch avatar URL": "Ekki tókst að sækja slóð á auðkennismynd",
"Set a display name:": "Stilltu birtingarnafn:",
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 884dac4269..61c80b6789 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1158,9 +1158,6 @@
"Refresh": "Aggiorna",
"We encountered an error trying to restore your previous session.": "Abbiamo riscontrato un errore tentando di ripristinare la tua sessione precedente.",
"Send analytics data": "Invia dati statistici",
- "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies ).": "Aiutare a migliorare Riot inviando statistiche d'uso? Verrà usato un cookie. (Vedi la nostra politica sui cookie e sulla privacy ).",
- "Help improve Riot by sending usage data? This will use a cookie.": "Aiutare a migliorare Riot inviando statistiche d'uso? Verrà usato un cookie.",
- "Yes please": "Sì grazie",
"Clear Storage and Sign Out": "Elimina lo storage e disconnetti",
"Send Logs": "Invia i log",
"Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Eliminare lo storage del browser potrebbe risolvere il problema, ma verrai disconnesso e la cronologia delle chat criptate sarà illeggibile.",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index a7e590c7ed..55840f752e 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1166,16 +1166,12 @@
"Enable widget screenshots on supported widgets": "Включить скриншоты виджета в поддерживаемых виджетах",
"Collapse Reply Thread": "Ответить с цитированием",
"Send analytics data": "Отправить данные аналитики",
- "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies ).": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie. (См. наши политики cookie и конфиденциальности ).",
- "Help improve Riot by sending usage data? This will use a cookie.": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie.",
- "Yes please": "Да, пожалуйста",
"Muted Users": "Приглушенные пользователи",
"Warning: This widget might use cookies.": "Внимание: этот виджет может использовать cookie.",
"Terms and Conditions": "Условия и положения",
"To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Для продолжения использования сервера %(homeserverDomain)s вы должны ознакомиться и принять условия и положения.",
"Review terms and conditions": "Просмотр условий и положений",
"e.g. %(exampleValue)s": "напр. %(exampleValue)s",
- "Help improve Riot by sending usage data ? This will use a cookie. (See our cookie and privacy policies ).": "Помогите улучшить Riot, отправляя данные использования ? Будут использоваться файлы cookie. (Смотрите наши политики cookie и конфиденциальности ).",
"Failed to indicate account erasure": "Не удается удалить учетную запись",
"This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Это навсегда сделает вашу учетную запись невозможной для использования. Вы не сможете войти в систему, и никто не сможет перерегистрировать тот же идентификатор пользователя. Это приведет к тому, что ваша учетная запись выйдет из всех комнат, в которые она входит, и будут удалены данные вашей учетной записи с сервера идентификации. Это действие необратимо.",
"Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "По умолчанию деактивация вашей учетной записи не приведет к удалению всех ваших сообщений. Если вы хотите, чтобы мы удалили ваши сообщения, поставьте отметку в поле ниже.",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 5e27d5713d..9dcc74d790 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -900,8 +900,6 @@
"This setting cannot be changed later!": "Den här inställningen kan inte ändras senare!",
"Unknown error": "Okänt fel",
"Incorrect password": "Felaktigt lösenord",
- "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Detta kommer att göra ditt konto permanent oanvändbart. Du kommer inte att kunna registrera samma användar-ID igen.",
- "This action is irreversible.": "Denna åtgärd går inte att ångra.",
"To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "För att verifiera att denna enhet kan litas på, vänligen kontakta ägaren på annat sätt (t ex personligen eller med ett telefonsamtal) och fråga om nyckeln ägaren har i sina användarinställningar för enheten matchar nyckeln nedan:",
"Device name": "Enhetsnamn",
"Device key": "Enhetsnyckel",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index e8217e0277..88cc5b6ad2 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1169,9 +1169,6 @@
"Enable widget screenshots on supported widgets": "在支援的小工具上啟用小工具螢幕快照",
"Send analytics data": "傳送分析資料",
"Muted Users": "已靜音的使用者",
- "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies ).": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。（參見我們的 cookie 與隱私政策 ）。",
- "Help improve Riot by sending usage data? This will use a cookie.": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。",
- "Yes please": "好的，請",
"e.g. %(exampleValue)s": "範例：%(exampleValue)s",
"Reload widget": "重新載入小工具",
"Please help improve Riot.im by sending anonymous usage data . This will use a cookie (please see our Cookie Policy ).": "請透過傳送匿名使用資料 來協助改善 Riot.im。這將會使用 cookie（請參見我們的 Cookie 政策 ）。",
From 75abb415d437d337382dc57717277fae67f57580 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 13 Jun 2018 16:17:26 +0100
Subject: [PATCH 0196/1196] improve tag panel accessibility and remove a no-op
dispatch
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/TagPanel.js | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 0b6dc9fc75..77259c863d 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -84,7 +84,10 @@ const TagPanel = React.createClass({
},
onMouseDown(e) {
- dis.dispatch({action: 'deselect_tags'});
+ // only dispatch if its not a no-op
+ if (this.state.selectedTags.length > 0) {
+ dis.dispatch({action: 'deselect_tags'});
+ }
},
onCreateGroupClick(ev) {
@@ -113,17 +116,18 @@ const TagPanel = React.createClass({
/>;
});
- const clearButton = this.state.selectedTags.length > 0 ?
-
+ ;
+ }
return
+
From 846c14062a424544d1aa9345c85778c17c6ba92f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 13 Jun 2018 09:28:35 +0100 Subject: [PATCH 0183/1196] show redacted stickers like other redacted messages Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/messages/MessageEvent.js | 3 ++- src/components/views/rooms/EventTile.js | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js index 38f55c9d70..babe1bbf29 100644 --- a/src/components/views/messages/MessageEvent.js +++ b/src/components/views/messages/MessageEvent.js @@ -69,7 +69,8 @@ module.exports = React.createClass({ if (msgtype && bodyTypes[msgtype]) { BodyType = bodyTypes[msgtype]; } else if (this.props.mxEvent.getType() === 'm.sticker') { - BodyType = sdk.getComponent('messages.MStickerBody'); + // if sticker is redacted, show UnknownBody otherwise it'll fall through to elif + BodyType = this.props.mxEvent.isRedacted() ? UnknownBody : sdk.getComponent('messages.MStickerBody'); } else if (content.url) { // Fallback to MFileBody if there's a content URL BodyType = bodyTypes['m.file']; diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js index 589524bb9e..c43ddaad11 100644 --- a/src/components/views/rooms/EventTile.js +++ b/src/components/views/rooms/EventTile.js @@ -490,7 +490,7 @@ module.exports = withMatrixClient(React.createClass({ } const isSending = (['sending', 'queued', 'encrypting'].indexOf(this.props.eventSendStatus) !== -1); - const isRedacted = (eventType === 'm.room.message') && this.props.isRedacted; + const isRedacted = isMessageEvent(this.props.mxEvent) && this.props.isRedacted; const isEncryptionFailure = this.props.mxEvent.isDecryptionFailure(); const classes = classNames({ @@ -715,9 +715,15 @@ module.exports = withMatrixClient(React.createClass({ }, })); +// XXX this'll eventually be dynamic based on the fields once we have extensible event types +const messageTypes = ['m.room.message', 'm.sticker']; +function isMessageEvent(ev) { + return (messageTypes.includes(ev.getType())); +} + module.exports.haveTileForEvent = function(e) { // Only messages have a tile (black-rectangle) if redacted - if (e.isRedacted() && e.getType() !== 'm.room.message') return false; + if (e.isRedacted() && !isMessageEvent(e)) return false; const handler = getHandlerTile(e); if (handler === undefined) return false; From 20caea47f81aaa46ae04d9408b15da5b28374aa8 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 13 Jun 2018 09:32:21 +0100 Subject: [PATCH 0184/1196] make more generic Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/messages/MessageEvent.js | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js index babe1bbf29..c4d29257ff 100644 --- a/src/components/views/messages/MessageEvent.js +++ b/src/components/views/messages/MessageEvent.js @@ -62,18 +62,24 @@ module.exports = React.createClass({ 'm.audio': sdk.getComponent('messages.MAudioBody'), 'm.video': sdk.getComponent('messages.MVideoBody'), }; + const evTypes = { + 'm.sticker': sdk.getComponent('messages.MStickerBody'), + }; const content = this.props.mxEvent.getContent(); + const type = this.props.mxEvent.getType(); const msgtype = content.msgtype; let BodyType = UnknownBody; - if (msgtype && bodyTypes[msgtype]) { - BodyType = bodyTypes[msgtype]; - } else if (this.props.mxEvent.getType() === 'm.sticker') { - // if sticker is redacted, show UnknownBody otherwise it'll fall through to elif - BodyType = this.props.mxEvent.isRedacted() ? UnknownBody : sdk.getComponent('messages.MStickerBody'); - } else if (content.url) { - // Fallback to MFileBody if there's a content URL - BodyType = bodyTypes['m.file']; + if (!this.props.mxEvent.isRedacted()) { + // only resolve BodyType if event is not redacted + if (msgtype && bodyTypes[msgtype]) { + BodyType = bodyTypes[msgtype]; + } else if (type && evTypes[type]) { + BodyType = evTypes[type]; + } else if (content.url) { + // Fallback to MFileBody if there's a content URL + BodyType = bodyTypes['m.file']; + } } return
-
- { clearButton }
-
+ { clearButton }
Date: Wed, 13 Jun 2018 16:55:16 +0100
Subject: [PATCH 0197/1196] Fix exception when opening dev tools
Apparently draft sometimes gets unhappy when you try to move to the
end of an empty state, so only move to the end if we actually
created a non-empty state.
This will be irrelevant once https://github.com/matrix-org/matrix-react-sdk/pull/1890
is merged, but I have the fix now, and this is probably otherwise
going to annoy me now I'm doing things where devtools is very useful.
Fixes https://github.com/vector-im/riot-web/issues/6436
---
src/components/views/rooms/MessageComposerInput.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 97e8780f0f..66bae869ff 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -244,12 +244,14 @@ export default class MessageComposerInput extends React.Component {
let editorState = null;
if (contentState) {
- editorState = EditorState.createWithContent(contentState, compositeDecorator);
+ editorState = EditorState.moveFocusToEnd(
+ EditorState.createWithContent(contentState, compositeDecorator)
+ );
} else {
editorState = EditorState.createEmpty(compositeDecorator);
}
- return EditorState.moveFocusToEnd(editorState);
+ return editorState;
}
componentDidMount() {
From 77708d5b659f498e3b4279014c887f1f4bdbe04f Mon Sep 17 00:00:00 2001
From: Osoitz
Date: Wed, 13 Jun 2018 09:20:33 +0000
Subject: [PATCH 0198/1196] Translated using Weblate (Basque)
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
src/i18n/strings/eu.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 1be59bdbd5..caeca8daf9 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -586,7 +586,7 @@
"Please enter the code it contains:": "Sartu dakarren kodea:",
"If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Ez baduzu e-mail helbide bat zehazten, ezin izango duzu zure pasahitza berrezarri. Ziur zaude?",
"You are registering with %(SelectedTeamName)s": "%(SelectedTeamName)s erabiliz erregistratzen ari zara",
- "Default server": "Zerbitzari lenetetsia",
+ "Default server": "Zerbitzari lehenetsia",
"Custom server": "Zerbitzari aukeratua",
"Home server URL": "Hasiera zerbitzariaren URLa",
"Identity server URL": "Identitate zerbitzariaren URLa",
From d4578783ef3b3ae6a788b2059f57d4b23381fea2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 13 Jun 2018 18:46:02 +0100
Subject: [PATCH 0199/1196] apply pr review feedback fix copyright headers fix
user settings link accessibility fix typo and add noopener
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/ContextualMenu.js | 2 +-
src/components/structures/UserSettings.js | 4 ++--
src/components/views/dialogs/ShareDialog.js | 9 +++++----
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js
index d6a11ca974..12603c1b45 100644
--- a/src/components/structures/ContextualMenu.js
+++ b/src/components/structures/ContextualMenu.js
@@ -1,6 +1,6 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2018 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 8511010ed6..25ca70056b 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -1304,9 +1304,9 @@ module.exports = React.createClass({
{ _t("Logged in as:") + ' ' }
-
+
{ this._me }
-
+
{ _t('Access Token:') + ' ' }
diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js
index a88052ee6d..e68922d35a 100644
--- a/src/components/views/dialogs/ShareDialog.js
+++ b/src/components/views/dialogs/ShareDialog.js
@@ -1,5 +1,5 @@
/*
-Copyright 2018 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ const socials = [
img: 'img/social/',
url: (url) => `https://plus.google.com/share?url=${url}`,
},*/ {
- name: 'Linked In',
+ name: 'LinkedIn',
img: 'img/social/linkedin.png',
url: (url) => `https://www.linkedin.com/shareArticle?mini=true&url=${url}`,
}, {
@@ -193,13 +193,14 @@ export default class ShareDialog extends React.Component {
Date: Sun, 27 May 2018 19:14:49 +0000
Subject: [PATCH 0201/1196] Translated using Weblate (Hungarian)
Currently translated at 100.0% (1190 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
src/i18n/strings/hu.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index aa1904d0bf..ce0e859a22 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1195,5 +1195,6 @@
"Yes, I want to help!": "Igen, segítek!",
"Can't leave Server Notices room": "Nem lehet elhagyni a Szerver Üzenetek szobát",
"This room is used for important messages from the Homeserver, so you cannot leave it.": "Ez a szoba fontos szerverüzenetek közlésére jött létre, nem tudsz kilépni belőle.",
- "To notify everyone in the room, you must be a": "Hogy mindenkinek tudj üzenni ahhoz ilyen szinten kell lenned:"
+ "To notify everyone in the room, you must be a": "Hogy mindenkinek tudj üzenni ahhoz ilyen szinten kell lenned:",
+ "Try the app first": "Először próbáld ki az alkalmazást"
}
From 5dced2f699777fad937115fc0e072c0d1c27fdfb Mon Sep 17 00:00:00 2001
From: Sotiris Papatheodorou
Date: Wed, 13 Jun 2018 22:21:32 +0000
Subject: [PATCH 0202/1196] Translated using Weblate (Greek)
Currently translated at 71.8% (855 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
---
src/i18n/strings/el.json | 88 ++++++++++++++++++++++++++++++++++++++--
1 file changed, 84 insertions(+), 4 deletions(-)
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index 929ca5e7df..1b22679520 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -107,7 +107,7 @@
"Failed to reject invitation": "Δεν ήταν δυνατή η απόρριψη της πρόσκλησης",
"Failed to save settings": "Δεν ήταν δυνατή η αποθήκευση των ρυθμίσεων",
"Failed to send email": "Δεν ήταν δυνατή η αποστολή ηλ. αλληλογραφίας",
- "Failed to verify email address: make sure you clicked the link in the email": "Δεν ήταν δυνατή η επιβεβαίωση του μηνύματος ηλεκτρονικής αλληλογραφίας βεβαιωθείτε οτι κάνατε κλικ στον σύνδεσμο που σας στάλθηκε",
+ "Failed to verify email address: make sure you clicked the link in the email": "Δεν ήταν δυνατή η επιβεβαίωση της διεύθυνσης ηλεκτρονικής αλληλογραφίας: βεβαιωθείτε οτι κάνατε κλικ στον σύνδεσμο που σας στάλθηκε",
"Favourite": "Αγαπημένο",
"Favourites": "Αγαπημένα",
"Fill screen": "Γέμισε την οθόνη",
@@ -264,7 +264,7 @@
"Room %(roomId)s not visible": "Το δωμάτιο %(roomId)s δεν είναι ορατό",
"%(roomName)s does not exist.": "Το %(roomName)s δεν υπάρχει.",
"Searches DuckDuckGo for results": "Γίνεται αναζήτηση στο DuckDuckGo για αποτελέσματα",
- "Seen by %(userName)s at %(dateTime)s": "Διαβάστηκε από %(userName)s στις %(dateTime)s",
+ "Seen by %(userName)s at %(dateTime)s": "Διαβάστηκε από τον/την %(userName)s στις %(dateTime)s",
"Send anyway": "Αποστολή ούτως ή άλλως",
"Send Invites": "Αποστολή προσκλήσεων",
"Send Reset Email": "Αποστολή μηνύματος επαναφοράς",
@@ -465,7 +465,7 @@
"%(senderName)s removed their profile picture.": "Ο %(senderName)s αφαίρεσε τη φωτογραφία του προφίλ του.",
"%(senderName)s requested a VoIP conference.": "Ο %(senderName)s αιτήθηκε μια συνδιάσκεψη VoIP.",
"Riot does not have permission to send you notifications - please check your browser settings": "Το Riot δεν έχει δικαιώματα για αποστολή ειδοποιήσεων - παρακαλούμε ελέγξτε τις ρυθμίσεις του περιηγητή σας",
- "Riot was not given permission to send notifications - please try again": "Δεν δόθηκαν δικαιώματα στο Riot να αποστείλει ειδοποιήσεις - παρακαλούμε προσπαθήστε ξανά",
+ "Riot was not given permission to send notifications - please try again": "Δεν δόθηκαν δικαιώματα αποστολής ειδοποιήσεων στο Riot - παρακαλούμε προσπαθήστε ξανά",
"Room contains unknown devices": "Το δωμάτιο περιέχει άγνωστες συσκευές",
"%(roomName)s is not accessible at this time.": "Το %(roomName)s δεν είναι προσβάσιμο αυτή τη στιγμή.",
"Scroll to bottom of page": "Μετάβαση στο τέλος της σελίδας",
@@ -773,5 +773,85 @@
"e.g. ": "π.χ. ",
"Your device resolution": "Η ανάλυση της συσκευής σας",
"The information being sent to us to help make Riot.im better includes:": "Οι πληροφορίες που στέλνονται σε εμάς με σκοπό την βελτίωση του Riot.im περιλαμβάνουν:",
- "Call Failed": "Η κλήση απέτυχε"
+ "Call Failed": "Η κλήση απέτυχε",
+ "Whether or not you're logged in (we don't record your user name)": "Εάν είστε συνδεδεμένος/η ή όχι (δεν καταγράφουμε το όνομα χρήστη σας)",
+ "e.g. %(exampleValue)s": "π.χ. %(exampleValue)s",
+ "Review Devices": "Ανασκόπηση συσκευών",
+ "Call Anyway": "Κλήση όπως και να 'χει",
+ "Answer Anyway": "Απάντηση όπως και να 'χει",
+ "Call": "Κλήση",
+ "Answer": "Απάντηση",
+ "AM": "ΠΜ",
+ "PM": "ΜΜ",
+ "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
+ "Who would you like to add to this community?": "Ποιον/α θα θέλατε να προσθέσετε σε αυτή την κοινότητα;",
+ "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Προσοχή: κάθε άτομο που προσθέτετε στην κοινότητα θε είναι δημοσίως ορατό σε οποιονδήποτε γνωρίζει το αναγνωριστικό της κοινότητας",
+ "Invite new community members": "Προσκαλέστε νέα μέλη στην κοινότητα",
+ "Name or matrix ID": "Όνομα ή αναγνωριστικό του matrix",
+ "Invite to Community": "Πρόσκληση στην κοινότητα",
+ "Which rooms would you like to add to this community?": "Ποια δωμάτια θα θέλατε να προσθέσετε σε αυτή την κοινότητα;",
+ "Add rooms to the community": "Προσθήκη δωματίων στην κοινότητα",
+ "Add to community": "Προσθήκη στην κοινότητα",
+ "Failed to invite the following users to %(groupId)s:": "Αποτυχία πρόσκλησης των ακόλουθων χρηστών στο %(groupId)s :",
+ "Failed to invite users to community": "Αποτυχία πρόσκλησης χρηστών στην κοινότητα",
+ "Failed to invite users to %(groupId)s": "Αποτυχία πρόσκλησης χρηστών στο %(groupId)s",
+ "Failed to add the following rooms to %(groupId)s:": "Αποτυχία προσθήκης των ακόλουθων δωματίων στο %(groupId)s:",
+ "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Υπάρχουν άγνωστες συσκευές στο δωμάτιο: εάν συνεχίσετε χωρίς να τις επιβεβαιώσετε, θα μπορούσε κάποιος να κρυφακούει την κλήση σας.",
+ "Show these rooms to non-members on the community page and room list?": "Εμφάνιση αυτών των δωματίων σε μη-μέλη στην σελίδα της κοινότητας και στη λίστα δωματίων;",
+ "Room name or alias": "Όνομα η ψευδώνυμο δωματίου",
+ "Restricted": "Περιορισμένο",
+ "Unable to create widget.": "Αδυναμία δημιουργίας widget.",
+ "Reload widget": "Ανανέωση widget",
+ "You are not in this room.": "Δεν είστε μέλος αυτού του δωματίου.",
+ "You do not have permission to do that in this room.": "Δεν έχετε την άδεια να το κάνετε αυτό σε αυτό το δωμάτιο.",
+ "You are now ignoring %(userId)s": "Τώρα αγνοείτε τον/την %(userId)s",
+ "You are no longer ignoring %(userId)s": "Δεν αγνοείτε πια τον/την %(userId)s",
+ "%(oldDisplayName)s changed their display name to %(displayName)s.": "Ο/Η %(oldDisplayName)s άλλαξε το εμφανιζόμενο όνομά του/της σε %(displayName)s.",
+ "%(senderName)s changed the pinned messages for the room.": "Ο/Η %(senderName)s άλλαξε τα καρφιτσωμένα μηνύματα του δωματίου.",
+ "%(widgetName)s widget modified by %(senderName)s": "Έγινε αλλαγή στο widget %(widgetName)s από τον/την %(senderName)s",
+ "%(widgetName)s widget added by %(senderName)s": "Προστέθηκε το widget %(widgetName)s από τον/την %(senderName)s",
+ "%(widgetName)s widget removed by %(senderName)s": "Το widget %(widgetName)s αφαιρέθηκε από τον/την %(senderName)s",
+ "%(names)s and %(count)s others are typing|other": "Ο/Η %(names)s και άλλοι/ες %(count)s πληκτρολογούν",
+ "%(names)s and %(count)s others are typing|one": "Ο/Η %(names)s και άλλος ένας πληκτρολογούν",
+ "Message Replies": "Απαντήσεις",
+ "Message Pinning": "Καρφίτσωμα Μηνυμάτων",
+ "Hide avatar changes": "Απόκρυψη αλλαγών εικονιδίων χρηστών",
+ "Hide display name changes": "Απόκρυψη αλλαγών εμφανιζόμενων ονομάτων",
+ "Hide avatars in user and room mentions": "Απόκρυψη εικονιδίων στις αναφορές χρηστών και δωματίων",
+ "Enable URL previews for this room (only affects you)": "Ενεργοποίηση προεπισκόπισης URL για αυτό το δωμάτιο (επηρεάζει μόνο εσάς)",
+ "Delete %(count)s devices|other": "Διαγραφή %(count)s συσκευών",
+ "Delete %(count)s devices|one": "Διαγραφή συσκευής",
+ "Select devices": "Επιλογή συσκευών",
+ "Cannot add any more widgets": "Δεν είναι δυνατή η προσθήκη άλλων widget",
+ "The maximum permitted number of widgets have already been added to this room.": "Ο μέγιστος επιτρεπτός αριθμός widget έχει ήδη προστεθεί σε αυτό το δωμάτιο.",
+ "Add a widget": "Προσθήκη widget",
+ "%(senderName)s sent an image": "Ο/Η %(senderName)s έστειλε μία εικόνα",
+ "%(senderName)s sent a video": "Ο/Η %(senderName)s έστειλε ένα βίντεο",
+ "%(senderName)s uploaded a file": "Ο/Η %(senderName)s αναφόρτωσε ένα αρχείο",
+ "If your other devices do not have the key for this message you will not be able to decrypt them.": "Εάν οι άλλες συσκευές σας δεν έχουν το κλειδί για αυτό το μήνυμα, τότε δεν θα μπορείτε να το αποκρυπτογραφήσετε.",
+ "Disinvite this user?": "Ακύρωση πρόσκλησης αυτού του χρήστη;",
+ "Mention": "Αναφορά",
+ "Invite": "Πρόσκληση",
+ "User Options": "Επιλογές Χρήστη",
+ "Send an encrypted reply…": "Αποστολή κρυπτογραφημένης απάντησης…",
+ "Send a reply (unencrypted)…": "Αποστολή απάντησης (μη κρυπτογραφημένης)…",
+ "Send an encrypted message…": "Αποστολή κρυπτογραφημένου μηνύματος…",
+ "Send a message (unencrypted)…": "Αποστολή μηνύματος (μη κρυπτογραφημένου)…",
+ "Unable to reply": "Αδυναμία απάντησης",
+ "Unpin Message": "Ξεκαρφίτσωμα μηνύματος",
+ "Jump to message": "Πηγαίντε στο μήνυμα",
+ "No pinned messages.": "Κανένα καρφιτσωμένο μήνυμα.",
+ "Loading...": "Φόρτωση...",
+ "Pinned Messages": "Καρφιτσωμένα Μηνύματα",
+ "%(duration)ss": "%(duration)sδ",
+ "%(duration)sm": "%(duration)sλ",
+ "%(duration)sh": "%(duration)sω",
+ "%(duration)sd": "%(duration)sμ",
+ "Online for %(duration)s": "Σε σύνδεση για %(duration)s",
+ "Idle for %(duration)s": "Αδρανής για %(duration)s",
+ "Offline for %(duration)s": "Εκτός σύνδεσης για %(duration)s",
+ "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Διαβάστηκε από τον/την %(displayName)s (%(userName)s) στις %(dateTime)s",
+ "Room Notification": "Ειδοποίηση Δωματίου",
+ "Notify the whole room": "Ειδοποιήστε όλο το δωμάτιο",
+ "Sets the room topic": "Ορίζει το θέμα του δωματίου"
}
From 05e1dd55f0890eb11d354e2e35cefa75402b3ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA=D0=BE=20=D0=9C=2E=20=D0=9A=D0=BE?=
=?UTF-8?q?=D1=81=D1=82=D0=B8=D1=9B?=
Date: Wed, 13 Jun 2018 17:55:34 +0000
Subject: [PATCH 0203/1196] Translated using Weblate (Serbian)
Currently translated at 99.6% (1186 of 1190 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
---
src/i18n/strings/sr.json | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index e73107376b..b2eee28b37 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -1160,5 +1160,29 @@
"Clear Storage and Sign Out": "Очисти складиште и одјави ме",
"Refresh": "Освежи",
"We encountered an error trying to restore your previous session.": "Наишли смо на грешку приликом повраћаја ваше претходне сесије.",
- "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Чишћење складишта вашег прегледача може решити проблем али ће вас то одјавити и учинити шифровани историјат ћаскања нечитљивим."
+ "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Чишћење складишта вашег прегледача може решити проблем али ће вас то одјавити и учинити шифровани историјат ћаскања нечитљивим.",
+ "e.g. %(exampleValue)s": "нпр.: %(exampleValue)s",
+ "Reload widget": "Поново учитај виџет",
+ "Send analytics data": "Пошаљи аналитичке податке",
+ "Enable widget screenshots on supported widgets": "Омогући снимке екрана виџета у подржаним виџетима",
+ "At this time it is not possible to reply with a file so this will be sent without being a reply.": "У овом тренутку није могуће одговорити са датотеком тако да ово неће бити послато у облику одговора.",
+ "Unable to reply": "Не могу да одговорим",
+ "At this time it is not possible to reply with an emote.": "У овом тренутку није могуће одговорити са емотиконом.",
+ "To notify everyone in the room, you must be a": "Да бисте обавестили све у соби, морате бити",
+ "Muted Users": "Утишани корисници",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie (please see our Cookie Policy ).": "Помозите побољшавање Riot.im програма тако што ћете послати анонимне податке о коришћењу . Ово ће захтевати коришћење колачића (погледајте нашу политику о колачићима ).",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie.": "Помозите побољшавање Riot.im програма тако што ћете послати анонимне податке о коришћењу . Ово ће захтевати коришћење колачића.",
+ "Yes, I want to help!": "Да, желим помоћи!",
+ "Warning: This widget might use cookies.": "Упозорење: овај виџет ће можда користити колачиће.",
+ "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Не могу да учитам догађај на који је послат одговор, или не постоји или немате овлашћење да га погледате.",
+ "Failed to indicate account erasure": "Неуспех при наговештавању да је налог обрисан",
+ "To continue, please enter your password:": "Да бисте наставили, унесите вашу лозинку:",
+ "password": "лозинка",
+ "Collapse Reply Thread": "Скупи нит са одговорима",
+ "Can't leave Server Notices room": "Не могу да напустим собу са напоменама сервера",
+ "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ова соба се користи за важне поруке са Кућног сервера, не можете изаћи из ове собе.",
+ "Terms and Conditions": "Услови коришћења",
+ "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Да бисте наставили са коришћењем Кућног сервера %(homeserverDomain)s морате погледати и пристати на наше услове коришћења.",
+ "Review terms and conditions": "Погледај услове коришћења",
+ "Try the app first": "Пробајте прво апликацију"
}
From 666d46922266974004f8662ca654c932e865b58c Mon Sep 17 00:00:00 2001
From: David Baker
Date: Thu, 14 Jun 2018 10:52:39 +0100
Subject: [PATCH 0204/1196] Revert "Fix exception when opening dev tools"
---
src/components/views/rooms/MessageComposerInput.js | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 66bae869ff..97e8780f0f 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -244,14 +244,12 @@ export default class MessageComposerInput extends React.Component {
let editorState = null;
if (contentState) {
- editorState = EditorState.moveFocusToEnd(
- EditorState.createWithContent(contentState, compositeDecorator)
- );
+ editorState = EditorState.createWithContent(contentState, compositeDecorator);
} else {
editorState = EditorState.createEmpty(compositeDecorator);
}
- return editorState;
+ return EditorState.moveFocusToEnd(editorState);
}
componentDidMount() {
From ebee8a8b5d3d801235a6a75b3ec1e17f7ff8545c Mon Sep 17 00:00:00 2001
From: Szimszon
Date: Thu, 14 Jun 2018 09:58:17 +0000
Subject: [PATCH 0205/1196] Translated using Weblate (Hungarian)
Currently translated at 100.0% (1192 of 1192 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
src/i18n/strings/hu.json | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index f878ca7b7d..d0b204bed6 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1188,5 +1188,7 @@
"Can't leave Server Notices room": "Nem lehet elhagyni a Szerver Üzenetek szobát",
"This room is used for important messages from the Homeserver, so you cannot leave it.": "Ez a szoba fontos szerverüzenetek közlésére jött létre, nem tudsz kilépni belőle.",
"To notify everyone in the room, you must be a": "Hogy mindenkinek tudj üzenni ahhoz ilyen szinten kell lenned:",
- "Try the app first": "Először próbáld ki az alkalmazást"
+ "Try the app first": "Először próbáld ki az alkalmazást",
+ "Encrypting": "Titkosít",
+ "Encrypted, not sent": "Titkosítva, de nincs elküldve"
}
From f6d75f865464d864fe5f31e2363711eae3391b13 Mon Sep 17 00:00:00 2001
From: Andrey
Date: Thu, 14 Jun 2018 10:04:20 +0000
Subject: [PATCH 0206/1196] Translated using Weblate (Russian)
Currently translated at 99.8% (1190 of 1192 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
src/i18n/strings/ru.json | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 859b1f2b3c..794a36e91f 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1186,5 +1186,7 @@
"To notify everyone in the room, you must be a": "Для уведомления всех в комнате, вы должны быть",
"Can't leave Server Notices room": "Невозможно покинуть комнату сервера уведомлений",
"This room is used for important messages from the Homeserver, so you cannot leave it.": "Эта комната используется для важных сообщений от сервера, поэтому вы не можете ее покинуть.",
- "Try the app first": "Сначала попробуйте приложение"
+ "Try the app first": "Сначала попробуйте приложение",
+ "Encrypting": "Шифрование",
+ "Encrypted, not sent": "Зашифровано, не отправлено"
}
From 384c9745896fa79311a3e4be474eb200d64656f9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 Jun 2018 11:16:57 +0100
Subject: [PATCH 0207/1196] tidy up if statements and fix up comments
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/RoomSubList.js | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 17daa8553b..33ff17caa4 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -106,15 +106,10 @@ var RoomSubList = React.createClass({
applySearchFilter: function(list, filter) {
if (filter === "") return list;
const lcFilter = filter.toLowerCase();
- return list.filter((room) => {
- if (room.name && room.name.toLowerCase().includes(lcFilter)) return true;
- // only apply search filter to aliases if it looks like an alias (starts with `#`)
- // to prevent loads of false positives with server names, e.g `matrix`
- if (filter[0] === '#' && room.getAliases().some((alias) => {
- return alias.toLowerCase().startsWith(lcFilter);
- })) return true;
- return false;
- });
+ // case insensitive if room name includes filter,
+ // or if starts with `#` and one of room's aliases starts with filter
+ return list.filter((room) => (room.name && room.name.toLowerCase().includes(lcFilter)) ||
+ (filter[0] === '#' && room.getAliases().some((alias) => alias.toLowerCase().startsWith(lcFilter))));
},
// The header is collapsable if it is hidden or not stuck
From c811c30c0dd525aafa91409a19c3d3982535f200 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 Jun 2018 11:36:04 +0100
Subject: [PATCH 0208/1196] fix styling of clearButton when its not there
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
res/css/structures/_TagPanel.scss | 2 +-
src/components/structures/TagPanel.js | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index ab1d4feac3..a76c04805d 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -25,7 +25,7 @@ limitations under the License.
justify-content: space-between;
}
-.mx_TagPanel .mx_TagPanel_clearButton {
+.mx_TagPanel .mx_TagPanel_clearButton_container {
/* Constant height within flex mx_TagPanel */
height: 70px;
width: 60px;
diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 77259c863d..6b6b09c5dc 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -127,7 +127,9 @@ const TagPanel = React.createClass({
}
return
Social
{
- socials.map((social) =>
-
+
)
}
From a257dc27c5c7af9ad4af3847ea1b91d49db5ae3c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 13 Jun 2018 19:08:24 +0100
Subject: [PATCH 0200/1196] move css rule to be more generic; remove overriden
rule
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
res/css/views/messages/_MTextBody.scss | 5 -----
res/css/views/rooms/_EventTile.scss | 1 +
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/res/css/views/messages/_MTextBody.scss b/res/css/views/messages/_MTextBody.scss
index fcf397fd2d..93a89ad1b7 100644
--- a/res/css/views/messages/_MTextBody.scss
+++ b/res/css/views/messages/_MTextBody.scss
@@ -17,8 +17,3 @@ limitations under the License.
.mx_MTextBody {
white-space: pre-wrap;
}
-
-.mx_MTextBody pre{
- overflow-y: auto;
- max-height: 30vh;
-}
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index ce2bf9c8a4..80d2cd3418 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -391,6 +391,7 @@ limitations under the License.
.mx_EventTile_content .markdown-body pre {
overflow-x: overlay;
overflow-y: visible;
+ max-height: 30vh;
}
.mx_EventTile_content .markdown-body code {
From 3c4d62ddf85924777b7b883f5c71096b83fef5c1 Mon Sep 17 00:00:00 2001
From: Szimszon
- { clearButton }
+
Date: Thu, 14 Jun 2018 11:42:21 +0100
Subject: [PATCH 0209/1196] change cursor:pointer iff clicking TagPanel
background does something
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
res/css/structures/_TagPanel.scss | 5 ++++-
src/components/structures/TagPanel.js | 13 ++++++++++---
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index a76c04805d..415aafd924 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -17,7 +17,6 @@ limitations under the License.
.mx_TagPanel {
flex: 0 0 60px;
background-color: $tertiary-accent-color;
- cursor: pointer;
display: flex;
flex-direction: column;
@@ -25,6 +24,10 @@ limitations under the License.
justify-content: space-between;
}
+.mx_TagPanel_items_selected {
+ cursor: pointer;
+}
+
.mx_TagPanel .mx_TagPanel_clearButton_container {
/* Constant height within flex mx_TagPanel */
height: 70px;
diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 6b6b09c5dc..652211595b 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -1,5 +1,5 @@
/*
-Copyright 2017 New Vector Ltd.
+Copyright 2017, 2018 New Vector Ltd.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@ import dis from '../../dispatcher';
import { _t } from '../../languageHandler';
import { Droppable } from 'react-beautiful-dnd';
+import classNames from 'classnames';
const TagPanel = React.createClass({
displayName: 'TagPanel',
@@ -116,8 +117,10 @@ const TagPanel = React.createClass({
/>;
});
+ const itemsSelected = this.state.selectedTags.length > 0;
+
let clearButton;
- if (this.state.selectedTags.length > 0) {
+ if (itemsSelected) {
clearButton =
;
}
- return
+ { clearButton }
+
+ const classes = classNames('mx_TagPanel', {
+ mx_TagPanel_items_selected: itemsSelected,
+ });
+
+ return
Date: Thu, 14 Jun 2018 10:45:23 +0000
Subject: [PATCH 0210/1196] Translated using Weblate (Hungarian)
Currently translated at 100.0% (1194 of 1194 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
src/i18n/strings/hu.json | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index d0b204bed6..427d6b89ea 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1190,5 +1190,7 @@
"To notify everyone in the room, you must be a": "Hogy mindenkinek tudj üzenni ahhoz ilyen szinten kell lenned:",
"Try the app first": "Először próbáld ki az alkalmazást",
"Encrypting": "Titkosít",
- "Encrypted, not sent": "Titkosítva, de nincs elküldve"
+ "Encrypted, not sent": "Titkosítva, de nincs elküldve",
+ "No Audio Outputs detected": "Nem található hang kimenet",
+ "Audio Output": "Hang kimenet"
}
From 63e9c0aa1e02d066544e52691f5280570349e0b3 Mon Sep 17 00:00:00 2001
From: Andrey
Date: Thu, 14 Jun 2018 10:21:15 +0000
Subject: [PATCH 0211/1196] Translated using Weblate (Russian)
Currently translated at 99.8% (1192 of 1194 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
src/i18n/strings/ru.json | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 794a36e91f..9853c8a173 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1188,5 +1188,7 @@
"This room is used for important messages from the Homeserver, so you cannot leave it.": "Эта комната используется для важных сообщений от сервера, поэтому вы не можете ее покинуть.",
"Try the app first": "Сначала попробуйте приложение",
"Encrypting": "Шифрование",
- "Encrypted, not sent": "Зашифровано, не отправлено"
+ "Encrypted, not sent": "Зашифровано, не отправлено",
+ "No Audio Outputs detected": "Аудиовыход не обнаружен",
+ "Audio Output": "Аудиовыход"
}
From 9a225840ce6a43f5e62a03a18cbe28ba6a1ecc7b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 Jun 2018 12:00:53 +0100
Subject: [PATCH 0212/1196] check type before msgtype in the case of
`m.sticker` with msgtype (undef)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/messages/MessageEvent.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js
index c4d29257ff..fd51e6074b 100644
--- a/src/components/views/messages/MessageEvent.js
+++ b/src/components/views/messages/MessageEvent.js
@@ -72,10 +72,10 @@ module.exports = React.createClass({
let BodyType = UnknownBody;
if (!this.props.mxEvent.isRedacted()) {
// only resolve BodyType if event is not redacted
- if (msgtype && bodyTypes[msgtype]) {
- BodyType = bodyTypes[msgtype];
- } else if (type && evTypes[type]) {
+ if (type && evTypes[type]) {
BodyType = evTypes[type];
+ } else if (msgtype && bodyTypes[msgtype]) {
+ BodyType = bodyTypes[msgtype];
} else if (content.url) {
// Fallback to MFileBody if there's a content URL
BodyType = bodyTypes['m.file'];
From d5fdfdaf8a1ee7ad219012e2ccefddb6d0351ef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?=
Date: Thu, 14 Jun 2018 11:25:26 +0000
Subject: [PATCH 0213/1196] Translated using Weblate (French)
Currently translated at 100.0% (1194 of 1194 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
src/i18n/strings/fr.json | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 50f801e94c..0b7abd6af5 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1188,5 +1188,9 @@
"Can't leave Server Notices room": "Impossible de quitter le salon des Annonces du serveur",
"This room is used for important messages from the Homeserver, so you cannot leave it.": "Ce salon est utilisé pour les messages importants du serveur d'accueil, donc vous ne pouvez pas en partir.",
"To notify everyone in the room, you must be a": "Pour notifier tout le monde dans le salon, vous devez être un(e)",
- "Try the app first": "Essayer d'abord l'application"
+ "Try the app first": "Essayer d'abord l'application",
+ "Encrypting": "Chiffrement en cours",
+ "Encrypted, not sent": "Chiffré, pas envoyé",
+ "No Audio Outputs detected": "Aucune sortie audio détectée",
+ "Audio Output": "Sortie audio"
}
From 36574ca0fb1b0a14a5886a953b3d6dbaad2ea7d2 Mon Sep 17 00:00:00 2001
From: David Baker
Date: Thu, 14 Jun 2018 13:03:42 +0100
Subject: [PATCH 0214/1196] Fix doc
---
src/WidgetUtils.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/WidgetUtils.js b/src/WidgetUtils.js
index 14fe3f59bd..98ee935f35 100644
--- a/src/WidgetUtils.js
+++ b/src/WidgetUtils.js
@@ -100,7 +100,8 @@ export default class WidgetUtils {
* @param {string} widgetId The ID of the widget to wait for
* @param {boolean} add True to wait for the widget to be added,
* false to wait for it to be deleted.
- * @returns {Promise} that resolves when the widget is available
+ * @returns {Promise} that resolves when the widget is the the
+ * requested state according to the `add` param
*/
static waitForUserWidget(widgetId, add) {
return new Promise((resolve, reject) => {
@@ -146,7 +147,8 @@ export default class WidgetUtils {
* @param {string} roomId The ID of the room to wait for the widget in
* @param {boolean} add True to wait for the widget to be added,
* false to wait for it to be deleted.
- * @returns {Promise} that resolves when the widget is available
+ * @returns {Promise} that resolves when the widget is the the
+ * requested state according to the `add` param
*/
static waitForRoomWidget(widgetId, roomId, add) {
return new Promise((resolve, reject) => {
From aa7d62b7402499297853fad02950679f8a279ce8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 Jun 2018 13:20:16 +0100
Subject: [PATCH 0215/1196] fix naming of methods and fields
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/dialogs/ShareDialog.js | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js
index e68922d35a..97d496adbc 100644
--- a/src/components/views/dialogs/ShareDialog.js
+++ b/src/components/views/dialogs/ShareDialog.js
@@ -67,10 +67,10 @@ export default class ShareDialog extends React.Component {
super(props);
this.onCopyClick = this.onCopyClick.bind(this);
- this.onCheckboxClick = this.onCheckboxClick.bind(this);
+ this.onLinkRecentCheckboxClick = this.onLinkRecentCheckboxClick.bind(this);
this.state = {
- ticked: false,
+ linkRecentTicked: false,
};
}
@@ -116,9 +116,9 @@ export default class ShareDialog extends React.Component {
e.target.onmouseleave = close;
}
- onCheckboxClick() {
+ onLinkRecentCheckboxClick() {
this.setState({
- ticked: !this.state.ticked,
+ linkRecentTicked: !this.state.linkRecentTicked,
});
}
@@ -135,16 +135,16 @@ export default class ShareDialog extends React.Component {
if (events.length > 0) {
checkbox =
- { bodyNodes }
+ { this._getMembershipSection() }
+ { this._getGroupSection() }
);
From a7f5059aca1b6e61ade8ce5512ea782a22b20d08 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 15 Jun 2018 18:55:21 +0100
Subject: [PATCH 0255/1196] add nop to fix `onClick` being required warning
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/groups/GroupTile.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/components/views/groups/GroupTile.js b/src/components/views/groups/GroupTile.js
index c1554cd9ed..509c209baa 100644
--- a/src/components/views/groups/GroupTile.js
+++ b/src/components/views/groups/GroupTile.js
@@ -22,6 +22,7 @@ import sdk from '../../../index';
import dis from '../../../dispatcher';
import FlairStore from '../../../stores/FlairStore';
+function nop() {}
const GroupTile = React.createClass({
displayName: 'GroupTile',
@@ -81,7 +82,7 @@ const GroupTile = React.createClass({
) : null;
// XXX: Use onMouseDown as a workaround for https://github.com/atlassian/react-beautiful-dnd/issues/273
// instead of onClick. Otherwise we experience https://github.com/vector-im/riot-web/issues/6156
- return
+ return
{ (droppableProvided, droppableSnapshot) => (
{ clearButton }
From 68e2ee4e51784a7de27bd9765b47b95262b66bb8 Mon Sep 17 00:00:00 2001
From: Szimszon
+ onClick={this.onLinkRecentCheckboxClick} />
;
}
- if (this.state.ticked) {
+ if (this.state.linkRecentTicked) {
matrixToUrl = makeEventPermalink(this.props.target.roomId, events[events.length - 1].getId());
} else {
matrixToUrl = makeRoomPermalink(this.props.target.roomId);
From 7d7a6f3d9c904874c352470d658b981196b3c8c9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 Jun 2018 13:35:35 +0100
Subject: [PATCH 0216/1196] ShareDialog share Message, link to timestamp and
permalink in ctx menu
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
.../views/context_menus/MessageContextMenu.js | 11 ++++++++++-
src/components/views/dialogs/ShareDialog.js | 7 +++++--
src/components/views/rooms/EventTile.js | 15 +++++++++++++--
3 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 99ec493ced..bdd267c4ee 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -184,6 +184,15 @@ module.exports = React.createClass({
this.closeMenu();
},
+ onPermalinkClick: function(e: Event) {
+ e.preventDefault();
+ const ShareDialog = sdk.getComponent("dialogs.ShareDialog");
+ Modal.createTrackedDialog('share room message dialog', '', ShareDialog, {
+ target: this.props.mxEvent,
+ });
+ this.closeMenu();
+ },
+
onReplyClick: function() {
dis.dispatch({
action: 'reply_to_event',
@@ -290,7 +299,7 @@ module.exports = React.createClass({
const permalinkButton = (
{ _t('Permalink') }
+ target="_blank" rel="noopener" onClick={this.onPermalinkClick}>{ _t('Share Message') }
);
diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js
index 97d496adbc..12efc8b919 100644
--- a/src/components/views/dialogs/ShareDialog.js
+++ b/src/components/views/dialogs/ShareDialog.js
@@ -16,7 +16,7 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
-import {Room, User, Group, RoomMember} from 'matrix-js-sdk';
+import {Room, User, Group, RoomMember, MatrixEvent} from 'matrix-js-sdk';
import sdk from '../../../index';
import { _t } from '../../../languageHandler';
import QRCode from 'qrcode-react';
@@ -59,7 +59,7 @@ export default class ShareDialog extends React.Component {
PropTypes.instanceOf(User),
PropTypes.instanceOf(Group),
PropTypes.instanceOf(RoomMember),
- // PropTypes.instanceOf(MatrixEvent),
+ PropTypes.instanceOf(MatrixEvent),
]).isRequired,
};
@@ -155,6 +155,9 @@ export default class ShareDialog extends React.Component {
} else if (this.props.target instanceof Group) {
title = _t('Share Community');
matrixToUrl = makeGroupPermalink(this.props.target.groupId);
+ } else if (this.props.target instanceof MatrixEvent) {
+ title = _t('Share Room Message');
+ matrixToUrl = makeEventPermalink(this.props.target.roomId, this.props.target.eventId);
}
const encodedUrl = encodeURIComponent(matrixToUrl);
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 589524bb9e..1160c7c886 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -438,6 +438,17 @@ module.exports = withMatrixClient(React.createClass({
});
},
+ onPermalinkShareClicked: function(e) {
+ // These permalinks are like above, can be opened in new tab/window to matrix.to
+ // but otherwise fire the ShareDialog as it makes little sense to click permalink
+ // whilst it is in the current room
+ e.preventDefault();
+ const ShareDialog = sdk.getComponent("dialogs.ShareDialog");
+ Modal.createTrackedDialog('share room event dialog', '', ShareDialog, {
+ target: this.props.mxEvent,
+ });
+ },
+
_renderE2EPadlock: function() {
const ev = this.props.mxEvent;
const props = {onClick: this.onCryptoClicked};
@@ -667,7 +678,7 @@ module.exports = withMatrixClient(React.createClass({
{ avatar }
{ sender }
-
+
{ timestamp }
{ this._renderE2EPadlock() }
@@ -694,7 +705,7 @@ module.exports = withMatrixClient(React.createClass({
{ avatar }
{ sender }
-
+
{ timestamp }
{ this._renderE2EPadlock() }
From e1d3c2e4c73536f1f755edeb6aa18e7533b7b3fb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 Jun 2018 13:36:39 +0100
Subject: [PATCH 0217/1196] run gen-i18n and prune-i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/i18n/strings/be.json | 1 -
src/i18n/strings/bg.json | 1 -
src/i18n/strings/ca.json | 1 -
src/i18n/strings/cs.json | 1 -
src/i18n/strings/da.json | 1 -
src/i18n/strings/de_DE.json | 1 -
src/i18n/strings/el.json | 1 -
src/i18n/strings/en_EN.json | 3 ++-
src/i18n/strings/en_US.json | 1 -
src/i18n/strings/eo.json | 1 -
src/i18n/strings/es.json | 1 -
src/i18n/strings/eu.json | 1 -
src/i18n/strings/fa.json | 1 -
src/i18n/strings/fi.json | 1 -
src/i18n/strings/fr.json | 1 -
src/i18n/strings/gl.json | 1 -
src/i18n/strings/he.json | 1 -
src/i18n/strings/hu.json | 1 -
src/i18n/strings/id.json | 1 -
src/i18n/strings/is.json | 1 -
src/i18n/strings/it.json | 1 -
src/i18n/strings/ja.json | 1 -
src/i18n/strings/ko.json | 1 -
src/i18n/strings/lt.json | 1 -
src/i18n/strings/lv.json | 1 -
src/i18n/strings/ml.json | 1 -
src/i18n/strings/nb_NO.json | 1 -
src/i18n/strings/nl.json | 1 -
src/i18n/strings/pl.json | 1 -
src/i18n/strings/pt.json | 1 -
src/i18n/strings/pt_BR.json | 1 -
src/i18n/strings/ru.json | 1 -
src/i18n/strings/sk.json | 1 -
src/i18n/strings/sq.json | 1 -
src/i18n/strings/sr.json | 1 -
src/i18n/strings/sv.json | 1 -
src/i18n/strings/ta.json | 1 -
src/i18n/strings/th.json | 1 -
src/i18n/strings/tr.json | 1 -
src/i18n/strings/uk.json | 1 -
src/i18n/strings/zh_Hans.json | 1 -
src/i18n/strings/zh_Hant.json | 1 -
42 files changed, 2 insertions(+), 42 deletions(-)
diff --git a/src/i18n/strings/be.json b/src/i18n/strings/be.json
index 7e79f5d355..31360c87f4 100644
--- a/src/i18n/strings/be.json
+++ b/src/i18n/strings/be.json
@@ -31,7 +31,6 @@
"Noisy": "Шумна",
"Resend": "Паўторна",
"On": "Уключыць",
- "Permalink": "Пастаянная спасылка",
"remove %(name)s from the directory.": "выдаліць %(name)s з каталога.",
"Off": "Выключыць",
"Delete the room alias %(alias)s and remove %(name)s from the directory?": "Выдаліць псеўданім пакоя %(alias)s і выдаліць %(name)s з каталога?",
diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index d157f4dff8..b86941b3b7 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1125,7 +1125,6 @@
"Set Password": "Задаване на парола",
"An error occurred whilst saving your email notification preferences.": "Възникна грешка при запазване на настройките за имейл известяване.",
"Enable audible notifications in web client": "Включване на звукови известия в уеб клиент",
- "Permalink": "Permalink",
"Off": "Изключено",
"Riot does not know how to join a room on this network": "Riot не знае как да се присъедини към стая от тази мрежа",
"Mentions only": "Само при споменаване",
diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 407b9f61d4..f7212619b2 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -1004,7 +1004,6 @@
"Unable to fetch notification target list": "No s'ha pogut obtenir la llista d'objectius de les notificacions",
"Set Password": "Establiu una contrasenya",
"Enable audible notifications in web client": "Habilita les notificacions d'àudio al client web",
- "Permalink": "Enllaç permanent",
"Off": "Apagat",
"Riot does not know how to join a room on this network": "El Riot no sap com unir-se a una sala en aquesta xarxa",
"Mentions only": "Només mencions",
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 33c7a3d5f1..99424d6043 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -1062,7 +1062,6 @@
"Set Password": "Nastavit heslo",
"An error occurred whilst saving your email notification preferences.": "Při ukládání nastavení e-mailových upozornění nastala chyba.",
"Enable audible notifications in web client": "Povolit zvuková upozornění ve webové aplikaci",
- "Permalink": "Trvalý odkaz",
"Off": "Vypnout",
"#example": "#příklad",
"Mentions only": "Pouze zmínky",
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 2a59530d5a..02497a7934 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -371,7 +371,6 @@
"Unable to fetch notification target list": "Kan ikke hente meddelelsesmålliste",
"Set Password": "Indstil Password",
"Enable audible notifications in web client": "Aktivér hørbare underretninger i webklienten",
- "Permalink": "Permanent link",
"Resend": "Send igen",
"Riot does not know how to join a room on this network": "Riot ved ikke, hvordan man kan deltage i et rum på dette netværk",
"Mentions only": "Kun nævninger",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 8f75b71689..9688f4da8f 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1126,7 +1126,6 @@
"Unable to fetch notification target list": "Liste der Benachrichtigungsempfänger konnte nicht abgerufen werden",
"Set Password": "Passwort einrichten",
"Enable audible notifications in web client": "Audio-Benachrichtigungen im Web-Client aktivieren",
- "Permalink": "Permanenter Link",
"Off": "Aus",
"Riot does not know how to join a room on this network": "Riot weiß nicht, wie es einem Raum auf diesem Netzwerk beitreten soll",
"Mentions only": "Nur, wenn du erwähnt wirst",
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index fabd88c74a..e12f9223a2 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -746,7 +746,6 @@
"What's New": "Τι νέο υπάρχει",
"Set Password": "Ορισμός κωδικού πρόσβασης",
"Enable audible notifications in web client": "Ενεργοποίηση ηχητικών ειδοποιήσεων",
- "Permalink": "Μόνιμος σύνδεσμος",
"Off": "Ανενεργό",
"#example": "#παράδειγμα",
"Mentions only": "Μόνο αναφορές",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 76d0cb6f33..bb5ad5405b 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -862,6 +862,7 @@
"Link to most recent message": "Link to most recent message",
"Share User": "Share User",
"Share Community": "Share Community",
+ "Share Room Message": "Share Room Message",
"COPY": "COPY",
"You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.",
"We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.",
@@ -881,7 +882,7 @@
"View Source": "View Source",
"View Decrypted Source": "View Decrypted Source",
"Unhide Preview": "Unhide Preview",
- "Permalink": "Permalink",
+ "Share Message": "Share Message",
"Quote": "Quote",
"Source URL": "Source URL",
"Collapse Reply Thread": "Collapse Reply Thread",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 43e2041020..be71d0ae1d 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -816,7 +816,6 @@
"Unable to fetch notification target list": "Unable to fetch notification target list",
"Set Password": "Set Password",
"Enable audible notifications in web client": "Enable audible notifications in web client",
- "Permalink": "Permalink",
"Off": "Off",
"Riot does not know how to join a room on this network": "Riot does not know how to join a room on this network",
"Mentions only": "Mentions only",
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 68645ffd9c..3c20baef9e 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -1077,7 +1077,6 @@
"Unable to fetch notification target list": "Malsukcesis akiri la liston de celoj por sciigoj",
"Set Password": "Agordi pasvorton",
"Enable audible notifications in web client": "Ŝalti aŭdeblajn sciigojn en la retkliento",
- "Permalink": "Konstanta ligilo",
"Off": "For",
"Riot does not know how to join a room on this network": "Riot ne scias aliĝi al ĉambroj en tiu ĉi reto",
"Mentions only": "Nur mencioj",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 8e7925ba36..b377e97e74 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -717,7 +717,6 @@
"Riot does not know how to join a room on this network": "Riot no sabe cómo unirse a una sala en esta red",
"Set Password": "Establecer contraseña",
"Enable audible notifications in web client": "Habilitar notificaciones audibles en el cliente web",
- "Permalink": "Enlace permanente",
"Off": "Apagado",
"#example": "#ejemplo",
"Mentions only": "Sólo menciones",
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index fe9d3db424..229c9d648e 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1127,7 +1127,6 @@
"Unable to fetch notification target list": "Ezin izan da jakinarazpen helburuen zerrenda eskuratu",
"Set Password": "Ezarri pasahitza",
"Enable audible notifications in web client": "Gaitu jakinarazpen entzungarriak web bezeroan",
- "Permalink": "Esteka iraunkorra",
"Off": "Ez",
"Riot does not know how to join a room on this network": "Riotek ez daki nola elkartu gela batetara sare honetan",
"Mentions only": "Aipamenak besterik ez",
diff --git a/src/i18n/strings/fa.json b/src/i18n/strings/fa.json
index 0e532d9483..2b18ba7693 100644
--- a/src/i18n/strings/fa.json
+++ b/src/i18n/strings/fa.json
@@ -124,7 +124,6 @@
"Set Password": "پسوردتان را انتخاب کنید",
"An error occurred whilst saving your email notification preferences.": "خطایی در حین ذخیرهی ترجیجات شما دربارهی رایانامه رخ داد.",
"Enable audible notifications in web client": "آگاهسازی صدادار را در کارگزار وب فعال کن",
- "Permalink": "پایاپیوند",
"Off": "خاموش",
"Riot does not know how to join a room on this network": "رایوت از چگونگی ورود به یک گپ در این شبکه اطلاعی ندارد",
"Mentions only": "فقط نامبردنها",
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index e5787ab561..204ed4ba87 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -1050,7 +1050,6 @@
"Set Password": "Aseta salasana",
"An error occurred whilst saving your email notification preferences.": "Sähköposti-ilmoitusasetuksia tallettaessa tapahtui virhe.",
"Enable audible notifications in web client": "Ota käyttöön äänelliset ilmoitukset",
- "Permalink": "Pysyvä linkki",
"remove %(name)s from the directory.": "poista %(name)s hakemistosta.",
"Off": "Pois päältä",
"Riot does not know how to join a room on this network": "Riot ei tiedä miten liittya huoneeseen tässä verkossa",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 367e89d2b6..fa33d58846 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1121,7 +1121,6 @@
"Unable to fetch notification target list": "Impossible de récupérer la liste des appareils recevant les notifications",
"Set Password": "Définir un mot de passe",
"Enable audible notifications in web client": "Activer les notifications sonores pour le client web",
- "Permalink": "Permalien",
"Off": "Désactivé",
"Riot does not know how to join a room on this network": "Riot ne peut pas joindre un salon sur ce réseau",
"Mentions only": "Seulement les mentions",
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index fdab066031..70d0889ae0 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -1127,7 +1127,6 @@
"Unable to fetch notification target list": "Non se puido procesar a lista de obxetivo de notificacións",
"Set Password": "Establecer contrasinal",
"Enable audible notifications in web client": "Habilitar notificacións audibles no cliente web",
- "Permalink": "Ligazón permanente",
"Off": "Off",
"Riot does not know how to join a room on this network": "Riot non sabe cómo conectar con unha sala en esta rede",
"Mentions only": "Só mencións",
diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json
index dbae2858a9..7d96dfa089 100644
--- a/src/i18n/strings/he.json
+++ b/src/i18n/strings/he.json
@@ -221,7 +221,6 @@
"Unable to fetch notification target list": "לא ניתן לאחזר רשימת יעדי התראה",
"Set Password": "הגדר סיסמא",
"Enable audible notifications in web client": "אפשר התראות קוליות בדפדפן",
- "Permalink": "קישור קבוע",
"Off": "סגור",
"Riot does not know how to join a room on this network": "Riot אינו יודע כיצד להצטרף לחדר ברשת זו",
"Mentions only": "מאזכר בלבד",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 3d8100d8f1..e142e7506a 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1126,7 +1126,6 @@
"Unable to fetch notification target list": "Nem sikerült letölteni az értesítési célok listáját",
"Set Password": "Jelszó beállítása",
"Enable audible notifications in web client": "Hangértesítések engedélyezése a webkliensben",
- "Permalink": "Állandó hivatkozás",
"Off": "Ki",
"Riot does not know how to join a room on this network": "A Riot nem tud csatlakozni szobához ezen a hálózaton",
"Mentions only": "Csak ha megemlítenek",
diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
index 9db1a4a99c..f0506d873e 100644
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -324,7 +324,6 @@
"Unable to fetch notification target list": "Tidak dapat mengambil daftar notifikasi target",
"Set Password": "Ubah Password",
"Enable audible notifications in web client": "Aktifkan notifikasi suara di klien web",
- "Permalink": "Permalink",
"Off": "Mati",
"Riot does not know how to join a room on this network": "Riot tidak tau bagaimana gabung ruang di jaringan ini",
"Mentions only": "Hanya jika disinggung",
diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index d901c52f60..39f03156f5 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -380,7 +380,6 @@
"View Source": "Skoða frumkóða",
"View Decrypted Source": "Skoða afkóðaða upprunaskrá",
"Unhide Preview": "Birta forskoðun",
- "Permalink": "Varanlegur tengill",
"Quote": "Tilvitnun",
"Source URL": "Upprunaslóð",
"All messages (noisy)": "Öll skilaboð (hávært)",
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index c73dc8b60d..d96c315363 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1122,7 +1122,6 @@
"What's New": "Novità",
"Set Password": "Imposta Password",
"Enable audible notifications in web client": "Abilita notifiche audio nel client web",
- "Permalink": "Link permanente",
"Off": "Spento",
"#example": "#esempio",
"Mentions only": "Solo le citazioni",
diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 80bd4f1ff5..741de4b551 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -223,7 +223,6 @@
"Event Type": "イベントの形式",
"What's New": "新着",
"Enable audible notifications in web client": "ウェブクライアントで音による通知を有効化",
- "Permalink": "パーマリンク",
"remove %(name)s from the directory.": "ディレクトリから %(name)s を消去する。",
"Riot does not know how to join a room on this network": "Riotはこのネットワークで部屋に参加する方法を知りません",
"You can now return to your account after signing out, and sign in on other devices.": "サインアウト後にあなたの\nアカウントに戻る、また、他の端末でサインインすることができます。",
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 4e0a988223..7e58b9a253 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -754,7 +754,6 @@
"Riot does not know how to join a room on this network": "라이엇이 이 네트워크에서 방에 들어가는 법을 알 수 없어요",
"Set Password": "비밀번호 설정",
"Enable audible notifications in web client": "웹 클라이언트에서 알림 소리 켜기",
- "Permalink": "고유주소",
"Off": "끄기",
"#example": "#예",
"Mentions only": "답만 하기",
diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index bd46c25ed8..e1525f7af1 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -161,7 +161,6 @@
"Set Password": "Nustatyti slaptažodį",
"An error occurred whilst saving your email notification preferences.": "Įrašant pranešimų el. paštu nuostatas, įvyko klaida.",
"Unable to join network": "Nepavyko prisijungti prie tinklo",
- "Permalink": "Pastovioji nuoroda",
"Register": "Registruotis",
"Off": "Išjungta",
"Edit": "Koreguoti",
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 01e3ae5c6d..5622dcb408 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -1115,7 +1115,6 @@
"Unable to fetch notification target list": "Neizdevās iegūt paziņojumu mērķu sarakstu",
"Set Password": "Iestatīt paroli",
"Enable audible notifications in web client": "Iespējot skaņus paziņojumus web klientā",
- "Permalink": "Pastāvīgā saite",
"Off": "izslēgts",
"Riot does not know how to join a room on this network": "Riot nezin kā pievienoties šajā tīklā esošajai istabai",
"Mentions only": "Vienīgi atsauces",
diff --git a/src/i18n/strings/ml.json b/src/i18n/strings/ml.json
index 6de7e92df7..a4bf0b421a 100644
--- a/src/i18n/strings/ml.json
+++ b/src/i18n/strings/ml.json
@@ -137,7 +137,6 @@
"Unable to fetch notification target list": "നോട്ടിഫിക്കേഷന് ടാര്ഗെറ്റ് ലിസ്റ്റ് നേടാനായില്ല",
"Set Password": "രഹസ്യവാക്ക് സജ്ജീകരിക്കുക",
"Enable audible notifications in web client": "വെബ് പതിപ്പിലെ അറിയിപ്പുകള് കേള്ക്കാവുന്നതാക്കുക",
- "Permalink": "പെര്മാലിങ്ക്",
"remove %(name)s from the directory.": "%(name)s ഡയറക്റ്ററിയില് നിന്ന് നീക്കം ചെയ്യുക.",
"Off": "ഓഫ്",
"Riot does not know how to join a room on this network": "ഈ നെറ്റ്വര്ക്കിലെ ഒരു റൂമില് എങ്ങനെ അംഗമാകാമെന്ന് റയട്ടിന് അറിയില്ല",
diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index 47da50122c..9a2b859854 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -98,7 +98,6 @@
"Riot does not know how to join a room on this network": "Riot vet ikke hvordan man kan komme inn på et rom på dette nettverket",
"An error occurred whilst saving your email notification preferences.": "En feil oppsto i forbindelse med lagring av epost varsel innstillinger.",
"Enable audible notifications in web client": "Aktiver lyd-varsel i webklient",
- "Permalink": "Permanent lenke",
"remove %(name)s from the directory.": "fjern %(name)s fra katalogen.",
"Off": "Av",
"#example": "#eksempel",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index f09c63118e..bda64146cc 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1120,7 +1120,6 @@
"Unable to fetch notification target list": "Het is mislukt om de lijst van notificatiedoelen op te halen",
"Set Password": "Wachtwoord instellen",
"Enable audible notifications in web client": "Geluidsmeldingen in de webclient aanzetten",
- "Permalink": "Permanente link",
"Off": "Uit",
"Riot does not know how to join a room on this network": "Riot weet niet hoe het moet deelnemen in een ruimte op dit netwerk",
"Mentions only": "Alleen vermeldingen",
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index d3dcb72f49..30afa07202 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -901,7 +901,6 @@
"Unable to fetch notification target list": "Nie można pobrać listy docelowej dla powiadomień",
"Set Password": "Ustaw hasło",
"Enable audible notifications in web client": "Włącz dźwiękowe powiadomienia w kliencie internetowym",
- "Permalink": "Odnośnik bezpośredni",
"Off": "Wyłącz",
"Riot does not know how to join a room on this network": "Riot nie wie, jak dołączyć do pokoju w tej sieci",
"Mentions only": "Tylko, gdy wymienieni",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index d165c6c057..c8f7a45dcf 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -826,7 +826,6 @@
"Unable to fetch notification target list": "Não foi possível obter a lista de alvos de notificação",
"Set Password": "Definir palavra-passe",
"Enable audible notifications in web client": "Ativar notificações de áudio no cliente web",
- "Permalink": "Link permanente",
"Off": "Desativado",
"Riot does not know how to join a room on this network": "O Riot não sabe como entrar numa sala nesta rede",
"Mentions only": "Apenas menções",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 0a4d847805..a5c4e06922 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -1101,7 +1101,6 @@
"Unable to fetch notification target list": "Não foi possível obter a lista de alvos de notificação",
"Set Password": "Definir senha",
"Enable audible notifications in web client": "Ativar notificações de áudio no cliente web",
- "Permalink": "Link permanente",
"Off": "Desativado",
"Riot does not know how to join a room on this network": "O sistema não sabe como entrar na sala desta rede",
"Mentions only": "Apenas menções",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 2bdce2fe4f..599847ab84 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1125,7 +1125,6 @@
"Unable to fetch notification target list": "Не удалось получить список устройств для уведомлений",
"Set Password": "Задать пароль",
"Enable audible notifications in web client": "Включить звуковые уведомления в веб-клиенте",
- "Permalink": "Постоянная ссылка",
"Off": "Выключить",
"Riot does not know how to join a room on this network": "Riot не знает, как присоединиться к комнате, принадлежащей к этой сети",
"Mentions only": "Только при упоминаниях",
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index ed07ff5c09..fb49973550 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -1126,7 +1126,6 @@
"Set Password": "Nastaviť Heslo",
"An error occurred whilst saving your email notification preferences.": "Počas ukladania vašich nastavení oznamovania emailom sa vyskytla chyba.",
"Enable audible notifications in web client": "Povoliť zvukové oznámenia vo webovom klientovi",
- "Permalink": "Trvalý odkaz",
"Off": "Zakázané",
"Riot does not know how to join a room on this network": "Riot nedokáže vstúpiť do miestnosti na tejto sieti",
"Mentions only": "Len zmienky",
diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 2936695a6d..66f6f032b7 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -269,7 +269,6 @@
"Set Password": "Caktoni Fjalëkalim",
"An error occurred whilst saving your email notification preferences.": "Ndodhi një gabim teksa ruheshin parapëlqimet tuaja për njoftime me email.",
"Enable audible notifications in web client": "Aktivizoni njoftime audio te klienti web",
- "Permalink": "Permalidhje",
"Register": "Regjistrohuni",
"Off": "Off",
"Edit": "Përpunoni",
diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index ebacd28a5c..e24fa93c09 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -1101,7 +1101,6 @@
"Set Password": "Постави лозинку",
"An error occurred whilst saving your email notification preferences.": "Догодила се грешка при чувању ваших поставки мејл обавештења.",
"Enable audible notifications in web client": "Омогући звучна обавештења у веб клијенту",
- "Permalink": "Трајна веза",
"Resend": "Поново пошаљи",
"Riot does not know how to join a room on this network": "Riot не зна како да приступи соби на овој мрежи",
"Mentions only": "Само спомињања",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index ff64f1a8e6..91d1477190 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -547,7 +547,6 @@
"Unable to fetch notification target list": "Det gick inte att hämta aviseringsmållistan",
"Set Password": "Välj lösenord",
"Enable audible notifications in web client": "Sätt på högljudda aviseringar i webbklienten",
- "Permalink": "Permanent länk",
"Off": "Av",
"Riot does not know how to join a room on this network": "Riot kan inte gå med i ett rum på det här nätverket",
"Mentions only": "Endast omnämnande",
diff --git a/src/i18n/strings/ta.json b/src/i18n/strings/ta.json
index 6aecb54bfd..b8fe318b46 100644
--- a/src/i18n/strings/ta.json
+++ b/src/i18n/strings/ta.json
@@ -78,7 +78,6 @@
"Off": "அமை",
"On": "மீது",
"Operation failed": "செயல்பாடு தோல்வியுற்றது",
- "Permalink": "நிரந்தரத் தொடுப்பு",
"powered by Matrix": "Matrix-ஆல் ஆனது",
"Quote": "மேற்கோள்",
"Reject": "நிராகரி",
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index 6fa7febabd..dac3656631 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -544,7 +544,6 @@
"Riot does not know how to join a room on this network": "Riot ไม่รู้วิธีเข้าร่วมห้องในเครือข่ายนี้",
"Set Password": "ตั้งรหัสผ่าน",
"Enable audible notifications in web client": "เปิดใช้งานเสียงแจ้งเตือนบนเว็บไคลเอนต์",
- "Permalink": "ลิงก์ถาวร",
"Off": "ปิด",
"#example": "#example",
"Mentions only": "เมื่อถูกกล่าวถึงเท่านั้น",
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 797fed79ce..43ba89c968 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -741,7 +741,6 @@
"Unable to fetch notification target list": "Bildirim hedef listesi çekilemedi",
"An error occurred whilst saving your email notification preferences.": "E-posta bildirim tercihlerinizi kaydetme işlemi sırasında bir hata oluştu.",
"Enable audible notifications in web client": "Web istemcisinde sesli bildirimleri etkinleştir",
- "Permalink": "Kalıcı Bağlantı(permalink)",
"Off": "Kapalı",
"Riot does not know how to join a room on this network": "Riot bu ağdaki bir odaya nasıl gireceğini bilmiyor",
"Mentions only": "Sadece Mention'lar",
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 74bf855d22..b07a5dadab 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -232,7 +232,6 @@
"Unable to fetch notification target list": "Неможливо отримати перелік цілей сповіщення",
"Set Password": "Задати пароль",
"Enable audible notifications in web client": "Увімкнути звукові сповіщення у мережевому застосунку",
- "Permalink": "Постійне посилання",
"Off": "Вимкнено",
"Riot does not know how to join a room on this network": "Riot не знає як приєднатись до кімнати у цій мережі",
"Mentions only": "Тільки згадки",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 8e2dc6e0f8..b1547170b0 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -1099,7 +1099,6 @@
"Unable to fetch notification target list": "无法获取通知目标列表",
"Set Password": "设置密码",
"Enable audible notifications in web client": "在网页客户端启用音频通知",
- "Permalink": "永久链接",
"Off": "关闭",
"Riot does not know how to join a room on this network": "Riot 不知道如何在此网络中加入聊天室",
"Mentions only": "只限提及",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 95424eaefb..1e43f27a59 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1126,7 +1126,6 @@
"Riot does not know how to join a room on this network": "Riot 不知道如何在此網路中加入聊天室",
"Set Password": "設定密碼",
"Enable audible notifications in web client": "在網頁客戶端啟用音訊通知",
- "Permalink": "永久連結",
"Off": "關閉",
"#example": "#範例",
"Mentions only": "僅提及",
From bef435e15af87ebd622d88647f98df086e06be2f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 Jun 2018 13:41:12 +0100
Subject: [PATCH 0218/1196] allow ShareEvent to devolve into ShareRoom using
checkbox + i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/dialogs/ShareDialog.js | 31 +++++++++++++++------
src/i18n/strings/en_EN.json | 1 +
2 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js
index 12efc8b919..873fcc4dee 100644
--- a/src/components/views/dialogs/ShareDialog.js
+++ b/src/components/views/dialogs/ShareDialog.js
@@ -67,10 +67,11 @@ export default class ShareDialog extends React.Component {
super(props);
this.onCopyClick = this.onCopyClick.bind(this);
- this.onLinkRecentCheckboxClick = this.onLinkRecentCheckboxClick.bind(this);
+ this.onLinkSpecificEventCheckboxClick = this.onLinkSpecificEventCheckboxClick.bind(this);
this.state = {
- linkRecentTicked: false,
+ // MatrixEvent defaults to share linkSpecificEvent
+ linkSpecificEvent: this.props.target instanceof MatrixEvent,
};
}
@@ -116,9 +117,9 @@ export default class ShareDialog extends React.Component {
e.target.onmouseleave = close;
}
- onLinkRecentCheckboxClick() {
+ onLinkSpecificEventCheckboxClick() {
this.setState({
- linkRecentTicked: !this.state.linkRecentTicked,
+ linkSpecificEvent: !this.state.linkSpecificEvent,
});
}
@@ -135,16 +136,16 @@ export default class ShareDialog extends React.Component {
if (events.length > 0) {
checkbox =
Date: Thu, 14 Jun 2018 12:41:44 +0000
Subject: [PATCH 0219/1196] Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1194 of 1194 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
---
src/i18n/strings/zh_Hant.json | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 87886ec652..3f2e2d9dd5 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1187,5 +1187,10 @@
"Terms and Conditions": "條款與細則",
"To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "要繼續使用 %(homeserverDomain)s 家伺服器，您必須審閱並同意我們的條款與細則。",
"Review terms and conditions": "審閱條款與細則",
- "To notify everyone in the room, you must be a": "為了通知每個在聊天室裡的人，您必須為"
+ "To notify everyone in the room, you must be a": "為了通知每個在聊天室裡的人，您必須為",
+ "Encrypting": "正在加密",
+ "Encrypted, not sent": "已加密，未傳送",
+ "No Audio Outputs detected": "未偵測到音訊輸出",
+ "Audio Output": "音訊輸出",
+ "Try the app first": "先試試看應用程式"
}
From ef178b282c2f82181584a284b14b3d3e56a22f87 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 Jun 2018 13:44:05 +0100
Subject: [PATCH 0220/1196] use getters on MatrixEvent for roomId and eventId
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/dialogs/ShareDialog.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js
index 873fcc4dee..bbd381ad29 100644
--- a/src/components/views/dialogs/ShareDialog.js
+++ b/src/components/views/dialogs/ShareDialog.js
@@ -169,9 +169,9 @@ export default class ShareDialog extends React.Component {
;
if (this.state.linkSpecificEvent) {
- matrixToUrl = makeEventPermalink(this.props.target.roomId, this.props.target.eventId);
+ matrixToUrl = makeEventPermalink(this.props.target.getRoomId(), this.props.target.getId());
} else {
- matrixToUrl = makeRoomPermalink(this.props.target.roomId);
+ matrixToUrl = makeRoomPermalink(this.props.target.getRoomId());
}
}
From 33a3cfead6e2766d9a0b7211f074290c92ae0257 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 Jun 2018 13:47:33 +0100
Subject: [PATCH 0221/1196] controlled checkboxes use `checked` not `value`
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/dialogs/ShareDialog.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js
index bbd381ad29..a1a8598fdb 100644
--- a/src/components/views/dialogs/ShareDialog.js
+++ b/src/components/views/dialogs/ShareDialog.js
@@ -136,8 +136,8 @@ export default class ShareDialog extends React.Component {
if (events.length > 0) {
checkbox =
+ onClick={this.onLinkSpecificEventCheckboxClick} />
;
}
- if (this.state.linkRecentTicked) {
+ if (this.state.linkSpecificEvent) {
matrixToUrl = makeEventPermalink(this.props.target.roomId, events[events.length - 1].getId());
} else {
matrixToUrl = makeRoomPermalink(this.props.target.roomId);
@@ -157,7 +158,21 @@ export default class ShareDialog extends React.Component {
matrixToUrl = makeGroupPermalink(this.props.target.groupId);
} else if (this.props.target instanceof MatrixEvent) {
title = _t('Share Room Message');
- matrixToUrl = makeEventPermalink(this.props.target.roomId, this.props.target.eventId);
+ checkbox =
+
+
+
;
+
+ if (this.state.linkSpecificEvent) {
+ matrixToUrl = makeEventPermalink(this.props.target.roomId, this.props.target.eventId);
+ } else {
+ matrixToUrl = makeRoomPermalink(this.props.target.roomId);
+ }
}
const encodedUrl = encodeURIComponent(matrixToUrl);
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index bb5ad5405b..3802c73431 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -863,6 +863,7 @@
"Share User": "Share User",
"Share Community": "Share Community",
"Share Room Message": "Share Room Message",
+ "Link to selected message": "Link to selected message",
"COPY": "COPY",
"You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.",
"We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.",
From e870399084ec9163f3fb655dbe586f9464c32287 Mon Sep 17 00:00:00 2001
From: Jeff Huang
{ contentHeader }
From a2219472f6a115897ba23c6dcdfea64722d568b0 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 15 Jun 2018 18:47:15 +0100
Subject: [PATCH 0254/1196] inline redundant `bodyNodes`, fixes react no unique
key warning too
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/GroupView.js | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index c7610219f7..365aadffa5 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -1127,10 +1127,6 @@ export default React.createClass({
let avatarNode;
let nameNode;
let shortDescNode;
- const bodyNodes = [
- this._getMembershipSection(),
- this._getGroupSection(),
- ];
const rightButtons = [];
if (this.state.editing && this.state.isUserPrivileged) {
let avatarImage;
@@ -1269,7 +1265,8 @@ export default React.createClass({
From a899871d52f6c296285064ff9a08ec38cab24fdd Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 15 Jun 2018 18:55:37 +0100
Subject: [PATCH 0256/1196] specify unique key to make react happy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/MyGroups.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index 0bfb30674e..edb50fcedb 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -70,7 +70,7 @@ export default withMatrixClient(React.createClass({
if (this.state.groups) {
const groupNodes = [];
this.state.groups.forEach((g) => {
- groupNodes.push(
{ _t('Your Communities') }
: ; content = groupNodes.length > 0 ? From 43681026b8f93f14bb5fbd7f97b52e36f506866f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 15 Jun 2018 19:01:12 +0100 Subject: [PATCH 0257/1196] s/onClick/onChange because react cries about it Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/GroupView.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js index 365aadffa5..96dea14c1f 100644 --- a/src/components/structures/GroupView.js +++ b/src/components/structures/GroupView.js @@ -1052,7 +1052,7 @@ export default React.createClass({
{ _t('Only people who have been invited') }
@@ -1064,7 +1064,7 @@ export default React.createClass({
{ _t('Everyone') }
From b97aa77acac821a429e727edce3ce46365e88819 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 15 Jun 2018 19:27:23 +0100
Subject: [PATCH 0258/1196] factor out warn self demote and apply to muting
yourself
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/rooms/MemberInfo.js | 53 +++++++++++++++++-------
1 file changed, 37 insertions(+), 16 deletions(-)
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 2789c0e4cd..4a163b6a00 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -332,13 +332,42 @@ module.exports = withMatrixClient(React.createClass({
});
},
- onMuteToggle: function() {
+ _warnSelfDemote: function() {
+ const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+ return new Promise((resolve) => {
+ Modal.createTrackedDialog('Demoting Self', '', QuestionDialog, {
+ title: _t("Warning!"),
+ description:
+
+
;
}
- return
+ return
+ { _t("You will not be able to undo this change as you are demoting yourself, " +
+ "if you are the last privileged user in the room it will be impossible " +
+ "to regain privileges.") }
+
+ { _t("Are you sure?") } +
,
+ button: _t("Continue"),
+ onFinished: resolve,
+ });
+ });
+ },
+
+ onMuteToggle: async function() {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
const roomId = this.props.member.roomId;
const target = this.props.member.userId;
const room = this.props.matrixClient.getRoom(roomId);
if (!room) return;
+ // if muting self, warn as it may be irreversible
+ if (target === this.props.matrixClient.getUserId()) {
+ try {
+ if (!await this._warnSelfDemote()) return;
+ } catch (e) {
+ console.error("Failed to warn about self demotion: ", e);
+ return;
+ }
+ }
+
const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
if (!powerLevelEvent) return;
@@ -436,7 +465,7 @@ module.exports = withMatrixClient(React.createClass({
}).done();
},
- onPowerChange: function(powerLevel) {
+ onPowerChange: async function(powerLevel) {
const roomId = this.props.member.roomId;
const target = this.props.member.userId;
const room = this.props.matrixClient.getRoom(roomId);
@@ -455,20 +484,12 @@ module.exports = withMatrixClient(React.createClass({
// If we are changing our own PL it can only ever be decreasing, which we cannot reverse.
if (myUserId === target) {
- Modal.createTrackedDialog('Demoting Self', '', QuestionDialog, {
- title: _t("Warning!"),
- description:
- + { _t("Are you sure?") } +
- { _t("You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.") }
- { _t("Are you sure?") } -
,
- button: _t("Continue"),
- onFinished: (confirmed) => {
- if (confirmed) {
- this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
- }
- },
- });
+ try {
+ if (!await this._warnSelfDemote()) return;
+ this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
+ } catch (e) {
+ console.error("Failed to warn about self demotion: ", e);
+ }
return;
}
From df1584148334646e0e278617b6041f7520989b82 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 15 Jun 2018 19:28:23 +0100
Subject: [PATCH 0259/1196] split too long line
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/rooms/MemberInfo.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 4a163b6a00..6680e7d02c 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -499,7 +499,8 @@ module.exports = withMatrixClient(React.createClass({
title: _t("Warning!"),
description:
- { _t("Are you sure?") } -
- { _t("You will not be able to undo this change as you are promoting the user to have the same power level as yourself.") }
+ { _t("You will not be able to undo this change as you are promoting the user " + + "to have the same power level as yourself.") }
{ _t("Are you sure?") }
,
button: _t("Continue"),
From 4f693a1ff5f51e876ed94d717d4903e89f782ccd Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 08:27:17 +0100
Subject: [PATCH 0260/1196] implement group links in matrixLinkify:MATRIXTO.
Simplify if/else w/ map
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/linkify-matrix.js | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js
index 6bbea77733..328cb98888 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.js
@@ -169,11 +169,18 @@ matrixLinkify.VECTOR_URL_PATTERN = "^(?:https?:\/\/)?(?:"
+ "(?:www\\.)?(?:riot|vector)\\.im/(?:app|beta|staging|develop)/"
+ ")(#.*)";
-matrixLinkify.MATRIXTO_URL_PATTERN = "^(?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/((#|@|!).*)";
+matrixLinkify.MATRIXTO_URL_PATTERN = "^(?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/([#@!+].*)";
matrixLinkify.MATRIXTO_MD_LINK_PATTERN =
- '\\[([^\\]]*)\\]\\((?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/((#|@|!)[^\\)]*)\\)';
+ '\\[([^\\]]*)\\]\\((?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/([#@!+][^\\)]*)\\)';
matrixLinkify.MATRIXTO_BASE_URL= baseUrl;
+const matrixToEntityMap = {
+ '@': '#/user/',
+ '#': '#/room/',
+ '!': '#/room/',
+ '+': '#/group/',
+};
+
matrixLinkify.options = {
events: function(href, type) {
switch (type) {
@@ -204,24 +211,20 @@ matrixLinkify.options = {
case 'userid':
case 'groupid':
return matrixLinkify.MATRIXTO_BASE_URL + '/#/' + href;
- default:
- var m;
+ default: {
// FIXME: horrible duplication with HtmlUtils' transform tags
- m = href.match(matrixLinkify.VECTOR_URL_PATTERN);
+ let m = href.match(matrixLinkify.VECTOR_URL_PATTERN);
if (m) {
return m[1];
}
m = href.match(matrixLinkify.MATRIXTO_URL_PATTERN);
if (m) {
const entity = m[1];
- if (entity[0] === '@') {
- return '#/user/' + entity;
- } else if (entity[0] === '#' || entity[0] === '!') {
- return '#/room/' + entity;
- }
+ if (matrixToEntityMap[entity[0]]) return matrixToEntityMap[entity[0]] + entity;
}
return href;
+ }
}
},
From 3ebec92ac592e0c10f37f1f47fa09989536319d8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 08:27:47 +0100
Subject: [PATCH 0261/1196] replace hardcoded `matrix.to` with reference to
const in matrix-to for easier changing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/messages/TextualBody.js | 3 ++-
src/matrix-to.js | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 018754411c..60377a47d7 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -36,6 +36,7 @@ import * as ContextualMenu from '../../structures/ContextualMenu';
import SettingsStore from "../../../settings/SettingsStore";
import PushProcessor from 'matrix-js-sdk/lib/pushprocessor';
import ReplyThread from "../elements/ReplyThread";
+import {host as matrixtoHost} from '../../../matrix-to';
linkifyMatrix(linkify);
@@ -304,7 +305,7 @@ module.exports = React.createClass({
// never preview matrix.to links (if anything we should give a smart
// preview of the room/user they point to: nobody needs to be reminded
// what the matrix.to site looks like).
- if (host == 'matrix.to') return false;
+ if (host === matrixtoHost) return false;
if (node.textContent.toLowerCase().trim().startsWith(host.toLowerCase())) {
// it's a "foo.pl" style link
diff --git a/src/matrix-to.js b/src/matrix-to.js
index 72fb3c38fc..90b0a66090 100644
--- a/src/matrix-to.js
+++ b/src/matrix-to.js
@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-export const baseUrl = "https://matrix.to";
+export const host = "matrix.to";
+export const baseUrl = `https://${host}`;
export function makeEventPermalink(roomId, eventId) {
return `${baseUrl}/#/${roomId}/${eventId}`;
From efaccf734478cc01d0bb67208d26d0ffbf34d074 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 08:42:28 +0100
Subject: [PATCH 0262/1196] implement `hitting enter after Ctrl-K should switch
to the first result`
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/LeftPanel.js | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index 5acceb1009..f3ca005f55 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -93,6 +93,11 @@ var LeftPanel = React.createClass({
this._onMoveFocus(false);
handled = true;
break;
+ case KeyCode.ENTER:
+ this._onMoveFocus(false);
+ this.focusedElement.click();
+ handled = true;
+ break;
}
if (handled) {
From 897121163917e9576c92e66eed067121e3665217 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 08:42:40 +0100
Subject: [PATCH 0263/1196] delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/LeftPanel.js | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index f3ca005f55..416012c5f1 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -107,37 +107,33 @@ var LeftPanel = React.createClass({
},
_onMoveFocus: function(up) {
- var element = this.focusedElement;
+ let element = this.focusedElement;
// unclear why this isn't needed
// var descending = (up == this.focusDirection) ? this.focusDescending : !this.focusDescending;
// this.focusDirection = up;
- var descending = false; // are we currently descending or ascending through the DOM tree?
- var classes;
+ let descending = false; // are we currently descending or ascending through the DOM tree?
+ let classes;
do {
- var child = up ? element.lastElementChild : element.firstElementChild;
- var sibling = up ? element.previousElementSibling : element.nextElementSibling;
+ const child = up ? element.lastElementChild : element.firstElementChild;
+ const sibling = up ? element.previousElementSibling : element.nextElementSibling;
if (descending) {
if (child) {
element = child;
- }
- else if (sibling) {
+ } else if (sibling) {
element = sibling;
- }
- else {
+ } else {
descending = false;
element = element.parentElement;
}
- }
- else {
+ } else {
if (sibling) {
element = sibling;
descending = true;
- }
- else {
+ } else {
element = element.parentElement;
}
}
@@ -149,8 +145,7 @@ var LeftPanel = React.createClass({
descending = true;
}
}
-
- } while(element && !(
+ } while (element && !(
classes.contains("mx_RoomTile") ||
classes.contains("mx_SearchBox_search") ||
classes.contains("mx_RoomSubList_ellipsis")));
From 1afdb0e3c053dd45dd25fe8742c44449c2552269 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 08:44:57 +0100
Subject: [PATCH 0264/1196] add null-guard
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/LeftPanel.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index 416012c5f1..7517103d88 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -95,7 +95,9 @@ var LeftPanel = React.createClass({
break;
case KeyCode.ENTER:
this._onMoveFocus(false);
- this.focusedElement.click();
+ if (this.focusedElement) {
+ this.focusedElement.click();
+ }
handled = true;
break;
}
From ff33ef4b5150439f97e9bb21bee9e42e5efa4338 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 08:50:53 +0100
Subject: [PATCH 0265/1196] allow using tab to navigate room list smarter
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/LeftPanel.js | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index 5acceb1009..7a930fa233 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -85,6 +85,10 @@ var LeftPanel = React.createClass({
let handled = false;
switch (ev.keyCode) {
+ case KeyCode.TAB:
+ this._onMoveFocus(ev.shiftKey);
+ handled = true;
+ break;
case KeyCode.UP:
this._onMoveFocus(true);
handled = true;
From 423b8939e7c015eadbbe9e778031773b99614ff4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 08:52:14 +0100
Subject: [PATCH 0266/1196] simplify handled logic by inverting it
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/LeftPanel.js | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index 7a930fa233..7b115a6c4b 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -82,21 +82,20 @@ var LeftPanel = React.createClass({
_onKeyDown: function(ev) {
if (!this.focusedElement) return;
- let handled = false;
+ let handled = true;
switch (ev.keyCode) {
case KeyCode.TAB:
this._onMoveFocus(ev.shiftKey);
- handled = true;
break;
case KeyCode.UP:
this._onMoveFocus(true);
- handled = true;
break;
case KeyCode.DOWN:
this._onMoveFocus(false);
- handled = true;
break;
+ default:
+ handled = false;
}
if (handled) {
From 8fa96e19d562666410786ee7cfa506463693ea88 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 09:07:16 +0100
Subject: [PATCH 0267/1196] allow rightclicking for exposing room tile context
menus
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/groups/GroupInviteTile.js | 16 +++++++++++++---
src/components/views/rooms/RoomTile.js | 17 ++++++++++++++---
2 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index 4d5f3c6f3a..fff9aafac1 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -66,6 +66,11 @@ export default React.createClass({
});
},
+ onContextMenu: function(e) {
+ this.onBadgeClicked(e);
+ e.preventDefault();
+ },
+
onBadgeClicked: function(e) {
// Prevent the RoomTile onClick event firing as well
e.stopPropagation();
@@ -79,7 +84,7 @@ export default React.createClass({
}
const RoomTileContextMenu = sdk.getComponent('context_menus.GroupInviteTileContextMenu');
- const elementRect = e.target.getBoundingClientRect();
+ const elementRect = this.refs.badge.getBoundingClientRect();
// The window X and Y offsets are to adjust position when zoomed in to page
const x = elementRect.right + window.pageXOffset + 3;
@@ -125,7 +130,7 @@ export default React.createClass({
});
const badgeContent = badgeEllipsis ? '\u00B7\u00B7\u00B7' : '!';
- const badge = + { _t("You will not be able to undo this change as you are promoting the user " + + "to have the same power level as yourself.") }
{ _t("Are you sure?") }
{ badgeContent }
;
+ const badge = { badgeContent }
;
let tooltip;
if (this.props.collapsed && this.state.hover) {
@@ -139,7 +144,12 @@ export default React.createClass({
});
return (
-
{ av }
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 11eb2090f2..1a9e404012 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -187,6 +187,11 @@ module.exports = React.createClass({
this.badgeOnMouseLeave();
},
+ onContextMenu: function(e) {
+ this.onBadgeClicked(e);
+ e.preventDefault();
+ },
+
badgeOnMouseEnter: function() {
// Only allow non-guests to access the context menu
// and only change it if it needs to change
@@ -208,7 +213,7 @@ module.exports = React.createClass({
}
const RoomTileContextMenu = sdk.getComponent('context_menus.RoomTileContextMenu');
- const elementRect = e.target.getBoundingClientRect();
+ const elementRect = this.refs.badge.getBoundingClientRect();
// The window X and Y offsets are to adjust position when zoomed in to page
const x = elementRect.right + window.pageXOffset + 3;
@@ -280,7 +285,7 @@ module.exports = React.createClass({
badgeContent = '\u200B';
}
- badge = { badgeContent }
;
+ badge = { badgeContent }
;
const EmojiText = sdk.getComponent('elements.EmojiText');
let label;
@@ -317,7 +322,13 @@ module.exports = React.createClass({
directMessageIndicator = ;
}
- return { badgeContent }
;
+ const badge = { badgeContent }
;
const EmojiText = sdk.getComponent('elements.EmojiText');
let label;
@@ -317,9 +311,9 @@ module.exports = React.createClass({
const RoomAvatar = sdk.getComponent('avatars.RoomAvatar');
- let directMessageIndicator;
+ let dmIndicator;
if (this._isDirectMessageRoom(this.props.room.roomId)) {
- directMessageIndicator = ;
+ dmIndicator = ;
}
return
From 61e09395d0c49981663a3f6bbc110498127e9709 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 09:45:06 +0100
Subject: [PATCH 0269/1196] split continuations if longer than N
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/MessagePanel.js | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 50bdb37734..6e4697a8f0 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -1,5 +1,6 @@
/*
Copyright 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -25,6 +26,9 @@ import sdk from '../../index';
import MatrixClientPeg from '../../MatrixClientPeg';
+const CONTINUATION_MAX_INTERVAL = 5 * 60 * 1000; // 5 minutes
+const continuedTypes = ['m.sticker', 'm.room.message'];
+
/* (almost) stateless UI component which builds the event tiles in the room timeline.
*/
module.exports = React.createClass({
@@ -449,16 +453,17 @@ module.exports = React.createClass({
// Some events should appear as continuations from previous events of
// different types.
- const continuedTypes = ['m.sticker', 'm.room.message'];
+
const eventTypeContinues =
prevEvent !== null &&
continuedTypes.includes(mxEv.getType()) &&
continuedTypes.includes(prevEvent.getType());
- if (prevEvent !== null
- && prevEvent.sender && mxEv.sender
- && mxEv.sender.userId === prevEvent.sender.userId
- && (mxEv.getType() == prevEvent.getType() || eventTypeContinues)) {
+ // if there is a previous event and it has the same sender as this event
+ // and the types are the same/is in continuedTypes and the time between them is <= CONTINUATION_MAX_INTERVAL
+ if (prevEvent !== null && prevEvent.sender && mxEv.sender && mxEv.sender.userId === prevEvent.sender.userId &&
+ (mxEv.getType() === prevEvent.getType() || eventTypeContinues) &&
+ (mxEv.getTs() - prevEvent.getTs() <= CONTINUATION_MAX_INTERVAL)) {
continuation = true;
}
From 7d19841e6860c4a0de465398180cba85f314b8b6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 09:48:57 +0100
Subject: [PATCH 0270/1196] delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/MessagePanel.js | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 6e4697a8f0..f5fa2ceabf 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -193,7 +193,7 @@ module.exports = React.createClass({
/**
* Page up/down.
*
- * mult: -1 to page up, +1 to page down
+ * @param {number} mult: -1 to page up, +1 to page down
*/
scrollRelative: function(mult) {
if (this.refs.scrollPanel) {
@@ -203,6 +203,8 @@ module.exports = React.createClass({
/**
* Scroll up/down in response to a scroll key
+ *
+ * @param {KeyboardEvent} ev: the keyboard event to handle
*/
handleScrollKey: function(ev) {
if (this.refs.scrollPanel) {
@@ -261,6 +263,7 @@ module.exports = React.createClass({
this.eventNodes = {};
+ let visible = false;
let i;
// first figure out which is the last event in the list which we're
@@ -301,7 +304,7 @@ module.exports = React.createClass({
// if the readmarker has moved, cancel any active ghost.
if (this.currentReadMarkerEventId && this.props.readMarkerEventId &&
this.props.readMarkerVisible &&
- this.currentReadMarkerEventId != this.props.readMarkerEventId) {
+ this.currentReadMarkerEventId !== this.props.readMarkerEventId) {
this.currentGhostEventId = null;
}
@@ -408,8 +411,8 @@ module.exports = React.createClass({
let isVisibleReadMarker = false;
- if (eventId == this.props.readMarkerEventId) {
- var visible = this.props.readMarkerVisible;
+ if (eventId === this.props.readMarkerEventId) {
+ visible = this.props.readMarkerVisible;
// if the read marker comes at the end of the timeline (except
// for local echoes, which are excluded from RMs, because they
@@ -427,11 +430,11 @@ module.exports = React.createClass({
// XXX: there should be no need for a ghost tile - we should just use a
// a dispatch (user_activity_end) to start the RM animation.
- if (eventId == this.currentGhostEventId) {
+ if (eventId === this.currentGhostEventId) {
// if we're showing an animation, continue to show it.
ret.push(this._getReadMarkerGhostTile());
} else if (!isVisibleReadMarker &&
- eventId == this.currentReadMarkerEventId) {
+ eventId === this.currentReadMarkerEventId) {
// there is currently a read-up-to marker at this point, but no
// more. Show an animation of it disappearing.
ret.push(this._getReadMarkerGhostTile());
@@ -498,7 +501,7 @@ module.exports = React.createClass({
}
const eventId = mxEv.getId();
- const highlight = (eventId == this.props.highlightedEventId);
+ const highlight = (eventId === this.props.highlightedEventId);
// we can't use local echoes as scroll tokens, because their event IDs change.
// Local echos have a send "status".
@@ -637,7 +640,8 @@ module.exports = React.createClass({
render: function() {
const ScrollPanel = sdk.getComponent("structures.ScrollPanel");
const Spinner = sdk.getComponent("elements.Spinner");
- let topSpinner, bottomSpinner;
+ let topSpinner;
+ let bottomSpinner;
if (this.props.backPaginating) {
topSpinner = `
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/autocomplete/CommandProvider.js | 38 +++++++++++++++--------------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index e33fa7861f..2618b41c7d 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -2,6 +2,7 @@
Copyright 2016 Aviral Dasgupta
Copyright 2017 Vector Creations Ltd
Copyright 2017 New Vector Ltd
+Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -21,6 +22,7 @@ import { _t, _td } from '../languageHandler';
import AutocompleteProvider from './AutocompleteProvider';
import FuzzyMatcher from './FuzzyMatcher';
import {TextualCompletion} from './Components';
+import type {SelectionRange} from "./Autocompleter";
// TODO merge this with the factory mechanics of SlashCommands?
// Warning: Since the description string will be translated in _t(result.description), all these strings below must be in i18n/strings/en_EN.json file
@@ -110,10 +112,9 @@ const COMMANDS = [
args: '',
description: _td('Opens the Developer Tools dialog'),
},
- // Omitting `/markdown` as it only seems to apply to OldComposer
];
-const COMMAND_RE = /(^\/\w*)/g;
+const COMMAND_RE = /(^\/\w*)(?: .*)?/g;
export default class CommandProvider extends AutocompleteProvider {
constructor() {
@@ -123,23 +124,24 @@ export default class CommandProvider extends AutocompleteProvider {
});
}
- async getCompletions(query: string, selection: {start: number, end: number}) {
- let completions = [];
+ async getCompletions(query: string, selection: SelectionRange, force?: boolean) {
const {command, range} = this.getCurrentCommand(query, selection);
- if (command) {
- completions = this.matcher.match(command[0]).map((result) => {
- return {
- completion: result.command + ' ',
- component: (
Date: Fri, 15 Jun 2018 16:09:24 +0000
Subject: [PATCH 0275/1196] Translated using Weblate (French)
Currently translated at 100.0% (1203 of 1203 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
src/i18n/strings/fr.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 7291e8b6fb..71a6f27c0e 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1192,7 +1192,7 @@
"Encrypted, not sent": "Chiffré, pas envoyé",
"No Audio Outputs detected": "Aucune sortie audio détectée",
"Audio Output": "Sortie audio",
- "Share Link to User": "Partager le lien à l'utilisateur",
+ "Share Link to User": "Partager le lien vers l'utilisateur",
"Share room": "Partager le salon",
"Share Room": "Partager le salon",
"Link to most recent message": "Lien vers le message le plus récent",
From b87824ba929334a567935dbe11ba14bb3a391c72 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 19:49:53 +0100
Subject: [PATCH 0276/1196] hide `m.room.avatar` from FilePanel via sync filter
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/FilePanel.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index 3249cae22c..7d1d23839e 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -69,6 +69,7 @@ const FilePanel = React.createClass({
"timeline": {
"contains_url": true,
"not_types": [
+ "m.room.avatar",
"m.sticker",
],
},
From eb32dda260bb421865c987dccb4f0f9c9d6b8898 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 19:52:15 +0100
Subject: [PATCH 0277/1196] given we also want to hide widget events, hide all
except m.room.message
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/FilePanel.js | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index 7d1d23839e..927449750c 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -68,9 +68,8 @@ const FilePanel = React.createClass({
"room": {
"timeline": {
"contains_url": true,
- "not_types": [
- "m.room.avatar",
- "m.sticker",
+ "types": [
+ "m.room.message",
],
},
},
From 9251c80783a553f09262409a09fa1be166cc280c Mon Sep 17 00:00:00 2001
From: Osoitz
Date: Sun, 17 Jun 2018 08:34:39 +0000
Subject: [PATCH 0278/1196] Translated using Weblate (Basque)
Currently translated at 100.0% (1203 of 1203 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
src/i18n/strings/eu.json | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 720f6a3235..594d826a6c 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1187,5 +1187,19 @@
"Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Ahaztu bidali ditudan mezu guztiak kontua desaktibatzean (Abisua: Honekin etorkizuneko erabiltzaileek elkarrizketaren bertsio ez oso bat ikusiko dute)",
"Can't leave Server Notices room": "Ezin zara Server Notices gelatik atera",
"This room is used for important messages from the Homeserver, so you cannot leave it.": "Gela hau mezu hasiera zerbitzariaren garrantzitsuak bidaltzeko erabiltzen da, eta ezin zara atera.",
- "Try the app first": "Probatu aplikazioa aurretik"
+ "Try the app first": "Probatu aplikazioa aurretik",
+ "Encrypting": "Zifratzen",
+ "Encrypted, not sent": "Zifratua, bidali gabe",
+ "Share Link to User": "Partekatu esteka erabiltzailearekin",
+ "Share room": "Partekatu gela",
+ "Share Room": "Partekatu gela",
+ "Link to most recent message": "Esteka azken mezura",
+ "Share User": "Partekatu erabiltzailea",
+ "Share Community": "Partekatu komunitatea",
+ "Share Room Message": "Partekatu gelako mezua",
+ "Link to selected message": "Esteka hautatutako mezura",
+ "COPY": "KOPIATU",
+ "Share Message": "Partekatu mezua",
+ "No Audio Outputs detected": "Ez da audio irteerarik antzeman",
+ "Audio Output": "Audio irteera"
}
From 21bbf5dd9b888ec8ba23fe3c270de35c1776dd70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Kozio=C5=82?=
Date: Sun, 17 Jun 2018 12:22:35 +0000
Subject: [PATCH 0279/1196] Translated using Weblate (Polish)
Currently translated at 79.7% (959 of 1203 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
---
src/i18n/strings/pl.json | 39 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 38 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index d0b71cdb8d..63e4cd3529 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -920,5 +920,42 @@
"Collapse panel": "Ukryj panel",
"With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Z Twoją obecną przeglądarką, wygląd oraz wrażenia z używania aplikacji mogą być niepoprawne, a niektóre funkcje wcale nie działać. Kontynuuj jeśli chcesz spróbować, jednak trudno będzie pomóc w przypadku błędów, które mogą nastąpić!",
"Checking for an update...": "Sprawdzanie aktualizacji...",
- "There are advanced notifications which are not shown here": "Masz zaawansowane powiadomienia, nie pokazane tutaj"
+ "There are advanced notifications which are not shown here": "Masz zaawansowane powiadomienia, nie pokazane tutaj",
+ "e.g. %(exampleValue)s": "np. %(exampleValue)s",
+ "Always show encryption icons": "Zawsze wyświetlaj ikony szyfrowania",
+ "Send analytics data": "Wysyłaj dane analityczne",
+ "%(duration)ss": "%(duration)ss",
+ "%(duration)sm": "%(duration)sm",
+ "%(duration)sh": "%(duration)sg",
+ "%(duration)sd": "%(duration)sd",
+ "%(user)s is a %(userRole)s": "%(user)s ma rolę %(userRole)s",
+ "Members only (since the point in time of selecting this option)": "Tylko członkowie (od momentu włączenia tej opcji)",
+ "Members only (since they were invited)": "Tylko członkowie (od kiedy zostali zaproszeni)",
+ "Members only (since they joined)": "Tylko członkowie (od kiedy dołączyli)",
+ "Copied!": "Skopiowano!",
+ "Failed to copy": "Kopiowanie nieudane",
+ "Message removed by %(userId)s": "Wiadomość usunięta przez %(userId)s",
+ "Message removed": "Wiadomość usunięta",
+ "An email has been sent to %(emailAddress)s": "Email został wysłany do %(emailAddress)s",
+ "A text message has been sent to %(msisdn)s": "Wysłano wiadomość tekstową do %(msisdn)s",
+ "Code": "Kod",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie (please see our Cookie Policy ).": "Pomóż nam ulepszyć Riot.im wysyłając anonimowe dane analityczne. Spowoduje to użycie pliku cookie (zobacz naszą Politykę plików cookie).",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie.": "Pomóż nam ulepszyć Riot.im wysyłając anonimowe dane analityczne. Spowoduje to użycie pliku cookie.",
+ "Yes, I want to help!": "Tak, chcę pomóc!",
+ "Warning: This widget might use cookies.": "Uwaga: Ten widżet może używać ciasteczek.",
+ "Delete Widget": "Usuń widżet",
+ "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Usunięcie widżetu usuwa go dla wszystkich użytkowników w tym pokoju. Czy na pewno chcesz usunąć ten widżet?",
+ "Communities": "Społeczności",
+ "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
+ "collapse": "Zwiń",
+ "expand": "Rozwiń",
+ "Custom of %(powerLevel)s": "Poziom niestandardowy %(powerLevel)s",
+ "In reply to ": "W odpowiedzi do ",
+ "Matrix ID": "Matrix ID",
+ "email address": "adres e-mail",
+ "example": "przykład",
+ "Advanced options": "Opcje zaawansowane",
+ "To continue, please enter your password:": "Aby kontynuować, proszę wprowadzić swoje hasło:",
+ "password": "hasło",
+ "Refresh": "Odśwież"
}
From a7f82365a85fc0b4ef64e1e7afef11b92286c07b Mon Sep 17 00:00:00 2001
From: Krombel
Date: Mon, 18 Jun 2018 10:50:41 +0000
Subject: [PATCH 0280/1196] Translated using Weblate (German)
Currently translated at 99.1% (1193 of 1203 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
src/i18n/strings/de_DE.json | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index ba31308e3a..a4ecc140a0 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1186,5 +1186,10 @@
"This room is used for important messages from the Homeserver, so you cannot leave it.": "Du kannst diesen Raum nicht verlassen, da dieser Raum für wichtige Nachrichten vom Heimserver verwendet wird.",
"Terms and Conditions": "Geschäftsbedingungen",
"To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Um den %(homeserverDomain)s -Heimserver weiter zu verwenden, musst du die Geschäftsbedingungen sichten und ihnen zustimmen.",
- "Review terms and conditions": "Geschäftsbedingungen anzeigen"
+ "Review terms and conditions": "Geschäftsbedingungen anzeigen",
+ "Encrypting": "Verschlüssele",
+ "Encrypted, not sent": "Verschlüsselt, nicht gesendet",
+ "Share Link to User": "Sende Link an Benutzer",
+ "Share room": "Teile Raum",
+ "Share Room": "Teile Raum"
}
From 1a236499b1f33df966635b3bb6f4bfd8ee41f5a7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Jun 2018 11:54:06 +0100
Subject: [PATCH 0281/1196] fix import
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/rooms/RoomTile.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index bb9e0a8d3b..776bd5cd70 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -24,7 +24,7 @@ import dis from '../../../dispatcher';
import MatrixClientPeg from '../../../MatrixClientPeg';
import DMRoomMap from '../../../utils/DMRoomMap';
import sdk from '../../../index';
-import ContextualMenu from '../../structures/ContextualMenu';
+import {createMenu} from '../../structures/ContextualMenu';
import * as RoomNotifs from '../../../RoomNotifs';
import * as FormattingUtils from '../../../utils/FormattingUtils';
import AccessibleButton from '../elements/AccessibleButton';
@@ -217,7 +217,7 @@ module.exports = React.createClass({
y = y - (chevronOffset + 8); // where 8 is half the height of the chevron
const self = this;
- ContextualMenu.createMenu(RoomTileContextMenu, {
+ createMenu(RoomTileContextMenu, {
chevronOffset: chevronOffset,
left: x,
top: y,
From 15892a8c6a46a5d01fad9f80ef07a1db8d26755d Mon Sep 17 00:00:00 2001
From: Krombel
Date: Mon, 18 Jun 2018 10:54:30 +0000
Subject: [PATCH 0282/1196] Translated using Weblate (German)
Currently translated at 100.0% (1203 of 1203 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
src/i18n/strings/de_DE.json | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index a4ecc140a0..ef34cb78fe 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1191,5 +1191,15 @@
"Encrypted, not sent": "Verschlüsselt, nicht gesendet",
"Share Link to User": "Sende Link an Benutzer",
"Share room": "Teile Raum",
- "Share Room": "Teile Raum"
+ "Share Room": "Teile Raum",
+ "Link to most recent message": "Link zur aktuellsten Nachricht",
+ "Share User": "Teile Benutzer",
+ "Share Community": "Teile Community",
+ "Share Room Message": "Teile Raumnachricht",
+ "Link to selected message": "Link zur ausgewählten Nachricht",
+ "COPY": "KOPIEREN",
+ "Share Message": "Teile Nachricht",
+ "No Audio Outputs detected": "Keine Ton-Ausgabe erkannt",
+ "Audio Output": "Ton-Ausgabe",
+ "Try the app first": "App erst ausprobieren"
}
From e0d36b18c92ec42f8827dbae88bbdc5baf0c144d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Jun 2018 12:05:57 +0100
Subject: [PATCH 0283/1196] make RoomTile context menu appear where you right
clicked instead
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/rooms/RoomTile.js | 71 +++++++++++++++-----------
1 file changed, 40 insertions(+), 31 deletions(-)
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 776bd5cd70..ee7f8a76c7 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -182,9 +182,30 @@ module.exports = React.createClass({
this.badgeOnMouseLeave();
},
+ _showContextMenu: function(x, y, chevronOffset) {
+ const RoomTileContextMenu = sdk.getComponent('context_menus.RoomTileContextMenu');
+
+ createMenu(RoomTileContextMenu, {
+ chevronOffset,
+ left: x,
+ top: y,
+ room: this.props.room,
+ onFinished: () => {
+ this.setState({ menuDisplayed: false });
+ this.props.refreshSubList();
+ },
+ });
+ this.setState({ menuDisplayed: true });
+ },
+
onContextMenu: function(e) {
- this.onBadgeClicked(e);
+ // Prevent the RoomTile onClick event firing as well
e.preventDefault();
+ // Only allow non-guests to access the context menu
+ if (MatrixClientPeg.get().isGuest()) return;
+
+ const chevronOffset = 12;
+ this._showContextMenu(e.clientX, e.clientY - (chevronOffset + 8), chevronOffset);
},
badgeOnMouseEnter: function() {
@@ -200,37 +221,25 @@ module.exports = React.createClass({
},
onBadgeClicked: function(e) {
- // Only allow none guests to access the context menu
- if (!MatrixClientPeg.get().isGuest()) {
- // If the badge is clicked, then no longer show tooltip
- if (this.props.collapsed) {
- this.setState({ hover: false });
- }
-
- const RoomTileContextMenu = sdk.getComponent('context_menus.RoomTileContextMenu');
- const elementRect = this.refs.badge.getBoundingClientRect();
-
- // The window X and Y offsets are to adjust position when zoomed in to page
- const x = elementRect.right + window.pageXOffset + 3;
- const chevronOffset = 12;
- let y = (elementRect.top + (elementRect.height / 2) + window.pageYOffset);
- y = y - (chevronOffset + 8); // where 8 is half the height of the chevron
-
- const self = this;
- createMenu(RoomTileContextMenu, {
- chevronOffset: chevronOffset,
- left: x,
- top: y,
- room: this.props.room,
- onFinished: function() {
- self.setState({ menuDisplayed: false });
- self.props.refreshSubList();
- },
- });
- this.setState({ menuDisplayed: true });
- }
// Prevent the RoomTile onClick event firing as well
e.stopPropagation();
+ // Only allow non-guests to access the context menu
+ if (MatrixClientPeg.get().isGuest()) return;
+
+ // If the badge is clicked, then no longer show tooltip
+ if (this.props.collapsed) {
+ this.setState({ hover: false });
+ }
+
+ const elementRect = e.target.getBoundingClientRect();
+
+ // The window X and Y offsets are to adjust position when zoomed in to page
+ const x = elementRect.right + window.pageXOffset + 3;
+ const chevronOffset = 12;
+ let y = (elementRect.top + (elementRect.height / 2) + window.pageYOffset);
+ y = y - (chevronOffset + 8); // where 8 is half the height of the chevron
+
+ this._showContextMenu(x, y, chevronOffset);
},
render: function() {
@@ -279,7 +288,7 @@ module.exports = React.createClass({
badgeContent = '\u200B';
}
- const badge =
Date: Mon, 18 Jun 2018 15:24:34 +0100
Subject: [PATCH 0286/1196] Fix blank sticker picker
Let the battle of z-indexes commence
https://github.com/matrix-org/matrix-react-sdk/pull/1948/files#diff-8bc8827809a72c7548846c443d19f00aR29
---
src/components/views/elements/PersistedElement.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/views/elements/PersistedElement.js b/src/components/views/elements/PersistedElement.js
index c4bac27b4e..8115a36eeb 100644
--- a/src/components/views/elements/PersistedElement.js
+++ b/src/components/views/elements/PersistedElement.js
@@ -36,7 +36,7 @@ function getOrCreateContainer() {
}
// Greater than that of the ContextualMenu
-const PE_Z_INDEX = 3000;
+const PE_Z_INDEX = 5000;
/*
* Class of component that renders its children in a separate ReactDOM virtual tree
From e1e60cb1474a519846eb417f6f379d4edf9f9d62 Mon Sep 17 00:00:00 2001
From: David Baker
Date: Mon, 18 Jun 2018 16:00:42 +0100
Subject: [PATCH 0287/1196] delint CallHandler
---
.eslintignore.errorfiles | 1 -
src/CallHandler.js | 132 +++++++++++++++++++++------------------
2 files changed, 72 insertions(+), 61 deletions(-)
diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles
index 42818244b3..e5eb9d70c8 100644
--- a/.eslintignore.errorfiles
+++ b/.eslintignore.errorfiles
@@ -4,7 +4,6 @@ src/autocomplete/AutocompleteProvider.js
src/autocomplete/Autocompleter.js
src/autocomplete/EmojiProvider.js
src/autocomplete/UserProvider.js
-src/CallHandler.js
src/component-index.js
src/components/structures/BottomLeftMenu.js
src/components/structures/CompatibilityPage.js
diff --git a/src/CallHandler.js b/src/CallHandler.js
index da764ec4b6..55a05798af 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -124,7 +124,7 @@ function _setCallListeners(call) {
description: _t(
"There are unknown devices in this room: "+
"if you proceed without verifying them, it will be "+
- "possible for someone to eavesdrop on your call."
+ "possible for someone to eavesdrop on your call.",
),
button: _t('Review Devices'),
onFinished: function(confirmed) {
@@ -247,50 +247,52 @@ function _onAction(payload) {
switch (payload.action) {
case 'place_call':
- if (module.exports.getAnyActiveCall()) {
- const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
- Modal.createTrackedDialog('Call Handler', 'Existing Call', ErrorDialog, {
- title: _t('Existing Call'),
- description: _t('You are already in a call.'),
- });
- return; // don't allow >1 call to be placed.
- }
+ {
+ if (module.exports.getAnyActiveCall()) {
+ const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+ Modal.createTrackedDialog('Call Handler', 'Existing Call', ErrorDialog, {
+ title: _t('Existing Call'),
+ description: _t('You are already in a call.'),
+ });
+ return; // don't allow >1 call to be placed.
+ }
- // if the runtime env doesn't do VoIP, whine.
- if (!MatrixClientPeg.get().supportsVoip()) {
- const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
- Modal.createTrackedDialog('Call Handler', 'VoIP is unsupported', ErrorDialog, {
- title: _t('VoIP is unsupported'),
- description: _t('You cannot place VoIP calls in this browser.'),
- });
- return;
- }
+ // if the runtime env doesn't do VoIP, whine.
+ if (!MatrixClientPeg.get().supportsVoip()) {
+ const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+ Modal.createTrackedDialog('Call Handler', 'VoIP is unsupported', ErrorDialog, {
+ title: _t('VoIP is unsupported'),
+ description: _t('You cannot place VoIP calls in this browser.'),
+ });
+ return;
+ }
- var room = MatrixClientPeg.get().getRoom(payload.room_id);
- if (!room) {
- console.error("Room %s does not exist.", payload.room_id);
- return;
- }
+ const room = MatrixClientPeg.get().getRoom(payload.room_id);
+ if (!room) {
+ console.error("Room %s does not exist.", payload.room_id);
+ return;
+ }
- var members = room.getJoinedMembers();
- if (members.length <= 1) {
- const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
- Modal.createTrackedDialog('Call Handler', 'Cannot place call with self', ErrorDialog, {
- description: _t('You cannot place a call with yourself.'),
- });
- return;
- } else if (members.length === 2) {
- console.log("Place %s call in %s", payload.type, payload.room_id);
- const call = Matrix.createNewMatrixCall(MatrixClientPeg.get(), payload.room_id);
- placeCall(call);
- } else { // > 2
- dis.dispatch({
- action: "place_conference_call",
- room_id: payload.room_id,
- type: payload.type,
- remote_element: payload.remote_element,
- local_element: payload.local_element,
- });
+ const members = room.getJoinedMembers();
+ if (members.length <= 1) {
+ const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+ Modal.createTrackedDialog('Call Handler', 'Cannot place call with self', ErrorDialog, {
+ description: _t('You cannot place a call with yourself.'),
+ });
+ return;
+ } else if (members.length === 2) {
+ console.log("Place %s call in %s", payload.type, payload.room_id);
+ const call = Matrix.createNewMatrixCall(MatrixClientPeg.get(), payload.room_id);
+ placeCall(call);
+ } else { // > 2
+ dis.dispatch({
+ action: "place_conference_call",
+ room_id: payload.room_id,
+ type: payload.type,
+ remote_element: payload.remote_element,
+ local_element: payload.local_element,
+ });
+ }
}
break;
case 'place_conference_call':
@@ -338,10 +340,18 @@ function _onAction(payload) {
}, function(err) {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
console.error("Conference call failed: " + err);
- Modal.createTrackedDialog('Call Handler', 'Failed to set up conference call', ErrorDialog, {
- title: _t('Failed to set up conference call'),
- description: _t('Conference call failed.') + ' ' + ((err && err.message) ? err.message : ''),
- });
+ Modal.createTrackedDialog(
+ 'Call Handler',
+ 'Failed to set up conference call',
+ ErrorDialog,
+ {
+ title: _t('Failed to set up conference call'),
+ description: (
+ _t('Conference call failed.') +
+ ' ' + ((err && err.message) ? err.message : '')
+ ),
+ },
+ );
});
}
},
@@ -350,22 +360,24 @@ function _onAction(payload) {
}
break;
case 'incoming_call':
- if (module.exports.getAnyActiveCall()) {
- // ignore multiple incoming calls. in future, we may want a line-1/line-2 setup.
- // we avoid rejecting with "busy" in case the user wants to answer it on a different device.
- // in future we could signal a "local busy" as a warning to the caller.
- // see https://github.com/vector-im/vector-web/issues/1964
- return;
- }
+ {
+ if (module.exports.getAnyActiveCall()) {
+ // ignore multiple incoming calls. in future, we may want a line-1/line-2 setup.
+ // we avoid rejecting with "busy" in case the user wants to answer it on a different device.
+ // in future we could signal a "local busy" as a warning to the caller.
+ // see https://github.com/vector-im/vector-web/issues/1964
+ return;
+ }
- // if the runtime env doesn't do VoIP, stop here.
- if (!MatrixClientPeg.get().supportsVoip()) {
- return;
- }
+ // if the runtime env doesn't do VoIP, stop here.
+ if (!MatrixClientPeg.get().supportsVoip()) {
+ return;
+ }
- var call = payload.call;
- _setCallListeners(call);
- _setCallState(call, call.roomId, "ringing");
+ const call = payload.call;
+ _setCallListeners(call);
+ _setCallState(call, call.roomId, "ringing");
+ }
break;
case 'hangup':
if (!calls[payload.room_id]) {
From 03bec1b51519956b3e72d495ad6740e900a0f133 Mon Sep 17 00:00:00 2001
From: Miguel Branco
Date: Mon, 18 Jun 2018 13:59:04 +0000
Subject: [PATCH 0288/1196] Translated using Weblate (Galician)
Currently translated at 98.5% (1185 of 1203 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
---
src/i18n/strings/gl.json | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index aaf84f717d..665ed03cba 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -1164,5 +1164,24 @@
"Refresh": "Actualizar",
"We encountered an error trying to restore your previous session.": "Atopamos un fallo intentando restablecer a súa sesión anterior.",
"Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Limpando o almacenamento do navegador podería resolver o problema, pero desconectarao e non poderá ler o historial cifrado da conversa.",
- "Collapse Reply Thread": "Comprimir o fío de respostas"
+ "Collapse Reply Thread": "Comprimir o fío de respostas",
+ "e.g. %(exampleValue)s": "p.ex.%(exampleValue)s",
+ "Send analytics data": "Enviar datos de análises",
+ "Enable widget screenshots on supported widgets": "Activar as capturas de widgets para aqueles que as permiten",
+ "Encrypting": "Cifrando",
+ "Encrypted, not sent": "Cifrado, sen enviar",
+ "Share Link to User": "Compartir a ligazón co usuario",
+ "Share room": "Compartir sala",
+ "To notify everyone in the room, you must be a": "Para avisar a todos os da sala ten que ser",
+ "Muted Users": "Usuarios silenciados",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie (please see our Cookie Policy ).": "Mellore Riot.im enviando os datos anónimos de uso . Iso suporá o emprego dunha cookie (véxase a nosa Política de Cookies ).",
+ "Please help improve Riot.im by sending anonymous usage data . This will use a cookie.": "Mellore Riot.im enviando o uso de datos anónimo . Iso usará unha cookie.",
+ "Yes, I want to help!": "Si, quero axuda",
+ "Warning: This widget might use cookies.": "Aviso: este widget podería usar algunha cookie.",
+ "Reload widget": "Volver a cargar o widget",
+ "Failed to indicate account erasure": "Non se deu indicado a eliminación de conta",
+ "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Iso fará que a súa deixe de ter uso de xeito permanente. Non poderá acceder e ninguén vai a poder volver a rexistrar esa mesma ID de usuario. Suporá que saía de todas as salas de conversas nas que estaba e eliminará os detalles da súa conta do servidores de identificación.Isto non se poderá desfacer",
+ "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Desactivando a súa conta non supón que por defecto esquezamos as súas mensaxes enviadas. Se quere que nos esquezamos das súas mensaxes, prema na caixa de embaixo.",
+ "To continue, please enter your password:": "Para continuar introduza o seu contrasinal:",
+ "password": "contrasinal"
}
From 55a6a4dd8fcaadc2e0fab0b42c389bcab4328ba4 Mon Sep 17 00:00:00 2001
From: Miguel Branco
Date: Mon, 18 Jun 2018 15:28:27 +0000
Subject: [PATCH 0289/1196] Translated using Weblate (Galician)
Currently translated at 100.0% (1203 of 1203 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
---
src/i18n/strings/gl.json | 548 ++++++++++++++++++++-------------------
1 file changed, 283 insertions(+), 265 deletions(-)
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 665ed03cba..41f98676b6 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -1,31 +1,31 @@
{
- "This email address is already in use": "Este enderezo de correo xa está a ser utilizado",
- "This phone number is already in use": "Este número de teléfono xa está a ser utilizado",
+ "This email address is already in use": "Xa se está a usar este correo",
+ "This phone number is already in use": "Xa se está a usar este teléfono",
"Failed to verify email address: make sure you clicked the link in the email": "Fallo na verificación do enderezo de correo: asegúrese de ter picado na ligazón do correo",
"The remote side failed to pick up": "O interlocutor non respondeu",
- "Unable to capture screen": "Non se puido pillar a pantalla",
- "Existing Call": "Chamada existente",
+ "Unable to capture screen": "Non se puido capturar a pantalla",
+ "Existing Call": "Rexistro de chamadas",
"You are already in a call.": "Xa está nunha chamada.",
- "VoIP is unsupported": "VoIP non admitida",
- "You cannot place VoIP calls in this browser.": "Non pode establecer chamadas VoIP en este navegador.",
- "You cannot place a call with yourself.": "Non pode chamarse a vostede mesma.",
- "Conference calls are not supported in this client": "Non pode establecer chamadas de Reunión en este cliente",
- "Conference calls are not supported in encrypted rooms": "Nas salas cifradas non se pode establecer Chamadas de Reunión",
+ "VoIP is unsupported": "Sen soporte para VoIP",
+ "You cannot place VoIP calls in this browser.": "Non pode establecer chamadas VoIP neste navegador.",
+ "You cannot place a call with yourself.": "Non pode facer unha chamada a si mesmo.",
+ "Conference calls are not supported in this client": "Non pode establecer chamadas de reunión neste cliente",
+ "Conference calls are not supported in encrypted rooms": "Nas salas cifradas non se pode establecer chamadas de reunión",
"Warning!": "Aviso!",
- "Conference calling is in development and may not be reliable.": "As chamadas de Reunión poderían non ser totalmente estables xa que están en desenvolvemento.",
+ "Conference calling is in development and may not be reliable.": "As chamadas de reunión poderían non ser totalmente estables xa que están en desenvolvemento.",
"Failed to set up conference call": "Fallo ao establecer a chamada de reunión",
"Conference call failed.": "Fallo na chamada de reunión.",
"Call Failed": "Fallou a chamada",
- "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Hai dispositivos descoñecidos en esta sala: si sigue adiante sen verificalos, pode ser posible que alguén bote un ollo a súa chamada.",
+ "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Hai dispositivos descoñecidos en esta sala: se segue adiante sen verificalos, pode ser posible que alguén bote un ollo a súa chamada.",
"Review Devices": "Revisar dispositivos",
"Call Anyway": "Chamar igualmente",
- "Answer Anyway": "Respostar igualmente",
+ "Answer Anyway": "Responder igualmente",
"Call": "Chamar",
- "Answer": "Respostar",
- "Call Timeout": "Finou a chamada",
- "The file '%(fileName)s' failed to upload": "O ficheiro '%(fileName)s' non se puido subir",
- "The file '%(fileName)s' exceeds this home server's size limit for uploads": "O ficheiro '%(fileName)s' excede o límite establecido polo servidor para subidas",
- "Upload Failed": "Fallou a subida",
+ "Answer": "Resposta",
+ "Call Timeout": "Tempo de resposta de chamada",
+ "The file '%(fileName)s' failed to upload": "Non se puido subir o ficheiro '%(fileName)s'",
+ "The file '%(fileName)s' exceeds this home server's size limit for uploads": "O ficheiro '%(fileName)s' excede o límite de tamaño establecido para este servidor",
+ "Upload Failed": "Fallou o envío",
"Sun": "Dom",
"Mon": "Lun",
"Tue": "Mar",
@@ -50,66 +50,66 @@
"%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
"%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(time)s",
"%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s %(time)s",
- "Who would you like to add to this community?": "A quén lle gustaría engadir a esta comunidade?",
- "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Aviso: calquer persoa que vostede engada a unha comunidade será públicamente visible para calquera que coñeza o ID da comunidade",
- "Invite new community members": "Convidar a novos membros da comunidade",
+ "Who would you like to add to this community?": "A quen quere engadir a esta comunidade?",
+ "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Aviso: calquera persoa que engada a unha comunidade estará publicamente visible para calquera que coñeza a ID da comunidade",
+ "Invite new community members": "Convidará comunidade a novos participantes ",
"Name or matrix ID": "Nome ou ID matrix",
- "Invite to Community": "Convide a comunidade",
- "Which rooms would you like to add to this community?": "Qué salas desexaría engadir a esta comunidade?",
- "Show these rooms to non-members on the community page and room list?": "Mostrar estas salas a non-membros na páxina da comunidade e lista de salas?",
- "Add rooms to the community": "Engadir salas a comunidade",
+ "Invite to Community": "Convidar á comunidade",
+ "Which rooms would you like to add to this community?": "Que salas desexaría engadir a esta comunidade?",
+ "Show these rooms to non-members on the community page and room list?": "Quere que estas salas se lle mostren a outros membros de fóra da comunidade na lista de salas?",
+ "Add rooms to the community": "Engadir salas á comunidade",
"Room name or alias": "Nome da sala ou alcume",
- "Add to community": "Engadir a comunidade",
- "Failed to invite the following users to %(groupId)s:": "Fallo ao convidar as seguintes usuarias a %(groupId)s:",
- "Failed to invite users to community": "Fallou o convite de usuarias a comunidade",
- "Failed to invite users to %(groupId)s": "Fallou o convite de usuarias a %(groupId)s",
+ "Add to community": "Engadir á comunidade",
+ "Failed to invite the following users to %(groupId)s:": "Fallo ao convidar os seguintes usuarios a %(groupId)s:",
+ "Failed to invite users to community": "Houbo un fallo convidando usuarios á comunidade",
+ "Failed to invite users to %(groupId)s": "Houbo un fallo convidando usuarios a %(groupId)s",
"Failed to add the following rooms to %(groupId)s:": "Fallo ao engadir as seguintes salas a %(groupId)s:",
- "Riot does not have permission to send you notifications - please check your browser settings": "Riot non ten permiso para enviarlle notificacións - por favor comprobe os axustes do navegador",
- "Riot was not given permission to send notifications - please try again": "Riot non ten permiso para enviar notificacións - inténteo de novo",
- "Unable to enable Notifications": "Non se puideron habilitar as notificacións",
+ "Riot does not have permission to send you notifications - please check your browser settings": "Riot non ten permiso para enviarlle notificacións: comprobe os axustes do navegador",
+ "Riot was not given permission to send notifications - please try again": "Riot non ten permiso para enviar notificacións: inténteo de novo",
+ "Unable to enable Notifications": "Non se puideron activar as notificacións",
"This email address was not found": "Non se atopou este enderezo de correo",
- "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "O seu enderezo de correo semella non estar asociado a un ID Matrix en este servidor.",
- "Default": "Por omisión",
+ "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "O seu enderezo de correo semella non estar asociado a un ID Matrix neste servidor.",
+ "Default": "Por defecto",
"Restricted": "Restrinxido",
"Moderator": "Moderador",
"Admin": "Administrador",
"Start a chat": "Iniciar unha conversa",
- "Who would you like to communicate with?": "Con quén desexa comunicarse?",
+ "Who would you like to communicate with?": "Con quen desexa comunicarse?",
"Email, name or matrix ID": "Correo, nome ou ID matrix",
"Start Chat": "Iniciar conversa",
- "Invite new room members": "Convidar a sala a novos membros",
- "Who would you like to add to this room?": "A quén desexaría engadir a esta sala?",
+ "Invite new room members": "Convidar a novos participantes",
+ "Who would you like to add to this room?": "A quen desexaría engadir a esta sala?",
"Send Invites": "Enviar convites",
"Failed to invite user": "Fallo ao convidar usuaria",
"Operation failed": "Fallou a operación",
"Failed to invite": "Fallou o convite",
- "Failed to invite the following users to the %(roomName)s room:": "Non se puideron convidar as seguintes usuarias a sala %(roomName)s:",
+ "Failed to invite the following users to the %(roomName)s room:": "Houbo un fallo convidando os seguintes usuarios á sala %(roomName)s:",
"You need to be logged in.": "Precisa estar conectada.",
- "You need to be able to invite users to do that.": "Vostede precisa estar autorizada a convidar usuarias para facer iso.",
- "Unable to create widget.": "Non se puido crear o widget.",
+ "You need to be able to invite users to do that.": "Precisa autorización para convidar a outros usuarias para poder facer iso.",
+ "Unable to create widget.": "Non se puido crear o trebello.",
"Failed to send request.": "Fallo ao enviar a petición.",
"This room is not recognised.": "Non se recoñece esta sala.",
"Power level must be positive integer.": "O nivel de poder ten que ser un enteiro positivo.",
- "You are not in this room.": "Vostede non está en esta sala.",
- "You do not have permission to do that in this room.": "Non ten permiso para facer eso en esta sala.",
+ "You are not in this room.": "Non está nesta sala.",
+ "You do not have permission to do that in this room.": "Non ten permiso para facer iso nesta sala.",
"Missing room_id in request": "Falta o room_id na petición",
"Must be viewing a room": "Debería estar vendo unha sala",
"Room %(roomId)s not visible": "A sala %(roomId)s non é visible",
- "Missing user_id in request": "Falata o user_id na petición",
+ "Missing user_id in request": "Falta o user_id na petición",
"Usage": "Uso",
"/ddg is not a command": "/ddg non é unha orde",
"To use it, just wait for autocomplete results to load and tab through them.": "Para utilizala, agarde que carguen os resultados de autocompletado e escolla entre eles.",
"Unrecognised room alias:": "Alcumes de sala non recoñecidos:",
"Ignored user": "Usuaria ignorada",
"You are now ignoring %(userId)s": "Agora está a ignorar %(userId)s",
- "Unignored user": "Usuarias non ignorada",
+ "Unignored user": "Usuarios non ignorados",
"You are no longer ignoring %(userId)s": "Xa non está a ignorar a %(userId)s",
"Unknown (user, device) pair:": "Parella descoñecida (dispositivo, usuaria):",
"Device already verified!": "Dispositivo xa verificado!",
- "WARNING: Device already verified, but keys do NOT MATCH!": "AVISO: o dispositivo xa está verificado, que as chaves NON CONCORDAN!",
- "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "AVISO: FALLOU A VERIFICACIÓN DE CHAVES! A chave de firma para %(userId)s e dispositivo %(deviceId)s é \"%(fprint)s\" que non concorda coa chave proporcionada \"%(fingerprint)s\". Esto podería significar que as súas comunicacións están a ser interceptadas!",
+ "WARNING: Device already verified, but keys do NOT MATCH!": "Aviso: o dispositivo xa está verificado só que as chaves NON CONCORDAN!",
+ "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "AVISO: FALLOU A VERIFICACIÓN DE CHAVES! A chave de firma para o %(userId)s e dispositivo %(deviceId)s é \"%(fprint)s\" que non concorda coa chave proporcionada \"%(fingerprint)s\". Isto podería significar que as súas comunicacións están a ser interceptadas!",
"Verified key": "Chave verificada",
- "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "A chave de firma que proporcionou concorda coa chave de firma que recibeu do dispositivo %(deviceId)s de %(userId)s. Dispositivo marcado como verificado.",
+ "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "A chave de firma que proporcionou concorda coa chave de firma que recibiu do dispositivo %(deviceId)s de %(userId)s. Dispositivo marcado como verificado.",
"Unrecognised command:": "Orde non recoñecida:",
"Reason": "Razón",
"%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aceptou o convite para %(displayName)s.",
@@ -123,7 +123,7 @@
"%(senderName)s changed their profile picture.": "%(senderName)s cambiou a súa imaxe de perfil.",
"%(senderName)s set a profile picture.": "%(senderName)s estableceu a imaxe de perfil.",
"VoIP conference started.": "Comezou a conferencia VoIP.",
- "%(targetName)s joined the room.": "%(targetName)s uneuse a sala.",
+ "%(targetName)s joined the room.": "%(targetName)s uniuse a sala.",
"VoIP conference finished.": "Rematou a conferencia VoIP.",
"%(targetName)s rejected the invitation.": "%(targetName)s rexeitou a invitación.",
"%(targetName)s left the room.": "%(targetName)s deixou a sala.",
@@ -143,25 +143,25 @@
"%(senderName)s ended the call.": "%(senderName)s rematou a chamada.",
"%(senderName)s placed a %(callType)s call.": "%(senderName)s estableceu unha chamada %(callType)s.",
"%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s enviou un convite a %(targetDisplayName)s para unirse a sala.",
- "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s fixo o historial da sala visible para toda a membresía, desde o punto en que foron convidadas.",
- "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s estableceu o historial futuro visible a toda a membresía, desde o punto en que se uniron.",
- "%(senderName)s made future room history visible to all room members.": "%(senderName)s fixo visible para toda a membresía o historial futuro da sala.",
+ "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s fixo o historial da sala visible para todos os participantes, desde o punto en que foron convidadas.",
+ "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s estableceu o historial futuro visible a todos os participantes, desde o punto en que se uniron.",
+ "%(senderName)s made future room history visible to all room members.": "%(senderName)s fixo visible para todos participantes o historial futuro da sala.",
"%(senderName)s made future room history visible to anyone.": "%(senderName)s fixo visible para calquera o historial futuro da sala.",
"%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s fixo visible o historial futuro da sala para descoñecidos (%(visibility)s).",
- "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s activou o cifrado extremo-a-extremo (algoritmo %(algorithm)s).",
+ "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s activou o cifrado de par-a-par (algoritmo %(algorithm)s).",
"%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s desde %(fromPowerLevel)s a %(toPowerLevel)s",
"%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s cambiou o nivel de autoridade a %(powerLevelDiffText)s.",
"%(senderName)s changed the pinned messages for the room.": "%(senderName)s cambiou as mensaxes fixadas para a sala.",
- "%(widgetName)s widget modified by %(senderName)s": "O engadido %(widgetName)s modificado por %(senderName)s",
- "%(widgetName)s widget added by %(senderName)s": "O %(widgetName)s engadido por %(senderName)s",
+ "%(widgetName)s widget modified by %(senderName)s": "O trebello %(widgetName)s modificado por %(senderName)s",
+ "%(widgetName)s widget added by %(senderName)s": "O trebello %(widgetName)s engadido por %(senderName)s",
"%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s eliminado por %(senderName)s",
"%(displayName)s is typing": "%(displayName)s está a escribir",
"%(names)s and %(count)s others are typing|other": "%(names)s e %(count)s outras están a escribir",
"%(names)s and %(count)s others are typing|one": "%(names)s e outra está a escribir",
"%(names)s and %(lastPerson)s are typing": "%(names)s e %(lastPerson)s están a escribir",
- "Failure to create room": "Fallo ao crear a sala",
+ "Failure to create room": "Fallou a creación da sala",
"Server may be unavailable, overloaded, or you hit a bug.": "O servidor podería non estar dispoñible, con sobrecarga ou ter un fallo.",
- "Send anyway": "Enviar de todos xeitos",
+ "Send anyway": "Enviar de todos os xeitos",
"Send": "Enviar",
"Unnamed Room": "Sala sen nome",
"Your browser does not support the required cryptography extensions": "O seu navegador non soporta as extensións de criptografía necesarias",
@@ -170,7 +170,7 @@
"Failed to join room": "Non se puido unir a sala",
"Message Pinning": "Fixando mensaxe",
"Tag Panel": "Panel de etiquetas",
- "Disable Emoji suggestions while typing": "Deshabilitar a suxestión de Emoji mentras escribe",
+ "Disable Emoji suggestions while typing": "Desactivar a suxestión de Emoji mentres escribe",
"Use compact timeline layout": "Utilizar a disposición compacta da liña temporal",
"Hide removed messages": "Ocultar mensaxes eliminadas",
"Hide join/leave messages (invites/kicks/bans unaffected)": "Ocultar mensaxes de unión/saída (convites/expulsións/bloqueos non afectados)",
@@ -178,19 +178,19 @@
"Hide display name changes": "Ocultar cambios no nome público",
"Hide read receipts": "Ocultar avisos de recepción",
"Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostrar marcas de tempo con formato 12 horas (ex. 2:30pm)",
- "Always show message timestamps": "Mostar sempre marcas de tempo",
+ "Always show message timestamps": "Mostrar sempre marcas de tempo",
"Autoplay GIFs and videos": "Reprodución automática de GIFs e vídeos",
- "Enable automatic language detection for syntax highlighting": "Habilitar a detección automática de idioma para o resalte da sintaxe",
+ "Enable automatic language detection for syntax highlighting": "Activar a detección automática de idioma para o resalte da sintaxe",
"Hide avatars in user and room mentions": "Ocultar avatares nas mencións de usuarios e salas",
- "Disable big emoji in chat": "Deshabilitar emojis grandes nas conversas",
+ "Disable big emoji in chat": "Desactivar emojis grandes nas conversas",
"Don't send typing notifications": "Non enviar notificacións de escritura",
"Automatically replace plain text Emoji": "Substituír automaticamente Emoji en texto plano",
- "Disable Peer-to-Peer for 1:1 calls": "Deshabilitar Peer-to-Peer para chamadas 1:1",
- "Never send encrypted messages to unverified devices from this device": "Non enviar mensaxes cifradas a dispositivos non verificados desde este dispositivo",
- "Never send encrypted messages to unverified devices in this room from this device": "Non enviar mensaxes cifradas a dispositivos non verificados en esta sala desde este dispositivo",
- "Enable inline URL previews by default": "Habilitar por omisión vistas previas en liña de URL",
- "Enable URL previews for this room (only affects you)": "Habilitar vista previa de URL en esta sala (só lle afecta a vostede)",
- "Enable URL previews by default for participants in this room": "Habilitar vista previa de URL por omisión para as participantes en esta sala",
+ "Disable Peer-to-Peer for 1:1 calls": "Desactivar Peer-to-Peer para chamadas 1:1",
+ "Never send encrypted messages to unverified devices from this device": "Nunca enviar mensaxes cifradas aos dispositivos que non estean verificados neste dispositivo",
+ "Never send encrypted messages to unverified devices in this room from this device": "Nunca enviar mensaxes cifradas aos dispositivos que non estean verificados nesta sala desde este dispositivo",
+ "Enable inline URL previews by default": "Activar por defecto as vistas previas en liña de URL",
+ "Enable URL previews for this room (only affects you)": "Activar avista previa de URL nesta sala (só lle afecta a vostede)",
+ "Enable URL previews by default for participants in this room": "Activar a vista previa de URL por defecto para as participantes nesta sala",
"Room Colour": "Cor da sala",
"Active call (%(roomName)s)": "Chamada activa (%(roomName)s)",
"unknown caller": "interlocutora descoñecida",
@@ -211,8 +211,8 @@
"Upload new:": "Subir nova:",
"No display name": "Sen nome público",
"New passwords don't match": "Os contrasinais novos non coinciden",
- "Passwords can't be empty": "Os contranais non poden estar baldeiros",
- "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Ao cambiar o contrasinal restablecerá todas as chaves de cifrado extremo-a-extremo en todos os dispositivos, facendo ilexible o historial da conversa a menos que primeiro exporte as chaves da sala e posteriormente as importe. No futuro melloraremos esto.",
+ "Passwords can't be empty": "Os contrasinais non poden estar baleiros",
+ "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Ao cambiar o contrasinal restablecerá todas as chaves de cifrado extremo-a-extremo en todos os dispositivos, facendo ilexible o historial da conversa a menos que primeiro exporte as chaves da sala e posteriormente as importe. No futuro melloraremos isto.",
"Continue": "Continuar",
"Export E2E room keys": "Exportar chaves E2E da sala",
"Do you want to set an email address?": "Quere establecer un enderezo de correo electrónico?",
@@ -231,14 +231,14 @@
"Last seen": "Visto por última vez",
"Select devices": "Escolla dispositivos",
"Failed to set display name": "Fallo ao establecer o nome público",
- "Disable Notifications": "Deshabilitar notificacións",
- "Enable Notifications": "Habilitar notificacións",
+ "Disable Notifications": "Desactivar notificacións",
+ "Enable Notifications": "Activar ass notificacións",
"%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
"Message Replies": "Respostas a mensaxe",
"Mirror local video feed": "Copiar fonte de vídeo local",
- "Cannot add any more widgets": "Non pode engadir máis widgets",
- "The maximum permitted number of widgets have already been added to this room.": "Xa se engadeu o número máximo de widgets a esta sala.",
- "Add a widget": "Engadir widget",
+ "Cannot add any more widgets": "Non pode engadir máis trebellos",
+ "The maximum permitted number of widgets have already been added to this room.": "Xa se lle engadiron o número máximo de trebellos a esta sala.",
+ "Add a widget": "Engadir un trebello",
"Drop File Here": "Solte aquí o ficheiro",
"Drop file here to upload": "Solte aquí o ficheiro para subilo",
" (unsupported)": " (non soportado)",
@@ -246,7 +246,7 @@
"Ongoing conference call%(supportedText)s.": "Chamada de conferencia en curso%(supportedText)s.",
"%(senderName)s sent an image": "%(senderName)s enviou unha imaxe",
"%(senderName)s sent a video": "%(senderName)s enviou un vídeo",
- "%(senderName)s uploaded a file": "%(senderName)s subeu un ficheiro",
+ "%(senderName)s uploaded a file": "%(senderName)s subiu un ficheiro",
"Options": "Axustes",
"Undecryptable": "Non descifrable",
"Encrypted by a verified device": "Cifrado por un dispositivo verificado",
@@ -271,7 +271,7 @@
"Failed to toggle moderator status": "Fallo ao mudar a estado de moderador",
"Failed to change power level": "Fallo ao cambiar o nivel de permisos",
"Are you sure?": "Está segura?",
- "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Non poderá desfacer este cambio xa que está promovendo a usaria a ter o mesmo nivel de permisos que vostede.",
+ "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Non poderá desfacer este cambio xa que lle estará promocionando e outorgándolle a outra persoa os mesmos permisos que os seus.",
"No devices with registered encryption keys": "Sen dispositivos con chaves de cifrado rexistradas",
"Devices": "Dispositivos",
"Unignore": "Non ignorar",
@@ -290,7 +290,7 @@
"and %(count)s others...|other": "e %(count)s outras...",
"and %(count)s others...|one": "e outra máis...",
"Invited": "Convidada",
- "Filter room members": "Filtrar membros da conversa",
+ "Filter room members": "Filtrar os participantes da conversa",
"%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (permiso %(powerLevelNumber)s)",
"Attachment": "Anexo",
"Upload Files": "Subir ficheiros",
@@ -306,9 +306,9 @@
"Send a reply (unencrypted)…": "Enviar unha resposta (non cifrada)…",
"Send an encrypted message…": "Enviar unha mensaxe cifrada…",
"Send a message (unencrypted)…": "Enviar unha mensaxe (non cifrada)…",
- "You do not have permission to post to this room": "Non ten permiso para comentar en esta sala",
- "Turn Markdown on": "Habilitar Markdown",
- "Turn Markdown off": "Deshabilitar Markdown",
+ "You do not have permission to post to this room": "Non ten permiso para comentar nesta sala",
+ "Turn Markdown on": "Activar Markdown",
+ "Turn Markdown off": "Desactivar Markdown",
"Hide Text Formatting Toolbar": "Agochar barra de formato de texto",
"Server error": "Fallo no servidor",
"Server unavailable, overloaded, or something else went wrong.": "Servidor non dispoñible, sobrecargado, ou outra cousa puido fallar.",
@@ -321,8 +321,8 @@
"quote": "cita",
"bullet": "lista",
"numbullet": "lista numerada",
- "Markdown is disabled": "Markdown deshabilitado",
- "Markdown is enabled": "Markdown habilitado",
+ "Markdown is disabled": "Markdown desactivado",
+ "Markdown is enabled": "Markdown activado",
"Unpin Message": "Desfixar mensaxe",
"Jump to message": "Ir a mensaxe",
"No pinned messages.": "Sen mensaxes fixadas.",
@@ -340,7 +340,7 @@
"Idle": "En pausa",
"Offline": "Fóra de liña",
"Unknown": "Descoñecido",
- "Replying": "Respostando",
+ "Replying": "Respondendo",
"Seen by %(userName)s at %(dateTime)s": "Visto por %(userName)s as %(dateTime)s",
"No rooms to show": "Sen salas que mostrar",
"Unnamed room": "Sala sen nome",
@@ -357,11 +357,11 @@
"Forget room": "Esquecer sala",
"Search": "Busca",
"Show panel": "Mostra panel",
- "Drop here to favourite": "Solte aqui para favorito",
+ "Drop here to favourite": "Solte aquí para favorito",
"Drop here to tag direct chat": "Solte aquí para etiquetar chat directo",
"Drop here to restore": "Solte aquí para restablecer",
"Drop here to tag %(section)s": "Solte aquí para etiquetar %(section)s",
- "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Non poderá desfacer este cambio xa que está a diminuír a súa autoridade, si vostede é a única usuaria con autorización na sala será imposible voltar a obter privilexios.",
+ "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Non poderá desfacer este cambio xa que está a diminuír a súa autoridade, se é a única persoa con autorización na sala será imposible volver a obter privilexios.",
"Drop here to demote": "Arrastre aquí para degradar",
"Press to start a chat with someone": "Pulse para iniciar a conversa con alguén",
"You're not in any rooms yet! Press to make a room or to browse the directory": "Aínda non está en ningunha sala! Pulse para crear unha sala ou para buscar no directorio",
@@ -377,75 +377,75 @@
"You have been invited to join this room by %(inviterName)s": "Foi convidada por %(inviterName)s a unirse a esta sala",
"Would you like to accept or decline this invitation?": "Quere aceptar ou rexeitar este convite?",
"Reason: %(reasonText)s": "Razón: %(reasonText)s",
- "Rejoin": "Voltar a unirse",
+ "Rejoin": "Volver a unirse",
"You have been kicked from %(roomName)s by %(userName)s.": "Foi expulsada de %(roomName)s por %(userName)s.",
- "You have been kicked from this room by %(userName)s.": "Foi expulsada de esta sala por %(userName)s.",
+ "You have been kicked from this room by %(userName)s.": "Foi expulsada desta sala por %(userName)s.",
"You have been banned from %(roomName)s by %(userName)s.": "Non se lle permite acceder a %(roomName)s por %(userName)s.",
"You have been banned from this room by %(userName)s.": "Non se lle permite o acceso a esta sala por %(userName)s.",
"This room": "Esta sala",
"%(roomName)s does not exist.": "%(roomName)s non existe.",
- "%(roomName)s is not accessible at this time.": "%(roomName)s non está accesible en este momento.",
+ "%(roomName)s is not accessible at this time.": "%(roomName)s non está accesible neste momento.",
"You are trying to access %(roomName)s.": "Está intentando acceder a %(roomName)s.",
"You are trying to access a room.": "Está intentando acceder a unha sala.",
"Click here to join the discussion!": "Pulse aquí para unirse a conversa!",
- "This is a preview of this room. Room interactions have been disabled": "Esta é unha vista previa de esta sala. Desactiváronse as interaccións coa sala",
+ "This is a preview of this room. Room interactions have been disabled": "Esta é unha vista previa desta sala. Desactiváronse as interaccións coa sala",
"To change the room's avatar, you must be a": "Para cambiar o avatar da sala, debe ser",
"To change the room's name, you must be a": "Para cambiar o nome da sala, debe ser",
"To change the room's main address, you must be a": "Para cambiar o enderezo principal da sala, debe ser",
"To change the room's history visibility, you must be a": "Para cambiar a visibilidade do histórico da sala, debe ser",
"To change the permissions in the room, you must be a": "Para cambiar os permisos na sala, debe ser",
"To change the topic, you must be a": "Para cambiar o asunto, debe ser",
- "To modify widgets in the room, you must be a": "Para modificar os widgets da sala, debe ser",
+ "To modify widgets in the room, you must be a": "Para modificar os trebellos da sala, debe ser",
"Failed to unban": "Fallou eliminar a prohibición",
"Banned by %(displayName)s": "Non aceptado por %(displayName)s",
"Privacy warning": "Aviso de intimidade",
- "Changes to who can read history will only apply to future messages in this room": "Os cambios sobre quen pode ler o histórico serán de aplicación a futuras mensaxes en esta sala",
+ "Changes to who can read history will only apply to future messages in this room": "Os cambios sobre quen pode ler o histórico serán de aplicación para as futuras mensaxes nesta sala",
"The visibility of existing history will be unchanged": "A visibilidade do histórico existente non cambiará",
"unknown error code": "código de fallo descoñecido",
"Failed to forget room %(errCode)s": "Fallo ao esquecer sala %(errCode)s",
- "End-to-end encryption is in beta and may not be reliable": "O cifrado de extremo-a-extremo está en beta e podería non ser fiable",
+ "End-to-end encryption is in beta and may not be reliable": "O cifrado de par-a-par está en beta e podería non ser fiable",
"You should not yet trust it to secure data": "Polo de agora non debería confiarlle datos seguros",
"Devices will not yet be able to decrypt history from before they joined the room": "Os dispositivos non poderán descifrar o histórico anterior a que se uniron a sala",
- "Once encryption is enabled for a room it cannot be turned off again (for now)": "Unha vez habilitado o cifrado para unha sala non se poderá desactivar (por agora)",
+ "Once encryption is enabled for a room it cannot be turned off again (for now)": "Unha vez activou o cifrado para unha sala non se poderá desactivar (por agora)",
"Encrypted messages will not be visible on clients that do not yet implement encryption": "As mensaxes cifradas non será visibles en clientes que non aínda non teñan implementado o cifrado",
- "Enable encryption": "Habilitar cifrado",
- "(warning: cannot be disabled again!)": "(aviso: non se pode deshabilitar!)",
- "Encryption is enabled in this room": "O cifrado está habilitado en esta sala",
- "Encryption is not enabled in this room": "O cifrado non se habilitou para esta sala",
+ "Enable encryption": "Activar o cifrado",
+ "(warning: cannot be disabled again!)": "(aviso: non se pode desactivar!)",
+ "Encryption is enabled in this room": "O cifrado está activado nesta sala",
+ "Encryption is not enabled in this room": "Non se activou o cifrado nesta sala",
"Privileged Users": "Usuarios con privilexios",
- "No users have specific privileges in this room": "Non hai usuarias con privilexios específicos en esta sala",
- "Banned users": "Usuarias non permitidas",
+ "No users have specific privileges in this room": "Non hai usuarios con privilexios específicos nesta sala",
+ "Banned users": "Usuarios excluídos",
"This room is not accessible by remote Matrix servers": "Esta sala non é accesible por servidores Matrix remotos",
"Leave room": "Deixar a sala",
"Favourite": "Favorita",
"Tagged as: ": "Etiquetada como: ",
"To link to a room it must have an address.": "Para ligar a unha sala deberá ter un enderezo.",
- "Guests cannot join this room even if explicitly invited.": "As convidadas non se poden unir a esta sala incluso se foro explicitamente convidadas.",
+ "Guests cannot join this room even if explicitly invited.": "Os convidados non se poden unir a esta sala inda que fosen convidados explicitamente.",
"Click here to fix": "Pulse aquí para solución",
- "Who can access this room?": "Quén pode acceder a esta sala?",
+ "Who can access this room?": "Quen pode acceder a esta sala?",
"Only people who have been invited": "Só persoas que foron convidadas",
"Anyone who knows the room's link, apart from guests": "Calquera que coñeza o enderezo da sala, aparte das convidadas",
"Anyone who knows the room's link, including guests": "Calquera que coñeza a ligazón a sala, incluíndo as convidadas",
"Publish this room to the public in %(domain)s's room directory?": "Publicar esta sala no directorio público de salas de %(domain)s?",
- "Who can read history?": "Quén pode ler o histórico?",
+ "Who can read history?": "Quen pode ler o histórico?",
"Anyone": "Calquera",
"Members only (since the point in time of selecting this option)": "Só membros (desde o momento en que se selecciona esta opción)",
"Members only (since they were invited)": "Só membros (desde que foron convidados)",
"Members only (since they joined)": "Só membros (desde que se uniron)",
"Permissions": "Permisos",
- "The default role for new room members is": "Por omisión o rol na sala para novos membros é",
+ "The default role for new room members is": "O rol por defecto na sala para novos participantes é",
"To send messages, you must be a": "Para enviar mensaxes, deberá ser",
- "To invite users into the room, you must be a": "Para convidar a usuarias a esta sala, debe ser",
+ "To invite users into the room, you must be a": "Para convidar a usuarios a esta sala, debe ser",
"To configure the room, you must be a": "Para configurar a sala, debe ser",
- "To kick users, you must be a": "Para expulsar usuarias, debe ser",
- "To ban users, you must be a": "Para prohibir usuarias, debe ser",
- "To remove other users' messages, you must be a": "Para eliminar mensaxes de outras usuarias, debe ser",
+ "To kick users, you must be a": "Para expulsar usuarios, debe ser",
+ "To ban users, you must be a": "Para prohibir usuarios, debe ser",
+ "To remove other users' messages, you must be a": "Para eliminar mensaxes doutras usuarios, debe ser",
"To send events of type
Click here to open settings and give it one!": "A súa comunidade non ten unha Descrición Longa, unha páxina HTML para mostrar aos membros.
Pulse aquí para abrir os axustes e publicar unha!", + "You are a member of this community": "É membro desta comunidade", + "Your community hasn't got a Long Description, a HTML page to show to community members.
Click here to open settings and give it one!": "A súa comunidade non ten unha descrición longa, ou unha páxina HTML que lle mostrar aos seus participantes.
Pulse aquí para abrir os axustes e publicar unha!", "Long Description (HTML)": "Descrición longa (HTML)", "Description": "Descrición", "Community %(groupId)s not found": "Non se atopou a comunidade %(groupId)s", @@ -749,13 +749,13 @@ "Old cryptography data detected": "Detectouse o uso de criptografía sobre datos antigos", "Logout": "Desconectar", "Your Communities": "As súas Comunidades", - "Error whilst fetching joined communities": "Fallo mentras se obtiñas as comunidades unidas", + "Error whilst fetching joined communities": "Fallo mentres se obtiñas as comunidades unidas", "Create a new community": "Crear unha nova comunidade", - "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crear unha comunidade para agrupar usuarias e salas! Poña unha páxina de inicio personalizada para destacar o seu lugar no universo Matrix.", + "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crear unha comunidade para agrupar usuaria/os e salas! Poña unha páxina de inicio personalizada para destacar o seu lugar no universo Matrix.", "Join an existing community": "Unirse a unha comunidade existente", "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "Para unirse a unha comunidade existente deberá coñecer o identificador de esa comunidade; terá un aspecto como +exemplo:matrix.org.", "You have no visible notifications": "Non ten notificacións visibles", - "Scroll to bottom of page": "Desplácese ate o final da páxina", + "Scroll to bottom of page": "Desprácese ate o final da páxina", "Message not sent due to unknown devices being present": "Non se enviou a mensaxe porque hai dispositivos non coñecidos", "Show devices , send anyway or cancel .": "Mostrar dispositivos , enviar igualmente ou cancelar .",
"%(count)s of your messages have not been sent.|other": "Algunha das súas mensaxes non foron enviadas.",
@@ -764,7 +764,7 @@
"%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|one": "Reenviar mensaxe ou cancelar mensaxe agora.",
"Warning": "Aviso",
"Connectivity to the server has been lost.": "Perdeuse a conexión ao servidor.",
- "Sent messages will be stored until your connection has returned.": "As mensaxes enviadas gardaránse ate que retome a conexión.",
+ "Sent messages will be stored until your connection has returned.": "As mensaxes enviadas gardaranse ate que retome a conexión.",
"%(count)s new messages|other": "%(count)s novas mensaxes",
"%(count)s new messages|one": "%(count)s nova mensaxe",
"Active call": "Chamada activa",
@@ -785,19 +785,19 @@
"Click to mute video": "Pulse para acalar video",
"Click to unmute audio": "Pulse para escoitar audio",
"Click to mute audio": "Pulse para acalar audio",
- "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Intentouse cargar un punto concreto do historial de esta sala, pero vostede non ten permiso para ver a mensaxe en cuestión.",
- "Tried to load a specific point in this room's timeline, but was unable to find it.": "Intentouse cargar un punto específico do historial de esta sala, pero non se puido atopar.",
+ "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Intentouse cargar un punto concreto do historial desta sala, pero non ten permiso para ver a mensaxe en cuestión.",
+ "Tried to load a specific point in this room's timeline, but was unable to find it.": "Intentouse cargar un punto específico do historial desta sala, pero non se puido atopar.",
"Failed to load timeline position": "Fallo ao cargar posición da liña temporal",
"Uploading %(filename)s and %(count)s others|other": "Subindo %(filename)s e %(count)s máis",
"Uploading %(filename)s and %(count)s others|zero": "Subindo %(filename)s",
"Uploading %(filename)s and %(count)s others|one": "Subindo %(filename)s e %(count)s máis",
"Light theme": "Decorado claro",
- "Dark theme": "Decorado oscuro",
+ "Dark theme": "Decorado escuro",
"Status.im theme": "Decorado Status.im",
"Can't load user settings": "Non se puideron cargar os axustes de usuaria",
"Server may be unavailable or overloaded": "O servidor podería non está dispoñible ou sobrecargado",
"Sign out": "Desconectar",
- "For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.": "Por seguridade, ao desconectarse borrará todas as chaves de cifrado extremo-a-extremo en este navegador. Si quere poder descifrar o historial da conversa en futuras sesións en Riot, por favor exporte as chaves da sala e gárdeas en lugar seguro.",
+ "For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.": "Por seguridade, ao desconectarse borrará todas as chaves de cifrado par-a-par ste navegador. Se quere poder descifrar o historial da conversa en futuras sesións en Riot, por favor exporte as chaves da sala e gárdeas en lugar seguro.",
"Failed to change password. Is your password correct?": "Fallo ao cambiar o contrasinal. É correcto o contrasinal?",
"Success": "Parabéns",
"Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "O seu contrasinal cambiouse correctamente. Non recibirá notificacións tipo push en outros dispositivos ate que se conecte novamente en eles",
@@ -807,17 +807,17 @@
"Refer a friend to Riot:": "Convide a un amigo a Riot:",
"Interface Language": "Idioma da Interface",
"User Interface": "Interface de usuaria",
- "Autocomplete Delay (ms):": "Retraso no autocompletado (ms):",
+ "Autocomplete Delay (ms):": "Atraso no autocompletado (ms):",
"": "",
"Import E2E room keys": "Importar chaves E2E da sala",
"Cryptography": "Criptografía",
"Device ID:": "ID de dispositivo:",
"Device key:": "Chave do dispositivo:",
- "Ignored Users": "Usuarias ignoradas",
+ "Ignored Users": "Usuarios ignorados",
"Analytics": "Analytics",
"Riot collects anonymous analytics to allow us to improve the application.": "Riot recolle información analítica anónima para permitirnos mellorar o aplicativo.",
"Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "A intimidade impórtanos, así que non recollemos información personal ou identificable nos datos dos nosos análises.",
- "Learn more about how we use analytics.": "Saber máis sobre cómo utilizamos analytics.",
+ "Learn more about how we use analytics.": "Saber máis sobre como utilizamos analytics.",
"Labs": "Labs",
"These are experimental features that may break in unexpected ways": "Estas son características experimentais que poderían dar lugar a fallos non agardados",
"Use with caution": "Utilice con precaución",
@@ -828,24 +828,24 @@
"Check for update": "Comprobar actualización",
"Reject all %(invitedRooms)s invites": "Rexeitar todos os %(invitedRooms)s convites",
"Bulk Options": "Opcións en bloque",
- "Desktop specific": "Específicas de escritorio",
- "Start automatically after system login": "Iniciar automáticamente despóis de iniciar sesión",
+ "Desktop specific": "Configuracións de escritorio",
+ "Start automatically after system login": "Iniciar automaticamente despois de iniciar sesión",
"No media permissions": "Sen permisos de medios",
"You may need to manually permit Riot to access your microphone/webcam": "Igual ten que permitir manualmente a Riot acceder ao seus micrófono e cámara",
"Missing Media Permissions, click here to request.": "Faltan permisos de medios, pulse aquí para solicitalos.",
"No Microphones detected": "Non se detectaron micrófonos",
"No Webcams detected": "Non se detectaron cámaras",
- "Default Device": "Dispositivo por omisión",
+ "Default Device": "Dispositivo por defecto",
"Microphone": "Micrófono",
"Camera": "Cámara",
"VoIP": "VoIP",
- "Email": "Correo-e",
- "Add email address": "Engadir enderezo correo-e",
+ "Email": "Correo electrónico",
+ "Add email address": "Engadir enderezo correo electrónico",
"Notifications": "Notificacións",
"Profile": "Perfil",
"Display name": "Nome mostrado",
"Account": "Conta",
- "To return to your account in future you need to set a password": "Estableza un contrasinal para voltar a súa conta con posterioridade",
+ "To return to your account in future you need to set a password": "Estableza un contrasinal para volver a súa conta con posterioridade",
"Logged in as:": "Conectada como:",
"Access Token:": "Testemuño de acceso:",
"click to reveal": "pulse para revelar",
@@ -854,31 +854,31 @@
"matrix-react-sdk version:": "versión matrix-react-sdk:",
"riot-web version:": "versión riot-web:",
"olm version:": "versión olm:",
- "Failed to send email": "Fallo ao enviar correo-e",
- "The email address linked to your account must be entered.": "Debe introducir o correo-e ligado a súa conta.",
+ "Failed to send email": "Fallo ao enviar correo electrónico",
+ "The email address linked to your account must be entered.": "Debe introducir o correo electrónico ligado a súa conta.",
"A new password must be entered.": "Debe introducir un novo contrasinal.",
"New passwords must match each other.": "Os novos contrasinais deben ser coincidentes.",
- "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Detectáronse datos de una versión anterior de Riot. Esto causará un mal funcionamento da criptografía extremo-a-extremo na versión antiga. As mensaxes cifradas extremo-a-extremo intercambiadas mentras utilizaba a versión anterior poderían non ser descifrables en esta versión. Esto tamén podería causar que mensaxes intercambiadas con esta versión tampouco funcionasen. Si ten problemas, desconéctese e conéctese de novo. Para manter o historial de mensaxes, exporte e reimporte as súas chaves.",
- "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "O restablecemento do contrasinal restablecerá tamén as chaves de cifrado extremo-a-extremo en todos os dispositivos, facendo o historial de chat cifrado non lexible, a menos que primeiro exporte as chaves da sala e as reimporte posteriormente. No futuro melloraremos esto.",
- "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Enviouse un email a %(emailAddress)s. Unha vez siga a ligazón que contén, pulse abaixo.",
- "I have verified my email address": "Validei o meu enderezo de correo-e",
+ "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Detectáronse datos de una versión anterior de Riot. Isto causará un mal funcionamento da criptografía extremo-a-extremo na versión antiga. As mensaxes cifradas extremo-a-extremo intercambiadas mentres utilizaba a versión anterior poderían non ser descifrables en esta versión. Isto tamén podería causar que mensaxes intercambiadas con esta versión tampouco funcionasen. Se ten problemas, desconéctese e conéctese de novo. Para manter o historial de mensaxes, exporte e reimporte as súas chaves.",
+ "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "O restablecemento do contrasinal restablecerá tamén as chaves de cifrado extremo-a-extremo en todos os dispositivos, facendo o historial de chat cifrado non lexible, a menos que primeiro exporte as chaves da sala e as reimporte posteriormente. No futuro melloraremos isto.",
+ "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Enviouse un correo a %(emailAddress)s. Unha vez siga a ligazón que contén, pulse abaixo.",
+ "I have verified my email address": "Validei o meu enderezo de correo electrónico",
"Your password has been reset": "Restableceuse o seu contrasinal",
"You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "Foi desconectado de todos os seus dispositivos e xa non recibirá notificacións push. Para reactivar as notificacións, conéctese de novo en cada dispositivo",
- "Return to login screen": "Voltar a pantalla de conexión",
+ "Return to login screen": "Volver a pantalla de conexión",
"To reset your password, enter the email address linked to your account": "Para restablecer o seu contrasinal, introduza o enderezo de correo electrónico ligado a súa conta",
"New password": "Novo contrasinal",
"Confirm your new password": "Confirme o seu novo contrasinal",
- "Send Reset Email": "Enviar correo-e de restablecemento",
+ "Send Reset Email": "Enviar correo electrónico de restablecemento",
"Create an account": "Crear unha conta",
- "This Home Server does not support login using email address.": "Este servidor non soporta a conexión utilizando un enderezo de correo-e.",
+ "This Home Server does not support login using email address.": "Este servidor non soporta a conexión utilizando un enderezo de correo electrónico.",
"Incorrect username and/or password.": "Nome de usuaria ou contrasinal non válidos.",
"Please note you are logging into the %(hs)s server, not matrix.org.": "Teña en conta que se está a conectar ao servidor %(hs)s, non a matrix.org.",
- "Guest access is disabled on this Home Server.": "O acceso de convidados está deshabilitado en este servidor de inicio.",
+ "Guest access is disabled on this Home Server.": "O acceso de convidados está desactivado neste servidor de inicio.",
"The phone number entered looks invalid": "O número de teléfono introducido non semella ser válido",
"This homeserver doesn't offer any login flows which are supported by this client.": "Este servidor non ofrece ningún sistema de conexión que soporte este cliente.",
"Error: Problem communicating with the given homeserver.": "Fallo: problema ao comunicarse con servidor proporcionado.",
"Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "Non se pode conectar ao servidor vía HTTP cando na barra de enderezos do navegador está HTTPS. Utilice HTTPS ou active scripts non seguros.",
- "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Non se conectou ao servidor - por favor comprobe a conexión, asegúrese de o certificado SSL do servidor é de confianza, e que ningún engadido do navegador está bloqueando as peticións.",
+ "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Non se conectou ao servidor - por favor comprobe a conexión, asegúrese de que ocertificado SSL do servidor sexa de confianza, e que ningún engadido do navegador estea bloqueando as peticións.",
"Sign in to get started": "Conéctese para iniciar",
"Failed to fetch avatar URL": "Fallo ao obter o URL do avatar",
"Set a display name:": "Establecer nome público:",
@@ -887,7 +887,7 @@
"Missing password.": "Falta contrasinal.",
"Passwords don't match.": "Non coinciden os contrasinais.",
"Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Contrasinal demasiado curto (min %(MIN_PASSWORD_LENGTH)s).",
- "This doesn't look like a valid email address.": "Non semella ser un enderezo de correo-e válido.",
+ "This doesn't look like a valid email address.": "Non semella ser un enderezo de correo electrónico válido.",
"This doesn't look like a valid phone number.": "Non semella ser un número de teléfono válido.",
"You need to enter a user name.": "É preciso que introduza un nome de usuaria.",
"An unknown error occurred.": "Aconteceu un erro descoñecido.",
@@ -910,8 +910,8 @@
"Results from DuckDuckGo": "Resultados desde DuckDuckGo",
"Emoji": "Emoji",
"Notify the whole room": "Notificar a toda a sala",
- "Room Notification": "Notificación da Sala",
- "Users": "Usuarias",
+ "Room Notification": "Notificación da sala",
+ "Users": "Usuarios",
"unknown device": "dispositivo descoñecido",
"NOT verified": "Non validado",
"verified": "validado",
@@ -931,28 +931,28 @@
"Passphrases must match": "As frases de paso deben coincidir",
"Passphrase must not be empty": "A frase de paso non pode quedar baldeira",
"Export room keys": "Exportar chaves da sala",
- "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Este proceso permítelle exportar a un ficheiro local as chaves para as mensaxes que recibeu en salas cifradas. Posteriormente permitiralle importar as chaves en outro cliente Matrix no futuro, así o cliente poderá descifrar esas mensaxes.",
- "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "O ficheiro exportado permitiralle a calquera que poida lelo descifrar e cifrar mensaxes que vostede ve, así que debería ter coidado e gardalo de xeito seguro. Para axudarlle, debe introducir unha frase de paso aquí abaixo que será utilizada para cifrar os datos exportados. Só será posible importar os datos utilizando a misma frase de paso.",
+ "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Este proceso permítelle exportar a un ficheiro local as chaves para as mensaxes que recibiu en salas cifradas. Posteriormente permitiralle importar as chaves en outro cliente Matrix no futuro, así o cliente poderá descifrar esas mensaxes.",
+ "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "O ficheiro exportado permitiralle a calquera que poida lelo descifrar e cifrar mensaxes que vostede ve, así que debería ter coidado e gardalo de xeito seguro. Para axudarlle, debe introducir unha frase de paso aquí abaixo que será utilizada para cifrar os datos exportados. Só será posible importar os datos utilizando a mesma frase de paso.",
"Enter passphrase": "Introduza a frase de paso",
"Confirm passphrase": "Confirme a frase de paso",
"Export": "Exportar",
"Import room keys": "Importar chaves de sala",
- "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Este proceso permítelle importar chaves de cifrado que vostede exportou de outro cliente Matrix. Así poderá descifrar calquer mensaxe que o outro cliente puidese cifrar.",
+ "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Este proceso permítelle importar chaves de cifrado que vostede exportou de outro cliente Matrix. Así poderá descifrar calquera mensaxe que o outro cliente puidese cifrar.",
"The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "O ficheiro exportado estará protexido con unha frase de paso. Debe introducir aquí esa frase de paso para descifrar o ficheiro.",
"File to import": "Ficheiro a importar",
"Import": "Importar",
"The information being sent to us to help make Riot.im better includes:": "A información enviada a Riot.im para axudarnos a mellorar inclúe:",
- "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Si esta páxina inclúe información identificable como ID de grupo, usuario ou sala, estes datos son eliminados antes de ser enviados ao servidor.",
+ "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Se esta páxina inclúe información identificable como ID de grupo, usuario ou sala, estes datos son eliminados antes de ser enviados ao servidor.",
"The platform you're on": "A plataforma na que está",
"The version of Riot.im": "A versión de Riot.im",
- "Whether or not you're logged in (we don't record your user name)": "Si está ou non conectada (non gardamos o nome de usuaria)",
+ "Whether or not you're logged in (we don't record your user name)": "Se está ou non conectado/a (non gardamos os nomes de usuarios)",
"Your language of choice": "A súa preferencia de idioma",
- "Which officially provided instance you are using, if any": "Qué instancia oficial está a utilizar, si algunha",
- "Whether or not you're using the Richtext mode of the Rich Text Editor": "Si utiliza o modo Richtext ou non do Editor Rich Text",
+ "Which officially provided instance you are using, if any": "Se a houbese, que instancia oficial está a utilizar",
+ "Whether or not you're using the Richtext mode of the Rich Text Editor": "Se utiliza o modo Richtext ou non do editor de texto enriquecido",
"Your homeserver's URL": "O URL do seu servidor de inicio",
"Your identity server's URL": "O URL da súa identidade no servidor",
"In reply to ": "En resposta a ",
- "This room is not public. You will not be able to rejoin without an invite.": "Esta sala non é pública. Non poderá voltar a ela sin un convite.",
+ "This room is not public. You will not be able to rejoin without an invite.": "Esta sala non é pública. Non poderá volver a ela sen un convite.",
"This room is not showing flair for any communities": "Esta sala non mostra popularidade para as comunidades",
"%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s cambiou o seu nome mostrado a %(displayName)s.",
"Clear filter": "Quitar filtro",
@@ -960,57 +960,57 @@
"Failed to remove tag %(tagName)s from room": "Fallo ao eliminar a etiqueta %(tagName)s da sala",
"Failed to add tag %(tagName)s to room": "Fallo ao engadir a etiqueta %(tagName)s a sala",
"Failed to lookup current room": "Fallo ao bloquear a sala actual",
- "Disable Community Filter Panel": "Deshabilitar o panel de filtro de comunidades",
+ "Disable Community Filter Panel": "Desactivar o panel de filtro de comunidades",
"Your key share request has been sent - please check your other devices for key share requests.": "Enviouse a solicitude de compartir chave - por favor comprobe as peticións de compartir chaves nos seus outros dispositivos.",
- "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "As peticións de compartir chaves envíanse de xeito automático aos seus outros dispositivos. Si rexeita o obvia estas peticións nos outros dispositivos, pulse aquí para solicitar novamente as chaves para esta sesión.",
- "If your other devices do not have the key for this message you will not be able to decrypt them.": "Si os seus outros dispositivos non teñen as chaves para est mensaxe non poderán descifrala.",
+ "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "As peticións de compartir chaves envíanse de xeito automático aos seus outros dispositivos. Se rexeita o obvia estas peticións nos outros dispositivos, pulse aquí para solicitar novamente as chaves para esta sesión.",
+ "If your other devices do not have the key for this message you will not be able to decrypt them.": "Se os seus outros dispositivos non teñen as chaves para este mensaxe non poderán descifrala.",
"Key request sent.": "Petición de chave enviada.",
- "Re-request encryption keys from your other devices.": "Voltar a pedir chaves de cifrado desde os outros dispositivos.",
+ "Re-request encryption keys from your other devices.": "Volver a pedir chaves de cifrado desde os outros dispositivos.",
"%(user)s is a %(userRole)s": "%(user)s é %(userRole)s",
"Flair": "Aura",
"Showing flair for these communities:": "Mostrar o aura para estas comunidades:",
- "Flair will appear if enabled in room settings": "O Aura aparecerá si está habilitada nas preferencias da sala",
+ "Flair will appear if enabled in room settings": "O Aura aparecerá si está activado nas preferencias da sala",
"Flair will not appear": "O Aura non aparecerá",
"Display your community flair in rooms configured to show it.": "Mostrar o aura da súa comunidade en salas configuradas para mostralo.",
"Did you know: you can use communities to filter your Riot.im experience!": "Sabía que pode utilizar as comunidades para mellorar a súa experiencia con Riot.im!",
- "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Para establecer un filtro, arrastre un avatar da comunidade sobre o panel de filtros na parte esquerda da pantalla. Pode pulsar nun avatar no panel de filtrado en calquer moemento para ver só salas e xente asociada a esa comunidade.",
+ "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Para establecer un filtro, arrastre un avatar da comunidade sobre o panel de filtros na parte esquerda da pantalla. Pode pulsar nun avatar no panel de filtrado en calquera momento para ver só salas e xente asociada a esa comunidade.",
"Deops user with given id": "Degradar usuaria co id dado",
"Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Visto por %(displayName)s(%(userName)s en %(dateTime)s",
"Code": "Código",
"Unable to join community": "Non se puido unir a comunidade",
"Unable to leave community": "Non se puido deixar a comunidade",
- "Changes made to your community name and avatar might not be seen by other users for up to 30 minutes.": "Os cambios realizados a súa comunidade name e avatarname and avatar might not be seen by other users for up to 30 minutes.": "Os cambios realizados a súa comunidade name e avatar poida que non os vexan outros usuarios ate dentro de 30 minutos.",
"Join this community": "Únase a esta comunidade",
"Leave this community": "Deixar esta comunidade",
"Debug Logs Submission": "Envío de rexistro de depuración",
- "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Si enviou un reporte de fallo a través de GitHub, os informes poden axudarnos a examinar o problema. Os informes de fallo conteñen datos do uso do aplicativo incluíndo o seu nome de usuaria, os IDs ou alcumes das salas e grupos que visitou e os nomes de usuaria de outras personas. Non conteñen mensaxes.",
+ "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Si enviou un reporte de fallo a través de GitHub, os informes poden axudarnos a examinar o problema. Os informes de fallo conteñen datos do uso do aplicativo incluíndo o seu nome de usuaria, os IDs ou alcumes das salas e grupos que visitou e os nomes de usuaria de outras persoas. Non conteñen mensaxes.",
"Submit debug logs": "Enviar informes de depuración",
- "Opens the Developer Tools dialog": "Abre o cadro de Ferramentas de Desenvolvedoras",
- "Stickerpack": "Peganitas",
- "You don't currently have any stickerpacks enabled": "Non ten paquetes de pegatinas habilitados",
- "Add a stickerpack": "Engadir un paquete de pegatinas",
- "Hide Stickers": "Agochar pegatinas",
- "Show Stickers": "Mostrar pegatinas",
- "Who can join this community?": "Quén pode unirse a esta comunidade?",
+ "Opens the Developer Tools dialog": "Abre o cadro de Ferramentas de desenvolvemento",
+ "Stickerpack": "Iconas",
+ "You don't currently have any stickerpacks enabled": "Non ten paquetes de iconas activados",
+ "Add a stickerpack": "Engadir un paquete de iconas",
+ "Hide Stickers": "Agochar iconas",
+ "Show Stickers": "Mostrar iconas",
+ "Who can join this community?": "Quen pode unirse a esta comunidade?",
"Everyone": "Todo o mundo",
"Fetching third party location failed": "Fallo ao obter a localización de terceiros",
"A new version of Riot is available.": "Está dispoñible unha nova versión de Riot.",
"Couldn't load home page": "Non se cargou a páxina de inicio",
"Send Account Data": "Enviar datos da conta",
- "All notifications are currently disabled for all targets.": "Todas as notificacións están deshabilitadas para todos os destinos.",
+ "All notifications are currently disabled for all targets.": "Todas as notificacións están desactivadas para todos os destinos.",
"Uploading report": "Informe da subida",
"Sunday": "Domingo",
- "Notification targets": "Obxetivos das notificacións",
+ "Notification targets": "Obxectivos das notificacións",
"Today": "Hoxe",
"Failed to get protocol list from Home Server": "Fallo ao obter a lista de protocolo desde o servidor",
"You are not receiving desktop notifications": "Non está a recibir notificacións de escritorio",
"Friday": "Venres",
"Update": "Actualizar",
- "What's New": "Qué hai de novo",
+ "What's New": "Que hai de novo",
"Add an email address above to configure email notifications": "Engada un enderezo de correo electrónico para configurar as notificacións",
"Expand panel": "Expandir panel",
"On": "On",
- "%(count)s Members|other": "%(count)s Membros",
+ "%(count)s Members|other": "%(count)s participantes",
"Filter room names": "Filtrar nomes de sala",
"Changelog": "Rexistro de cambios",
"Waiting for response from server": "Agardando pola resposta do servidor",
@@ -1018,14 +1018,14 @@
"Advanced notification settings": "Axustes avanzados de notificación",
"Failed to send logs: ": "Fallo ao enviar os informes: ",
"delete the alias.": "borrar alcume.",
- "To return to your account in future you need to set a password": "Para voltar a súa conta no futuro debe establecer un contrasinal>/u>",
+ "To return to your account in future you need to set a password": "Para volver a súa conta no futuro debe establecer un contrasinal>/u>",
"Forget": "Esquecer",
"#example": "#exemplo",
"Hide panel": "Agochar panel",
"You cannot delete this image. (%(code)s)": "Non pode eliminar esta imaxe. (%(code)s)",
"Cancel Sending": "Cancelar o envío",
"This Room": "Esta sala",
- "The Home Server may be too old to support third party networks": "O servidor de inicio podería ser demasiando antigo como para aceptar redes de terceiros",
+ "The Home Server may be too old to support third party networks": "O servidor de inicio podería ser demasiado antigo como para aceptar redes de terceiros",
"Noisy": "Ruidoso",
"Error saving email notification preferences": "Fallo ao cargar os axustes de notificacións",
"Messages containing my display name": "Mensaxes que conteñen o meu nome público",
@@ -1035,25 +1035,25 @@
"Failed to update keywords": "Fallo ao actualizar as palabras chave",
"Notes:": "Notas:",
"remove %(name)s from the directory.": "eliminar %(name)s do directorio.",
- "Notifications on the following keywords follow rules which can’t be displayed here:": "Notificacións das reglas de seguimento das seguintes palabras que non se mostrarán aquí:",
+ "Notifications on the following keywords follow rules which can’t be displayed here:": "Notificacións das regras de seguimento das seguintes palabras que non se mostrarán aquí:",
"Safari and Opera work too.": "Safari e Opera tamén funcionan.",
"Please set a password!": "Por favor estableza un contrasinal!",
"You have successfully set a password!": "Mudou con éxito o seu contrasinal!",
- "An error occurred whilst saving your email notification preferences.": "Algo fallou mentras se gardaban as súas preferencias de notificaicón.",
+ "An error occurred whilst saving your email notification preferences.": "Algo fallou mentres se gardaban as súas preferencias de notificación.",
"Explore Room State": "Explorar estado da sala",
"Search for a room": "Buscar unha sala",
"Source URL": "URL fonte",
"Messages sent by bot": "Mensaxes enviadas por bot",
"Filter results": "Filtrar resultados",
- "Members": "Membresía",
+ "Members": "Participantes",
"No update available.": "Sen actualizacións.",
- "Resend": "Voltar a enviar",
+ "Resend": "Volver a enviar",
"Files": "Ficheiros",
"Collecting app version information": "Obtendo información sobre a versión da app",
"Delete the room alias %(alias)s and remove %(name)s from the directory?": "Eliminar o alcume da sala %(alias)s e borrar %(name)s do directorio?",
- "This will allow you to return to your account after signing out, and sign in on other devices.": "Esto permitiralle voltar a súa conta tras desconectarse, e conectarse en outros dispositivos.",
+ "This will allow you to return to your account after signing out, and sign in on other devices.": "Isto permitiralle volver a súa conta tras desconectarse, e conectarse en outros dispositivos.",
"Keywords": "Palabras chave",
- "Enable notifications for this account": "Habilitar notificacións para esta conta",
+ "Enable notifications for this account": "Activar notificacións para esta conta",
"Directory": "Directorio",
"Invite to this community": "Convidar a esta comunidade",
"Failed to get public room list": "Fallo ao obter a lista de salas públicas",
@@ -1063,22 +1063,22 @@
"Enter keywords separated by a comma:": "Introduza palabras chave separadas por vírgulas:",
"Search…": "Buscar…",
"Remove %(name)s from the directory?": "Eliminar %(name)s do directorio?",
- "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot utiliza características avanzadas do navegador, algunhas das cales non están dispoñibles ou son experimentales no seu navegador actual.",
+ "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot utiliza características avanzadas do navegador, algunhas das cales non están dispoñibles ou son experimentais no seu navegador actual.",
"Developer Tools": "Ferramentas para desenvolver",
"Preparing to send logs": "Preparándose para enviar informe",
- "Enable desktop notifications": "Habilitar notificacións de escritorio",
- "Remember, you can always set an email address in user settings if you change your mind.": "Lembre, sempre poderá poñer un enderezo de correo nos axustes de usuario si cambia de idea.",
+ "Enable desktop notifications": "Activar as notificacións de escritorio",
+ "Remember, you can always set an email address in user settings if you change your mind.": "Lembre que sempre poderá poñer un enderezo de correo nos axustes de usuario se cambiase de idea.",
"Explore Account Data": "Explorar datos da conta",
"All messages (noisy)": "Todas as mensaxes (alto)",
"Saturday": "Sábado",
- "I understand the risks and wish to continue": "Entendos os riscos e desexo continuar",
+ "I understand the risks and wish to continue": "Entendo os riscos e desexo continuar",
"Direct Chat": "Chat directo",
"The server may be unavailable or overloaded": "O servidor podería non estar dispoñible ou sobrecargado",
"Reject": "Rexeitar",
"Failed to set Direct Message status of room": "Fallo ao establecer o estado Mensaxe Directa da sala",
"Monday": "Luns",
"Remove from Directory": "Eliminar do directorio",
- "Enable them now": "Habilitalas agora",
+ "Enable them now": "Activalos agora",
"Messages containing my user name": "Mensaxes que conteñen o meu nome de usuaria",
"Toolbox": "Ferramentas",
"Collecting logs": "Obtendo rexistros",
@@ -1097,10 +1097,10 @@
"Downloading update...": "Descargando actualización...",
"You have successfully set a password and an email address!": "Estableceu correctamente un contrasinal e enderezo de correo!",
"Failed to send custom event.": "Fallo ao enviar evento personalizado.",
- "What's new?": "Qué hai de novo?",
- "Notify me for anything else": "Notificarme todo o demáis",
+ "What's new?": "Que hai de novo?",
+ "Notify me for anything else": "Notificarme todo o demais",
"When I'm invited to a room": "Cando son convidado a unha sala",
- "Can't update user notification settings": "Non se poden actualizar os axutes de notificación",
+ "Can't update user notification settings": "Non se poden actualizar os axustes de notificación",
"Notify for all other messages/rooms": "Notificar para todas as outras mensaxes/salas",
"Unable to look up room ID from server": "Non se puido atopar o ID da sala do servidor",
"Couldn't find a matching Matrix room": "Non coincide con ningunha sala de Matrix",
@@ -1112,8 +1112,8 @@
"Back": "Atrás",
"Reply": "Resposta",
"Show message in desktop notification": "Mostrar mensaxe nas notificacións de escritorio",
- "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Os informes de depuración conteñen datos de utilización do aplicativo como o seu nome de usuaria, os IDs ou alcumes de salas e grupos que vostede visitou e os nomes de usuaria de outras usuarias. Non conteñen mensaxes.",
- "Unhide Preview": "Desagochar a vista previsa",
+ "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Os informes de depuración conteñen datos de utilización do aplicativo como o seu nome de usuario, os IDs ou alcumes de salas e grupos que vostede visitou e os nomes de usuarios doutras usuarias. Non conteñen mensaxes.",
+ "Unhide Preview": "Desagochar a vista previa",
"Unable to join network": "Non se puido conectar a rede",
"You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Pode que os configurase nun cliente diferente de Riot. Non pode establecelos desde Riot pero aínda así aplicaranse",
"Sorry, your browser is not able to run Riot.": "Desculpe, o seu navegador non pode executar Riot.",
@@ -1123,40 +1123,40 @@
"Error encountered (%(errorDetail)s).": "Houbo un erro (%(errorDetail)s).",
"Login": "Conectar",
"Low Priority": "Baixa prioridade",
- "Unable to fetch notification target list": "Non se puido procesar a lista de obxetivo de notificacións",
+ "Unable to fetch notification target list": "Non se puido procesar a lista de obxectivo de notificacións",
"Set Password": "Establecer contrasinal",
- "Enable audible notifications in web client": "Habilitar notificacións audibles no cliente web",
+ "Enable audible notifications in web client": "Activar as notificacións audibles no cliente web",
"Off": "Off",
- "Riot does not know how to join a room on this network": "Riot non sabe cómo conectar con unha sala en esta rede",
+ "Riot does not know how to join a room on this network": "Riot non sabe como conectar cunha sala nesta rede",
"Mentions only": "Só mencións",
- "You can now return to your account after signing out, and sign in on other devices.": "Pode voltar a súa contra tras desconectarse, e conectarse en outros dispositivos.",
- "Enable email notifications": "Habilitar notificacións de correo",
+ "You can now return to your account after signing out, and sign in on other devices.": "Pode volver a súa contra tras desconectarse, e conectarse en outros dispositivos.",
+ "Enable email notifications": "Activar notificacións de correo",
"Event Type": "Tipo de evento",
"Download this file": "Descargue este ficheiro",
"Pin Message": "Fixar mensaxe",
"Failed to change settings": "Fallo ao cambiar os axustes",
"View Community": "Ver Comunidade",
- "%(count)s Members|one": "%(count)s Membro",
+ "%(count)s Members|one": "%(count)s participante",
"Event sent!": "Evento enviado!",
"View Source": "Ver fonte",
"Event Content": "Contido do evento",
"Thank you!": "Grazas!",
"Collapse panel": "Agochar panel",
- "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Co seu navegador actual a apareciencia e uso do aplicativo poderían estar totalmente falseadas, e algunhas características poderían non funcionar. Se quere pode continuar, pero debe ser consciente de que poden haber fallos!",
+ "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Co seu navegador actual a aparencia e uso do aplicativo poderían estar totalmente falseadas, e algunhas características poderían non funcionar. Se quere pode continuar, pero debe ser consciente de que poden haber fallos!",
"Checking for an update...": "Comprobando as actualizacións...",
"There are advanced notifications which are not shown here": "Existen notificacións avanzadas que non se mostran aquí",
- "Every page you use in the app": "Cada páxina que vostede utiliza no aplicativo",
- "e.g. ": "ex. ",
- "Your User Agent": "User Agent",
+ "Every page you use in the app": "Cada páxina que use na aplicación",
+ "e.g. ": "p.ex. ",
+ "Your User Agent": "Axente de usuario",
"Your device resolution": "Resolución do dispositivo",
- "Missing roomId.": "Falta o id da sala.",
+ "Missing roomId.": "Falta o ID da sala.",
"Always show encryption icons": "Mostra sempre iconas de cifrado",
- "At this time it is not possible to reply with a file so this will be sent without being a reply.": "En este intre non é posible respostar con un ficheiro así que este será enviado sin ser considerado resposta.",
- "Unable to reply": "Non puido respostar",
- "At this time it is not possible to reply with an emote.": "En este intre non é posible respostar con un emote.",
- "Popout widget": "Widget emerxente",
+ "At this time it is not possible to reply with a file so this will be sent without being a reply.": "Neste intre non é posible responder con un ficheiro así que este será enviado sen ser considerado resposta.",
+ "Unable to reply": "Non puido responder",
+ "At this time it is not possible to reply with an emote.": "Neste intre non é posible responder con un emote.",
+ "Popout widget": "trebello emerxente",
"Picture": "Imaxe",
- "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Non se cargou o evento ao que respostaba, ou non existe ou non ten permiso para velo.",
+ "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Non se cargou o evento ao que respondía, ou non existe ou non ten permiso para velo.",
"Riot bugs are tracked on GitHub: create a GitHub issue.": "Os fallos de Riot séguense en GitHub: crear un informe en GitHub.",
"Log out and remove encryption keys?": "Desconectar e eliminar as chaves de cifrado?",
"Send Logs": "Enviar informes",
@@ -1165,9 +1165,9 @@
"We encountered an error trying to restore your previous session.": "Atopamos un fallo intentando restablecer a súa sesión anterior.",
"Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Limpando o almacenamento do navegador podería resolver o problema, pero desconectarao e non poderá ler o historial cifrado da conversa.",
"Collapse Reply Thread": "Comprimir o fío de respostas",
- "e.g. %(exampleValue)s": "p.ex.%(exampleValue)s",
+ "e.g. %(exampleValue)s": "p.ex. %(exampleValue)s",
"Send analytics data": "Enviar datos de análises",
- "Enable widget screenshots on supported widgets": "Activar as capturas de widgets para aqueles que as permiten",
+ "Enable widget screenshots on supported widgets": "Activar as capturas de trebellos para aqueles que as permiten",
"Encrypting": "Cifrando",
"Encrypted, not sent": "Cifrado, sen enviar",
"Share Link to User": "Compartir a ligazón co usuario",
@@ -1177,11 +1177,29 @@
"Please help improve Riot.im by sending anonymous usage data . This will use a cookie (please see our Cookie Policy ).": "Mellore Riot.im enviando os datos anónimos de uso . Iso suporá o emprego dunha cookie (véxase a nosa Política de Cookies ).",
"Please help improve Riot.im by sending anonymous usage data . This will use a cookie.": "Mellore Riot.im enviando o uso de datos anónimo . Iso usará unha cookie.",
"Yes, I want to help!": "Si, quero axuda",
- "Warning: This widget might use cookies.": "Aviso: este widget podería usar algunha cookie.",
- "Reload widget": "Volver a cargar o widget",
+ "Warning: This widget might use cookies.": "Aviso: este trebello podería usar algunha cookie.",
+ "Reload widget": "Volver a cargar o trebello",
"Failed to indicate account erasure": "Non se deu indicado a eliminación de conta",
"This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Iso fará que a súa deixe de ter uso de xeito permanente. Non poderá acceder e ninguén vai a poder volver a rexistrar esa mesma ID de usuario. Suporá que saía de todas as salas de conversas nas que estaba e eliminará os detalles da súa conta do servidores de identificación.Isto non se poderá desfacer",
"Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Desactivando a súa conta non supón que por defecto esquezamos as súas mensaxes enviadas. Se quere que nos esquezamos das súas mensaxes, prema na caixa de embaixo.",
"To continue, please enter your password:": "Para continuar introduza o seu contrasinal:",
- "password": "contrasinal"
+ "password": "contrasinal",
+ "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "A visibilidade das mensaxes en Matrix é parecida ás dos correos electrónicos. Que esquezamos as súas mensaxes significa que as súas mensaxes non se van a compartir con ningún novo membro ou usuario que non estea rexistrado. Mais aqueles usuarios que xa tiveron acceso a estas mensaxes si que seguirán tendo acceso as súas propias copias desas mensaxes.",
+ "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Esquezan todas as mensaxes que eu enviara no momento en que elimine a miña conta. (Aviso: iso suporá que os seguintes participantes só verán unha versión incompleta das conversas.)",
+ "Share Room": "Compartir sala",
+ "Link to most recent message": "Ligazón ás mensaxes máis recentes",
+ "Share User": "Compartir usuario",
+ "Share Community": "Compartir comunidade",
+ "Share Room Message": "Compartir unha mensaxe da sala",
+ "Link to selected message": "Ligazón á mensaxe escollida",
+ "COPY": "Copiar",
+ "Share Message": "Compartir mensaxe",
+ "Can't leave Server Notices room": "Non se pode saír da sala de información do servidor",
+ "This room is used for important messages from the Homeserver, so you cannot leave it.": "Esta sala emprégase para mensaxes importantes do servidor da sala, as que non pode saír dela.",
+ "Terms and Conditions": "Termos e condicións",
+ "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Para continuar usando o servidor %(homeserverDomain)s ten que revisar primeiro os seus termos e condicións e logo aceptalos.",
+ "Review terms and conditions": "Revise os termos e condicións",
+ "No Audio Outputs detected": "Non se detectou unha saída de audio",
+ "Audio Output": "Saída de audio",
+ "Try the app first": "Probe a aplicación primeiro"
}
From a8520335ef8d79b6e60c4f149765dcd70d5dd818 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Jun 2018 17:37:55 +0100
Subject: [PATCH 0290/1196] once command has a space, strict match instead of
fuzzy match
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/autocomplete/CommandProvider.js | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index b162f2f92a..38ad5efeb9 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -128,8 +128,26 @@ export default class CommandProvider extends AutocompleteProvider {
const {command, range} = this.getCurrentCommand(query, selection);
if (!command) return [];
- // if the query is just `/` (and the user hit TAB or waits), show them all COMMANDS otherwise FuzzyMatch them
- const matches = query === '/' ? COMMANDS : this.matcher.match(command[1]);
+ let matches;
+ if (command[0] !== command[1]) {
+ // The input looks like a command with arguments, perform exact match
+ const match = COMMANDS.find((o) => o.command === command[1]);
+ if (match) {
+ matches = [match];
+ }
+ }
+
+ // If we don't yet have matches
+ if (!matches) {
+ if (query === '/') {
+ // If they have just entered `/` show everything
+ matches = COMMANDS;
+ } else {
+ // otherwise fuzzy match against all of the fields
+ matches = this.matcher.match(command[1]);
+ }
+ }
+
return matches.map((result) => {
return {
// If the command is the same as the one they entered, we don't want to discard their arguments
From bea52eccf836ce8e31413e66dcb18bece316122f Mon Sep 17 00:00:00 2001
From: Luke Barnard
Date: Mon, 18 Jun 2018 17:40:48 +0100
Subject: [PATCH 0291/1196] Remove unused import, constant
---
src/components/views/rooms/MessageComposerInput.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 97e8780f0f..57d433e55c 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -45,8 +45,7 @@ import Markdown from '../../../Markdown';
import ComposerHistoryManager from '../../../ComposerHistoryManager';
import MessageComposerStore from '../../../stores/MessageComposerStore';
-import {MATRIXTO_URL_PATTERN, MATRIXTO_MD_LINK_PATTERN} from '../../../linkify-matrix';
-const REGEX_MATRIXTO = new RegExp(MATRIXTO_URL_PATTERN);
+import {MATRIXTO_MD_LINK_PATTERN} from '../../../linkify-matrix';
const REGEX_MATRIXTO_MARKDOWN_GLOBAL = new RegExp(MATRIXTO_MD_LINK_PATTERN, 'g');
import {asciiRegexp, shortnameToUnicode, emojioneList, asciiList, mapUnicodeToShort} from 'emojione';
From d6f0f775611209d5c06a6558e8e0f70a9c624424 Mon Sep 17 00:00:00 2001
From: Luke Barnard
Date: Mon, 18 Jun 2018 17:45:47 +0100
Subject: [PATCH 0292/1196] Fix MATRIXTO_URL_PATTERN RegExp groups
Fixes https://github.com/vector-im/riot-web/issues/6900
Fixes https://github.com/vector-im/riot-web/issues/6899
---
src/linkify-matrix.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js
index 328cb98888..d72319948a 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.js
@@ -169,7 +169,7 @@ matrixLinkify.VECTOR_URL_PATTERN = "^(?:https?:\/\/)?(?:"
+ "(?:www\\.)?(?:riot|vector)\\.im/(?:app|beta|staging|develop)/"
+ ")(#.*)";
-matrixLinkify.MATRIXTO_URL_PATTERN = "^(?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/([#@!+].*)";
+matrixLinkify.MATRIXTO_URL_PATTERN = "^(?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/(([#@!+]).*)";
matrixLinkify.MATRIXTO_MD_LINK_PATTERN =
'\\[([^\\]]*)\\]\\((?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/([#@!+][^\\)]*)\\)';
matrixLinkify.MATRIXTO_BASE_URL= baseUrl;
From 0383937e0dfb3185cfe5dd1e480a9b36ca48e937 Mon Sep 17 00:00:00 2001
From: Miguel Branco
Date: Mon, 18 Jun 2018 15:32:05 +0000
Subject: [PATCH 0293/1196] Translated using Weblate (Galician)
Currently translated at 100.0% (1203 of 1203 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
---
src/i18n/strings/gl.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 41f98676b6..572da43dcf 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -52,7 +52,7 @@
"%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s %(time)s",
"Who would you like to add to this community?": "A quen quere engadir a esta comunidade?",
"Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Aviso: calquera persoa que engada a unha comunidade estará publicamente visible para calquera que coñeza a ID da comunidade",
- "Invite new community members": "Convidará comunidade a novos participantes ",
+ "Invite new community members": "Convidará comunidade a novos participantes",
"Name or matrix ID": "Nome ou ID matrix",
"Invite to Community": "Convidar á comunidade",
"Which rooms would you like to add to this community?": "Que salas desexaría engadir a esta comunidade?",
From 015d4332351bc543e7f08676425968c48b96c26f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Jun 2018 18:14:48 +0100
Subject: [PATCH 0294/1196] fix a way to get stuck in set password/email flow
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/UserSettings.js | 1 -
.../views/dialogs/SetPasswordDialog.js | 7 ++-----
src/components/views/globals/PasswordNagBar.js | 16 ++--------------
src/components/views/settings/ChangePassword.js | 7 +++++--
4 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 2622d7bd89..6397e73434 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -429,7 +429,6 @@ module.exports = React.createClass({
"push notifications on other devices until you log back in to them",
) + ".",
});
- dis.dispatch({action: 'password_changed'});
},
_onAddEmailEditFinished: function(value, shouldSubmit) {
diff --git a/src/components/views/dialogs/SetPasswordDialog.js b/src/components/views/dialogs/SetPasswordDialog.js
index 31c4ad7a3f..42c35ad187 100644
--- a/src/components/views/dialogs/SetPasswordDialog.js
+++ b/src/components/views/dialogs/SetPasswordDialog.js
@@ -1,5 +1,6 @@
/*
Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -79,15 +80,11 @@ export default React.createClass({
Modal.createDialog(WarmFuzzy, {
didSetEmail: res.didSetEmail,
onFinished: () => {
- this._onContinueClicked();
+ this.props.onFinished();
},
});
},
- _onContinueClicked: function() {
- this.props.onFinished(true);
- },
-
_onPasswordChangeError: function(err) {
let errMsg = err.error || "";
if (err.httpStatus === 403) {
diff --git a/src/components/views/globals/PasswordNagBar.js b/src/components/views/globals/PasswordNagBar.js
index 93f4fe06e5..4233363b95 100644
--- a/src/components/views/globals/PasswordNagBar.js
+++ b/src/components/views/globals/PasswordNagBar.js
@@ -1,5 +1,6 @@
/*
Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -14,28 +15,15 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-'use strict';
-
import React from 'react';
import sdk from '../../../index';
import Modal from '../../../Modal';
-import dis from '../../../dispatcher';
import { _t } from '../../../languageHandler';
export default React.createClass({
onUpdateClicked: function() {
const SetPasswordDialog = sdk.getComponent('dialogs.SetPasswordDialog');
- Modal.createTrackedDialog('Set Password Dialog', 'Password Nag Bar', SetPasswordDialog, {
- onFinished: (passwordChanged) => {
- if (!passwordChanged) {
- return;
- }
- // Notify SessionStore that the user's password was changed
- dis.dispatch({
- action: 'password_changed',
- });
- },
- });
+ Modal.createTrackedDialog('Set Password Dialog', 'Password Nag Bar', SetPasswordDialog);
},
render: function() {
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index 9cac25e6cc..b2ffe531b5 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -1,5 +1,6 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -14,14 +15,13 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-'use strict';
-
const React = require('react');
import PropTypes from 'prop-types';
const MatrixClientPeg = require("../../../MatrixClientPeg");
const Modal = require("../../../Modal");
const sdk = require("../../../index");
+import dis from "../../../dispatcher";
import Promise from 'bluebird';
import AccessibleButton from '../elements/AccessibleButton';
import { _t } from '../../../languageHandler';
@@ -143,6 +143,9 @@ module.exports = React.createClass({
});
cli.setPassword(authDict, newPassword).then(() => {
+ // Notify SessionStore that the user's password was changed
+ dis.dispatch({action: 'password_changed'});
+
if (this.props.shouldAskForEmail) {
return this._optionallySetEmail().then((confirmed) => {
this.props.onFinished({
From 3449a60d3272a736b809d45f318ecb6d0f49cbdb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Jun 2018 18:17:10 +0100
Subject: [PATCH 0295/1196] fix onBlur breaking the SetEmail field (setting it
back empty :()
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/dialogs/SetEmailDialog.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/components/views/dialogs/SetEmailDialog.js b/src/components/views/dialogs/SetEmailDialog.js
index d80574804f..e643ddbc34 100644
--- a/src/components/views/dialogs/SetEmailDialog.js
+++ b/src/components/views/dialogs/SetEmailDialog.js
@@ -1,5 +1,6 @@
/*
Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -36,7 +37,7 @@ export default React.createClass({
getInitialState: function() {
return {
- emailAddress: null,
+ emailAddress: '',
emailBusy: false,
};
},
@@ -127,6 +128,7 @@ export default React.createClass({
const EditableText = sdk.getComponent('elements.EditableText');
const emailInput = this.state.emailBusy ?
Date: Mon, 18 Jun 2018 18:21:16 +0100
Subject: [PATCH 0296/1196] delint EditableText
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/elements/EditableText.js | 47 ++++++++++---------
1 file changed, 26 insertions(+), 21 deletions(-)
diff --git a/src/components/views/elements/EditableText.js b/src/components/views/elements/EditableText.js
index ce1817c272..1f49bcddae 100644
--- a/src/components/views/elements/EditableText.js
+++ b/src/components/views/elements/EditableText.js
@@ -1,5 +1,6 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -14,15 +15,9 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-'use strict';
-
-const React = require('react');
+import React from 'react';
import PropTypes from 'prop-types';
-const KEY_TAB = 9;
-const KEY_SHIFT = 16;
-const KEY_WINDOWS = 91;
-
module.exports = React.createClass({
displayName: 'EditableText',
@@ -66,9 +61,7 @@ module.exports = React.createClass({
},
componentWillReceiveProps: function(nextProps) {
- if (nextProps.initialValue !== this.props.initialValue ||
- nextProps.initialValue !== this.value
- ) {
+ if (nextProps.initialValue !== this.props.initialValue || nextProps.initialValue !== this.value) {
this.value = nextProps.initialValue;
if (this.refs.editable_div) {
this.showPlaceholder(!this.value);
@@ -139,7 +132,7 @@ module.exports = React.createClass({
this.showPlaceholder(false);
}
- if (ev.key == "Enter") {
+ if (ev.key === "Enter") {
ev.stopPropagation();
ev.preventDefault();
}
@@ -156,9 +149,9 @@ module.exports = React.createClass({
this.value = ev.target.textContent;
}
- if (ev.key == "Enter") {
+ if (ev.key === "Enter") {
this.onFinish(ev);
- } else if (ev.key == "Escape") {
+ } else if (ev.key === "Escape") {
this.cancelEdit();
}
@@ -193,7 +186,7 @@ module.exports = React.createClass({
const submit = (ev.key === "Enter") || shouldSubmit;
this.setState({
phase: this.Phases.Display,
- }, function() {
+ }, () => {
if (this.value !== this.props.initialValue) {
self.onValueChanged(submit);
}
@@ -204,23 +197,35 @@ module.exports = React.createClass({
const sel = window.getSelection();
sel.removeAllRanges();
- if (this.props.blurToCancel) {this.cancelEdit();} else {this.onFinish(ev, this.props.blurToSubmit);}
+ if (this.props.blurToCancel) {
+ this.cancelEdit();
+ } else {
+ this.onFinish(ev, this.props.blurToSubmit);
+ }
this.showPlaceholder(!this.value);
},
render: function() {
- let editable_el;
+ const {className, editable, initialValue, label, labelClassName} = this.props;
+ let editableEl;
- if (!this.props.editable || (this.state.phase == this.Phases.Display && (this.props.label || this.props.labelClassName) && !this.value)) {
+ if (!editable || (this.state.phase === this.Phases.Display && (label || labelClassName) && !this.value)) {
// show the label
- editable_el = ", function(roomId, args) {
- const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
- // TODO Don't explain this away, actually show a search UI here.
- Modal.createTrackedDialog('Slash Commands', '/ddg is not a command', ErrorDialog, {
- title: _t('/ddg is not a command'),
- description: _t('To use it, just wait for autocomplete results to load and tab through them.'),
- });
- return success();
+export const CommandMap = {
+ ddg: new Command({
+ name: 'ddg',
+ args: '',
+ description: _td('Searches DuckDuckGo for results'),
+ runFn: function(roomId, args) {
+ const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
+ // TODO Don't explain this away, actually show a search UI here.
+ Modal.createTrackedDialog('Slash Commands', '/ddg is not a command', ErrorDialog, {
+ title: _t('/ddg is not a command'),
+ description: _t('To use it, just wait for autocomplete results to load and tab through them.'),
+ });
+ return success();
+ },
}),
- // Change your nickname
- nick: new Command("nick", "", function(roomId, args) {
- if (args) {
- return success(
- MatrixClientPeg.get().setDisplayName(args),
- );
- }
- return reject(this.getUsage());
- }),
-
- // Changes the colorscheme of your current room
- tint: new Command("tint", " []", function(roomId, args) {
- if (args) {
- const matches = args.match(/^(#([0-9a-fA-F]{3}|[0-9a-fA-F]{6}))( +(#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})))?$/);
- if (matches) {
- Tinter.tint(matches[1], matches[4]);
- const colorScheme = {};
- colorScheme.primary_color = matches[1];
- if (matches[4]) {
- colorScheme.secondary_color = matches[4];
- } else {
- colorScheme.secondary_color = colorScheme.primary_color;
- }
- return success(
- SettingsStore.setValue("roomColor", roomId, SettingLevel.ROOM_ACCOUNT, colorScheme),
- );
+ nick: new Command({
+ name: 'nick',
+ args: '',
+ description: _td('Changes your display nickname'),
+ runFn: function(roomId, args) {
+ if (args) {
+ return success(MatrixClientPeg.get().setDisplayName(args));
}
- }
- return reject(this.getUsage());
+ return reject(this.getUsage());
+ },
}),
- // Change the room topic
- topic: new Command("topic", "", function(roomId, args) {
- if (args) {
- return success(
- MatrixClientPeg.get().setRoomTopic(roomId, args),
- );
- }
- return reject(this.getUsage());
- }),
-
- // Invite a user
- invite: new Command("invite", "", function(roomId, args) {
- if (args) {
- const matches = args.match(/^(\S+)$/);
- if (matches) {
- return success(
- MatrixClientPeg.get().invite(roomId, matches[1]),
- );
- }
- }
- return reject(this.getUsage());
- }),
-
- // Join a room
- join: new Command("join", "#alias:domain", function(roomId, args) {
- if (args) {
- const matches = args.match(/^(\S+)$/);
- if (matches) {
- let roomAlias = matches[1];
- if (roomAlias[0] !== '#') {
- return reject(this.getUsage());
- }
- if (!roomAlias.match(/:/)) {
- roomAlias += ':' + MatrixClientPeg.get().getDomain();
- }
-
- dis.dispatch({
- action: 'view_room',
- room_alias: roomAlias,
- auto_join: true,
- });
-
- return success();
- }
- }
- return reject(this.getUsage());
- }),
-
- part: new Command("part", "[#alias:domain]", function(roomId, args) {
- let targetRoomId;
- if (args) {
- const matches = args.match(/^(\S+)$/);
- if (matches) {
- let roomAlias = matches[1];
- if (roomAlias[0] !== '#') {
- return reject(this.getUsage());
- }
- if (!roomAlias.match(/:/)) {
- roomAlias += ':' + MatrixClientPeg.get().getDomain();
- }
-
- // Try to find a room with this alias
- const rooms = MatrixClientPeg.get().getRooms();
- for (let i = 0; i < rooms.length; i++) {
- const aliasEvents = rooms[i].currentState.getStateEvents(
- "m.room.aliases",
- );
- for (let j = 0; j < aliasEvents.length; j++) {
- const aliases = aliasEvents[j].getContent().aliases || [];
- for (let k = 0; k < aliases.length; k++) {
- if (aliases[k] === roomAlias) {
- targetRoomId = rooms[i].roomId;
- break;
- }
- }
- if (targetRoomId) { break; }
+ tint: new Command({
+ name: 'tint',
+ args: ' []',
+ description: _td('Changes colour scheme of current room'),
+ runFn: function(roomId, args) {
+ if (args) {
+ const matches = args.match(/^(#([\da-fA-F]{3}|[\da-fA-F]{6}))( +(#([\da-fA-F]{3}|[\da-fA-F]{6})))?$/);
+ if (matches) {
+ Tinter.tint(matches[1], matches[4]);
+ const colorScheme = {};
+ colorScheme.primary_color = matches[1];
+ if (matches[4]) {
+ colorScheme.secondary_color = matches[4];
+ } else {
+ colorScheme.secondary_color = colorScheme.primary_color;
}
- if (targetRoomId) { break; }
- }
- if (!targetRoomId) {
- return reject(_t("Unrecognised room alias:") + ' ' + roomAlias);
+ return success(
+ SettingsStore.setValue('roomColor', roomId, SettingLevel.ROOM_ACCOUNT, colorScheme),
+ );
}
}
- }
- if (!targetRoomId) targetRoomId = roomId;
- return success(
- MatrixClientPeg.get().leave(targetRoomId).then(
- function() {
- dis.dispatch({action: 'view_next_room'});
- },
- ),
- );
+ return reject(this.getUsage());
+ },
}),
- // Kick a user from the room with an optional reason
- kick: new Command("kick", " []", function(roomId, args) {
- if (args) {
- const matches = args.match(/^(\S+?)( +(.*))?$/);
- if (matches) {
- return success(
- MatrixClientPeg.get().kick(roomId, matches[1], matches[3]),
- );
+ topic: new Command({
+ name: 'topic',
+ args: '',
+ description: _td('Sets the room topic'),
+ runFn: function(roomId, args) {
+ if (args) {
+ return success(MatrixClientPeg.get().setRoomTopic(roomId, args));
}
- }
- return reject(this.getUsage());
+ return reject(this.getUsage());
+ },
+ }),
+
+ invite: new Command({
+ name: 'invite',
+ args: '',
+ description: _td('Invites user with given id to current room'),
+ runFn: function(roomId, args) {
+ if (args) {
+ const matches = args.match(/^(\S+)$/);
+ if (matches) {
+ return success(MatrixClientPeg.get().invite(roomId, matches[1]));
+ }
+ }
+ return reject(this.getUsage());
+ },
+ }),
+
+ join: new Command({
+ name: 'join',
+ args: '',
+ description: _td('Joins room with given alias'),
+ runFn: function(roomId, args) {
+ if (args) {
+ const matches = args.match(/^(\S+)$/);
+ if (matches) {
+ let roomAlias = matches[1];
+ if (roomAlias[0] !== '#') return reject(this.getUsage());
+
+ if (!roomAlias.includes(':')) {
+ roomAlias += ':' + MatrixClientPeg.get().getDomain();
+ }
+
+ dis.dispatch({
+ action: 'view_room',
+ room_alias: roomAlias,
+ auto_join: true,
+ });
+
+ return success();
+ }
+ }
+ return reject(this.getUsage());
+ },
+ }),
+
+ part: new Command({
+ name: 'part',
+ args: '[]',
+ description: _td('Leave room'),
+ runFn: function(roomId, args) {
+ const cli = MatrixClientPeg.get();
+
+ let targetRoomId;
+ if (args) {
+ const matches = args.match(/^(\S+)$/);
+ if (matches) {
+ let roomAlias = matches[1];
+ if (roomAlias[0] !== '#') return reject(this.getUsage());
+
+ if (!roomAlias.includes(':')) {
+ roomAlias += ':' + cli.getDomain();
+ }
+
+ // Try to find a room with this alias
+ const rooms = cli.getRooms();
+ for (let i = 0; i < rooms.length; i++) {
+ const aliasEvents = rooms[i].currentState.getStateEvents('m.room.aliases');
+ for (let j = 0; j < aliasEvents.length; j++) {
+ const aliases = aliasEvents[j].getContent().aliases || [];
+ for (let k = 0; k < aliases.length; k++) {
+ if (aliases[k] === roomAlias) {
+ targetRoomId = rooms[i].roomId;
+ break;
+ }
+ }
+ if (targetRoomId) break;
+ }
+ if (targetRoomId) break;
+ }
+ if (!targetRoomId) return reject(_t('Unrecognised room alias:') + ' ' + roomAlias);
+ }
+ }
+
+ if (!targetRoomId) targetRoomId = roomId;
+ return success(
+ cli.leave(targetRoomId).then(function() {
+ dis.dispatch({action: 'view_next_room'});
+ }),
+ );
+ },
+ }),
+
+ kick: new Command({
+ name: 'kick',
+ args: ' [reason]',
+ description: _td('Kicks user with given id'),
+ runFn: function(roomId, args) {
+ if (args) {
+ const matches = args.match(/^(\S+?)( +(.*))?$/);
+ if (matches) {
+ return success(MatrixClientPeg.get().kick(roomId, matches[1], matches[3]));
+ }
+ }
+ return reject(this.getUsage());
+ },
}),
// Ban a user from the room with an optional reason
- ban: new Command("ban", " []", function(roomId, args) {
- if (args) {
- const matches = args.match(/^(\S+?)( +(.*))?$/);
- if (matches) {
- return success(
- MatrixClientPeg.get().ban(roomId, matches[1], matches[3]),
- );
+ ban: new Command({
+ name: 'ban',
+ args: ' [reason]',
+ description: _td('Bans user with given id'),
+ runFn: function(roomId, args) {
+ if (args) {
+ const matches = args.match(/^(\S+?)( +(.*))?$/);
+ if (matches) {
+ return success(MatrixClientPeg.get().ban(roomId, matches[1], matches[3]));
+ }
}
- }
- return reject(this.getUsage());
+ return reject(this.getUsage());
+ },
}),
- // Unban a user from the room
- unban: new Command("unban", "", function(roomId, args) {
- if (args) {
- const matches = args.match(/^(\S+)$/);
- if (matches) {
- // Reset the user membership to "leave" to unban him
- return success(
- MatrixClientPeg.get().unban(roomId, matches[1]),
- );
+ // Unban a user from ythe room
+ unban: new Command({
+ name: 'unban',
+ args: '',
+ description: _td('Unbans user with given id'),
+ runFn: function(roomId, args) {
+ if (args) {
+ const matches = args.match(/^(\S+)$/);
+ if (matches) {
+ // Reset the user membership to "leave" to unban him
+ return success(MatrixClientPeg.get().unban(roomId, matches[1]));
+ }
}
- }
- return reject(this.getUsage());
+ return reject(this.getUsage());
+ },
}),
- ignore: new Command("ignore", "", function(roomId, args) {
- if (args) {
- const matches = args.match(/^(\S+)$/);
- if (matches) {
- const userId = matches[1];
- const ignoredUsers = MatrixClientPeg.get().getIgnoredUsers();
- ignoredUsers.push(userId); // de-duped internally in the js-sdk
- return success(
- MatrixClientPeg.get().setIgnoredUsers(ignoredUsers).then(() => {
- const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
- Modal.createTrackedDialog('Slash Commands', 'User ignored', QuestionDialog, {
- title: _t("Ignored user"),
- description: (
- ',
+ description: _td('Ignores a user, hiding their messages from you'),
+ runFn: function(roomId, args) {
+ if (args) {
+ const cli = MatrixClientPeg.get();
+
+ const matches = args.match(/^(\S+)$/);
+ if (matches) {
+ const userId = matches[1];
+ const ignoredUsers = cli.getIgnoredUsers();
+ ignoredUsers.push(userId); // de-duped internally in the js-sdk
+ return success(
+ cli.setIgnoredUsers(ignoredUsers).then(() => {
+ const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
+ Modal.createTrackedDialog('Slash Commands', 'User ignored', QuestionDialog, {
+ title: _t('Ignored user'),
+ description: ", function(roomId, args) {
- if (args) {
- const matches = args.match(/^(\S+)$/);
- if (matches) {
- const userId = matches[1];
- const ignoredUsers = MatrixClientPeg.get().getIgnoredUsers();
- const index = ignoredUsers.indexOf(userId);
- if (index !== -1) ignoredUsers.splice(index, 1);
- return success(
- MatrixClientPeg.get().setIgnoredUsers(ignoredUsers).then(() => {
- const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
- Modal.createTrackedDialog('Slash Commands', 'User unignored', QuestionDialog, {
- title: _t("Unignored user"),
- description: (
- ',
+ description: _td('Stops ignoring a user, showing their messages going forward'),
+ runFn: function(roomId, args) {
+ if (args) {
+ const cli = MatrixClientPeg.get();
+
+ const matches = args.match(/^(\S+)$/);
+ if (matches) {
+ const userId = matches[1];
+ const ignoredUsers = cli.getIgnoredUsers();
+ const index = ignoredUsers.indexOf(userId);
+ if (index !== -1) ignoredUsers.splice(index, 1);
+ return success(
+ cli.setIgnoredUsers(ignoredUsers).then(() => {
+ const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
+ Modal.createTrackedDialog('Slash Commands', 'User unignored', QuestionDialog, {
+ title: _t('Unignored user'),
+ description: []", function(roomId, args) {
- if (args) {
- const matches = args.match(/^(\S+?)( +(-?\d+))?$/);
- let powerLevel = 50; // default power level for op
- if (matches) {
- const userId = matches[1];
- if (matches.length === 4 && undefined !== matches[3]) {
- powerLevel = parseInt(matches[3]);
- }
- if (!isNaN(powerLevel)) {
- const room = MatrixClientPeg.get().getRoom(roomId);
- if (!room) {
- return reject("Bad room ID: " + roomId);
+ op: new Command({
+ name: 'op',
+ args: ' []',
+ description: _td('Define the power level of a user'),
+ runFn: function(roomId, args) {
+ if (args) {
+ const matches = args.match(/^(\S+?)( +(-?\d+))?$/);
+ let powerLevel = 50; // default power level for op
+ if (matches) {
+ const userId = matches[1];
+ if (matches.length === 4 && undefined !== matches[3]) {
+ powerLevel = parseInt(matches[3]);
+ }
+ if (!isNaN(powerLevel)) {
+ const cli = MatrixClientPeg.get();
+ const room = cli.getRoom(roomId);
+ if (!room) return reject('Bad room ID: ' + roomId);
+
+ const powerLevelEvent = room.currentState.getStateEvents('m.room.power_levels', '');
+ return success(cli.setPowerLevel(roomId, userId, powerLevel, powerLevelEvent));
}
- const powerLevelEvent = room.currentState.getStateEvents(
- "m.room.power_levels", "",
- );
- return success(
- MatrixClientPeg.get().setPowerLevel(
- roomId, userId, powerLevel, powerLevelEvent,
- ),
- );
}
}
- }
- return reject(this.getUsage());
+ return reject(this.getUsage());
+ },
}),
// Reset the power level of a user
- deop: new Command("deop", "", function(roomId, args) {
- if (args) {
- const matches = args.match(/^(\S+)$/);
- if (matches) {
- const room = MatrixClientPeg.get().getRoom(roomId);
- if (!room) {
- return reject("Bad room ID: " + roomId);
- }
+ deop: new Command({
+ name: 'deop',
+ args: '',
+ description: _td('Deops user with given id'),
+ runFn: function(roomId, args) {
+ if (args) {
+ const matches = args.match(/^(\S+)$/);
+ if (matches) {
+ const cli = MatrixClientPeg.get();
+ const room = cli.getRoom(roomId);
+ if (!room) return reject('Bad room ID: ' + roomId);
- const powerLevelEvent = room.currentState.getStateEvents(
- "m.room.power_levels", "",
- );
- return success(
- MatrixClientPeg.get().setPowerLevel(
- roomId, args, undefined, powerLevelEvent,
- ),
- );
+ const powerLevelEvent = room.currentState.getStateEvents('m.room.power_levels', '');
+ return success(cli.setPowerLevel(roomId, args, undefined, powerLevelEvent));
+ }
}
- }
- return reject(this.getUsage());
+ return reject(this.getUsage());
+ },
}),
- // Open developer tools
- devtools: new Command("devtools", "", function(roomId) {
- const DevtoolsDialog = sdk.getComponent("dialogs.DevtoolsDialog");
- Modal.createDialog(DevtoolsDialog, { roomId });
- return success();
+ devtools: new Command({
+ name: 'devtools',
+ description: _td('Opens the Developer Tools dialog'),
+ runFn: function(roomId) {
+ const DevtoolsDialog = sdk.getComponent('dialogs.DevtoolsDialog');
+ Modal.createDialog(DevtoolsDialog, {roomId});
+ return success();
+ },
}),
// Verify a user, device, and pubkey tuple
- verify: new Command("verify", " ", function(roomId, args) {
- if (args) {
- const matches = args.match(/^(\S+) +(\S+) +(\S+)$/);
- if (matches) {
- const userId = matches[1];
- const deviceId = matches[2];
- const fingerprint = matches[3];
+ verify: new Command({
+ name: 'verify',
+ args: ' ',
+ description: _td('Verifies a user, device, and pubkey tuple'),
+ runFn: function(roomId, args) {
+ if (args) {
+ const matches = args.match(/^(\S+) +(\S+) +(\S+)$/);
+ if (matches) {
+ const cli = MatrixClientPeg.get();
- return success(
- // Promise.resolve to handle transition from static result to promise; can be removed
- // in future
- Promise.resolve(MatrixClientPeg.get().getStoredDevice(userId, deviceId)).then((device) => {
- if (!device) {
- throw new Error(_t(`Unknown (user, device) pair:`) + ` (${userId}, ${deviceId})`);
- }
+ const userId = matches[1];
+ const deviceId = matches[2];
+ const fingerprint = matches[3];
- if (device.isVerified()) {
- if (device.getFingerprint() === fingerprint) {
- throw new Error(_t(`Device already verified!`));
- } else {
- throw new Error(_t(`WARNING: Device already verified, but keys do NOT MATCH!`));
+ return success(
+ // Promise.resolve to handle transition from static result to promise; can be removed
+ // in future
+ Promise.resolve(cli.getStoredDevice(userId, deviceId)).then((device) => {
+ if (!device) {
+ throw new Error(_t('Unknown (user, device) pair:') + ` (${userId}, ${deviceId})`);
}
- }
- if (device.getFingerprint() !== fingerprint) {
- const fprint = device.getFingerprint();
- throw new Error(
- _t('WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device' +
- ' %(deviceId)s is "%(fprint)s" which does not match the provided key' +
- ' "%(fingerprint)s". This could mean your communications are being intercepted!',
- {deviceId: deviceId, fprint: fprint, userId: userId, fingerprint: fingerprint}));
- }
+ if (device.isVerified()) {
+ if (device.getFingerprint() === fingerprint) {
+ throw new Error(_t('Device already verified!'));
+ } else {
+ throw new Error(_t('WARNING: Device already verified, but keys do NOT MATCH!'));
+ }
+ }
- return MatrixClientPeg.get().setDeviceVerified(userId, deviceId, true);
- }).then(() => {
- // Tell the user we verified everything
- const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
- Modal.createTrackedDialog('Slash Commands', 'Verified key', QuestionDialog, {
- title: _t("Verified key"),
- description: (
- ',
+ description: _td('Displays action'),
}),
};
/* eslint-enable babel/no-invalid-this */
@@ -421,50 +476,39 @@ const aliases = {
j: "join",
};
-module.exports = {
- /**
- * Process the given text for /commands and perform them.
- * @param {string} roomId The room in which the command was performed.
- * @param {string} input The raw text input by the user.
- * @return {Object|null} An object with the property 'error' if there was an error
- * processing the command, or 'promise' if a request was sent out.
- * Returns null if the input didn't match a command.
- */
- processInput: function(roomId, input) {
- // trim any trailing whitespace, as it can confuse the parser for
- // IRC-style commands
- input = input.replace(/\s+$/, "");
- if (input[0] === "/" && input[1] !== "/") {
- const bits = input.match(/^(\S+?)( +((.|\n)*))?$/);
- let cmd;
- let args;
- if (bits) {
- cmd = bits[1].substring(1).toLowerCase();
- args = bits[3];
- } else {
- cmd = input;
- }
- if (cmd === "me") return null;
- if (aliases[cmd]) {
- cmd = aliases[cmd];
- }
- if (commands[cmd]) {
- return commands[cmd].run(roomId, args);
- } else {
- return reject(_t("Unrecognised command:") + ' ' + input);
- }
- }
- return null; // not a command
- },
+/**
+ * Process the given text for /commands and perform them.
+ * @param {string} roomId The room in which the command was performed.
+ * @param {string} input The raw text input by the user.
+ * @return {Object|null} An object with the property 'error' if there was an error
+ * processing the command, or 'promise' if a request was sent out.
+ * Returns null if the input didn't match a command.
+ */
+export function processCommandInput(roomId, input) {
+ // trim any trailing whitespace, as it can confuse the parser for
+ // IRC-style commands
+ input = input.replace(/\s+$/, '');
+ if (input[0] !== '/' || input[1] === '/') return null; // not a command
- getCommandList: function() {
- // Return all the commands plus /me and /markdown which aren't handled like normal commands
- const cmds = Object.keys(commands).sort().map(function(cmdKey) {
- return commands[cmdKey];
- });
- cmds.push(new Command("me", "", function() {}));
- cmds.push(new Command("markdown", "", function() {}));
+ const bits = input.match(/^(\S+?)( +((.|\n)*))?$/);
+ let cmd;
+ let args;
+ if (bits) {
+ cmd = bits[1].substring(1).toLowerCase();
+ args = bits[3];
+ } else {
+ cmd = input;
+ }
- return cmds;
- },
-};
+ if (aliases[cmd]) {
+ cmd = aliases[cmd];
+ }
+ if (CommandMap[cmd]) {
+ // if it has no runFn then its an ignored/nop command (autocomplete only) e.g `/me`
+ if (!CommandMap[cmd].runFn) return null;
+
+ return CommandMap[cmd].run(roomId, args);
+ } else {
+ return reject(_t('Unrecognised command:') + ' ' + input);
+ }
+}
diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index b162f2f92a..01a40be40c 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -18,101 +18,14 @@ limitations under the License.
*/
import React from 'react';
-import { _t, _td } from '../languageHandler';
+import {_t} from '../languageHandler';
import AutocompleteProvider from './AutocompleteProvider';
import FuzzyMatcher from './FuzzyMatcher';
import {TextualCompletion} from './Components';
+import {CommandMap} from '../SlashCommands';
import type {SelectionRange} from "./Autocompleter";
-// TODO merge this with the factory mechanics of SlashCommands?
-// Warning: Since the description string will be translated in _t(result.description), all these strings below must be in i18n/strings/en_EN.json file
-const COMMANDS = [
- {
- command: '/me',
- args: '',
- description: _td('Displays action'),
- },
- {
- command: '/ban',
- args: '
{ badgeContent }
;
+ const badge = { badgeContent }
;
const EmojiText = sdk.getComponent('elements.EmojiText');
let label;
From f88a2fd8fcffbe6bf2d8fdf954591c97113dd4b4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Jun 2018 12:16:33 +0100
Subject: [PATCH 0284/1196] make GroupInviteTile context menu appear where you
right clicked instead
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
.../views/groups/GroupInviteTile.js | 69 +++++++++++--------
1 file changed, 40 insertions(+), 29 deletions(-)
diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index fff9aafac1..25dba130f9 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -1,5 +1,6 @@
/*
Copyright 2017, 2018 New Vector Ltd
+Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,8 +21,9 @@ import { MatrixClient } from 'matrix-js-sdk';
import sdk from '../../../index';
import dis from '../../../dispatcher';
import AccessibleButton from '../elements/AccessibleButton';
-import * as ContextualMenu from "../../structures/ContextualMenu";
import classNames from 'classnames';
+import MatrixClientPeg from "../../../MatrixClientPeg";
+import {createMenu} from "../../structures/ContextualMenu";
export default React.createClass({
displayName: 'GroupInviteTile',
@@ -66,34 +68,11 @@ export default React.createClass({
});
},
- onContextMenu: function(e) {
- this.onBadgeClicked(e);
- e.preventDefault();
- },
+ _showContextMenu: function(x, y, chevronOffset) {
+ const GroupInviteTileContextMenu = sdk.getComponent('context_menus.GroupInviteTileContextMenu');
- onBadgeClicked: function(e) {
- // Prevent the RoomTile onClick event firing as well
- e.stopPropagation();
-
- // Only allow none guests to access the context menu
- if (this.context.matrixClient.isGuest()) return;
-
- // If the badge is clicked, then no longer show tooltip
- if (this.props.collapsed) {
- this.setState({ hover: false });
- }
-
- const RoomTileContextMenu = sdk.getComponent('context_menus.GroupInviteTileContextMenu');
- const elementRect = this.refs.badge.getBoundingClientRect();
-
- // The window X and Y offsets are to adjust position when zoomed in to page
- const x = elementRect.right + window.pageXOffset + 3;
- const chevronOffset = 12;
- let y = (elementRect.top + (elementRect.height / 2) + window.pageYOffset);
- y = y - (chevronOffset + 8); // where 8 is half the height of the chevron
-
- ContextualMenu.createMenu(RoomTileContextMenu, {
- chevronOffset: chevronOffset,
+ createMenu(GroupInviteTileContextMenu, {
+ chevronOffset,
left: x,
top: y,
group: this.props.group,
@@ -104,6 +83,38 @@ export default React.createClass({
this.setState({ menuDisplayed: true });
},
+ onContextMenu: function(e) {
+ // Prevent the RoomTile onClick event firing as well
+ e.preventDefault();
+ // Only allow non-guests to access the context menu
+ if (MatrixClientPeg.get().isGuest()) return;
+
+ const chevronOffset = 12;
+ this._showContextMenu(e.clientX, e.clientY - (chevronOffset + 8), chevronOffset);
+ },
+
+ onBadgeClicked: function(e) {
+ // Prevent the RoomTile onClick event firing as well
+ e.stopPropagation();
+ // Only allow non-guests to access the context menu
+ if (MatrixClientPeg.get().isGuest()) return;
+
+ // If the badge is clicked, then no longer show tooltip
+ if (this.props.collapsed) {
+ this.setState({ hover: false });
+ }
+
+ const elementRect = e.target.getBoundingClientRect();
+
+ // The window X and Y offsets are to adjust position when zoomed in to page
+ const x = elementRect.right + window.pageXOffset + 3;
+ const chevronOffset = 12;
+ let y = (elementRect.top + (elementRect.height / 2) + window.pageYOffset);
+ y = y - (chevronOffset + 8); // where 8 is half the height of the chevron
+
+ this._showContextMenu(x, y, chevronOffset);
+ },
+
render: function() {
const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
const EmojiText = sdk.getComponent('elements.EmojiText');
@@ -130,7 +141,7 @@ export default React.createClass({
});
const badgeContent = badgeEllipsis ? '\u00B7\u00B7\u00B7' : '!';
- const badge = { badgeContent }
;
+ const badge = { badgeContent }
;
let tooltip;
if (this.props.collapsed && this.state.hover) {
From 1ae51a83328362581d2df74b10469d7ebba60866 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Jun 2018 13:48:23 +0100
Subject: [PATCH 0285/1196] use changed argument in js-sdk
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/ContentMessages.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/ContentMessages.js b/src/ContentMessages.js
index 1d61b6de6a..fd21977108 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.js
@@ -243,7 +243,7 @@ function uploadFile(matrixClient, roomId, file, progressHandler) {
const blob = new Blob([encryptResult.data]);
return matrixClient.uploadContent(blob, {
progressHandler: progressHandler,
- omitFilename: true,
+ includeFilename: false,
}).then(function(url) {
// If the attachment is encrypted then bundle the URL along
// with the information needed to decrypt the attachment and
From 276c7a9c4d3ab43c2c443d6b7e5b2c3b46ad37d7 Mon Sep 17 00:00:00 2001
From: David Baker HTML for your community's page
\n\n Use the long description to introduce new members to the community, or distribute\n some important links\n
\n\n You can even use 'img' tags\n
\n": "HTML para a páxina da súa comunidade
\n\n Utilice a descrición longa para presentar novos membros a comunidade, ou publicar algunha ligazón importante\n \n
\n\n Tamén pode utilizar etiquetas 'img'\n
\n", "Add rooms to the community summary": "Engadir salas ao resumo da comunidade", - "Which rooms would you like to add to this summary?": "Qué salas desexa engadir a este resumo?", + "Which rooms would you like to add to this summary?": "Que salas desexa engadir a este resumo?", "Add to summary": "Engadir ao resumo", "Failed to add the following rooms to the summary of %(groupId)s:": "Algo fallou ao engadir estas salas ao resumo de %(groupId)s:", "Add a Room": "Engadir unha sala", "Failed to remove the room from the summary of %(groupId)s": "Algo fallou ao quitar a sala do resumo de %(groupId)s", "The room '%(roomName)s' could not be removed from the summary.": "A sala '%(roomName)s' non se puido eliminar do resumo.", - "Add users to the community summary": "Engadir usuarias ao resumo da comunidade", - "Who would you like to add to this summary?": "A quén desexa engadir a este resumo?", - "Failed to add the following users to the summary of %(groupId)s:": "Algo fallou ao engadir as seguintes usuarias ao resumo de %(groupId)s:", + "Add users to the community summary": "Engadir usuarios ao resumo da comunidade", + "Who would you like to add to this summary?": "A quen desexa engadir a este resumo?", + "Failed to add the following users to the summary of %(groupId)s:": "Algo fallou ao engadir aos seguintes usuarios ao resumo de %(groupId)s:", "Add a User": "Engadir unha usuaria", "Failed to remove a user from the summary of %(groupId)s": "Algo fallou ao eliminar a usuaria do resumo de %(groupId)s", "The user '%(displayName)s' could not be removed from the summary.": "A usuaria '%(displayName)s' non se puido eliminar do resumo.", @@ -726,14 +726,14 @@ "Leave %(groupName)s?": "Deixar %(groupName)s?", "Leave": "Saír", "Community Settings": "Axustes da comunidade", - "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Estas salas son mostradas aos membros da comunidade na páxina da comunidade. Os membros da comunidade poden unirse as salas pulsando en elas.", + "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Estas salas móstranselle aos membros da comunidade na páxina da comunidade.Os participantes da comunidade poden unirse ás salas premendo nelas.", "Add rooms to this community": "Engadir salas a esta comunidade", "Featured Rooms:": "Salas destacadas:", - "Featured Users:": "Usuarias destacadas:", + "Featured Users:": "Usuarios destacados:", "%(inviter)s has invited you to join this community": "%(inviter)s convidouna a unirse a esta comunidade", "You are an administrator of this community": "Vostede administra esta comunidade", - "You are a member of this community": "Vostede é membro de esta comunidade", - "Your community hasn't got a Long Description, a HTML page to show to community members.Click here to open settings and give it one!": "A súa comunidade non ten unha Descrición Longa, unha páxina HTML para mostrar aos membros.
Pulse aquí para abrir os axustes e publicar unha!", + "You are a member of this community": "É membro desta comunidade", + "Your community hasn't got a Long Description, a HTML page to show to community members.
Click here to open settings and give it one!": "A súa comunidade non ten unha descrición longa, ou unha páxina HTML que lle mostrar aos seus participantes.
Pulse aquí para abrir os axustes e publicar unha!", "Long Description (HTML)": "Descrición longa (HTML)", "Description": "Descrición", "Community %(groupId)s not found": "Non se atopou a comunidade %(groupId)s", @@ -749,13 +749,13 @@ "Old cryptography data detected": "Detectouse o uso de criptografía sobre datos antigos", "Logout": "Desconectar", "Your Communities": "As súas Comunidades", - "Error whilst fetching joined communities": "Fallo mentras se obtiñas as comunidades unidas", + "Error whilst fetching joined communities": "Fallo mentres se obtiñas as comunidades unidas", "Create a new community": "Crear unha nova comunidade", - "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crear unha comunidade para agrupar usuarias e salas! Poña unha páxina de inicio personalizada para destacar o seu lugar no universo Matrix.", + "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crear unha comunidade para agrupar usuaria/os e salas! Poña unha páxina de inicio personalizada para destacar o seu lugar no universo Matrix.", "Join an existing community": "Unirse a unha comunidade existente", "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "Para unirse a unha comunidade existente deberá coñecer o identificador de esa comunidade; terá un aspecto como +exemplo:matrix.org.", "You have no visible notifications": "Non ten notificacións visibles", - "Scroll to bottom of page": "Desplácese ate o final da páxina", + "Scroll to bottom of page": "Desprácese ate o final da páxina", "Message not sent due to unknown devices being present": "Non se enviou a mensaxe porque hai dispositivos non coñecidos", "
{ this.props.label || this.props.initialValue }
;
+ editableEl =
+ { label || initialValue }
+
;
} else {
// show the content editable div, but manually manage its contents as react and contentEditable don't play nice together
- editable_el = ;
+ editableEl = ;
}
- return editable_el;
+ return editableEl;
},
});
From 5bf3e5b00a5ce2c0bec94c4d0b396aa6463464ba Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Jun 2018 19:31:40 +0100
Subject: [PATCH 0297/1196] consolidate the two locations commands are defined,
as it was a MESS
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/SlashCommands.js | 768 +++++++++---------
src/autocomplete/CommandProvider.js | 98 +--
.../views/rooms/MessageComposerInput.js | 4 +-
3 files changed, 413 insertions(+), 457 deletions(-)
diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index d45e45e84c..3743fbb98c 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -14,28 +14,31 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import MatrixClientPeg from "./MatrixClientPeg";
-import dis from "./dispatcher";
-import Tinter from "./Tinter";
+
+import React from 'react';
+import MatrixClientPeg from './MatrixClientPeg';
+import dis from './dispatcher';
+import Tinter from './Tinter';
import sdk from './index';
-import { _t } from './languageHandler';
+import {_t, _td} from './languageHandler';
import Modal from './Modal';
-import SettingsStore, {SettingLevel} from "./settings/SettingsStore";
+import SettingsStore, {SettingLevel} from './settings/SettingsStore';
class Command {
- constructor(name, paramArgs, runFn) {
- this.name = name;
- this.paramArgs = paramArgs;
+ constructor({name, args='', description, runFn}) {
+ this.command = name;
+ this.args = args;
+ this.description = description;
this.runFn = runFn;
}
getCommand() {
- return "/" + this.name;
+ return "/" + this.command;
}
getCommandWithArgs() {
- return this.getCommand() + " " + this.paramArgs;
+ return this.getCommand() + " " + this.args;
}
run(roomId, args) {
@@ -47,16 +50,12 @@ class Command {
}
}
-function reject(msg) {
- return {
- error: msg,
- };
+function reject(error) {
+ return {error};
}
function success(promise) {
- return {
- promise: promise,
- };
+ return {promise};
}
/* Disable the "unexpected this" error for these commands - all of the run
@@ -65,352 +64,408 @@ function success(promise) {
/* eslint-disable babel/no-invalid-this */
-const commands = {
- ddg: new Command("ddg", "
-
- ),
- hasCancelButton: false,
- });
- }),
- );
+ ignore: new Command({
+ name: 'ignore',
+ args: '{ _t("You are now ignoring %(userId)s", {userId: userId}) }
-
+
,
+ hasCancelButton: false,
+ });
+ }),
+ );
+ }
}
- }
- return reject(this.getUsage());
+ return reject(this.getUsage());
+ },
}),
- unignore: new Command("unignore", "{ _t('You are now ignoring %(userId)s', {userId}) }
+
-
- ),
- hasCancelButton: false,
- });
- }),
- );
+ unignore: new Command({
+ name: 'unignore',
+ args: '{ _t("You are no longer ignoring %(userId)s", {userId: userId}) }
-
+
,
+ hasCancelButton: false,
+ });
+ }),
+ );
+ }
}
- }
- return reject(this.getUsage());
+ return reject(this.getUsage());
+ },
}),
// Define the power level of a user
- op: new Command("op", "{ _t('You are no longer ignoring %(userId)s', {userId}) }
+
-
- ),
- hasCancelButton: false,
- });
- }),
- );
+ if (device.getFingerprint() !== fingerprint) {
+ const fprint = device.getFingerprint();
+ throw new Error(
+ _t('WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device' +
+ ' %(deviceId)s is "%(fprint)s" which does not match the provided key ' +
+ '"%(fingerprint)s". This could mean your communications are being intercepted!',
+ {
+ fprint,
+ userId,
+ deviceId,
+ fingerprint,
+ }));
+ }
+
+ return cli.setDeviceVerified(userId, deviceId, true);
+ }).then(() => {
+ // Tell the user we verified everything
+ const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
+ Modal.createTrackedDialog('Slash Commands', 'Verified key', QuestionDialog, {
+ title: _t('Verified key'),
+ description: - { - _t("The signing key you provided matches the signing key you received " + - "from %(userId)s's device %(deviceId)s. Device marked as verified.", - {userId: userId, deviceId: deviceId}) - } -
-
+
,
+ hasCancelButton: false,
+ });
+ }),
+ );
+ }
}
- }
- return reject(this.getUsage());
+ return reject(this.getUsage());
+ },
+ }),
+
+ // Command definitions for autocompletion ONLY:
+
+ // /me is special because its not handled by SlashCommands.js and is instead done inside the Composer classes
+ me: new Command({
+ name: 'me',
+ args: '+ { + _t('The signing key you provided matches the signing key you received ' + + 'from %(userId)s\'s device %(deviceId)s. Device marked as verified.', + {userId, deviceId}) + } +
+