Commit graph

25571 commits

Author SHA1 Message Date
Travis Ralston
17d98e8956 Merge branch 'travis/room-list/css-layout' into travis/room-list/breadcrumbs 2020-06-08 17:11:28 -06:00
Travis Ralston
086b9101fa Add sublist badge counts to new room list
Also add IDLE state to rooms
2020-06-08 13:42:18 -06:00
Travis Ralston
2c8a42927c Merge branch 'travis/badge-ts' into travis/room-list/sublist-hover 2020-06-08 12:15:56 -06:00
Travis Ralston
21c8611300 Convert FormattingUtils to TypeScript and add badge utility function
The new function is to be used in the new room list.
2020-06-08 12:14:32 -06:00
Jorik Schellekens
b4bdb23f5f Clean up font scaling appearance 2020-06-08 19:02:36 +01:00
Travis Ralston
1487be5979 Merge branch 'travis/room-list/css-layout' into travis/room-list/sublist-hover 2020-06-08 11:47:48 -06:00
Jorik Schellekens
24cf3d5f05 add key to react list and let selector container wrap 2020-06-08 18:37:36 +01:00
Jorik Schellekens
a10e71edcf Use styled radio buttons for theme selection 2020-06-08 18:17:02 +01:00
Travis Ralston
de4c2fe3d9 Use real buttons in user menu 2020-06-08 11:06:21 -06:00
Jorik Schellekens
bd58f6ea7b Hide checkbox on dark backgrounds 2020-06-08 17:38:07 +01:00
Jorik Schellekens
d6a532040e lint 2020-06-08 16:57:39 +01:00
Jorik Schellekens
26eaef848b Use Element instead of HTMLElement 2020-06-08 16:53:19 +01:00
Jorik Schellekens
35ecaff399 Move Settings flag to ts 2020-06-08 16:48:32 +01:00
Travis Ralston
6002fef269 Merge branch 'travis/room-list/css-layout' into travis/room-list/user-menu 2020-06-08 09:41:38 -06:00
Travis Ralston
000c92a53f Merge branch 'develop' into travis/room-list/css-layout 2020-06-08 09:40:21 -06:00
Travis Ralston
fd8c056200 Fix i18n 2020-06-08 09:40:03 -06:00
Travis Ralston
50673496c3 Add hosting link 2020-06-08 09:32:16 -06:00
Travis Ralston
94ce23aa4b Wire up theme changer 2020-06-08 09:32:05 -06:00
Travis Ralston
acf78ae475 Wire up the remaining dialogs 2020-06-08 09:04:43 -06:00
Travis Ralston
de18af35ff Support minimum to open user settings to a particular tab
Tabs now have IDs, and we use those IDs to open things. This doesn't do any conversion to typescript, and doesn't add the same feature to the room settings out of concern for the size of diff.
2020-06-08 08:20:15 -06:00
Weblate
15212df3ae Merge branch 'origin/develop' into Weblate. 2020-06-08 14:08:40 +00:00
Jorik Schellekens
4b39ccbe26
Merge pull request #4727 from matrix-org/joriks/fix-read-receipt-overlap
Fix read receipt overlap
2020-06-08 15:08:35 +01:00
Weblate
50bd7fa0b4 Merge branch 'origin/develop' into Weblate. 2020-06-08 13:48:29 +00:00
Jorik Schellekens
fe0ae07b84
Merge pull request #4726 from matrix-org/joriks/font-scaling-unit-change
Load correct default font size
2020-06-08 14:48:24 +01:00
Jorik Schellekens
a7bc722b3f Use px where images use px width 2020-06-08 14:45:12 +01:00
Jorik Schellekens
458bea20be Load correct fonstSize default value 2020-06-08 14:31:53 +01:00
Weblate
11d9eea271 Merge branch 'origin/develop' into Weblate. 2020-06-08 13:16:06 +00:00
Michael Telatynski
36e49df025
Merge pull request #4724 from matrix-org/t3chguy/lb
send state of lowBandwidth in rageshakes
2020-06-08 14:16:02 +01:00
Weblate
7e0d028d52 Merge branch 'origin/develop' into Weblate. 2020-06-08 12:46:08 +00:00
Jorik Schellekens
349d7a5700
Merge pull request #4725 from matrix-org/joriks/font-scaling-unit-change
Change internal font size from from 15 to 10
2020-06-08 13:46:04 +01:00
Jorik Schellekens
2fe7c37566 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/font-scaling-unit-change 2020-06-08 13:37:05 +01:00
Michael Telatynski
6fe5196a19 send state of lowBandwidth in rageshakes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-08 11:43:50 +01:00
Weblate
8d37b4a37b Merge branch 'origin/develop' into Weblate. 2020-06-08 09:58:46 +00:00
yuuki-san
4b920c88dc Translated using Weblate (Slovak)
Currently translated at 68.7% (1552 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2020-06-08 09:58:46 +00:00
Michael Albert
dbc2f9cbfc Translated using Weblate (German)
Currently translated at 99.7% (2253 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-06-08 09:58:45 +00:00
J. Ryan Stinnett
b35cde4546
Merge pull request #4723 from matrix-org/jryans/upgrade-deps-2020-06-05
Upgrade deps
2020-06-08 10:58:38 +01:00
J. Ryan Stinnett
1315ed503b Upgrade deps 2020-06-08 10:12:11 +01:00
Travis Ralston
f05a1e532b Point buttons at the right functions 2020-06-07 22:17:02 -06:00
Travis Ralston
8b6b117fbf Appease the linter 2020-06-07 22:15:54 -06:00
Travis Ralston
8e0247afe5 Add most of the UI for the new room list's menu button
Incomplete implementation: buttons don't work, some text is missing, etc
2020-06-07 22:06:41 -06:00
Travis Ralston
bb3cdd3335 Merge branch 'travis/room-list/css-layout' into travis/room-list/user-menu 2020-06-07 20:24:10 -06:00
Weblate
1e32fa02da Merge branch 'origin/develop' into Weblate. 2020-06-08 02:22:45 +00:00
Travis Ralston
e4aeabe5a6
Merge pull request #4444 from pv/jitsi-popout-immediate-join
Ensure active Jitsi conference is closed on widget pop-out
2020-06-07 20:22:39 -06:00
Weblate
fe1137855e Merge branch 'origin/develop' into Weblate. 2020-06-08 01:05:13 +00:00
Travis Ralston
19a7297a77
Merge pull request #4720 from matrix-org/travis/room-list/sticky
Introduce sticky rooms to the new room list
2020-06-07 19:05:07 -06:00
Travis Ralston
760333a0ae Move function to a private function 2020-06-07 13:08:25 -06:00
Travis Ralston
a7fe7cb28d Merge remote-tracking branch 'origin/develop' into travis/room-list/sticky 2020-06-07 13:06:30 -06:00
Weblate
397660f3f3 Merge branch 'origin/develop' into Weblate. 2020-06-07 19:06:20 +00:00
Nils Haugen
8dfed9e597 Translated using Weblate (Norwegian Nynorsk)
Currently translated at 56.6% (1278 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2020-06-07 19:06:20 +00:00
Imre Kristoffer Eilertsen
43be243033 Translated using Weblate (Norwegian Bokmål)
Currently translated at 56.8% (1283 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
2020-06-07 19:06:18 +00:00