OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
24,865 Commits
215 Branches
561 Tags
460 MiB
Commit Graph

24865 Commits (53129cafc75eaeb7b063ffb33533239d747e4eac)

Author SHA1 Message Date
Michael Telatynski 91811581bc fix assertNoToasts 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 14:35:59 +01:00
Michael Telatynski 61066b0c4c test it again 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 14:27:09 +01:00
Michael Telatynski 627b568588 check if it is a race 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 13:48:20 +01:00
Michael Telatynski 841ce74ac2 Fix assert vs assert.equal 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 13:39:00 +01:00
Michael Telatynski faaca43a75 more loggin' 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 13:35:15 +01:00
Michael Telatynski 37c875b863 improve end to end tests 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 13:23:49 +01:00
Michael Telatynski d9552c7f5c e2e test toasts v2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 13:10:28 +01:00
Michael Telatynski 7b6d49c416 e2e test toasts 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 12:57:45 +01:00
Michael Telatynski b7c688d328 test e2e tests workaround 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 12:40:38 +01:00
Michael Telatynski 48de174576 remove debug 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 12:20:20 +01:00
Michael Telatynski efa47f1a8e Change out debug 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 12:02:51 +01:00
Michael Telatynski 3dade4e759 tweak 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 11:48:48 +01:00
Michael Telatynski 254ed4b1b6 Add debug lined to figure out e2e test failure 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 11:33:42 +01:00
David Baker 8bac26c5e3
Merge pull request #4648 from matrix-org/dbkr/remove_keyshare_dialog 
Remove the keyshare dialog
 2020-05-27 10:24:33 +01:00
Michael Telatynski c492ae97fd Merge branches 'develop' and 't3chguy/toasts3_2' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3_2 2020-05-27 09:45:38 +01:00
Travis Ralston 515304d32e
Merge pull request #4654 from matrix-org/travis/roomlist/badge-updates 
Update badge counts in new room list as needed
 2020-05-26 20:06:17 -06:00
Travis Ralston 8370fa8bb4 Event.decrypted from the client 2020-05-26 19:56:56 -06:00
Travis Ralston bf8a3d4419 Bind to the room instead of the client 
Also add the other missing deregister handlers
 2020-05-26 16:20:51 -06:00
Travis Ralston a9c54153ee Update badge counts in new room list as needed 2020-05-26 14:16:33 -06:00
poljar 6c10cbc903
EventIndex: Use a warning when redactions don't have an event id. 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-05-26 21:48:10 +02:00
Damir Jelić 58f0814530 EventIndex: Handle invalid m.room.redaction events correctly. 
Clients might send invalid redaction events, such events will not have a
valid redacts field containing the event id of the associated event that
was redacted.

Skip such events instead of ending up looping over the checkpoint
forever.
 2020-05-26 21:27:45 +02:00
Damir Jelić 403a64bcc6 EventIndex: Print out the checkpoint if there was an error during a crawl. 2020-05-26 20:48:22 +02:00
Jorik Schellekens 73213422a9 fix encryption icon missalignment 2020-05-26 18:15:06 +01:00
Jorik Schellekens 792859b939 Fix lines overflowing room list width 2020-05-26 17:39:39 +01:00
Jorik Schellekens d8836f0f4b Fir sublist sizing regression 2020-05-26 17:09:42 +01:00
David Baker a496dafd41 Remove the keyshare dialog 
Fixes https://github.com/vector-im/riot-web/issues/11908
 2020-05-26 16:51:20 +01:00
Jorik Schellekens 076a3e058d
Merge pull request #4635 from JorikSchellekens/joriks/field-ts 
Move Field to Typescript
 2020-05-26 16:13:03 +01:00
Jorik Schellekens fcbd197e7d Fix file list regression 2020-05-26 15:56:16 +01:00
Bruno Windels 3fc060c754
Merge pull request #4646 from matrix-org/bwindels/detectnetworkfailureforjoin 
Use connection error to detect network problem
 2020-05-26 14:18:06 +00:00
Bruno Windels f3ac96fa56
Merge pull request #4641 from matrix-org/bwindels/defaultfontsize 
Revert default font size to 15px
 2020-05-26 13:26:03 +00:00
Bruno Windels cfe5173235 use connection error to detect network problem 2020-05-26 15:23:12 +02:00
Bruno Windels d45a597528
Merge pull request #4645 from matrix-org/bwindels/addloggingforfailtojoinroom 
Add logging when room join fails
 2020-05-26 13:22:22 +00:00
Bruno Windels f1282179fb add logging when we fail to join a room 2020-05-26 14:58:09 +02:00
David Baker e5c4d6fdcd
Merge pull request #4644 from matrix-org/dbkr/kill_encryptedeventdialog 
Remove EncryptedEventDialog
 2020-05-26 13:55:02 +01:00
Michael Telatynski fb73bac4cf Update UpdateToast's priority to 30 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-26 13:53:28 +01:00
Michael Telatynski b7428fcf35
Merge pull request #4618 from matrix-org/t3chguy/toasts3 
Migrate Toasts to Typescript and to granular priority system
 2020-05-26 13:48:47 +01:00
David Baker d2fe4bcecd Unused imports 2020-05-26 13:46:47 +01:00
Michael Telatynski 0cec16d3b1
Merge pull request #4632 from matrix-org/t3chguy/confusing_copy 
Update Crypto Store Too New copy
 2020-05-26 13:45:40 +01:00
David Baker 563a36e0a1 Remove unused CSS too 2020-05-26 13:42:00 +01:00
Michael Telatynski d1084afb92
Merge pull request #4643 from matrix-org/t3chguy/fix-memberavatar 
MemberAvatar should not have its own letter fallback, it should use BaseAvatar
 2020-05-26 13:41:15 +01:00
David Baker 352727906e i18n 2020-05-26 13:40:36 +01:00
Michael Telatynski c74d890774 Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3 
 Conflicts:
	src/@types/global.d.ts
	src/components/structures/ToastContainer.tsx
 2020-05-26 13:38:17 +01:00
David Baker 7e45a71a8a Remove EncryptedEventDialog 
https://github.com/matrix-org/matrix-react-sdk/pull/4412 disabled it
when cross signing was enabled so it is essentially gone now anyway.

Fixes https://github.com/vector-im/riot-web/issues/11752
 2020-05-26 13:37:57 +01:00
Michael Telatynski 0713139dc5 Merge branches 'develop' and 't3chguy/confusing_copy' of github.com:matrix-org/matrix-react-sdk into t3chguy/confusing_copy 2020-05-26 13:35:18 +01:00
Michael Telatynski f8d2124aa3 MemberAvatar should not have its own letter fallback, it should use BaseAvatar's 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-26 13:33:47 +01:00
Bruno Windels cce53d8ab9 revert default font size to 15px 2020-05-26 14:11:36 +02:00
Michael Telatynski 29347d0c6a
Merge pull request #4630 from matrix-org/t3chguy/fix_upload_abort 
Fix media upload issues with abort and status bar
 2020-05-26 12:17:46 +01:00
Jorik Schellekens ba3fe850e0 Implement review 
- lint member order
- cleaner type coersion
- specify access modifiers everywhere
 2020-05-26 12:09:23 +01:00
Michael Telatynski b27ab6663e
Merge branch 'develop' into t3chguy/fix_upload_abort 2020-05-26 12:04:36 +01:00
Michael Telatynski a64de63f00
Merge pull request #4633 from matrix-org/t3chguy/group-view-guest 
fix viewGroup to actually show the group if possible
 2020-05-26 12:03:52 +01:00