ffd704838d
Merge remote-tracking branch 'origin/develop' into develop
2018-06-15 09:55:38 +00:00
349f95d5ab
Merge pull request #1957 from matrix-org/t3chguy/roomsublist_search_aliases
...
apply roomlist searchFilter to aliases if it begins with a `#`
2018-06-15 10:55:32 +01:00
4c67b5fe14
Merge remote-tracking branch 'origin/develop' into develop
2018-06-15 09:52:35 +00:00
6904c2bafe
Merge pull request #1948 from matrix-org/export_Group
...
Share Dialog
2018-06-15 10:52:27 +01:00
7de7275c6d
remove subheadings in ShareDialog
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 18:56:46 +01:00
8ac503c3ba
Merge remote-tracking branch 'origin/develop' into develop
2018-06-14 16:32:30 +00:00
e81edd958b
Merge pull request #1950 from matrix-org/t3chguy/group_invite_contextmenu
...
make RoomTooltip generic and add ContextMenu&Tooltip to GroupInviteTile
2018-06-14 17:32:24 +01:00
2a6f3ba555
Merge remote-tracking branch 'origin/develop' into develop
2018-06-14 16:31:29 +00:00
5077e9e89b
Merge pull request #1958 from matrix-org/dbkr/widget_waiting
...
Fix widgets re-appearing after being deleted
2018-06-14 17:31:23 +01:00
3b141d7a84
change variable names for clarity
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 16:48:00 +01:00
f033a71df1
Merge remote-tracking branch 'origin/develop' into develop
2018-06-14 15:10:42 +00:00
a3bc68c562
Merge pull request #1967 from matrix-org/luke/fix-crash-on-unspecified-thumbnail-info
...
Fix crash on unspecified thumbnail info, and handle gracefully
2018-06-14 16:10:35 +01:00
2eb23ed234
Add loadedImageDimensions to initial state
2018-06-14 15:53:49 +01:00
2d14d51ecb
Handle images without width/height info correctly
...
Prior to #1912 , height fix up of image events without an `info` in their
content would fail, setting `style.height = null + "px"`.
Now that all thumbnail sizing is done through one path, we can fix the
same problem for all cases (images, stickers, e2e/non-e2e) by handling
images without `info` correctly.
At the bare minimum, we use a null-guard that will make sure an image
without an `info` does not appear in the timeline (as a spinner or
otherwise until loaded). When loaded, we size it like any other image
by using the natural dimensions of the loaded image in place of `info`.
Note that we do not apply the same logic to images that *do* specify an
`info` with `w` and `h` keys. If the aspect ratio of the image does not
match that of the event, we use the one in `info` even when the image
has loaded.
2018-06-14 15:44:55 +01:00
c8d233c0a6
If unspecified, don't crash if missing thumbnail info
...
applies to stickers/images.
We might want to consider to do that is better than assuming a aspect
ratio of 600 x 800 (4:3).
2018-06-14 14:19:30 +01:00
1346f47a12
allow filtering Group Invite Tiles with the same search filter
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 14:18:39 +01:00
4e216714b5
remove commented code and move modal.close into a finally block
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 13:53:02 +01:00
3e6b3215cf
Update WidgetUtils.js
...
Fix fixed comment
2018-06-14 13:49:23 +01:00
33a3cfead6
controlled checkboxes use `checked` not `value`
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 13:47:33 +01:00
ef178b282c
use getters on MatrixEvent for roomId and eventId
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 13:44:05 +01:00
e870399084
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/
2018-06-14 12:42:02 +00:00
bef435e15a
allow ShareEvent to devolve into ShareRoom using checkbox + i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 13:41:12 +01:00
e1d3c2e4c7
run gen-i18n and prune-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 13:36:39 +01:00
7d7a6f3d9c
ShareDialog share Message, link to timestamp and permalink in ctx menu
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 13:35:35 +01:00
aa7d62b740
fix naming of methods and fields
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 13:20:16 +01:00
36574ca0fb
Fix doc
2018-06-14 13:03:42 +01:00
d5fdfdaf8a
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/
2018-06-14 11:25:33 +00:00
d2b267e32d
Merge remote-tracking branch 'origin/develop' into develop
2018-06-14 10:47:49 +00:00
63e9c0aa1e
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/
2018-06-14 10:47:49 +00:00
5523c1e50a
Merge pull request #1964 from matrix-org/t3chguy/tag_panel_a11y
...
fix styling of clearButton when its not there
2018-06-14 11:47:44 +01:00
68e2ee4e51
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/
2018-06-14 10:45:36 +00:00
3b501137a5
change cursor:pointer iff clicking TagPanel background does something
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 11:42:21 +01:00
c811c30c0d
fix styling of clearButton when its not there
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 11:36:04 +01:00
5c80c4fd2f
Merge remote-tracking branch 'origin/develop' into develop
2018-06-14 10:17:20 +00:00
7029e9ac74
Merge pull request #1912 from matrix-org/luke/kill-mimage-fixupheight
...
Implement slightly magical CSS soln. to thumbnail sizing
2018-06-14 11:17:15 +01:00
384c974589
tidy up if statements and fix up comments
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 11:16:57 +01:00
aed948ad51
Merge remote-tracking branch 'origin/develop' into develop
2018-06-14 10:11:58 +00:00
f6d75f8654
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/
2018-06-14 10:11:58 +00:00
3165a99f52
Merge pull request #1932 from matrix-org/t3chguy/audio_output
...
Select audio output for WebRTC
2018-06-14 11:11:53 +01:00
2454540bc0
Merge branch 'develop' into t3chguy/audio_output
2018-06-14 11:03:59 +01:00
ebee8a8b5d
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/
2018-06-14 09:58:30 +00:00
f8ca3674ac
Merge remote-tracking branch 'origin/develop' into develop
2018-06-14 09:58:05 +00:00
742a2d0111
Merge pull request #1962 from matrix-org/t3chguy/codeblock_notice
...
move css rule to be more generic; remove overriden rule
2018-06-14 10:57:58 +01:00
b9f69d6893
Merge remote-tracking branch 'origin/develop' into develop
2018-06-14 09:56:09 +00:00
84a9c6a824
Merge pull request #1960 from matrix-org/t3chguy/tag_panel_a11y
...
improve tag panel accessibility and remove a no-op dispatch
2018-06-14 10:56:03 +01:00
15e4255db6
Merge remote-tracking branch 'origin/develop' into develop
2018-06-14 09:52:58 +00:00
2e53baaaff
Merge pull request #1963 from matrix-org/revert-1961-dbkr/fix_devtools_exception
...
Revert "Fix exception when opening dev tools"
2018-06-14 10:52:53 +01:00
666d469222
Revert "Fix exception when opening dev tools"
2018-06-14 10:52:39 +01:00
2c0c97057f
Merge remote-tracking branch 'origin/develop' into develop
2018-06-14 09:49:20 +00:00
5804040a9b
Merge pull request #1959 from matrix-org/t3chguy/faded_encrypting_padlock
...
fix message appears unencrypted while encrypting and not_sent
2018-06-14 10:49:14 +01:00
Weblate