Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Commit Graph

  • 709d33c21c Merge pull request #5294 from matrix-org/t3chguy/fix/w2 Michael Telatynski 2020-10-07 11:08:44 +01:00
  • 8a226781c4 Fix edited replies being wrongly treated as big emoji Michael Telatynski 2020-10-07 11:08:43 +01:00
  • dbb011b8f1 delint Michael Telatynski 2020-10-07 10:53:17 +01:00
  • aeca2571e8 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-07 09:43:48 +00:00
  • 25eb587e3b Merge pull request #15402 from vector-im/t3chguy/fix/10353 Michael Telatynski 2020-10-07 10:43:43 +01:00
  • 0e42fc45e2 Resolve couple of React warnings/errors Michael Telatynski 2020-10-07 10:40:20 +01:00
  • 67193b0ea7 Fix StopGapWidget infinitely recursing Michael Telatynski 2020-10-07 10:39:52 +01:00
  • 29e3881fb3 Iterate design and fix post-merge conflict Michael Telatynski 2020-10-07 10:36:45 +01:00
  • ea059bbd7d Merge branch 'origin/develop' into Weblate. Weblate 2020-10-07 09:20:09 +00:00
  • 06f434c313 Merge pull request #15398 from uhoreg/dehydration J. Ryan Stinnett 2020-10-07 10:20:03 +01:00
  • c784039cf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets Michael Telatynski 2020-10-07 10:04:45 +01:00
  • 0d6edab708 Workaround Jest bug with ArrayBuffers Michael Telatynski 2020-10-07 01:22:29 +01:00
  • 3304dff984 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-06 23:15:01 +00:00
  • 430bceb91d Merge pull request #5281 from matrix-org/t3chguy/fix/9836 Michael Telatynski 2020-10-07 00:14:56 +01:00
  • a8d88e01fb Write Enzyme tests for SendMessageComposer state/history persistence behaviour Michael Telatynski 2020-10-07 00:10:40 +01:00
  • 965debf442 extend mockClient in testutils Michael Telatynski 2020-10-07 00:09:48 +01:00
  • ab518a469f Replace MatrixClientPeg with access to context in SendMessageComposer Michael Telatynski 2020-10-07 00:09:09 +01:00
  • 07c0b20075 Update Jest and JSDOM Michael Telatynski 2020-10-07 00:08:41 +01:00
  • 13afb8d4f1 Update Jest and JSDOM Michael Telatynski 2020-10-07 00:08:40 +01:00
  • 72aeb6ea5d bump olm version again Hubert Chathi 2020-10-06 18:04:13 -04:00
  • 99d069f7ae Merge branch 'origin/develop' into Weblate. Weblate 2020-10-06 21:59:02 +00:00
  • 35c7ccfcbd Merge pull request #5282 from matrix-org/t3chguy/fix/15380 Michael Telatynski 2020-10-06 22:58:56 +01:00
  • 1bd0d9e02b Iterate Michael Telatynski 2020-10-06 22:53:34 +01:00
  • 2e45374cf8 Update src/components/views/right_panel/UserInfo.tsx Michael Telatynski 2020-10-06 22:49:50 +01:00
  • cc25e98dbf Merge branch 'origin/develop' into Weblate. Weblate 2020-10-06 20:36:20 +00:00
  • a8ec588247 Translated using Weblate (German) @a2sc:matrix.org 2020-10-06 20:29:30 +00:00
  • 3fdefa354e Merge pull request #5279 from Sorunome/soru/fix-img-rendering Travis Ralston 2020-10-06 14:36:14 -06:00
  • e4e5137071 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-06 19:37:22 +00:00
  • 3d7358d03a Merge pull request #5293 from matrix-org/dbkr/fix_rightpanel_crash David Baker 2020-10-06 20:37:17 +01:00
  • 520e6e5fef update yarn.lock Hubert Chathi 2020-10-06 15:33:39 -04:00
  • e710346fd6 depend on newer olm Hubert Chathi 2020-10-06 15:30:36 -04:00
  • 49fd9f827d document dehydration feature flag Hubert Chathi 2020-10-06 15:29:45 -04:00
  • 0c6be6cf5e Update copyright David Baker 2020-10-06 19:32:21 +01:00
  • 9dc0837619 Hopefully fix righhtpanel crash David Baker 2020-10-06 18:11:28 +01:00
  • 0dc35967aa Merge branch 'origin/develop' into Weblate. Weblate 2020-10-06 13:57:52 +00:00
  • 6994247aa5 Translated using Weblate (Russian) Nikita Epifanov 2020-10-06 13:43:23 +00:00
  • e53d314828 Translated using Weblate (Estonian) Priit Jõerüüt 2020-10-06 12:16:46 +00:00
  • 6f5f66e255 Merge pull request #5283 from matrix-org/t3chguy/fix/w1 Michael Telatynski 2020-10-06 14:57:46 +01:00
  • 120f269190 Track replyToEvent along with CIDER state & history Michael Telatynski 2020-10-06 14:47:53 +01:00
  • 45fa647655 Convert SendHistoryManager to TS Michael Telatynski 2020-10-06 13:55:39 +01:00
  • 316fe0ad03 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-06 11:36:02 +00:00
  • a575268ebd Translated using Weblate (Estonian) Priit Jõerüüt 2020-10-06 10:45:42 +00:00
  • 8507480bdb Translated using Weblate (Albanian) Besnik Bleta 2020-10-06 09:42:27 +00:00
  • 5f615bd4c9 Merge pull request #5272 from matrix-org/t3chguy/fix/15255 Michael Telatynski 2020-10-06 12:35:56 +01:00
  • 55a18b8c2d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15255 Michael Telatynski 2020-10-06 10:51:30 +01:00
  • 17a04f2915 Fix naive pinning limit and app tile widgetMessaging NPE Michael Telatynski 2020-10-06 10:48:55 +01:00
  • cb090f4743 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-06 09:24:30 +00:00
  • 39c49125ce Merge pull request #5273 from matrix-org/t3chguy/fix/15323 Michael Telatynski 2020-10-06 10:24:26 +01:00
  • c4d9edffcc Merge branch 'origin/develop' into Weblate. Weblate 2020-10-06 09:23:24 +00:00
  • ab9b5b0d7b Merge pull request #5265 from matrix-org/t3chguy/feat/widget-max-width Michael Telatynski 2020-10-06 10:23:19 +01:00
  • 0bb26831ae Hide Jump to Read Receipt button for users who have not yet sent an RR Michael Telatynski 2020-10-06 08:28:06 +01:00
  • 930deba957 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-06 07:25:32 +00:00
  • 9a448e3974 Translated using Weblate (Hungarian) Szimszon 2020-10-06 05:47:06 +00:00
  • d8443628e4 Translated using Weblate (Estonian) Priit Jõerüüt 2020-10-06 05:36:47 +00:00
  • 6306524805 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-10-06 06:06:36 +00:00
  • 48da4c2abd Merge pull request #5280 from michel-zimmer/call-container-avatar-initial-center Michael Telatynski 2020-10-06 08:25:26 +01:00
  • fbcea7d2cc Fix editing and redactions not updating the Reply Thread Michael Telatynski 2020-10-06 08:23:48 +01:00
  • 80091f7db2 Fix call container avatar initial centering Michel Zimmer 2020-10-06 08:30:25 +02:00
  • 1042a84248 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-05 23:32:10 +00:00
  • 1e34365caa Merge pull request #5268 from matrix-org/t3chguy/fix/15349 Michael Telatynski 2020-10-06 00:32:05 +01:00
  • da7c0258c2 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-05 21:40:55 +00:00
  • f5f0686586 Merge pull request #5239 from uhoreg/dehydration Hubert Chathi 2020-10-05 17:40:49 -04:00
  • 2170e494fb Merge pull request #145 from vector-im/poljar/seshat-bump poljar 2020-10-05 18:30:27 +02:00
  • 6ced94914f package.json: Bump the seshat version. Damir Jelić 2020-10-05 18:23:32 +02:00
  • 5fdeb23ca0 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-05 16:14:51 +00:00
  • 9700ff9083 Merge pull request #15376 from vector-im/jryans/remove-outdated-config J. Ryan Stinnett 2020-10-05 17:14:45 +01:00
  • 7b209bdf9f Remove riot-bot from sample config J. Ryan Stinnett 2020-10-05 16:02:01 +01:00
  • 98212b225e Merge branch 'origin/develop' into Weblate. Weblate 2020-10-05 13:46:19 +00:00
  • 882648a918 Translated using Weblate (Italian) random 2020-10-05 12:52:36 +00:00
  • fdb8cb78f9 Merge pull request #5277 from matrix-org/t3chguy/fix/9551 Michael Telatynski 2020-10-05 14:46:12 +01:00
  • cf37f0abf2 Fix the AvatarSetting avatar getting crushed by the flexbox Michael Telatynski 2020-10-05 12:54:01 +01:00
  • 7a2ef99d54 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-05 11:31:08 +00:00
  • d149548d13 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-10-05 03:02:59 +00:00
  • 4f52afdb3c Merge pull request #5270 from matrix-org/t3chguy/rs/3620 Michael Telatynski 2020-10-05 12:31:01 +01:00
  • 34c15b5221 fix img tags not always being rendered correctly Sorunome 2020-10-05 09:50:19 +02:00
  • c791330145 Translated using Weblate (Slovenian) sagu 2020-10-03 07:17:50 +00:00
  • dcb4771d61 Translated using Weblate (German) @a2sc:matrix.org 2020-10-03 16:09:17 +00:00
  • 46266cb739 Translated using Weblate (Galician) Xose M 2020-10-03 05:19:29 +00:00
  • 73a2c18e87 Translated using Weblate (Estonian) Priit Jõerüüt 2020-10-02 21:37:51 +00:00
  • 49cc62ca43 Oh right. Run i18n again. Hubert Chathi 2020-10-02 17:48:13 -04:00
  • c1765c857e apply changes from review Hubert Chathi 2020-10-02 17:43:49 -04:00
  • 7210b8e80a Merge branch 'origin/develop' into Weblate. Weblate 2020-10-02 21:15:53 +00:00
  • f5a3915046 Translated using Weblate (Russian) Nikita Epifanov 2020-10-02 19:36:20 +00:00
  • 01031e33cb Merge pull request #5257 from matrix-org/t3chguy/fix/14112 Michael Telatynski 2020-10-02 22:15:47 +01:00
  • d03d228411 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-02 17:29:23 +00:00
  • 489c5b9b0a Merge pull request #5276 from michel-zimmer/room-directory-clipped-uris Michael Telatynski 2020-10-02 18:29:19 +01:00
  • aeba605816 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-02 17:19:10 +00:00
  • a6246a7e9f Merge pull request #5278 from matrix-org/t3chguy/fix/15362 Michael Telatynski 2020-10-02 18:19:05 +01:00
  • 5ca3b8648e Merge branch 'origin/develop' into Weblate. Weblate 2020-10-02 17:18:40 +00:00
  • 6caf53bd1e Merge pull request #5262 from matrix-org/t3chguy/fix/15286 Michael Telatynski 2020-10-02 18:18:36 +01:00
  • 4e095fb57b Merge branch 'origin/develop' into Weblate. Weblate 2020-10-02 17:18:25 +00:00
  • f01ea32397 Merge pull request #5261 from matrix-org/t3chguy/fix/15279 Michael Telatynski 2020-10-02 18:18:20 +01:00
  • 58bbbf31b9 Fix room directory clipping links in the room's topic Michel Zimmer 2020-10-02 18:00:58 +02:00
  • cc43de6ebf add comment Michael Telatynski 2020-10-02 16:46:27 +01:00
  • 7d11c3092d Decorate failed e2ee downgrade attempts better Michael Telatynski 2020-10-02 16:38:02 +01:00
  • d3cbb51ecb Use Own Profile Store for the Profile Settings Michael Telatynski 2020-10-02 15:39:34 +01:00
  • 2bb7b6535f Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering Tulir Asokan 2020-10-02 17:28:45 +03:00
  • d7d3003366 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-02 13:30:30 +00:00
  • 62a62b0289 Translated using Weblate (German) @a2sc:matrix.org 2020-10-02 10:20:29 +00:00
  • b50fcd98f6 Translated using Weblate (Chinese (Simplified)) FeralMeow 2020-10-02 09:55:25 +00:00