OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
39,341 Commits
208 Branches
547 Tags
437 MiB
Commit Graph

39341 Commits (4ae8f2a5a2072ea8925c742e0b77bece3b031b9f)

Author SHA1 Message Date
Šimon Brandner 5f6a1e336e
Remove unnecessary curly braces 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 18:46:19 +02:00
Šimon Brandner 9761c38f3d
Merge remote-tracking branch 'upstream/develop' into feature/hidden-rrs 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 18:39:22 +02:00
Weblate 051f5c666e Merge branch 'origin/develop' into Weblate. 2021-07-27 16:20:07 +00:00
Germain f82744db97
Merge pull request #6487 from matrix-org/gsouquet/fix-18265 2021-07-27 17:20:02 +01:00
Michael Telatynski 12461a79e1 Move SettingsStore `setting_updated` dispatch to action enum 2021-07-27 17:19:45 +01:00
Paulo Pinto 3f2dadf0fe When a single message is unpinned, link to it 
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-07-27 17:14:50 +01:00
Paulo Pinto 8fe7df9171 When a single message is pinned, link to it 
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-07-27 17:14:50 +01:00
Paulo Pinto 40ead34c08 Add test for textForPinnedEvent 
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-07-27 17:14:50 +01:00
Germain 7e453d7745
Typo 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-07-27 17:14:39 +01:00
Šimon Brandner bc11e215b8
Merge remote-tracking branch 'upstream/develop' into feature/muting 2021-07-27 18:14:23 +02:00
Weblate fccc6eff6c Merge branch 'origin/develop' into Weblate. 2021-07-27 16:12:06 +00:00
Michael Telatynski e7151ebf2d
Merge pull request #6488 from SimonBrandner/fix/call-crash/18270 2021-07-27 17:12:01 +01:00
Šimon Brandner 36607fa8a2
Fix call crashing because element was undefined 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 18:05:50 +02:00
Germain Souquet 30ce7b5eab Make link within replies clickable 2021-07-27 17:57:46 +02:00
Šimon Brandner 6f77d3bbab
Correctly hide the dialpad 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 17:52:13 +02:00
RiotRobot cc0ff41360 v3.27.0-rc.1 2021-07-27 16:01:52 +01:00
RiotRobot 3003d48914 Prepare changelog for v3.27.0-rc.1 2021-07-27 16:01:51 +01:00
Šimon Brandner 8294d324e3
Merge remote-tracking branch 'upstream/develop' into fix/call-view/18221 2021-07-27 16:55:59 +02:00
RiotRobot 78eb8ffc26 Upgrade matrix-js-sdk to 12.2.0-rc.1 2021-07-27 15:51:16 +01:00
Šimon Brandner 371de23b00
Merge remote-tracking branch 'upstream/develop' into feature/muting 2021-07-27 16:40:47 +02:00
Weblate 8ba70573cd Merge branch 'origin/develop' into Weblate. 2021-07-27 14:34:34 +00:00
David Baker 3e7aee3a87
Merge pull request #5992 from SimonBrandner/fix/12652/screen-share 
Add support for screen sharing in 1:1 calls
 2021-07-27 15:34:27 +01:00
Šimon Brandner b9e305daae
Delete mistake line 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 16:26:46 +02:00
Šimon Brandner 24f0c760ce
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 16:25:38 +02:00
Germain Souquet 3037be11c4 Restore padding for single person state events 2021-07-27 16:24:05 +02:00
Weblate 8e2845adb5 Merge branch 'origin/develop' into Weblate. 2021-07-27 14:05:32 +00:00
Travis Ralston 93f42182c0
Merge pull request #6479 from matrix-org/travis/voice-messages/fix-placeholder-ui 
Fix timing of voice message recording UI appearing
 2021-07-27 08:05:28 -06:00
Michael Telatynski 62033d0286 Merge branch 't3chguy/fix/18071' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071 2021-07-27 15:03:20 +01:00
Michael Telatynski 39d9ec3ced Merge branch 'develop' into t3chguy/fix/18071 2021-07-27 15:02:59 +01:00
Jaiwanth 6f8f0e8314 Change copyright year 2021-07-27 19:30:08 +05:30
Michael Telatynski 8dd11cd2a5
Merge branch 'develop' into t3chguy/fix/18071 2021-07-27 14:47:18 +01:00
Michael Telatynski 353c70ad75 i18n 2021-07-27 14:45:36 +01:00
Weblate f605c7139f Merge branch 'origin/develop' into Weblate. 2021-07-27 13:42:09 +00:00
David Baker 5ead53b36a
Merge pull request #6483 from SimonBrandner/fix/dont-anim-resize/18261 
Fix PiP resize issues
 2021-07-27 14:42:04 +01:00
Michael Telatynski 755007cbee Conclude labs flags and write more tests 2021-07-27 14:39:14 +01:00
Šimon Brandner f532c302b6
Don't animate when resizing and move when the PiP changes size 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 15:31:54 +02:00
Šimon Brandner 001490f70d
Fix unused resize listener 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 15:30:44 +02:00
Weblate 2924035391 Merge branch 'origin/develop' into Weblate. 2021-07-27 13:10:55 +00:00
David Baker f7d0419cee
Merge pull request #6482 from RiotTranslateBot/weblate-element-web-matrix-react-sdk 
Translations update from Weblate
 2021-07-27 14:10:50 +01:00
Weblate 3e1a3a5944 Merge branch 'origin/develop' into Weblate. 2021-07-27 12:57:45 +00:00
David Baker 148571828b
Merge pull request #6474 from matrix-org/gsouquet/fix-18017 
Make new reply UI clickable
 2021-07-27 13:57:41 +01:00
Weblate 90a658e77b Merge branch 'origin/develop' into Weblate. 2021-07-27 12:54:35 +00:00
David Baker 7733ee2578
Merge pull request #6478 from matrix-org/dbkr/scrollpanel_loop_breaker 
Fix infinite pagination loop when offline
 2021-07-27 13:54:30 +01:00
Weblate 543312c0cc Merge branch 'origin/develop' into Weblate. 2021-07-27 12:40:31 +00:00
waclaw66 f2ed147cae Translated using Weblate (Czech) 
Currently translated at 100.0% (3080 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-07-27 12:40:31 +00:00
jelv 1f7e668bb2 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3080 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-07-27 12:40:28 +00:00
David Baker 72becb73e1
Merge pull request #6473 from matrix-org/gsouquet/fix-18208 
Fix deleted message left offset in the timeline
 2021-07-27 13:40:20 +01:00
Germain Souquet 92394daa62 Merge branch 'develop' into gsouquet/threaded-messaging-2349 2021-07-27 14:37:50 +02:00
James Salter 474561600e Fix hash == "" 2021-07-27 13:31:56 +01:00
Šimon Brandner 5dd34de5fe
Handle mute state changes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 14:31:42 +02:00