Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-17 14:05:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,611 Commits 206 Branches 552 Tags 519 MiB
148f215d4e
Commit Graph

24611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Telatynski
148f215d4e clean up 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-25 19:02:44 +01:00
Michael Telatynski
73d966443c fix tests 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-24 14:25:31 +01:00
Michael Telatynski
cf7acded50 Simply BaseAvatar hooks 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-24 14:12:16 +01:00
Michael Telatynski
02ddda587b Fix useEventEmitter to support passing all callback arguments 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-24 14:11:25 +01:00
Michael Telatynski
37d04d6ceb
Merge pull request #4101 from matrix-org/t3chguy/leaks 
Transition BaseAvatar to hooks
 2020-05-23 11:19:58 +01:00
Michael Telatynski
880e16aaa2 Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks 
 Conflicts:
	src/components/views/avatars/BaseAvatar.js
	test/components/views/messages/TextualBody-test.js
 2020-05-23 11:12:58 +01:00
Michael Telatynski
696f158be0
Merge pull request #4614 from matrix-org/t3chguy/toasts2 
Convert BasePlatform and BaseEventIndexManager to Typescript
 2020-05-22 14:57:25 +01:00
RiotRobot
af59d3a094 Reset matrix-js-sdk back to develop branch 2020-05-22 14:14:09 +01:00
RiotRobot
5ec8459468 Merge branch 'master' into develop 2020-05-22 14:13:01 +01:00
Michael Telatynski
50f3e26586
Merge pull request #4619 from matrix-org/t3chguy/tag_dm_regr 
Fix: Tag_DM is not defined
 2020-05-22 14:03:56 +01:00
RiotRobot
5a4da13e86 v2.6.1 2020-05-22 14:00:29 +01:00
RiotRobot
762918d664 Prepare changelog for v2.6.1 2020-05-22 14:00:29 +01:00
Michael Telatynski
ac0d794877 Fix: Tag_DM is not defined 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 13:49:56 +01:00
J. Ryan Stinnett
1c3c084491
Merge pull request #4617 from matrix-org/jryans/release-4612 
Fix key backup restore with SSSS
 2020-05-22 13:43:26 +01:00
J. Ryan Stinnett
88df8790df
Merge pull request #4616 from matrix-org/jryans/release-4607 
Remove SSSS key upgrade check from rageshake
 2020-05-22 13:43:17 +01:00
David Baker
0201655538 Fix key backup restore with SSSS 
The room / session ID params come after the backupInfo for restoring
from SSSS so the options object was being passed into the wrong param.
Roll on TypeScript.

This meant restoring backups worked fine when the key was cached but
failed when it wasn't.

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4507
 2020-05-22 12:39:15 +01:00
David Baker
badda5ae81 Remove SSSS key upgrade check from rageshake 
This code doesn't exist anymore as the SSSS symmetric upgrade stuff
has been removed.

Fixes https://github.com/vector-im/riot-web/issues/13715
 2020-05-22 12:36:27 +01:00
David Baker
ac91304d8a
Merge pull request #4615 from matrix-org/travis/fix-timestamps 
Fix visibility of message timestamps
 2020-05-22 10:47:41 +01:00
David Baker
6bfa31cd47 run i18n which is unhappy about 'create room' for some reason 2020-05-22 10:34:00 +01:00
David Baker
ef4d0a8051 Make linter happy 2020-05-22 10:33:19 +01:00
Travis Ralston
a425c5440b Fix visibility of message timestamps 
Fixes https://github.com/vector-im/riot-web/issues/13736

This also fixes an unreported but complained about issue regarding the 'always show timestamps' option not working.

Looks like this regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4531 when things got shuffled around.
 2020-05-21 16:34:23 -06:00
Travis Ralston
7ff850deea
Merge pull request #4253 from matrix-org/travis/room-list-2 
Rewrite the room list store
 2020-05-21 13:30:32 -06:00
Travis Ralston
e3c0b47116 Hyphenize algorithm directories 2020-05-21 11:56:04 -06:00
Michael Telatynski
d0451fcd80
Merge pull request #4610 from matrix-org/t3chguy-patch-1 
Update code style to mention switch statements
 2020-05-21 18:54:58 +01:00
