mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-18 02:31:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
32745 commits 219 branches 562 tags 474 MiB
Commit graph

99 commits

Author SHA1 Message Date
Half-Shot
b2fc4a1c4d Style bridge settings tab according to design 
Signed-off-by: Half-Shot <will@half-shot.uk>
 2020-01-21 18:41:43 +00:00
Michael Telatynski
9877fd9e85
Fix Array.concat undefined 2020-01-17 10:04:38 +00:00
Travis Ralston
135c84251c Fix more imports post-merge 2020-01-09 14:19:19 -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
Will Hunt
7f0ed05ee1
Update BridgeSettingsTab.js 2020-01-05 23:32:49 +00:00
Will Hunt
2ccc8caa69
Fix indent 2020-01-05 15:50:06 +00:00
Half-Shot
50e19ba43d User may not be a bot, therefore do not imply it. 2020-01-03 14:04:59 +00:00
Half-Shot
668479d94a Tweak as per git review 2020-01-03 13:57:59 +00:00
Will Hunt
0a8cc416bf
Merge branch 'develop' into hs/bridge-info 2019-12-30 17:09:05 +01: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
Michael Telatynski
937b32663c Migrate away from Legacy React Contexts 2019-12-17 17:26:12 +00:00
Half-Shot
6225e402cc i18n'ed all over the plaace 2019-12-09 13:54:21 +00:00
Half-Shot
d9943754f7 Remove status as it's no longer part of the MSC 2019-12-09 13:28:16 +00:00
Will Hunt
ce21ce8bbe Lint 2019-12-09 13:22:45 +00:00
Half-Shot
9f2ccdf913 Add support for displaying avatars and links in bridge info 2019-12-09 13:22:45 +00:00
Half-Shot
0d537ecbb3 Add bridge info tab 2019-12-09 13:22:45 +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
Travis Ralston
61cc6c8293 Correctly update the banned users list when a user is unbanned 
Fixes https://github.com/vector-im/riot-web/issues/11123

Error wasn't actually the user being unbanned twice - it was a React error about "cannot call enqueueForceUpdate of undefined", which was a binding problem with onUnbanned. However, fixing that didn't do the intended thing - the user was still shown in the settings. We now just listen for membership and  fix it that way.
 2019-10-11 12:56:48 +01:00
Michael Telatynski
a0de7d5f14 Cull some easily fixable errors which make the console a mess 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-03 21:47:19 +01:00
Michael Telatynski
088f9e4cc5 Catch error from changing room power level requirements and show modal 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-09 12:50:05 +01:00
Travis Ralston
d6adf0fd6d Add responsible error handling because we're responsible people 2019-09-04 11:24:31 -06:00
Travis Ralston
2e3e2ec420 Fix member power levels in room settings 
Fixes https://github.com/vector-im/riot-web/issues/10736

We didn't have an onChange property on the PowerSelector component
 2019-09-03 08:36:24 -06:00
Michael Telatynski
00a06af419 Hide the E2EE PL selector if room is already encrypted 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-30 10:57:46 +01:00
Michael Telatynski
8967871b23 Merge branches 'develop' and 't3chguy/pl_control_e2e' of github.com:matrix-org/matrix-react-sdk into t3chguy/pl_control_e2e 
 Conflicts:
	src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
	src/i18n/strings/en_EN.json
 2019-08-30 10:56:47 +01:00
Michael Telatynski
f70f983c8c Expose upgrade room permissions in room settings and fix command 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-28 12:00:37 +01:00
Michael Telatynski
66714b29af expose power level toggle for enabling e2ee to room settings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-28 11:37:20 +01:00
Will Hunt
300095f50f Remove labs flag for custom notif sounds 2019-06-03 17:35:15 +01:00
Will Hunt
d752de0972 Improve UX 2019-05-15 15:52:42 +01:00
Will Hunt
626cb46915 Cleanup interface buttons 2019-05-14 21:05:22 +01:00
Will Hunt
64a384477e Resolve issues 2019-05-12 17:14:21 +01:00
Will Hunt
0f2cd6ea73 Stick behind a feature flag 2019-04-21 18:01:26 +01:00
Will Hunt
776210c135 Use settings store 2019-04-19 22:31:51 +01:00
Will Hunt
d33df45c5e Linting 2019-04-19 22:06:56 +01:00
Will Hunt
63ab7736ca Add a fancy room tab and uploader 2019-04-19 16:27:30 +01:00
Travis Ralston
ec01f6ffb1 Change wording for old room link 2019-04-11 10:40:25 -06:00
Travis Ralston
64423e1f7d let -> const 2019-04-10 15:34:06 -06:00
Travis Ralston
15e8ce7a7f Add a link in room settings to get at the tombstoned room if it exists 
Fixes https://github.com/vector-im/riot-web/issues/8542
 2019-04-10 15:00:02 -06:00
Travis Ralston
4beecb50c9 Fix room upgrade warnings popping up in upgraded rooms 
Rooms which are already upgraded shouldn't be asked to upgrade. Additionally, this fixes a bug where the room upgrade dialog would stay open even after upgrading the room.
 2019-04-08 15:39:36 -06:00
Travis Ralston
50614fa7fb Attach an onChange listener to the room's blacklist devices option 
Fixes https://github.com/vector-im/riot-web/issues/9235

The global option in user settings is unaffected by this bug. Users who have previously set the per-room flag without success can simply refresh the page and the change will be picked up. The bug here is that the current session would not update accordingly, however.

Introduced in https://github.com/matrix-org/matrix-react-sdk/pull/2523
 2019-03-22 14:22:20 -06:00
Travis Ralston
27c9b24cab Appease more of the linter 2019-03-15 16:44:27 -06:00
Travis Ralston
92b851b26c Update text for room version upgrades in settings 2019-03-15 15:49:18 -06:00
Travis Ralston
788041a774 Warn that members won't be invited to the new room in room settings 2019-03-14 17:33:34 -06:00
Travis Ralston
879fa22416 Merge branch 'develop' into travis/encryption-warning 2019-03-04 23:14:30 -07:00
Travis Ralston
7d207ca2c3 speeling 2019-02-28 20:45:31 -07:00
Travis Ralston
9402e81835 Get confirmation before enabling encryption 
Fixes https://github.com/vector-im/riot-web/issues/8843
 2019-02-28 20:39:07 -07:00
Travis Ralston
a41df7ab68 Convert PowerSelector to use mxField instead 2019-02-28 19:00:57 -07:00
Travis Ralston
bd54a401bc Sort settings tabs into a logical structure 
Fixes https://github.com/vector-im/riot-web/issues/8864
 2019-02-22 11:33:03 -07:00