mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 04:21:57 +03:00
Code Issues Projects Releases Packages Wiki Activity
25136 commits 214 branches 561 tags 414 MiB
Commit graph

25136 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
ea6b0a60ab Merge branch 'develop' into travis/room-list/css-layout 2020-06-05 13:19:00 -06: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
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
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
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
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
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
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
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
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
Michael Telatynski
88c325afa4
Merge pull request #4707 from tulir/patch-1 
Stop removing variation selector from quick reactions
 2020-06-04 17:41:15 +01:00
Travis Ralston
2fe56276f2 css for vis 2020-06-04 10:07:41 -06:00
Tulir Asokan
46b282142f
Stop removing variation selector from quick reactions 
Fixes vector-im/riot-web#13926

Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2020-06-04 18:58:13 +03:00
Travis Ralston
a3fdd643d7 Add hacky math support 2020-06-04 09:57:16 -06:00
Travis Ralston
cdf2d70aea Merge branch 'develop' into travis/room-list/scrolling-resize 2020-06-04 09:19:54 -06:00
Travis Ralston
83df79aab9 Try variable resizing 2020-06-04 09:19:03 -06:00
RiotRobot
3c73930e9a Reset matrix-js-sdk back to develop branch 2020-06-04 15:14:34 +01:00
RiotRobot
260d448db6 Merge branch 'master' into develop 2020-06-04 15:13:41 +01:00