mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 15:21:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
25206 commits 219 branches 562 tags 474 MiB
Commit graph

7683 commits

Author SHA1 Message Date
Travis Ralston
724f545b4a Merge remote-tracking branch 'origin/develop' into travis/room-list/sublist-badges 2020-06-09 08:06:10 -06:00
Travis Ralston
8632d56e97 dispose -> destroy 2020-06-09 08:05:35 -06:00
Travis Ralston
182dd41947
Merge pull request #4736 from matrix-org/travis/room-list/filter-explore 
Add filtering and exploring to the new room list
 2020-06-09 07:59:13 -06:00
Jorik Schellekens
7a3ed0e496
Merge pull request #4733 from matrix-org/joriks/font-scaling-appearance 
Clean up font scaling appearance
 2020-06-09 13:16:15 +01:00
Travis Ralston
5114c37b82 Add filtering and exploring to the new room list 
This is per the designs. Animation doesn't feel required here.

Like the rest of this series, this rewrites a component to be more purpose-built to help match the designs and to solve the smallest possible problem.
 2020-06-08 20:33:21 -06:00
Travis Ralston
9859891b4d Merge branch 'develop' into travis/room-list/sublist-badges 2020-06-08 18:12:43 -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
Jorik Schellekens
b4bdb23f5f Clean up font scaling appearance 2020-06-08 19:02:36 +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
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
Jorik Schellekens
a7bc722b3f Use px where images use px width 2020-06-08 14:45:12 +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
Travis Ralston
bb3cdd3335 Merge branch 'travis/room-list/css-layout' into travis/room-list/user-menu 2020-06-07 20:24:10 -06: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
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
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
475ba61671 Give the show more button some real CSS 
This is still somewhat placeholder.
 2020-06-05 08:48:23 -06:00
Travis Ralston
6752c2832e Add missing var 2020-06-05 08:40:32 -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
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
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
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
Jorik Schellekens
2ec47ecc74 Use different setting flag print expected values 2020-06-04 17:50:56 +01: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
Michael Telatynski
4043989a25
Merge pull request #4699 from matrix-org/t3chguy/fix-own-displayname 
Profile settings should never show a disambiguated display name
 2020-06-04 13:50:15 +01:00
Bruno Windels
07e0cab4a8 When trying to restore a keyback that has its key in 4S, check if 4S will be readable 
If the account data for the 4S key is cleared or lost somehow, don't attempt to
read the key and ask for the passphrase/recovery key instead, as doing so would trigger another
bootstrap from the restore key backup dialog, overwriting the existing key backup.
 2020-06-04 12:52:20 +02:00
Michael Telatynski
993a545cd2 Profile settings should never show a disambiguated display name 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-04 09:50:19 +01:00
Travis Ralston
30027a6556 Remove debugging 2020-06-03 21:53:58 -06:00
Travis Ralston
be4f75bca9 Add a 'show more' button to room lists 2020-06-03 21:53:08 -06:00
Travis Ralston
dbf996439b Wedge t3chguy's resizer prototype into the sublist 2020-06-03 21:17:51 -06:00
Travis Ralston
c07b5ebe9a Initial experiments with resizing of room lists 2020-06-03 21:17:18 -06:00
Michael Telatynski
bde327e1e6
Merge pull request #4695 from aaronraimist/center-headerbuttons 
Center HeaderButtons
 2020-06-04 00:36:23 +01:00
Aaron Raimist
ed2eca52b2
Don't show FormatBar if composer is empty 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-06-03 18:05:43 -05:00
Aaron Raimist
a4c9a67325 Delete files.png and change UploadConfirmDialog to use svg used elsewhere 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-06-03 17:23:37 -05:00