OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
25,449 Commits
212 Branches
549 Tags
667 MiB
Commit Graph

25449 Commits (884ead917da2addf49927d7a753287c2981e8c14)

Author SHA1 Message Date
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
Travis Ralston efa12b8c2f
Merge pull request #4687 from matrix-org/travis/split-left-panel 
Split the left panel into new and old for new room list designs
 2020-06-05 10:07:13 -06:00
David Baker b82a893a79 Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases 2020-06-05 16:00:43 +01:00
Weblate 5217e36ee3 Merge branch 'origin/develop' into Weblate. 2020-06-05 14:49:41 +00:00
Travis Ralston 475ba61671 Give the show more button some real CSS 
This is still somewhat placeholder.
 2020-06-05 08:48:23 -06:00
RiotRobot d54308a8c6 Reset matrix-js-sdk back to develop branch 2020-06-05 15:48:06 +01:00
RiotRobot 1d6141cf73 Merge branch 'master' into develop 2020-06-05 15:47:23 +01:00
RiotRobot c8366b7a47 v2.7.1 2020-06-05 15:43:24 +01:00
RiotRobot 94059b8524 Prepare changelog for v2.7.1 2020-06-05 15:43:23 +01:00
Travis Ralston 6752c2832e Add missing var 2020-06-05 08:40:32 -06:00
Travis Ralston 211ad66fea Fix i18n 2020-06-05 08:39:38 -06:00
Travis Ralston b31a8d494b Merge branch 'travis/room-list/scrolling-resize' into travis/room-list/css-layout 2020-06-05 08:39:19 -06:00
RiotRobot 68623b43b1 Merge branch 'release-v2.7.1' of github.com:matrix-org/matrix-react-sdk into release-v2.7.1 2020-06-05 15:35:34 +01:00
Michael Telatynski b49d437ee8
Merge pull request #4716 from matrix-org/t3chguy/1.6.4/r3 
Fix exceptions from Tooltip
 2020-06-05 15:33:50 +01:00
David Baker 93ed062900 Fix exceptions from Tooltip 
renderTooltip was not a bound function and so was failing to find
the parent when called from the 'scroll' event listener because
'this' was the window object rather than the Tooltip object.

Unsure at what point this broke - I assumed it was in thr recent
typescript conversion but it looks like it would have had the same
problem before.

(cherry picked from commit 5e569d75b6)
 2020-06-05 15:20:49 +01:00
RiotRobot e78fa602c0 Upgrade matrix-js-sdk to 6.2.1 2020-06-05 15:13:55 +01:00
Michael Telatynski 455b915143
Merge pull request #4715 from matrix-org/t3chguy/1.6.4/r2 
Fix not being able to dismiss new login toasts
 2020-06-05 11:34:06 +01:00
Michael Telatynski 04e6112dfb
Merge pull request #4714 from matrix-org/t3chguy/1.6.4/r1 
Fix compact layout regression
 2020-06-05 11:31:42 +01:00
Travis Ralston ab9284fced Fix not being able to dismiss new login toasts 
`toastKey` is a thing.

Fixes https://github.com/vector-im/riot-web/issues/13923

(cherry picked from commit c667ea69af)
 2020-06-05 11:24:22 +01:00
Michael Telatynski 0dc788eaa7 Fix compact layout regression 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit f4f23dba04)
 2020-06-05 11:22:33 +01:00
