Commit graph

25925 commits

Author SHA1 Message Date
Weblate
150665568f Merge branch 'origin/develop' into Weblate. 2020-06-25 22:34:33 +00:00
Michael Telatynski
85c5bb3bc3
Merge pull request #4835 from matrix-org/t3chguy/notifications0
More small tweaks in preparation for Notifications rework
2020-06-25 23:34:28 +01:00
Weblate
dcb2bdadb6 Merge branch 'origin/develop' into Weblate. 2020-06-25 22:27:44 +00:00
Travis Ralston
30489ce819
Merge pull request #4840 from matrix-org/travis/room-list/resizer-2
Iterate on the new room list resize handle
2020-06-25 16:27:39 -06:00
Travis Ralston
acf56559e1 Introduce an entirely new system for handling message preview copy
This reverts earlier changes made to textForEvent as they are no longer needed.

This also implements an entire tree of textForEvent-like behaviour as the previews need to be different, which is easiest done with its own stack.
2020-06-25 16:26:49 -06:00
Weblate
ce809f1dac Merge branch 'origin/develop' into Weblate. 2020-06-25 22:05:31 +00:00
Travis Ralston
326fa8be7d
Merge pull request #4837 from matrix-org/travis/room-list/hover-states
Update sublists for new hover states
2020-06-25 16:05:25 -06:00
Travis Ralston
555078a993 Iterate on the new room list resize handle
Only show shadow when resizing, increase the hit area, and make the handle show up when the list itself is hovered.
2020-06-25 16:03:56 -06:00
Travis Ralston
0cb54ed2a4 Align the badge count on non-aux lists with other badges 2020-06-25 15:42:44 -06:00
Weblate
27417b3f65 Merge branch 'origin/develop' into Weblate. 2020-06-25 21:37:48 +00:00
Travis Ralston
bebd0a35af
Merge pull request #4839 from matrix-org/travis/room-list/pixels
Tweak parts of the new room list design
2020-06-25 15:37:42 -06:00
Travis Ralston
aacedfaf13 Remove opacity from sublist header text, increase weight 2020-06-25 15:19:03 -06:00
Travis Ralston
129ff3a6e0 Match line colour from user menu in sublist menu 2020-06-25 15:17:19 -06:00
Travis Ralston
7b79dd6be1 Make the sign out button red 2020-06-25 15:13:28 -06:00
Travis Ralston
9f5a716cc5 Adjust padding and margins on user menu 2020-06-25 15:11:04 -06:00
Travis Ralston
2b58875c7f Fix alignment issues with the user menu objects 2020-06-25 15:07:38 -06:00
Michael Telatynski
29b0505bdb Welcome no longer needs any props
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 22:02:39 +01:00
Michael Telatynski
f02c52b758 unexport things which need not exporting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 22:01:41 +01:00
Michael Telatynski
c65ccbcacf Instead of passing sso and cas urls to Welcome, route via start_sso and start_cas
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 22:00:22 +01:00
Michael Telatynski
1c00ae8dd3 Move to mx_sso_hs_url and co for sso persistance to not conflict with guest creds
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 21:59:46 +01:00
Michael Telatynski
3524d678f7 Fix Welcome.html URLs
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 21:24:24 +01:00
Travis Ralston
0af1507eed Update sublists for new hover states
Fixes https://github.com/vector-im/riot-web/issues/14135
Unblocks https://github.com/vector-im/riot-web/issues/14089
2020-06-25 12:11:10 -06:00
Weblate
02d178b68e Merge branch 'origin/develop' into Weblate. 2020-06-25 16:13:57 +00:00
Travis Ralston
f8bd6c818d
Merge pull request #4836 from matrix-org/travis/room-list/resize-handle
Implement new resize handle for dogfooding
2020-06-25 10:13:51 -06:00
Travis Ralston
5efa5d2c80 Implement new resize handle for dogfooding
Smaller handle width, small shadow on the top of the show more button if there's more rooms to be shown. The resize handle also only shows when you're hovering in the area now.

