Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-15 20:54:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
27,728 Commits 206 Branches 552 Tags 518 MiB
7c1a9993e3
Commit Graph

27728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Travis Ralston
cac4e6c920 update js-sdk reference in lockfile 2020-08-18 12:50:25 -06:00
Travis Ralston
d3dba0ba3a
Merge pull request #5125 from matrix-org/travis/spec-i18n 
Use matrix-doc for SAS emoji translations
 2020-08-18 11:41:42 -06:00
Travis Ralston
323ebdfac8 Remove unused return type 2020-08-18 10:51:30 -06:00
Michael Telatynski
1fce3fd2ae
Merge pull request #3849 from matrix-org/travis/download-logs 
Add a rageshake function to download the logs locally
 2020-08-18 17:50:01 +01:00
Michael Telatynski
d55cb4266a Update copy 2020-08-18 17:38:10 +01:00
Michael Telatynski
8cff59f123 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs 2020-08-18 17:36:04 +01:00
Michael Telatynski
24a390f840
Merge pull request #5123 from matrix-org/t3chguy/room-list/14466 
Room List filtering visual tweaks
 2020-08-18 17:22:05 +01:00
Bruno Windels
5c6a36f89a
Merge pull request #5072 from matrix-org/bwindels/make-reply-not-overlay 
Make reply preview not an overlay so you can see new messages
 2020-08-18 11:48:41 +00:00
Michael Telatynski
697ba12b3a Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14466 2020-08-18 12:48:32 +01:00
Michael Telatynski
d1971cb163
Merge pull request #5113 from matrix-org/t3chguy/room-list/14959 
Allow room tile context menu when minimized using right click
 2020-08-18 12:45:55 +01:00
Michael Telatynski
aef8784b78
Merge pull request #5121 from matrix-org/t3chguy/null-guard-group-inviter 
Add null guard to group inviter for corrupted groups
 2020-08-18 12:45:06 +01:00
Michael Telatynski
3781b04f9c
Merge branch 'develop' into t3chguy/room-list/14466 2020-08-18 12:44:52 +01:00
Michael Telatynski
b6dd856649
Merge pull request #5118 from matrix-org/t3chguy/room-list/14617.2 
Room List styling tweaks
 2020-08-18 12:44:09 +01:00
Bruno Windels
5d98805d77 Merge branch 'develop' into bwindels/make-reply-not-overlay 2020-08-18 13:39:06 +02:00
Michael Telatynski
24a088e234 Iterate PR, tweak margins 2020-08-18 12:00:56 +01:00
Bruno Windels
fa1e27076d remove dupe method 2020-08-18 12:34:43 +02:00
Travis Ralston
d9e7253561 Use matrix-doc for SAS emoji translations 
This is done through the js-sdk's new SASEmojiV1 class.
 2020-08-17 15:37:36 -06:00
Travis Ralston
4f851542ac Implement force state for features like in the proposal 2020-08-17 13:51:41 -06:00
Travis Ralston
3659115921 Followup on some SettingsStore removals 2020-08-17 13:37:16 -06:00
Travis Ralston
2c0e6c859a Update settings documentation for features 2020-08-17 13:32:33 -06:00
Travis Ralston
71643862c0 Implement new config style for features 2020-08-17 13:24:55 -06:00
Travis Ralston
eda4e24926 Update LabsUserSettings for new feature behaviour 2020-08-17 13:19:15 -06:00
Travis Ralston
96087d61f6 Convert feature setting usages to regular settings 2020-08-17 13:12:18 -06:00
Michael Telatynski
3fe6f0a792 delint css 2020-08-17 18:26:42 +01:00
Michael Telatynski
2caee2eadd TypeScript: enable es2019 lib for newer definitions 2020-08-17 18:20:57 +01:00
Michael Telatynski
e20b375433 Add filter results count and explore prompt 2020-08-17 18:20:00 +01:00
Michael Telatynski
a4d11cc190 Change highlighting around the room list filter 2020-08-17 16:59:29 +01:00
Michael Telatynski
b9f22aa569 Merge branch 't3chguy/room-list/14617.2' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14466 2020-08-17 15:32:45 +01:00
RiotRobot
c91fc99d4b Reset matrix-js-sdk back to develop branch 2020-08-17 13:08:45 +01:00
RiotRobot
8a37c90ec1 Merge branch 'master' into develop 2020-08-17 13:07:27 +01:00
RiotRobot
ea337465ae v3.2.0 2020-08-17 12:59:51 +01:00
RiotRobot
18ae1a9547 Prepare changelog for v3.2.0 2020-08-17 12:59:51 +01:00
RiotRobot
32ca810809 Upgrade matrix-js-sdk to 8.1.0 2020-08-17 12:53:33 +01:00
Michael Telatynski
0329f5d77e
Merge pull request #5122 from matrix-org/t3chguy/cherry-pick/5120 
[Release] Fix corner rounding on images not always affecting right side
 2020-08-17 11:41:33 +01:00
Michael Telatynski
9a5134eff2 Fix corner rounding on images not always affecting right side 2020-08-17 11:14:36 +01:00
Michael Telatynski
758e37fe50
Merge pull request #5120 from matrix-org/t3chguy/fix/14948 
Fix corner rounding on images not always affecting right side
 2020-08-17 11:11:23 +01:00
Michael Telatynski
70f0701de5 null guard group inviter for corrupted groups 2020-08-17 10:59:43 +01:00
Michael Telatynski
6e2a26443d Fix corner rounding on images not always affecting right side 2020-08-17 10:55:54 +01:00
Michael Telatynski
27df9c038d
Merge pull request #5108 from matrix-org/t3chguy/room-list/14617 
Change add room action for rooms to context menu
 2020-08-17 09:41:42 +01:00
Michael Telatynski
d727455c17 Merge branch 't3chguy/room-list/14617' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14617.2 2020-08-14 18:59:07 +01:00
Michael Telatynski
21cdf5073c Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14617 2020-08-14 18:58:26 +01:00
Michael Telatynski
4381bdfdbf fix typo 2020-08-14 18:53:56 +01:00
Michael Telatynski
90d99239bb Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14617.2 2020-08-14 18:10:59 +01:00
Michael Telatynski
be1d390a93
Merge pull request #5106 from matrix-org/t3chguy/room-list/14608 
Switch out the globe icon and colour it depending on theme
 2020-08-14 18:10:29 +01:00
Michael Telatynski
2eb48bc588
Merge pull request #5116 from matrix-org/t3chguy/cherry-pick/5115 
[Release] Message Action Bar watch for event send changes
 2020-08-14 14:39:28 +01:00
Michael Telatynski
57f15bb1dd fix typo 2020-08-14 13:46:51 +01:00
Michael Telatynski
cd87480088 Watch for Event.status instead as we can do some things in SENT 2020-08-14 13:46:46 +01:00
Michael Telatynski
1f6ec421f4 Make event subscriptions conditional when needed 2020-08-14 13:46:42 +01:00
Michael Telatynski
d34f166187 Message Action Bar, subscribe to localEventIdReplaced events 2020-08-14 13:46:40 +01:00
Michael Telatynski
5f5828522b
Merge pull request #5115 from matrix-org/t3chguy/fix/14803 
Message Action Bar watch for event send changes
 2020-08-14 13:45:38 +01:00