OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
27,611 Commits
202 Branches
553 Tags
428 MiB
Commit Graph

27611 Commits (d727455c17a87fecc44feb500e6daa2be8916f3a)

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 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 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 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
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 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
Jorik Schellekens 0060acbb33
Merge pull request #5056 from matrix-org/joriks/style-fighting 
Quick win session 24/07/2020
 2020-08-12 15:21:06 +01:00
Weblate ff9875351f Merge branch 'origin/develop' into Weblate. 2020-08-12 14:18:51 +00:00
J. Ryan Stinnett 0c76af19f0
Merge pull request #5100 from matrix-org/jryans/remove-rebranding-toast 
Remove rebranding toast
 2020-08-12 15:18:44 +01:00
J. Ryan Stinnett 2e76e19f37 Remove rebrand toast from tests 2020-08-12 14:58:55 +01:00
J. Ryan Stinnett 1a68d2bb7c Update more types 2020-08-12 14:57:26 +01:00
J. Ryan Stinnett 83867b893f Update types 2020-08-12 14:53:31 +01:00
Weblate 823d6a168b Merge branch 'origin/develop' into Weblate. 2020-08-12 13:41:48 +00:00
strix aluco 839b533a97 Translated using Weblate (Ukrainian) 
Currently translated at 49.0% (1147 of 2341 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/uk/
 2020-08-12 13:41:48 +00:00
vejetaryenvampir f8526a7387 Translated using Weblate (Turkish) 
Currently translated at 73.4% (1719 of 2341 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/tr/
 2020-08-12 13:41:47 +00:00
Yes f41eb9e7cf Translated using Weblate (Swedish) 
Currently translated at 61.9% (1448 of 2341 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sv/
 2020-08-12 13:41:47 +00:00
rkfg bd51eb5ff0 Translated using Weblate (Russian) 
Currently translated at 100.0% (2341 of 2341 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ru/
 2020-08-12 13:41:46 +00:00
Marcelo Filho 98309d7743 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 97.0% (2271 of 2341 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/pt_BR/
 2020-08-12 13:41:45 +00:00
call_xz e8e847e9ba Translated using Weblate (Japanese) 
Currently translated at 57.8% (1354 of 2341 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ja/
 2020-08-12 13:41:42 +00:00
random 8ec871c594 Translated using Weblate (Italian) 
Currently translated at 100.0% (2341 of 2341 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/it/
 2020-08-12 13:41:42 +00:00
Bamstam 9c8f27f440 Translated using Weblate (German) 
Currently translated at 99.9% (2340 of 2341 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
 2020-08-12 13:41:40 +00:00