Commit Graph

24586 Commits (6bfa31cd47d626fe10c9148f16557c6a2a86bedd)

Author SHA1 Message Date
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
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
David Baker 4bf2e5fd8e 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-19 15:40:26 +01:00
Michael Telatynski e7d37228f2
Merge pull request #4603 from matrix-org/t3chguy/add_room_tooltip
Label the create room button better than "Add room"
2020-05-19 11:57:59 +01:00
RiotRobot 833eccf5cd Reset matrix-js-sdk back to develop branch 2020-05-19 11:25:07 +01:00
RiotRobot 19e496cacc Merge branch 'master' into develop 2020-05-19 11:23:16 +01:00
RiotRobot 26e6447be5 v2.6.0 2020-05-19 11:22:00 +01:00
RiotRobot bc8a53a7d7 Prepare changelog for v2.6.0 2020-05-19 11:21:59 +01:00
RiotRobot 406839e89a Upgrade matrix-js-sdk to 6.1.0 2020-05-19 11:13:57 +01:00
Travis Ralston 38920e7f30 Merge branch 'develop' into travis/room-list-2 2020-05-18 23:23:59 -06:00
Travis Ralston 9aff2e836e
Merge pull request #4593 from matrix-org/travis/dispatcher-types
Convert the dispatcher to TypeScript
2020-05-18 23:22:32 -06:00
Jorik Schellekens 7bb7f30b8f missed one 2020-05-18 22:02:22 +01:00
Jorik Schellekens bba6b2c441 Appease i18n 2020-05-18 17:06:54 +01:00
Jorik Schellekens 4deeef5fca Remove ability to remove avatars 2020-05-18 16:57:00 +01:00
Jorik Schellekens 5380e76b7b lint 2020-05-18 16:43:47 +01:00
Jorik Schellekens 17f535e5f8 Fix review problems
- removed superfluous position and classes
- fixed compact view
- fixed event list summary avatar and text overlap
- fixed a problem where the mention list refuses to load.
2020-05-18 16:37:10 +01:00
Michael Telatynski 1eea203db6
Merge pull request #4599 from matrix-org/t3chguy/progress_colour
Consolidate password/passphrase fields into a component & add dynamic colour to progress
2020-05-18 11:08:08 +01:00
Michael Telatynski 54640dcaac
Merge pull request #4590 from matrix-org/t3chguy/userview
UserView, show Welcome page in the mid panel instead of empty space
2020-05-18 11:07:49 +01:00
Michael Telatynski a864643d98 Label the create room button something better than "Add room"
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-18 10:37:02 +01:00
Michael Telatynski 657c10f1b5
Merge pull request #4602 from matrix-org/t3chguy/cherry-pick/5
Revert "ImageView make clicking off it easier"
2020-05-18 10:24:57 +01:00
David Baker 0191e0710c
Merge pull request #4601 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate
2020-05-18 10:23:35 +01:00
Michael Telatynski b6ac8cb28d Revert "ImageView make clicking off it easier"
(cherry picked from commit 52e3c97f8c)
2020-05-18 10:15:30 +01:00
yuuki-san 5ea4cc1c5b Translated using Weblate (Slovak)
Currently translated at 62.3% (1441 of 2312 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2020-05-18 09:14:53 +00:00