Travis Ralston
a11985f239 Which component? The room list! 2020-05-21 11:54:38 -06:00
Travis Ralston
559dd98d01 Fix comment style to be less bothersome 2020-05-21 11:53:16 -06:00
Michael Telatynski
099c06c6e5 Merge branches 'develop' and 't3chguy-patch-1' of github.com:matrix-org/matrix-react-sdk into t3chguy-patch-1 2020-05-21 18:31:00 +01:00
Michael Telatynski
3ae38714c1 make ts happy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-21 18:25:52 +01:00
Michael Telatynski
7b0e51a703 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-21 18:11:21 +01:00
Michael Telatynski
b27f1fa6db Convert BasePlatform and BaseEventIndexManager to Typescript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-21 18:06:36 +01:00
David Baker
7533a8f80b
Merge pull request #4612 from matrix-org/dbkr/fix_restore_with_ssss 
Fix key backup restore with SSSS
 2020-05-21 12:54:41 +01:00
David Baker
5d1c01fd6f Fix key backup restore with SSSS 
The room / session ID params come after the backupInfo for restoring
from SSSS so the options object was being passed into the wrong param.
Roll on TypeScript.

This meant restoring backups worked fine when the key was cached but
failed when it wasn't.

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4507
 2020-05-21 12:26:27 +01:00
poljar
af286ade4e
Merge pull request #4608 from matrix-org/poljar/eventindex-null-token 
Handle null tokens in the crawler loop.
 2020-05-21 12:07:18 +02:00
Michael Telatynski
5618c382bd
Update code style to mention switch statements 2020-05-20 16:01:34 +01:00
Jorik Schellekens
d95d0191a2
Merge pull request #4424 from JorikSchellekens/joriks/font-scaling-slider 
Font scaling settings and slider
 2020-05-20 15:29:36 +01:00
Jorik Schellekens
50a44405f0 CONSTANT_CASING 2020-05-20 15:17:47 +01:00
Jorik Schellekens
adec5a4f92 fix test 2020-05-20 15:09:10 +01:00
Jorik Schellekens
4e9a139e8b lint 2020-05-20 14:49:18 +01:00
Jorik Schellekens
82b76192ae Fixes, lints and i18n 2020-05-20 14:44:56 +01:00
Jorik Schellekens
6d9d4ee547 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-05-20 13:46:17 +01:00
Jorik Schellekens
55e72dd5bf Remove min and max font setting 2020-05-20 13:45:54 +01:00
Jorik Schellekens
3e30df17fb Slider is more responsive 2020-05-20 13:07:33 +01:00
Damir Jelić
db72c645ba EventIndex: Add a missing semicolon. 2020-05-20 11:14:37 +02:00
Damir Jelić
86ad6de41e EventIndex: Handle null tokens in the crawler loop as well. 
This is similar to 5eb510387c. But now the
checkpoint arrived during a crawl.
 2020-05-20 11:06:52 +02:00
Travis Ralston
b96c1ada8a
Merge pull request #4494 from pv/auxpanel-scrolling-persisted 
Prevent PersistedElements overflowing scrolled areas
 2020-05-19 15:28:58 -06:00
Jorik Schellekens
5a1bf03053
Merge pull request #4531 from JorikSchellekens/joriks/irc-ui 
IRC ui layout
 2020-05-19 18:43:58 +01:00
Jorik Schellekens
323d0762fc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/irc-ui 2020-05-19 18:03:44 +01:00
Jorik Schellekens
2e325191bc Merge remote-tracking branch 'nv/develop' into joriks/irc-ui 2020-05-19 17:18:36 +01:00
Jorik Schellekens
286828b3bb Disable irc mode in notifiactions panel 2020-05-19 16:15:13 +01:00
David Baker
465948e402
Merge pull request #4607 from matrix-org/dbkr/remove_rageshake_ssss_key_upgrade_check 
Remove SSSS key upgrade check from rageshake
 2020-05-19 15:58:03 +01:00