Michael Telatynski
4bea87f00d
Merge branches 'develop' and 't3chguy/render_html_entities_in_og-description' of github.com:matrix-org/matrix-react-sdk into t3chguy/render_html_entities_in_og-description
...
Conflicts:
package.json
2020-01-05 22:23:03 +00:00
Michael Telatynski
378a82e6fb
Use html-entities instead
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-05 22:22:09 +00:00
J. Ryan Stinnett
76f3a08909
Merge pull request #3800 from matrix-org/jryans/key-backup-dialogs-4s
...
Update key backup creation and recovery paths for SSSS
2020-01-03 16:32:02 +00:00
David Baker
2125bcf5a6
Comment remaining non-cross-signing-compliant components
...
Fixes https://github.com/vector-im/riot-web/issues/11748
2020-01-03 15:38:59 +00:00
J. Ryan Stinnett
b8683462e8
Update backup creation paths for SSSS
...
This updates the various backup creation entry points to ensure they support
creating with secret storage if the feature flag is enabled.
2020-01-03 15:34:05 +00:00
J. Ryan Stinnett
4211ec5063
Fix DOM structure in RoomRecoveryReminder
...
Buttons (which end up as <div>s) aren't allowed inside <p>s.
2020-01-03 13:51:45 +00:00
J. Ryan Stinnett
99559c5121
Update backup restore paths for SSSS
...
This updates all the various key backup entry points to ensure they use a flow
that supports backups stored under secret storage.
2020-01-03 13:33:36 +00:00
David Baker
89ac476281
Unused import
2020-01-02 16:59:46 +00:00
David Baker
39777620a3
order copyright lines by date
2020-01-02 16:58:00 +00:00
David Baker
ffba19bd61
Remove E2eIcon onClick
...
It displayed the Encrypted Event Info dialog, but this full of
super advanced debug information and base64 strings that no normal
users should ever have to see. It's still accessible via the comtext
menu (ie. the same place as 'View Source').
2020-01-02 16:52:25 +00:00
Michael Telatynski
4489b5a21a
Escape HTML in og:description and render any html &-encoded entities
2019-12-28 20:05:55 +00:00
Travis Ralston
98571d706f
Fix NPE when searching for rooms
...
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3751
2019-12-27 11:31:15 -07:00
Michael Telatynski
eac66f020f
Merge pull request #3783 from matrix-org/t3chguy/fuzzy_sort_memberlist
...
fuzzy-sort MemberList
2019-12-27 17:19:19 +00:00
Michael Telatynski
f9e386adaa
Improve SORT_REGEX
2019-12-27 17:04:14 +00:00
Michael Telatynski
2b39f3bdf1
Merge pull request #3784 from matrix-org/t3chguy/fix_stickerPickerChevronOffset
...
Fix sticker picker chevron offset calculation
2019-12-27 16:52:46 +00:00
Michael Telatynski
9bdadd2103
Merge pull request #3751 from matrix-org/t3chguy/react16_contexts_online_dot
...
Room Tile DMs online/active green dot
2019-12-27 16:50:21 +00:00
Michael Telatynski
ed24f19a3f
Fix stick picker chevron offset calculation
2019-12-26 20:12:50 +00:00
Michael Telatynski
ab12288979
Add more punctuation to regex
2019-12-26 19:29:25 +00:00
Michael Telatynski
e320f64ba1
fuzzy-sort MemberList
2019-12-26 19:27:04 +00:00
Michael Telatynski
e95b67e101
Only show it if exactly 2 members, until we get Canonical DMs
2019-12-26 18:15:08 +00:00
Michael Telatynski
22fe0add3c
Make UserOnlineDot more generic
2019-12-26 18:14:46 +00:00
Michael Telatynski
659644e612
Merge pull request #3773 from matrix-org/t3chguy/fix_incoming_call_dup
...
Fix duplicate Incoming Call prompt on Community Invite sublist
2019-12-23 18:10:51 +00:00
Michael Telatynski
e552195701
Fix duplicate Incoming Call prompt on Community Invite sublist
2019-12-23 17:57:53 +00:00
Michael Telatynski
1098fc939a
Merge pull request #3771 from matrix-org/t3chguy/ReactDOM.findDOMNode
...
stop using ReactDOM.findDOMNode in componentWillUnmount, use refs
2019-12-23 17:16:47 +00:00
Michael Telatynski
207045e979
fix ReadReceiptMarker ref
2019-12-23 12:54:31 +00:00
Michael Telatynski
17f5849985
stop using ReactDOM.findDOMNode in componentWillUnmount, use refs
2019-12-23 12:24:49 +00:00
Michael Telatynski
24a1017d6d
Fix typo in comment
2019-12-21 20:26:32 +00:00
Michael Telatynski
e936f7eb09
Fix room list filtering weird case sensitivity
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-12-21 11:13:37 +00:00
Michael Telatynski
24d0d0d596
Merge pull request #3743 from matrix-org/t3chguy/react16_contexts
...
Migrate away from React Legacy contexts API
2019-12-19 20:32:11 +00:00
Michael Telatynski
a410cc004f
Merge pull request #3745 from matrix-org/t3chguy/get_rid_of_emoji_stripped_data
...
Get rid of stripped-emoji.json in favour of an in-memory single source of truth
2019-12-19 19:25:50 +00:00
Michael Telatynski
e54429680b
tidy up
2019-12-19 15:28:11 +00:00
Michael Telatynski
26980e2ad5
apply unhomoglyph when filtering room list to fuzzify it
2019-12-19 15:26:04 +00:00
Michael Telatynski
db069b9602
delint
2019-12-19 14:33:46 +00:00
Michael Telatynski
6c1944359e
Add RoomTile online indicator to DMs
2019-12-19 14:29:46 +00:00
Michael Telatynski
d35b01b63a
Get rid of stripped-emoji.json in favour of an in-memory single truth source
2019-12-18 15:40:19 +00:00
Michael Telatynski
da4d72b3c4
delint
2019-12-17 17:34:03 +00:00
Michael Telatynski
937b32663c
Migrate away from Legacy React Contexts
2019-12-17 17:26:12 +00:00
Michael Telatynski
d28a892bb0
Stop using KeyboardEvent.keyCode as it is deprecated
2019-12-16 17:14:03 +00:00
David Baker
be914c7b0c
Merge pull request #3728 from matrix-org/jryans/verify-users
...
Verify users when cross-signing enabled
2019-12-16 10:12:46 +00:00
J. Ryan Stinnett
2df72bfde2
Update room / user decoration for cross-signing
2019-12-13 17:57:26 +00:00
Michael Telatynski
17a42cd287
Make LInkPreviewWidget close button Keyboard & SR Accessible
2019-12-13 14:02:50 +00:00
Travis Ralston
7230d51cca
Merge pull request #3703 from matrix-org/travis/right-panel-v2
...
Refactor RightPanel to match expected behaviour
2019-12-11 10:50:45 -07:00
Travis Ralston
633aa59e6c
Merge pull request #3716 from matrix-org/travis/mjolnir-render
...
Render policy room event updates in the timeline
2019-12-11 10:50:27 -07:00
Michael Telatynski
cb50f5ff5f
Merge pull request #3715 from matrix-org/t3chguy/fix_roomlist_context_menu_regression
...
Fix remaining context menu regressions
2019-12-11 09:36:45 +00:00
Michael Telatynski
c1b1f98201
Merge pull request #3712 from matrix-org/t3chguy/react16_refs
...
Migrate away from React Legacy string refs
2019-12-10 17:43:37 +00:00
Travis Ralston
b6d0308a54
Merge pull request #3706 from matrix-org/travis/dm-copy
...
Update copy for DM invites
2019-12-10 10:19:47 -07:00
Travis Ralston
f529a6c7a2
Render policy room event updates in the timeline
...
Fixes https://github.com/matrix-org/mjolnir/issues/15
This should be completely safe to deploy, even without a labs flag, because policy rooms (ban lists) are usually only joined by the people who know what they are. This also has no relation to the Mjolnir functionality currently in Riot, though it does make seeing your ban list a bit less awkward.
Ban list rules only show up in ban list rooms and rarely show up in public rooms, hence the somewhat vague messaging. It should be obvious that it's a ban list room due to the surrounding room decoration/purpose.
2019-12-09 20:36:00 -07:00
Michael Telatynski
5c92f8ab25
Fix RoomTile right click context menu
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-12-10 00:08:45 +00:00
Michael Telatynski
cd73162957
Merge branch 'develop' into t3chguy/react16_refs
2019-12-09 13:47:06 +00:00
Michael Telatynski
d22985f12e
Migrate string refs over to createRef
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-12-08 12:16:17 +00:00