Commit Graph

25546 Commits (321889f95bf849d0efdae88e48b440a7fa69d450)

Author SHA1 Message Date
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
notramo d029696049 Translated using Weblate (Hungarian)
Currently translated at 99.9% (2256 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-06-07 19:06:17 +00:00
XoseM 36597e23ed Translated using Weblate (Galician)
Currently translated at 67.3% (1521 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2020-06-07 19:06:17 +00:00
Kévin C 1af375ab0e Translated using Weblate (French)
Currently translated at 100.0% (2259 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-06-07 19:05:58 +00:00
Tirifto d960d57721 Translated using Weblate (Esperanto)
Currently translated at 99.9% (2258 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2020-06-07 19:05:58 +00:00
Jeff Huang e8c614d01e Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2259 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-06-07 19:05:55 +00:00
Travis Ralston 736151027f
Merge pull request #4721 from matrix-org/travis/room-list/edge-cases
Handle remaining cases for room updates in new room list
2020-06-07 13:05:50 -06:00
Travis Ralston 9b928b5a5d Handle remaining cases for room updates in new room list
For https://github.com/vector-im/riot-web/issues/13635

This adds support for:
* Tag changes
* DM changes
* Marking our own rooms as read
* Our own membership changes

The remaining branch we didn't need was the alternate 'new room' branch, so it was removed.

This is not optimized - optimization is deferred.
2020-06-05 20:12:32 -06:00
Travis Ralston 0bb1eefdea Remove view_room listener as it isn't needed
We use the RoomViewStore
2020-06-05 19:47:15 -06:00
Travis Ralston 021d6d626e Merge branch 'develop' into travis/room-list/css-layout 2020-06-05 19:44:09 -06:00
Travis Ralston 6548748d7c Introduce sticky rooms to the new room list
Originally this was intended to be done only in the importance algorithm, however it is clear that all algorithms will need to deal with this. As such, it has been put into the base class to deal with as we may override it in the future. 

This commit should be self-documenting enough to describe what is going on, though the major highlight is that the handling of the sticky room is done by lying to the underlying algorithm.

This has not been optimized for performance yet.

For https://github.com/vector-im/riot-web/issues/13635
2020-06-05 18:44:38 -06:00
Weblate 09ba491afd Merge branch 'origin/develop' into Weblate. 2020-06-05 22:54:27 +00:00
Michael Telatynski e809f280f5
Merge pull request #4719 from matrix-org/t3chguy/emoji-ligatures
Allow searching the emoji picker using other emoji
2020-06-05 23:54:21 +01:00
Michael Telatynski 0c32daa162 label ZWJ as such
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-05 23:34:04 +01:00
Michael Telatynski 69ea635398 Allow searching the emoji picker using other emoji
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-05 23:19:00 +01:00
Travis Ralston 2806c8c18b Fix temporary class 2020-06-05 14:13:28 -06:00
Travis Ralston 829bf3c774 Add another TODO comment 2020-06-05 14:11:04 -06:00
Travis Ralston 1d8833e9f8 Selected state, cleanup, and profile display 2020-06-05 14:08:20 -06:00
Travis Ralston ea6b0a60ab Merge branch 'develop' into travis/room-list/css-layout 2020-06-05 13:19:00 -06:00
Weblate 46c31d190e Merge branch 'origin/develop' into Weblate. 2020-06-05 19:18:05 +00:00
Travis Ralston ee3d2c51d8
Merge pull request #4697 from matrix-org/travis/room-list/scrolling-resize
New room list scrolling and resizing
2020-06-05 13:17:59 -06:00
Travis Ralston e93a41c5fb Minor clarity 2020-06-05 13:14:44 -06:00
Weblate 8b09d7052a Merge branch 'origin/develop' into Weblate. 2020-06-05 17:27:06 +00:00
Travis Ralston 68e59a3655
Merge pull request #4696 from aaronraimist/empty-formatbar
Don't show FormatBar if composer is empty
2020-06-05 11:27:00 -06:00
Travis Ralston 51038b0c02 Replace math hacks with temporary placeholder 2020-06-05 11:03:18 -06:00
Weblate 42215c5ed8 Merge branch 'origin/develop' into Weblate. 2020-06-05 16:07:18 +00:00