The original design called for the shadow to show up only if the user is cutting a tile or dragging, however that is complicated implementation-wise. For speed and encouraging a dogfooding pattern we're going ahead with this behaviour instead.
2020-06-25 10:08:44 -06:00
Michael Telatynski
4885615a40 improve typing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 16:55:38 +01:00
Michael Telatynski
7da02b7901 Add account and room-account data hooks
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 16:45:01 +01:00
Travis Ralston
c920cf784e Create a StaticNotificationState for representative purposes 2020-06-25 16:35:54 +01:00
Michael Telatynski
ed634a2bde Add StyledRadioGroup to simplify use of StyledRadioButton and use in Appearance Tab
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 16:35:40 +01:00
Weblate
9a92a5e21e Merge branch 'origin/develop' into Weblate. 2020-06-25 14:43:56 +00:00
Michael Telatynski
7683f2fe1a
Merge pull request #4834 from matrix-org/t3chguy/notifications0
Hide app badge count for hidden upgraded rooms (non-highlight)
2020-06-25 15:43:50 +01:00
Michael Telatynski
61618d5162 tidy up
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 15:02:52 +01:00
Weblate
c1c22c4818 Merge branch 'origin/develop' into Weblate. 2020-06-25 13:38:24 +00:00
XoseM
4b952737dc Translated using Weblate (Galician)
Currently translated at 93.7% (2147 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2020-06-25 13:38:24 +00:00
Jorik Schellekens
a2d53229ea
Merge pull request #4822 from matrix-org/joriks/appearance-tab-compact-to-advanced
Move compact modern layout checkbox to 'advanced'
2020-06-25 14:38:18 +01:00
Jorik Schellekens
41c59cc75e Fix deactivated checked checkbox styling 2020-06-25 14:21:08 +01:00
Weblate
81b889783a Merge branch 'origin/develop' into Weblate. 2020-06-25 13:18:32 +00:00
XoseM
d5cf4bcfa2 Translated using Weblate (Galician)
Currently translated at 93.7% (2146 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2020-06-25 13:18:32 +00:00
Travis Ralston
4d47dcaabd
Merge pull request #4825 from matrix-org/travis/room-list/default-lists
Allow the user to resize the new sublists to 1 tile
2020-06-25 07:18:26 -06:00
Weblate
c7fc4cacda Merge branch 'origin/develop' into Weblate. 2020-06-25 13:18:03 +00:00
XoseM
5045c0b135 Translated using Weblate (Galician)
Currently translated at 93.6% (2145 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2020-06-25 13:18:03 +00:00
Travis Ralston
92f0f1a5d8
Merge pull request #4832 from matrix-org/travis/react-can-shush
Make LoggedInView a real component because it uses shouldComponentUpdate
2020-06-25 07:17:56 -06:00
Travis Ralston
a3b38a2b5f Make LoggedInView a real component because it uses shouldComponentUpdate
React demands this.
2020-06-25 07:14:02 -06:00
Weblate
149d518394 Merge branch 'origin/develop' into Weblate. 2020-06-25 13:11:39 +00:00
ziriSut
2ef2f76de9 Translated using Weblate (Kabyle)
Currently translated at 20.1% (460 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
2020-06-25 13:11:38 +00:00
Michael Albert
fa3cc28dcc Translated using Weblate (German)
Currently translated at 99.9% (2289 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-06-25 13:11:37 +00:00
XoseM
aaff3e0bec Translated using Weblate (Galician)
Currently translated at 92.9% (2128 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2020-06-25 13:11:36 +00:00
Michael Telatynski
98fc23acb3
Merge pull request #4829 from matrix-org/t3chguy/notifications0
Small tweaks in preparation for Notifications rework
2020-06-25 14:11:24 +01:00
Michael Telatynski
8743af56ad Bring notification utils into this century to simplify ongoing Notifications work
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 09:00:13 +01:00
Michael Telatynski
d4eebd5202 Fix alwaysShowBadgeCounts settings defn
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 08:58:54 +01:00