PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
19825 commits 1 branch 0 tags 338 MiB
Commit graph

2801 commits

Author SHA1 Message Date
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
Michael Telatynski
4c55f3c5b5 Remove unused refs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-08 12:12:06 +00:00
Michael Telatynski
86e52d1ef3 Mark the This/All Rooms scope buttons as radios for a11y 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-07 12:45:28 +00:00
Travis Ralston
8d3418dfa9 Update copy for DM invites 
Fixes https://github.com/vector-im/riot-web/issues/10766
 2019-12-06 17:08:24 -07:00
Michael Telatynski
be6da03348
Merge pull request #3611 from matrix-org/t3chguy/context_menus 
ARIA compliant context menus
 2019-12-04 17:17:47 +00:00
Travis Ralston
b4e60af61f Appease the linter and de-dupe code 2019-12-03 23:15:49 -07:00
Travis Ralston
33044d713e Match e2e icons on events to expectations 
Fixes https://github.com/vector-im/riot-web/issues/11547

Steps taken:
* Convert `E2ePadlock` to a class-style component so the hover state can be tracked (tooltips).
* Convert the image mask to a background image to keep the `!` in the shield.
* Update copy.
 2019-12-03 22:41:22 -07:00
Michael Telatynski
757f811126 s/ContextualMenu/ContextMenu/ 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-02 23:21:59 +00:00
Michael Telatynski
e2733a27c4 add null-guard 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-02 10:06:58 +00:00
Michael Telatynski
811454462d fix Stickerpicker and MessageContextMenu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-28 20:38:58 +00:00
Michael Telatynski
6c5b777a77 Consolidate all except tooltips 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-28 18:16:59 +00:00
Michael Telatynski
6d69ec17d9 Merge branches 'develop' and 't3chguy/context_menus' of github.com:matrix-org/matrix-react-sdk into t3chguy/context_menus 
 Conflicts:
	src/components/views/context_menus/RoomTileContextMenu.js
 2019-11-28 16:25:59 +00:00
Travis Ralston
9f1df0ce8f
Merge pull request #3669 from matrix-org/travis/breadcrumb-upgrades 
Update breadcrumbs when we do eventually see upgraded rooms
 2019-11-26 10:33:07 -07:00
Matthew Hodgson
9f455fae4b
Merge branch 'develop' into matthew/fix_logging 2019-11-26 10:19:48 +00:00
Matthew Hodgson
9fd45d1f14 console.log doesn't take %s substitutions 2019-11-26 01:14:03 +00:00
Travis Ralston
9df227dbd0 Update breadcrumbs when we do eventually see upgraded rooms 
Fixes https://github.com/vector-im/riot-web/issues/11469
 2019-11-25 16:21:09 -07:00
Travis Ralston
6597e0bd42
Merge pull request #3646 from matrix-org/travis/integration-manager-opt 
Add an option to disable the use of integration managers for provisioning
 2019-11-21 08:10:56 -07:00
Michael Telatynski
d3f872bf7a Merge branches 'develop' and 't3chguy/remove_bluebird' of github.com:matrix-org/matrix-react-sdk into t3chguy/remove_bluebird 2019-11-21 11:15:32 +00:00
Travis Ralston
670c14b2e3 Circumvent the linter 2019-11-20 20:54:21 -07:00
Travis Ralston
a69d818a0d Our linter is seriously picky. 2019-11-20 20:49:41 -07:00
Travis Ralston
560c0afae3 Appease the linter 2019-11-20 20:45:16 -07:00
Travis Ralston
94fed922cf Intercept cases of disabled/no integration managers 
We already intercepted most of the cases where no integration manager was present, though there was a bug in many components where openAll() would be called regardless of an integration manager being available.

The integration manager being disabled by the user is handled in the IntegrationManager classes rather than on click because we have quite a few calls to these functions. The StickerPicker is an exception because it does slightly different behaviour.

This also removes the old "no integration manager configured" state from the IntegrationManager component as it is now replaced by a dialog.
 2019-11-20 20:40:39 -07:00
Travis Ralston
81c9bdd9f3 It's called an "Integration Manager" (singular) 
Fixes https://github.com/vector-im/riot-web/issues/11256

