sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity
20,465 Commits 4 Branches 19 Tags
d02185e4af661542e39a568d43aa58f19670ec0c
Commit Graph
3642 Commits
Author SHA1 Message Date
Zoe d02185e4af whoops, the number of unverified users matters to the logic 2020-01-17 10:22:53 +00:00
Zoe 510b08c88b changed logic to reflect the task 2020-01-17 10:18:50 +00:00
Zoe 8efc45b31a no need to verify our own devices for every room 2020-01-17 10:04:34 +00:00
Zoe 82c5349c4e Updated to properly handle logic 2020-01-16 16:31:50 +00:00
Zoe 9ac3cb6fd0 Merge remote-tracking branch 'origin/develop' into zip/11225-shields-distinguish-encrypt-from-verify 2020-01-16 11:23:57 +00:00
Zoe ff05041a5a Update room shield icons to represent encrypted but unverified chats in less alarmed tones 2020-01-16 11:10:23 +00:00
Travis RalstonandGitHub 7bfb3686cd Merge pull request #3839 from matrix-org/travis/sourcemaps 
Fix sourcemaps by refactoring the build system
 2020-01-15 10:11:33 -07:00
David BakerandGitHub fa174512cc Merge pull request #3837 from matrix-org/dbkr/dont_error_on_unknown_devices 
Don't error on unverified/unknown devices.
 2020-01-14 17:12:14 +00:00
