Commit Graph

10189 Commits (c8d233c0a6178020d6fc77c4dbcb9a6240b45eac)

Author SHA1 Message Date
Luke Barnard 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
David Baker 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
Michael Telatynski 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
Michael Telatynski 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
Luke Barnard 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
Michael Telatynski 3165a99f52
Merge pull request #1932 from matrix-org/t3chguy/audio_output
Select audio output for WebRTC
2018-06-14 11:11:53 +01:00
Michael Telatynski 2454540bc0
Merge branch 'develop' into t3chguy/audio_output 2018-06-14 11:03:59 +01:00
David Baker 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
David Baker 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
David Baker 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
David Baker 666d469222
Revert "Fix exception when opening dev tools" 2018-06-14 10:52:39 +01:00
David Baker 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
David Baker bb99950216
Merge pull request #1961 from matrix-org/dbkr/fix_devtools_exception
Fix exception when opening dev tools
2018-06-14 09:45:19 +01:00
Michael Telatynski a257dc27c5
move css rule to be more generic; remove overriden rule
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 19:08:24 +01:00
David Baker 038b43aabd
Merge pull request #1956 from matrix-org/t3chguy/show_redacted_sticker
show redacted stickers like other redacted messages
2018-06-13 17:28:22 +01:00
David Baker b81e12e4cc 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
2018-06-13 16:55:16 +01:00
Michael Telatynski 75abb415d4
improve tag panel accessibility and remove a no-op dispatch
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 16:17:26 +01:00
Michael Telatynski ac77b2d9ec
run gen-i18n and prune-i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 16:00:57 +01:00
Michael Telatynski 5cc2361737
change not_sent e2e lock to match colour of text
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 15:52:50 +01:00
Michael Telatynski d4b2f06a63
fix message appears unencrypted while in flight
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 13:51:04 +01:00
Luke Barnard bfb535d05c
Merge pull request #1951 from matrix-org/t3chguy/theme_memberinfo_close_btn
add mx_filterFlipColor to mx_MemberInfo_cancel img
2018-06-13 10:04:23 +01:00
Luke Barnard 5a275fcfef
Merge pull request #1953 from matrix-org/t3chguy/skip_set_displayname
don't set the displayname on registration as Synapse now does it
2018-06-13 10:03:35 +01:00
Luke Barnard 791784399a
Merge pull request #1955 from matrix-org/t3chguy/create_room_dialog_scaling
allow CreateRoom to scale properly horizontally
2018-06-13 09:45:29 +01:00
Michael Telatynski 20caea47f8
make more generic
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 09:32:21 +01:00
Michael Telatynski 846c14062a
show redacted stickers like other redacted messages
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 09:28:35 +01:00
Michael Telatynski 22bec0d67d
allow CreateRoom to scale properly horizontally
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 09:13:32 +01:00
Michael Telatynski 175f1aa15c
don't set the displayname on registration as Synapse now does it
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 16:43:54 +01:00
Luke Barnard b18a8c483e
Merge pull request #1952 from matrix-org/luke/context-menus-downwards-keep-vertically-on-screen
Keep context menus that extend downwards vertically on screen
2018-06-12 16:27:57 +01:00
Luke Barnard ffcba9498e 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.
2018-06-12 16:14:24 +01:00
Michael Telatynski ed779cabc4
add mx_filterFlipColor to mx_MemberInfo_cancel img
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 15:35:06 +01:00
David Baker e858cf3bcb Merge branch 'master' into develop 2018-06-12 14:26:29 +01:00
David Baker 13d52065f5 Merge branch 'release-v0.12.7' 2018-06-12 14:23:48 +01:00
David Baker ef1f580abb v0.12.7 2018-06-12 14:21:30 +01:00
David Baker 0ad738d510 Prepare changelog for v0.12.7 2018-06-12 14:21:30 +01:00
David Baker 334dccbdc7 Released js-sdk 2018-06-12 14:14:14 +01:00
Luke Barnard 2120858e5f
Merge branch 'develop' into luke/kill-mimage-fixupheight 2018-06-11 14:24:40 +01:00
David Baker 50e08c7560
Merge pull request #1947 from matrix-org/t3chguy/invite_checkIfAlone
re-run checkIfAlone if a member change occurred in the active room
2018-06-08 17:36:42 +01:00
David Baker 06321deea9
Merge pull request #1935 from turt2live/travis/persist-pinned-open
Persist pinned message open-ness between room switches
2018-06-08 16:48:40 +01:00
David Baker 8dce276e5b
Merge pull request #1933 from turt2live/travis/pin-cosmetics
Pinned message cosmetic improvements
2018-06-08 16:46:33 +01:00
David Baker 3983535536
Merge pull request #1916 from akihikodaki/sinon
Update sinon to 5.0.7
2018-06-08 16:41:11 +01:00
Michael Telatynski 0b9b03c9ee
re-run checkIfAlone if a member change occurred in the active room
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-07 22:01:27 +01:00
Travis Ralston 83f0459a7f
Merge branch 'develop' into travis/persist-pinned-open 2018-06-06 09:17:08 -06:00
David Baker 4834816a06 v0.12.7-rc.1 2018-06-06 16:06:45 +01:00
David Baker c8bf743506 Prepare changelog for v0.12.7-rc.1 2018-06-06 16:06:44 +01:00
David Baker 881e9a8070 js-sdk rc.1 2018-06-06 16:00:16 +01:00
David Baker 0d9ba17677
Merge pull request #1944 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2018-06-06 15:52:54 +01:00
Walter 03d67988e8 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/
2018-06-06 14:40:42 +00:00
Weblate 8b33c13517 Merge remote-tracking branch 'origin/develop' into develop 2018-06-06 09:08:58 +00:00
Michael Telatynski ffec32c7d9
Merge pull request #1943 from akihikodaki/react
Import react as React in src/components/views/elements/DNDTagTile.js
2018-06-06 10:08:52 +01:00
Akihiko Odaki bf0d03bce3 Import react as React in src/components/views/elements/DNDTagTile.js
Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
2018-06-06 17:59:50 +09:00