mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 19:56:47 +03:00
Code Issues Projects Releases Packages Wiki Activity
24792 commits 214 branches 561 tags 414 MiB
Commit graph

24792 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Weblate
415eff127f Merge branch 'origin/develop' into Weblate. 2020-05-19 21:29:03 +00: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
Weblate
1caaa67850 Merge branch 'origin/develop' into Weblate. 2020-05-19 17:44:04 +00: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
Weblate
94b5fb1b64 Merge branch 'origin/develop' into Weblate. 2020-05-19 14:58:09 +00:00
Kim Brose
894412ca4c Translated using Weblate (German) 
Currently translated at 99.8% (2308 of 2312 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-05-19 14:58:09 +00:00
Tirifto
dda0d2102c Translated using Weblate (Esperanto) 
Currently translated at 100.0% (2312 of 2312 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2020-05-19 14:58:08 +00: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
af2eed2228 Fix room alias lookup vs peeking race condition 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-19 13:18:50 +01:00
Weblate
87b0c09b0c Merge branch 'origin/develop' into Weblate. 2020-05-19 10:58:05 +00:00
rkfg
3cd0381202 Translated using Weblate (Russian) 
Currently translated at 89.8% (2075 of 2311 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-05-19 10:58:05 +00: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
Weblate
2700fa9515 Merge branch 'origin/develop' into Weblate. 2020-05-19 10:25:16 +00:00
RiotRobot
833eccf5cd Reset matrix-js-sdk back to develop branch 2020-05-19 11:25:07 +01:00
Weblate
3e3ddd4263 Merge branch 'origin/develop' into Weblate. 2020-05-19 10:24:42 +00:00
Priit Jõerüüt
82ca614fa7 Translated using Weblate (Estonian) 
Currently translated at 53.6% (1239 of 2311 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-05-19 10:24:42 +00: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
Weblate
86dca5292c Merge branch 'origin/develop' into Weblate. 2020-05-19 05:22:44 +00:00
yuuki-san
b9c31b27a2 Translated using Weblate (Slovak) 
Currently translated at 64.9% (1500 of 2311 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2020-05-19 05:22:44 +00: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
Weblate
89297a5133 Merge branch 'origin/develop' into Weblate. 2020-05-18 10:08:16 +00:00
yuuki-san
a8e92589ad Translated using Weblate (Slovak) 
Currently translated at 62.7% (1450 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 10:08:16 +00: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