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

Commit Graph

  • a6bcb59251 Merge branch 'develop' into fix/call-search-areas Panagiotis 2021-06-05 12:39:18 +03:00
  • 640ed0479a Translated using Weblate (Lithuanian) Govindas 2021-06-04 08:50:12 +00:00
  • 87622fb8ea Add a comment Šimon Brandner 2021-06-05 08:34:32 +02:00
  • 4b2a9a6bf7 Remove mistaken param Šimon Brandner 2021-06-05 08:33:14 +02:00
  • c3eb517700 Use fallback avatar only for DMs with 2 people Šimon Brandner 2021-06-05 08:22:43 +02:00
  • 8786c97cdb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations Jaiwanth 2021-06-05 11:27:08 +05:30
  • 3bf8e54d7f Use cached RoomContext settings values throughout rooms Robin Townsend 2021-06-05 01:25:43 -04:00
  • 13196b8146 Prefer cached settings values in shouldHideEvent Robin Townsend 2021-06-05 01:25:01 -04:00
  • 48d3e41351 Cache frequently used settings values in RoomContext Robin Townsend 2021-06-05 01:23:51 -04:00
  • 40d2f8228f Fix watching settings Robin Townsend 2021-06-05 01:16:52 -04:00
  • 03e59aa60c Remove translation Aaron Raimist 2021-06-04 17:17:58 -05:00
  • 31604c13c0 Lint the typescript tests David Baker 2021-06-04 16:52:50 +01:00
  • abfe6d85a0 Merge pull request #6141 from matrix-org/jryans/repair-event-status J. Ryan Stinnett 2021-06-04 14:16:59 +01:00
  • ab96d5f8af Repair event status position in timeline J. Ryan Stinnett 2021-06-04 11:54:58 +01:00
  • 93f41ce0ab Actually finish the empty state for the pinned messages card Michael Telatynski 2021-06-04 11:35:17 +01:00
  • 48bd6583ed Fix unpinning of pinned messages Michael Telatynski 2021-06-04 11:34:54 +01:00
  • f32726d5ed Begin extended implementation Jaiwanth 2021-06-04 15:08:17 +05:30
  • 330e230f2c Merge pull request #200 from aaronraimist/macos-preferences Michael Telatynski 2021-06-04 09:53:30 +01:00
  • dee2ecdf6c Merge pull request #202 from aaronraimist/zoomin Michael Telatynski 2021-06-04 09:50:18 +01:00
  • befcbf8e75 Add spaces into curly braces Šimon Brandner 2021-06-04 08:32:30 +02:00
  • 641c902408 i18n Šimon Brandner 2021-06-04 08:24:20 +02:00
  • 6cd76086a7 Improve wording Šimon Brandner 2021-06-04 08:23:32 +02:00
  • 1d3bf91e83 Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share Šimon Brandner 2021-06-04 08:19:29 +02:00
  • 8c533c7f8b Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile Šimon Brandner 2021-06-04 08:09:31 +02:00
  • 48c57610df Merge remote-tracking branch 'upstream/develop' into fix/mute-incoming-call/15591 Šimon Brandner 2021-06-04 08:08:34 +02:00
  • c99c42f341 Merge branch 'develop' into share-room Aaron Raimist 2021-06-04 01:08:09 -05:00
  • 12e013508d Merge pull request #6132 from matrix-org/travis/ts-mtxcli Travis Ralston 2021-06-04 00:07:22 -06:00
  • 629201a074 Merge branch 'develop' into fix/mute-incoming-call/15591 Šimon Brandner 2021-06-04 07:59:28 +02:00
  • 6eb33ac730 Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile Šimon Brandner 2021-06-04 07:49:05 +02:00
  • 3b2d6d442f Translate unknown call state Šimon Brandner 2021-06-04 07:43:30 +02:00
  • ae54a8f546 Return null Šimon Brandner 2021-06-04 07:42:17 +02:00
  • f109065606 lint Aaron Raimist 2021-06-04 00:22:59 -05:00
  • 344800d835 Remove accelerator Aaron Raimist 2021-06-04 00:16:45 -05:00
  • 8c99f0ad12 Switch zoomIn accelerator to CommandOrControl+Plus Aaron Raimist 2021-06-04 00:07:02 -05:00
  • bc0e3bb317 Add warning dialog when custom config.json is invalid Aaron Raimist 2021-06-03 23:39:29 -05:00
  • b7e4e9e075 Follow HIG: use ellipsis for Preferences menu item, add app name to About menu item Aaron Raimist 2021-06-03 23:07:19 -05:00
  • 5055ad0aec Put Preferences menu item in correct location on macOS Aaron Raimist 2021-06-03 22:56:02 -05:00
  • f22fd7aa3b Merge pull request #6096 from matrix-org/t3chguy/fix/6606 Michael Telatynski 2021-06-04 00:00:31 +01:00
  • 5d0d81e79a not sure how I butchered this merge conflict resolution this much. Michael Telatynski 2021-06-03 19:37:26 +01:00
  • 93010d34fd Merge branch 'develop' into t3chguy/fix/6606 Michael Telatynski 2021-06-03 19:33:09 +01:00
  • 7421efe8f9 Merge pull request #6136 from matrix-org/dbkr/map_phone_number_lookup_to_native David Baker 2021-06-03 19:01:46 +01:00
  • 0c97d90fb9 Iterate PR based on feedback Michael Telatynski 2021-06-03 16:44:28 +01:00
  • a36063704d Merge pull request #6138 from matrix-org/gsouquet/containment-event Germain 2021-06-03 16:38:55 +01:00
  • 5ef78f43a4 fix containment rule to keep height when resizing vertically Germain Souquet 2021-06-03 16:26:20 +01:00
  • f2643151c6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 Michael Telatynski 2021-06-03 16:22:59 +01:00
  • 8ef95a6237 Interface dispatcher payload David Baker 2021-06-03 14:38:13 +01:00
  • e7f0df7fcc Small fix Jaiwanth 2021-06-03 13:39:14 +05:30
  • dbaa394d65 i18n Michael Telatynski 2021-06-03 08:54:30 +01:00
  • 4c22d1f2a1 Refactor Jaiwanth 2021-06-03 13:21:56 +05:30
  • 7f83590846 Merge pull request #6079 from matrix-org/gsouquet/switch-rooms Germain 2021-06-03 08:44:01 +01:00
  • 4f50727010 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606 Michael Telatynski 2021-06-03 08:42:05 +01:00
  • 83d223475b delint imports Michael Telatynski 2021-06-03 08:41:22 +01:00
  • a34f8a29f4 fix mx_Event containment rules and empty read avatar row Germain Souquet 2021-06-03 08:41:12 +01:00
  • 4765216280 Merge branch 't3chguy/fix/6606' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606 Michael Telatynski 2021-06-03 08:36:04 +01:00
  • 42a3ace82a Iterate PR based on feedback Michael Telatynski 2021-06-03 08:35:12 +01:00
  • e334ce8192 First cut of space panel drag-and-drop ordering Michael Telatynski 2021-06-03 08:32:36 +01:00
  • 3f12b7280d Make AutoHideScrollbar pass through all unknown props Michael Telatynski 2021-06-03 08:31:06 +01:00
  • 430cfa9c06 Merge pull request #6127 from matrix-org/gsouquet/css-containment Germain 2021-06-03 08:10:29 +01:00
  • 183166c460 Unminify CSS and apply suggestions from the design team Jaiwanth 2021-06-03 12:40:00 +05:30
  • 9f1e1c2420 Translated using Weblate (French) c-cal 2021-06-01 15:37:08 +00:00
  • b4f8c66f7b Translated using Weblate (French) Miquel Lionel 2021-06-02 23:37:33 +00:00
  • c1a763fb4f Translated using Weblate (French) zopieux 2021-06-02 23:47:21 +00:00
  • 53fc475539 Update src/components/views/rooms/PinnedEventTile.tsx Michael Telatynski 2021-06-03 08:03:31 +01:00
  • 1c92e31683 Add missing license header Šimon Brandner 2021-06-02 19:27:57 +02:00
  • e0572acb14 Write tests for CallEventGrouper Šimon Brandner 2021-06-02 19:22:22 +02:00
  • 58652152c1 Strings are now in a different place... David Baker 2021-06-02 17:52:26 +01:00
  • 0aeddea30f Only do native lookup if it's supported David Baker 2021-06-02 17:47:29 +01:00
  • 2c4fa73a45 Map phone number lookup results to their native rooms David Baker 2021-06-02 17:39:13 +01:00
  • 079a5c10ad Respect space ordering field in m.tag for top level spaces Michael Telatynski 2021-06-02 16:43:38 +01:00
  • 4290237bdf Merge pull request #6135 from matrix-org/t3chguy/fix/17494 Michael Telatynski 2021-06-02 15:08:41 +01:00
  • 70e309f0de Merge pull request #5823 from matrix-org/gsouquet-scroll-to-live-reset-hash Germain 2021-06-02 14:10:16 +01:00
  • bc50028f70 Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash Germain Souquet 2021-06-02 13:54:05 +01:00
  • da13ec16f3 Merge branch 't3chguy/fix/17529' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 Michael Telatynski 2021-06-02 12:42:55 +01:00
  • 35948374e9 remove unused imports Michael Telatynski 2021-06-02 11:56:49 +01:00
  • bc89cf14dd ignore hash/fragment when de-duplicating links for url previews Michael Telatynski 2021-06-02 11:53:47 +01:00
  • 37c379c393 Merge branch 'develop' into feature/call-event-tile Šimon Brandner 2021-06-02 12:52:03 +02:00
  • 9d126c51e4 Merge pull request #6113 from matrix-org/gsouquet/improve-layout-rendering Germain 2021-06-02 11:41:59 +01:00
  • 96f5d3af05 Merge pull request #6130 from matrix-org/gsouquet/member-list-sort Germain 2021-06-02 11:40:52 +01:00
  • 2d50325836 Merge pull request #6133 from matrix-org/jryans/event-tile-radius J. Ryan Stinnett 2021-06-02 11:39:54 +01:00
  • bc3c759feb Add temporary mechanism for managing communities without dnd Michael Telatynski 2021-06-02 11:33:25 +01:00
  • f3431feaff Remove unused memoize import Germain Souquet 2021-06-02 11:25:32 +01:00
  • bc2f068e1e Merge pull request #6131 from matrix-org/dbkr/log_when_already_a_call David Baker 2021-06-02 11:13:46 +01:00
  • 82fe9a5c7b remove unused import Germain Souquet 2021-06-02 10:48:18 +01:00
  • d7a5547d80 use Intl.Collator over String.prototype.localeCompare for better performance Germain Souquet 2021-06-02 10:42:17 +01:00
  • 234c65b331 Tweak event border radius to match action bar J. Ryan Stinnett 2021-06-02 10:25:29 +01:00
  • 466a52e238 Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile Šimon Brandner 2021-06-02 10:45:35 +02:00
  • 3331e7bfbe Use enums where possible Šimon Brandner 2021-06-02 10:42:58 +02:00
  • b202f997e3 Refactor setState() Šimon Brandner 2021-06-02 10:30:17 +02:00
  • 78229a2fd0 Support user busy Šimon Brandner 2021-06-02 10:20:11 +02:00
  • 521b2445a8 Refactoring and fixes Šimon Brandner 2021-06-02 10:18:32 +02:00
  • f84ae4a173 Add await Jaiwanth 2021-06-02 13:12:03 +05:30
  • 692e499cf2 Handle encrypted stickers and store stickers in a separate folder Jaiwanth 2021-06-02 12:06:00 +05:30
  • 3dc6cfbf34 Undo olmVersion handling Travis Ralston 2021-06-01 22:31:08 -06:00
  • c9883f346c Build pass 1 Travis Ralston 2021-06-01 22:21:04 -06:00
  • 5b2dacd99e Adapt for js-sdk MatrixClient conversion to TS Travis Ralston 2021-06-01 21:36:28 -06:00
  • 992861a1cd Fix forward dialog tests Robin Townsend 2021-06-01 20:36:28 -04:00
  • 59660df0cb Use a QueryMatcher for forward dialog filtering Robin Townsend 2021-06-01 20:17:20 -04:00
  • 4ef69fcbf6 Use settings hooks in forward dialog Robin Townsend 2021-06-01 18:09:51 -04:00
  • c78167977a Remove unused class Robin Townsend 2021-06-01 17:57:26 -04:00
  • 8efbdd0406 Match forward dialog send failed indicator color with button Robin Townsend 2021-06-01 17:56:46 -04:00