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

27693 Commits (ae65ed5c2ecf56e719fd24414832891f5b58d48b)

Author SHA1 Message Date
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
Michael Telatynski 655cc95570 fix typo 2020-08-14 13:37:28 +01:00
Michael Telatynski 591847b274 Watch for Event.status instead as we can do some things in SENT 2020-08-14 13:37:11 +01:00
Michael Telatynski de9816574f Make event subscriptions conditional when needed 2020-08-14 13:30:27 +01:00
Michael Telatynski f982c7b334 Message Action Bar, subscribe to localEventIdReplaced events 2020-08-14 13:22:52 +01:00
Michael Telatynski 315435e3ef
Merge pull request #5114 from matrix-org/t3chguy/cherry-pick/5109 
Fix /op slash command to release
 2020-08-14 12:15:26 +01:00
Michael Telatynski 38701f3e71 Fix /op slash command 
(cherry picked from commit 3f2c1500e5)
 2020-08-14 12:05:54 +01:00
Michael Telatynski 8f0e4dae9d Allow room tile context menu when minimized using right click 2020-08-14 12:01:16 +01:00
Michael Telatynski b577667447
Merge pull request #5110 from matrix-org/t3chguy/room-list/14298 
Put message previews for Emoji behind Labs
 2020-08-14 11:33:37 +01:00
Michael Telatynski 228d1af6dc i18n 2020-08-14 11:01:03 +01:00
Michael Telatynski d861536487 Make globe transparent 2020-08-14 10:30:54 +01:00
Michael Telatynski 4ec602b960 Make cutout in the decorated room avatar transparent rather than fixed 2020-08-14 10:20:59 +01:00
Michael Telatynski a4847da0c2
Merge pull request #5107 from matrix-org/t3chguy/room-list/community-active-marker 
Fix styling for selected community marker
 2020-08-13 20:22:35 +01:00
J. Ryan Stinnett 054067abbe
Merge pull request #5112 from matrix-org/jryans/repair-action-bar-safe-area-release 
Fix action bar safe area regression
 2020-08-13 20:04:16 +01:00
J. Ryan Stinnett df65d03473 Fix action bar safe area regression 
The action bar was recently moved, but the safe area was not, which left a gap
between the event and the action bar, making it quite easy to trigger hover on a
different event instead of reaching the action bar.

Fixes https://github.com/vector-im/element-web/issues/14953
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/5056
 2020-08-13 19:44:15 +01:00
J. Ryan Stinnett ad7d5b74a6
Merge pull request #5111 from matrix-org/jryans/repair-action-bar-safe-area 
Fix action bar safe area regression
 2020-08-13 19:42:58 +01:00
J. Ryan Stinnett 3ece2dd21d Fix action bar safe area regression 
The action bar was recently moved, but the safe area was not, which left a gap
between the event and the action bar, making it quite easy to trigger hover on a
different event instead of reaching the action bar.

Fixes https://github.com/vector-im/element-web/issues/14953
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/5056
 2020-08-13 19:24:11 +01:00
Michael Telatynski fbb058a8e3
Merge pull request #5109 from matrix-org/t3chguy/fix/14951 
Fix /op slash command
 2020-08-13 17:16:47 +01:00
Michael Telatynski 62c1798bec try to fix the e2e tests 2020-08-13 16:55:48 +01:00
Michael Telatynski e7bd656a19 i18n 2020-08-13 16:41:25 +01:00
Michael Telatynski 50b9da7597 Put message previews for Emoji behind Labs 2020-08-13 16:40:18 +01:00
Michael Telatynski 3f2c1500e5 Fix /op slash command 2020-08-13 16:29:25 +01:00
Michael Telatynski b8a260bb84 Change add room action for rooms to context menu 2020-08-13 16:18:26 +01:00
Michael Telatynski 4abbcd8c06 Fix styling for selected community marker 2020-08-13 15:24:21 +01:00
Michael Telatynski df75024a21 Switch out the globe icon and colour it depending on theme 2020-08-13 15:16:31 +01:00
Michael Telatynski 8aa50ecb59 Iterate rageshake download styling 2020-08-13 13:08:07 +01:00
RiotRobot 8e8a2e602b v3.2.0-rc.1 2020-08-13 12:17:59 +01:00
RiotRobot ee1ea4132d Prepare changelog for v3.2.0-rc.1 2020-08-13 12:17:58 +01:00
RiotRobot 47bb6d0b25 Upgrade matrix-js-sdk to 8.1.0-rc.1 2020-08-13 12:12:10 +01:00
J. Ryan Stinnett 850c850bde
Merge pull request #5105 from RiotTranslateBot/weblate-element-web-matrix-react-sdk 
Update from Weblate
 2020-08-13 11:11:05 +01:00
Weblate 66099568b8 Merge branch 'origin/develop' into Weblate. 2020-08-13 09:38:01 +00:00
strix aluco a4d30c1549 Translated using Weblate (Ukrainian) 
Currently translated at 50.0% (1166 of 2331 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/uk/
 2020-08-13 09:38:00 +00:00
Michael Telatynski 7fc67e6a62
Merge pull request #5103 from matrix-org/t3chguy/fix/14910 
padding the timeline so that its scrollbar has its own space from the resizer
 2020-08-13 10:37:53 +01:00
Michael Telatynski df980dbf92 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs 2020-08-12 22:48:03 +01:00
Michael Telatynski 3e475bb69c padding the timeline so that its scrollbar has its own space from the resize handle 2020-08-12 16:21:37 +01:00
Weblate 9586be039f Merge branch 'origin/develop' into Weblate. 2020-08-12 15:02:07 +00:00
Michael Telatynski b990a0dd3a
Merge pull request #5102 from matrix-org/t3chguy/14938 
Try to close notification on all platforms which support it, not just electron
 2020-08-12 16:02:02 +01:00
Weblate f3704efed1 Merge branch 'origin/develop' into Weblate. 2020-08-12 15:01:47 +00:00
Michael Telatynski cacb0af5a2
Merge pull request #5101 from matrix-org/t3chguy/fix/14934 
Fix exception when stripping replies from an event with a non-string body
 2020-08-12 16:01:41 +01:00
Weblate c8a34d2640 Merge branch 'origin/develop' into Weblate. 2020-08-12 14:21:13 +00:00