Travis Ralston 90c7535a69 Export VIEWS from MatrixChat for riot-web tests 2020-01-13 20:15:58 -07:00
David Baker 14501b748b lint again 2020-01-13 21:58:26 +00:00
David Baker 9a1be1a24d Don't try to set crypto options without crypto enabled 2020-01-13 21:54:14 +00:00
Travis Ralston bf6798e109 Appease the linter 2020-01-13 13:28:33 -07:00
Travis Ralston 5fd27a10bb Merge branch 'develop' into travis/sourcemaps 2020-01-13 11:19:41 -07:00
David Baker e47240d838 Lint Eastwood 2020-01-13 17:56:40 +00:00
David Baker 76fe87c941 Don't error on unverifie/unknownd devices. 
When cross-signing is enabled, we no longer want to fail and
prompt the user to ack every device in the room. All the info should
be conveyed in the shield colour (although isn't fully just yet).

Fixes https://github.com/vector-im/riot-web/issues/11750
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1150
 2020-01-13 17:41:58 +00:00
Michael TelatynskiandDavid Baker 66b55495bb Fix right panel buttons highlighting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-13 12:40:45 +00:00
Michael TelatynskiandJ. Ryan Stinnett 9c686bf501 Fix right panel buttons highlighting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-13 12:15:54 +00:00
David Baker 63942d5200 Fix listener leak on RoomView 
It looks like this was causing entire detached DOM trees to leak
in memory by react's internal fibers holding onto them from the
component.
 2020-01-10 11:12:52 +00:00
Travis Ralston 727ce892de Fix remaining RoomView conflict 
RoomContext was pulled out to its own file.
 2020-01-09 14:17:33 -07:00
Travis Ralston 3e5cc9550b Fix import merge conflicts, removing any that aren't needed anymore 
Many imports were removed as part of refactoring work, so here we are.
 2020-01-09 14:17:33 -07:00
Travis Ralston fde32f13a5 [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop 2020-01-09 14:15:09 -07:00
Michael Telatynski d31c863563 Remove all usages of slate in favour of CIDER 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 00:15:48 +00:00
Travis Ralston 9edc361afc Use new imports for js-sdk's ContentRepo 
Per https://github.com/matrix-org/matrix-js-sdk/pull/1134/commits/f4d1c5c006027962cd18dffb3f7c521d9e24e831
 2020-01-03 12:29:22 -07:00
Travis RalstonandGitHub c88efa5c2c Merge pull request #3778 from bit/master 
support channel names with slash in name/alias
 2020-01-02 09:19:02 -07:00
j 9eed423994 support channel names with slash in name/alias 
Signed-off-by: Jan Gerber <j@mailb.org>
 2019-12-29 12:10:31 +01:00
Michael Telatynski e9ebfa100f Do not show Top Unread Messages Bar and Jump to bottom button if searching 2019-12-26 20:32:25 +00:00
Travis Ralston 92ea1157be Reintroduce working resizer code for right panel 
Fixes https://github.com/vector-im/riot-web/issues/11674

This re-introduces and adapted version of what was there before, but fixed for the new collapsed logic: https://github.com/matrix-org/matrix-react-sdk/pull/3703/files#diff-633a0248e235d7446a8868a9145efce2L77-L93

We no longer have a collapsedRhs variable and only set the panel when it is opened, so we can accurately track expanded/collapsed state through presence of a panel.
 2019-12-23 19:26:59 -07:00
Michael TelatynskiandGitHub 6e9791c950 Merge pull request #3755 from matrix-org/t3chguy/tags_changes 
Apply new design to highlighted tags and add toggle mechanic
 2019-12-23 17:18:07 +00:00
Michael TelatynskiandGitHub 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 17f5849985 stop using ReactDOM.findDOMNode in componentWillUnmount, use refs 2019-12-23 12:24:49 +00:00
Michael Telatynski 661701f7ca Merge branches 'develop' and 't3chguy/tags_changes' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/tags_changes 
 Conflicts:
	src/components/views/elements/TagTile.js
 2019-12-23 11:00:42 +00:00
Travis Ralston 615648af13 Fix tabbed view export for component index 2019-12-22 21:23:14 -07:00
Travis Ralston 0d2cb6e731 Import haveTileForEvent() from the right place 2019-12-22 21:23:07 -07:00
Travis Ralston d002c2ccde Merge branch 'travis/babel7-wp-es6-export' into travis/sourcemaps-es6 2019-12-22 21:20:13 -07:00
Travis Ralston f1ac3d2f64 Convert imports to ES6 from CommonJS 
This is needed because `require()` means something different in webpack - it ends up importing the module as something we didn't expect (and is occasionally async)
 2019-12-22 21:16:06 -07:00
Travis Ralston 042bd35d79 Fix MatrixClientPeg imports 2019-12-22 21:15:54 -07:00
Travis Ralston d56f0f2a25 Convert many imports to handle ES6 exports 
Reliant upon https://github.com/matrix-org/matrix-react-sdk/pull/3761
 2019-12-22 21:04:42 -07:00
Travis Ralston 4aec432b30 Convert the more complicated CommonJS exports to ES6-style 2019-12-22 21:01:03 -07:00
Travis Ralston 344dac4fb9 Convert CommonJS exports to ES6-compatible exports 
We use `export default` begrudgingly here. Ideally we'd use just `export`, though this entire SDK expects things to be exported as a default. Instead of breaking everything, we'll sacrifice our export pattern for a smaller diff - a later commit can always do the default export -> regular export conversion.
 2019-12-22 21:01:02 -07:00
Michael Telatynski 3a36d61fab delint 2019-12-19 21:10:22 +00:00
Michael Telatynski d9ea9b4ad3 Iterate to match design on Zeplin 2019-12-19 20:53:34 +00:00
Michael TelatynskiandGitHub 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 b2249d0561 Initial rejig 2019-12-19 20:09:05 +00:00
David BakerandGitHub 290df9f50e Merge pull request #3753 from matrix-org/dbkr/combine_cross_sig_dm_verif_feature_flags 
Combine cross signing and verification over DM feature flags
 2019-12-19 17:27:41 +00:00
Michael TelatynskiandGitHub f3802bfd05 Merge pull request #3746 from matrix-org/t3chguy/emoji_picker 
Make EmojiPicker an unmanaged Context Menu as it is too complex to be managed
 2019-12-19 16:58:34 +00:00
David Baker 3d8422c88a Combine cross signing and verification over DM feature flags 
This means we can just make the new member info panel support
cross-signing exclusively rather than having to try & make it
temporarily support both
 2019-12-19 15:23:32 +00:00
Michael Telatynski 3678e64f5d Internationalise M_TOO_LARGE error from Synapse 2019-12-19 13:25:43 +00:00
Michael Telatynski a1df87a375 Make EmojiPicker an unmanaged Context Menu as it is too complex to be managed 2019-12-19 07:23:05 +00:00
Michael Telatynski 937b32663c Migrate away from Legacy React Contexts 2019-12-17 17:26:12 +00:00
Travis RalstonandGitHub 590ef79300 Merge pull request #3737 from matrix-org/travis/room-dir 
Fix room directory maintaining and error state
 2019-12-17 08:07:12 -07:00