Weblate 8cd90e3d98 Merge branch 'origin/develop' into Weblate. 2020-06-05 10:03:09 +00:00
MamasLT 0a1080de5a Translated using Weblate (Lithuanian) 
Currently translated at 67.4% (1522 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-06-05 10:03:09 +00:00
Michael Telatynski f221e06068
Merge pull request #4712 from matrix-org/t3chguy/compact-mode 
Fix compact layout regression
 2020-06-05 11:02:59 +01:00
Michael Telatynski f4f23dba04 Fix compact layout regression 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-05 10:53:00 +01:00
Travis Ralston 1f11298aa3 Annotate hacky math 2020-06-04 21:45:32 -06:00
Travis Ralston e90e70bd77 Misc cleanup 2020-06-04 21:43:33 -06:00
Travis Ralston 0694637b06 Remove debug 2020-06-04 21:38:06 -06:00
Travis Ralston f347019cf8 Remove obviously questionable color choices 2020-06-04 21:37:10 -06:00
Travis Ralston 0c15b2bdb6 Simple structuring of the room list itself 
This covers the larger parts of the design, but doesn't deal with the nuances of hover states, badge sizing, etc.
 2020-06-04 21:21:04 -06:00
Travis Ralston 4c1bc50649 Initial styling for new room list 
This is a work in progress, but covers the coarse areas. This uses all-new classes to better describe what everything is, and to reduce the number of selectors we keep track of.

This is primarily layout for the list and not actually the final structure. For example, some buttons are missing and other areas are not styled correctly - the idea in this commit was to get things roughly in the right place and work on it.
 2020-06-04 16:41:18 -06:00
Travis Ralston 02c131e3ff Merge branch 'travis/room-list/scrolling-resize' into travis/room-list/css-layout 2020-06-04 16:40:55 -06:00
Travis Ralston be3510ae69 Merge branch 'travis/split-left-panel' into travis/room-list/css-layout 2020-06-04 16:40:49 -06:00
Travis Ralston 434f6ea4d4 Remove legacy sublist sizing 2020-06-04 16:36:14 -06:00
Travis Ralston dc01607ad9 Merge branch 'develop' into travis/split-left-panel 2020-06-04 15:09:51 -06:00
Weblate 6fd24e837c Merge branch 'origin/develop' into Weblate. 2020-06-04 21:07:24 +00:00
Matthew Hodgson 02cdc8a201
Merge pull request #4710 from matrix-org/matthew/fix-safari-emoji 
fix emoji in safari
 2020-06-04 22:07:18 +01:00
Matthew Hodgson c171bdfec7 fix emoji in safari 
1. emoji sometimes vanished from the autocompleter due to a rounding error
   combined with maxWidth: 1em on the emoji span kicking in at arbitrary
   font sizes/zooms
2. apparently safari needs explicit VS-16 ligatures, as per
   ff7dec427f
 2020-06-04 22:01:16 +01:00
Weblate 2bf74c0229 Merge branch 'origin/develop' into Weblate. 2020-06-04 20:12:26 +00:00
Travis Ralston 3fff46b0c7
Merge pull request #4709 from matrix-org/travis/later 
Fix not being able to dismiss new login toasts
 2020-06-04 14:12:21 -06:00
Travis Ralston dc23dd637c Revert "Add a warning for dismissing invalid toasts" 
This reverts commit 3674b6446e.
 2020-06-04 14:07:06 -06:00
Travis Ralston 3674b6446e Add a warning for dismissing invalid toasts 2020-06-04 13:53:09 -06:00
Travis Ralston c667ea69af Fix not being able to dismiss new login toasts 
`toastKey` is a thing.

Fixes https://github.com/vector-im/riot-web/issues/13923
 2020-06-04 13:48:35 -06:00
Jorik Schellekens f3011f00f7
Remove debug 2020-06-04 19:43:35 +01:00
Weblate f72e331d99 Merge branch 'origin/develop' into Weblate. 2020-06-04 18:30:01 +00:00
David Baker ddc9c67a8b
Merge pull request #4708 from matrix-org/dbkr/bind_tooltip_render 
Fix exceptions from Tooltip
 2020-06-04 19:29:56 +01:00
Jorik Schellekens bba6767608 Update displayed min and max 2020-06-04 18:00:22 +01:00
David Baker 5e569d75b6 Fix exceptions from Tooltip 
renderTooltip was not a bound function and so was failing to find
the parent when called from the 'scroll' event listener because
'this' was the window object rather than the Tooltip object.

Unsure at what point this broke - I assumed it was in thr recent
typescript conversion but it looks like it would have had the same
problem before.
 2020-06-04 17:54:18 +01:00