Commit Graph

  • a1cb070c60 Translated using Weblate (Italian) random 2020-06-19 09:14:21 +00:00
  • e4521a4d81 Translated using Weblate (Hungarian) Szimszon 2020-06-19 09:40:15 +00:00
  • db14729489 Translated using Weblate (Galician) XoseM 2020-06-19 15:49:12 +00:00
  • 4948e49f76 Translated using Weblate (French) Kévin C 2020-06-19 11:57:13 +00:00
  • 87ab0f9830 Merge pull request #4762 from matrix-org/dbkr/fix_verification_race David Baker 2020-06-19 17:06:02 +01:00
  • 3f936a1fe4 Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss David Baker 2020-06-19 16:50:29 +01:00
  • 748f4dccb4 riot-desktop: Bump the required seshat version. Damir Jelić 2020-06-19 10:52:02 +02:00
  • 931ca6e3bd Merge branch 'origin/develop' into Weblate. Weblate 2020-06-19 08:51:03 +00:00
  • 4e92472f73 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-19 08:48:50 +00:00
  • c7f72f0d00 Translated using Weblate (Esperanto) Victor Grousset 2020-06-19 02:14:36 +00:00
  • 95dadca8e8 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-06-19 00:55:53 +00:00
  • 069f009d85 Merge remote-tracking branch 'origin/poljar/eventindex-user-version' into develop Damir Jelić 2020-06-19 09:54:29 +02:00
  • c1646e882a Merge remote-tracking branch 'origin/poljar/eventindex-newly-encrypted-room' into develop Damir Jelić 2020-06-19 09:54:19 +02:00
  • cfee2a43fb Merge branch 'poljar/eventindex-user-version' into develop Damir Jelić 2020-06-19 09:53:43 +02:00
  • 1b1608c56d Merge remote-tracking branch 'origin/poljar/eventindex-newly-encrypted-room' into develop Damir Jelić 2020-06-19 09:53:34 +02:00
  • e3ae05b6b9 Merge branch 'poljar/eventindex-user-version' into develop Damir Jelić 2020-06-19 09:50:40 +02:00
  • 253212d8c8 Merge remote-tracking branch 'origin/poljar/eventindex-new-encrypted-rooom' into develop Damir Jelić 2020-06-19 09:50:22 +02:00
  • ec4b350a82 Merge remote-tracking branch 'origin/poljar/seshat-search-pagination' into develop Damir Jelić 2020-06-19 09:50:03 +02:00
  • c690cfc6c5 mark messages with a black shield if the megolm session isn't trusted Hubert Chathi 2020-06-18 21:57:33 -04:00
  • 8b0bc522da Merge branch 'origin/develop' into Weblate. Weblate 2020-06-18 22:53:47 +00:00
  • f136ba4a98 Merge pull request #4796 from matrix-org/travis/room-list/bug/crash-filter Travis Ralston 2020-06-18 16:53:42 -06:00
  • ff7d1a0034 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-18 22:20:18 +00:00
  • e723d6115c Merge pull request #4795 from matrix-org/t3chguy/hide_unknown_rooms_search Michael Telatynski 2020-06-18 23:20:12 +01:00
  • 6112018401 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-18 21:59:47 +00:00
  • 47fd7ab06c Merge pull request #4794 from matrix-org/travis/room-list/mvp Travis Ralston 2020-06-18 15:59:42 -06:00
  • 7fef41f3a7 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-18 21:59:39 +00:00
  • 5e834a50a9 Merge pull request #14102 from vector-im/travis/room-list/mvp Travis Ralston 2020-06-18 15:59:33 -06:00
  • 7191c01265 Fix crash when filtering new room list too fast Travis Ralston 2020-06-18 15:52:55 -06:00
  • 3ac028565b i18n Michael Telatynski 2020-06-18 22:50:10 +01:00
  • eec42cff49 tidy up Michael Telatynski 2020-06-18 22:49:39 +01:00
  • 847f12c289 Update i18n Travis Ralston 2020-06-18 15:47:30 -06:00
  • 0e9ef8804d Mark the new room list as ready for general testing Travis Ralston 2020-06-18 15:46:37 -06:00
  • cbf35a6060 Mark the new room list as ready for general testing Travis Ralston 2020-06-18 15:46:04 -06:00
  • 045def4566 hide search results from unknown rooms Michael Telatynski 2020-06-18 22:45:42 +01:00
  • 712f10c76d Merge branch 'origin/develop' into Weblate. Weblate 2020-06-18 18:36:48 +00:00
  • a09779063c Translated using Weblate (Chinese (Simplified)) vicdorke 2020-06-18 17:05:25 +00:00
  • 69c5aecfc7 Merge pull request #4784 from bocoup/extend-querymatcher-heuristic Michael Telatynski 2020-06-18 19:36:42 +01:00
  • 2e0cb4746a fixup! Extend QueryMatcher's sorting heuristic Mike Pennisi 2020-06-18 14:20:40 -04:00
  • 4ffc54d143 fixup! Extend QueryMatcher's sorting heuristic Mike Pennisi 2020-06-18 13:24:02 -04:00
  • a128961d03 Translated using Weblate (Chinese (Simplified)) Lmath Alpha 2020-06-18 16:59:20 +00:00
  • 37b299412f Fix merge conflicts Jorik Schellekens 2020-06-18 15:47:26 +01:00
  • f2440388b1 Merge branch 'joriks/font-scaling-message-preview' into joriks/appearance-tab-layout-options Jorik Schellekens 2020-06-18 15:37:01 +01:00
  • b9fb9aae4a Rename MessagePreview to EventTilePreview Jorik Schellekens 2020-06-18 15:36:23 +01:00
  • 0d3ea6c9d4 Merge branch 'joriks/font-scaling-message-preview' of github.com:matrix-org/matrix-react-sdk into joriks/font-scaling-message-preview Jorik Schellekens 2020-06-18 15:34:03 +01:00
  • 997c7ffc96 Add missing semicolons Jorik Schellekens 2020-06-18 15:26:53 +01:00
  • 15881fc7d0 Merge branch 'develop' into joriks/font-scaling-message-preview Jorik Schellekens 2020-06-18 15:19:28 +01:00
  • adfe1ac9bf Remove stray debug Jorik Schellekens 2020-06-18 15:13:28 +01:00
  • 5a310cfd85 Merge pull request #4793 from matrix-org/revert-4686-rel-2 David Baker 2020-06-18 15:12:56 +01:00
  • 9b9e6e04e3 Merge remote-tracking branch 'origin/develop' into dbkr/fix_verification_race David Baker 2020-06-18 15:12:06 +01:00
  • f6e55345a1 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-18 14:08:30 +00:00
  • 29d0cfc0b0 Merge pull request #4791 from matrix-org/joriks/semicolon Jorik Schellekens 2020-06-18 15:08:25 +01:00
  • e4d824839a Revert "Use recovery keys over passphrases" David Baker 2020-06-18 09:35:11 +01:00
  • ba0bc8f29c Resolve "The Great Conflict" Jorik Schellekens 2020-06-18 14:55:24 +01:00
  • 291997421b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/semicolon Jorik Schellekens 2020-06-18 14:54:20 +01:00
  • 74174041bb Remove semicolon in style Jorik Schellekens 2020-06-18 14:53:12 +01:00
  • 199f776e58 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-18 13:51:27 +00:00
  • 5b27a570a8 Merge pull request #4790 from matrix-org/revert-4686-dbkr/recovery_keys_over_passphrases David Baker 2020-06-18 14:51:22 +01:00
  • 08fd9cda4f Merge branch 'origin/develop' into Weblate. Weblate 2020-06-18 13:48:51 +00:00
  • c26513b1e3 Merge pull request #4783 from matrix-org/travis/room-list/sticky-headers-reliability Travis Ralston 2020-06-18 07:48:46 -06:00
  • 8f3a6fc30e Consistent quotes Travis Ralston 2020-06-18 07:48:36 -06:00
  • 9a05f5bc03 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-18 13:46:37 +00:00
  • 4a5cc8557c Merge pull request #4785 from matrix-org/travis/room-list/show-less-is-more Travis Ralston 2020-06-18 07:46:32 -06:00
  • c6eaac8b80 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-18 13:46:18 +00:00
  • b857c9d199 Merge pull request #4786 from matrix-org/travis/room-list/show-n-reliability Travis Ralston 2020-06-18 07:46:13 -06:00
  • 385d784036 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-18 13:46:08 +00:00
  • 87aece9997 Merge pull request #4787 from matrix-org/travis/room-list/performance-2 Travis Ralston 2020-06-18 07:46:03 -06:00
  • 47a825be7c Merge branch 'develop' into joriks/appearance-advanced Jorik Schellekens 2020-06-18 14:41:28 +01:00
  • a1db9dd352 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-18 13:35:07 +00:00
  • 45a6bf3a6d Translated using Weblate (Hungarian) Szimszon 2020-06-17 18:04:14 +00:00
  • f1365a8d30 Translated using Weblate (Galician) XoseM 2020-06-18 10:33:35 +00:00
  • 5ceae3085c Translated using Weblate (French) Kévin C 2020-06-18 06:30:37 +00:00
  • 9b90dcd1a8 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-06-18 02:04:17 +00:00
  • 27a9a7b4c1 Merge pull request #4789 from matrix-org/dbkr/remove_ssss_secret_cache_option David Baker 2020-06-18 14:34:59 +01:00
  • 05d0309081 Lint a few semicolons Jorik Schellekens 2020-06-18 14:32:43 +01:00
  • 9760f94ff5 Merge branch 'joriks/font-scaling-message-preview' into joriks/appearance-tab-layout-options Jorik Schellekens 2020-06-18 14:04:31 +01:00
  • 69969dfee8 Respond to review Jorik Schellekens 2020-06-18 13:58:35 +01:00
  • a579ea95db Lint and i18n Jorik Schellekens 2020-06-18 13:28:24 +01:00
  • 3c268a31c8 i18n David Baker 2020-06-18 10:48:18 +01:00
  • 793c6c549e Unused import David Baker 2020-06-18 10:45:15 +01:00
  • 54e235b0b9 Remove labs option to cache 'passphrase' David Baker 2020-06-18 10:42:33 +01:00
  • e0a34d9dea Revert "Use recovery keys over passphrases" David Baker 2020-06-18 09:35:11 +01:00
  • 8db67743f7 Improve room switching in the new room list Travis Ralston 2020-06-17 22:42:01 -06:00
  • 245181cf80 Fix show less/more button occluding the list automatically Travis Ralston 2020-06-17 22:09:59 -06:00
  • 1735da8cb1 Don't show a 'show less' button when it's impossible to collapse Travis Ralston 2020-06-17 22:04:34 -06:00
  • 6af4d82ce7 Extend QueryMatcher's sorting heuristic Mike Pennisi 2020-06-17 23:31:02 -04:00
  • 321889f95b Clear top when not sticking headers to the top Travis Ralston 2020-06-17 20:01:03 -06:00
  • d12f33fb58 v1.6.6-rc.1 v1.6.6-rc.1 RiotRobot 2020-06-17 21:52:14 +01:00
  • b954292e06 Prepare changelog for v1.6.6-rc.1 RiotRobot 2020-06-17 21:52:13 +01:00
  • d587a8e910 Upgrade matrix-react-sdk to 2.8.0-rc.1 RiotRobot 2020-06-17 21:49:25 +01:00
  • 2c227f68d4 Upgrade matrix-js-sdk to 7.0.0-rc.1 RiotRobot 2020-06-17 21:49:00 +01:00
  • b5aa66015c v2.8.0-rc.1 RiotRobot 2020-06-17 21:46:34 +01:00
  • 2533c33c54 Prepare changelog for v2.8.0-rc.1 RiotRobot 2020-06-17 21:46:33 +01:00
  • 0168182f5b v1.6.6-rc.1 RiotRobot 2020-06-17 21:40:42 +01:00
  • 9cf829730f Prepare changelog for v1.6.6-rc.1 RiotRobot 2020-06-17 21:40:42 +01:00
  • dd23a50a3c Upgrade matrix-js-sdk to 7.0.0-rc.1 RiotRobot 2020-06-17 21:40:30 +01:00
  • ab2a1e5fdd Upgrade matrix-js-sdk to 7.0.0-rc.1 RiotRobot 2020-06-17 21:38:17 +01:00
  • 3597f43b73 Merge pull request #94 from vector-im/t3chguy/electron9 Michael Telatynski 2020-06-17 20:59:14 +01:00
  • 9f42796577 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-17 17:06:09 +00:00
  • 803b7bb30f Merge pull request #4694 from justin-sleep/remove-escape-backslashes Travis Ralston 2020-06-17 11:06:04 -06:00
  • 1fb5a6f6b3 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-17 16:39:51 +00:00