mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-24 10:15:43 +03:00
Code Issues Projects Releases Packages Wiki Activity
25184 commits 203 branches 553 tags 406 MiB
Commit graph

25184 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
fd8c056200 Fix i18n 2020-06-08 09:40:03 -06:00
Travis Ralston
50673496c3 Add hosting link 2020-06-08 09:32:16 -06:00
Travis Ralston
94ce23aa4b Wire up theme changer 2020-06-08 09:32:05 -06:00
Travis Ralston
acf78ae475 Wire up the remaining dialogs 2020-06-08 09:04:43 -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
4b39ccbe26
Merge pull request #4727 from matrix-org/joriks/fix-read-receipt-overlap 
Fix read receipt overlap
 2020-06-08 15:08:35 +01:00
Jorik Schellekens
fe0ae07b84
Merge pull request #4726 from matrix-org/joriks/font-scaling-unit-change 
Load correct default font size
 2020-06-08 14:48:24 +01:00
Jorik Schellekens
a7bc722b3f Use px where images use px width 2020-06-08 14:45:12 +01:00
Jorik Schellekens
458bea20be Load correct fonstSize default value 2020-06-08 14:31:53 +01: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
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
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
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
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
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
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
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