This was finally annoying me enough to fix it.
 2019-11-20 20:14:25 -07:00
Travis Ralston
8abc0953d5 Remove the import my IDE should have removed for me 2019-11-20 11:08:53 -07:00
Travis Ralston
93e4de9861 Fix positioning and sizing of e2e icon in the composer 
This also removes the special case class for the composer because the input is now aligned regardless of icon.
 2019-11-20 11:00:39 -07:00
Michael Telatynski
6121420113
Merge branch 'develop' into t3chguy/remove_bluebird 2019-11-20 15:21:23 +00:00
Travis Ralston
5b6ace2558 Appease the linter 2019-11-18 18:02:47 -07:00
Travis Ralston
b185eed462 Wire up the widget permission prompt to the cross-platform setting 
This doesn't have any backwards compatibility with anyone who has already clicked "Allow". We kinda want everyone to read the new prompt, so what better way to do it than effectively revoke all widget permissions?

Part of https://github.com/vector-im/riot-web/issues/11262
 2019-11-18 17:56:33 -07:00
Travis Ralston
f5ec9eb8f4 Ensure widgets always have a sender associated with them 
Fixes https://github.com/vector-im/riot-web/issues/11419
 2019-11-18 13:16:36 -07:00
Michael Telatynski
5c172a383d Merge branch 't3chguy/remove_bluebird_2' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/remove_bluebird 
 Conflicts:
	src/components/views/right_panel/UserInfo.js
 2019-11-18 10:36:43 +00:00
Michael Telatynski
d4d51dc61f Rip out the remainder of Bluebird 2019-11-18 10:03:05 +00:00
Travis Ralston
616a5ab55d Merge branch 'develop' into travis/deactivate-2 2019-11-15 10:24:20 -07:00
Bruno Windels
ca12e6c010 don't render unverified state on bubbles 
as they are only used for verification right now,
and verification events will be unverified by definition,
so no need to alarm users needlessly.

Also, this breaks the bubble layout on hover due to e2e icons
and verified left border style.
 2019-11-15 16:14:18 +01:00
Bruno Windels
f4988392f9 restyle e2e icons 2019-11-15 16:14:18 +01:00
Travis Ralston
b05dabe2b7 Add better error handling to Synapse user deactivation 
Also clearly flag it as a Synapse user deactivation in the analytics, so we don't get confused.

Fixes https://github.com/vector-im/riot-web/issues/10986
 2019-11-14 12:02:43 -07:00
Michael Telatynski
217dfc3eed Replace all trivial Promise.defer usages with regular Promises 
(cherry picked from commit 44401d73b4)
 2019-11-12 12:07:56 +00:00
Michael Telatynski
548e38cba9 Revert "Replace all trivial Promise.defer usages with regular Promises" 
This reverts commit 44401d73
 2019-11-12 11:56:53 +00:00
Michael Telatynski
168b1b68bb Revert "s/.done(/.then(/ since modern es6 track unhandled promise exceptions" 
This reverts commit 09a8fec2
 2019-11-12 11:56:21 +00:00
Michael Telatynski
09a8fec261 s/.done(/.then(/ since modern es6 track unhandled promise exceptions 2019-11-12 11:51:23 +00:00
Michael Telatynski
44401d73b4 Replace all trivial Promise.defer usages with regular Promises 2019-11-12 11:40:38 +00:00
Michael Telatynski
2eddb6ca01 DRY context menu placement algorithms 2019-11-12 11:24:14 +00:00
Michael Telatynski
1c4d89f2d7 Migrate all standard Context Menus over to new custom framework 2019-11-11 17:53:17 +00:00
Travis Ralston
5a5ebee918 Check for a message type before assuming it is a room message 
Redacted messages do not have message types, despite being room messages. 

Fixes https://github.com/vector-im/riot-web/issues/11352

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/3601

Click-to-ping being broken (as mentioned by https://github.com/vector-im/riot-web/issues/11353) is a side effect of the react stack falling over. Once one room crashes, click-to-ping is broken everywhere.
 2019-11-08 10:39:38 -07:00