Commit Graph

  • cc1de6124b Merge branch 'origin/develop' into Weblate. Weblate 2020-05-26 19:04:56 +00:00
  • 906da4eb1c Translated using Weblate (Lithuanian) MamasLT 2020-05-26 16:46:52 +00:00
  • 403a64bcc6 EventIndex: Print out the checkpoint if there was an error during a crawl. Damir Jelić 2020-05-26 20:47:30 +02:00
  • 73213422a9 fix encryption icon missalignment Jorik Schellekens 2020-05-26 18:15:06 +01:00
  • 792859b939 Fix lines overflowing room list width Jorik Schellekens 2020-05-26 17:39:39 +01:00
  • d8836f0f4b Fir sublist sizing regression Jorik Schellekens 2020-05-26 17:09:42 +01:00
  • a496dafd41 Remove the keyshare dialog David Baker 2020-05-26 16:51:20 +01:00
  • 354d8d6fef Merge branch 'origin/develop' into Weblate. Weblate 2020-05-26 15:13:08 +00:00
  • 076a3e058d Merge pull request #4635 from JorikSchellekens/joriks/field-ts Jorik Schellekens 2020-05-26 16:13:03 +01:00
  • 492dd42f4d Merge pull request #13809 from JorikSchellekens/develop Jorik Schellekens 2020-05-26 16:12:46 +01:00
  • fcbd197e7d Fix file list regression Jorik Schellekens 2020-05-26 15:56:16 +01:00
  • 8f5c0c7c81 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-26 14:18:13 +00:00
  • f51c93ba68 Translated using Weblate (Czech) Stanislav Lukeš 2020-05-26 13:28:30 +00:00
  • 3fc060c754 Merge pull request #4646 from matrix-org/bwindels/detectnetworkfailureforjoin Bruno Windels 2020-05-26 14:18:06 +00:00
  • 1e21c043cf Merge branch 'origin/develop' into Weblate. Weblate 2020-05-26 13:26:09 +00:00
  • c2ccac0d76 Translated using Weblate (Czech) Stanislav Lukeš 2020-05-26 13:23:34 +00:00
  • f3ac96fa56 Merge pull request #4641 from matrix-org/bwindels/defaultfontsize Bruno Windels 2020-05-26 13:26:03 +00:00
  • cfe5173235 use connection error to detect network problem Bruno Windels 2020-05-26 15:20:58 +02:00
  • 0cf2e2452e Merge branch 'origin/develop' into Weblate. Weblate 2020-05-26 13:22:27 +00:00
  • d45a597528 Merge pull request #4645 from matrix-org/bwindels/addloggingforfailtojoinroom Bruno Windels 2020-05-26 13:22:22 +00:00
  • f1282179fb add logging when we fail to join a room Bruno Windels 2020-05-26 14:58:09 +02:00
  • 076d3ab00f Merge branch 'origin/develop' into Weblate. Weblate 2020-05-26 12:55:07 +00:00
  • e5c4d6fdcd Merge pull request #4644 from matrix-org/dbkr/kill_encryptedeventdialog David Baker 2020-05-26 13:55:02 +01:00
  • fb73bac4cf Update UpdateToast's priority to 30 Michael Telatynski 2020-05-26 13:53:28 +01:00
  • 2f5eedd996 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-26 12:48:53 +00:00
  • b7428fcf35 Merge pull request #4618 from matrix-org/t3chguy/toasts3 Michael Telatynski 2020-05-26 13:48:47 +01:00
  • d2fe4bcecd Unused imports David Baker 2020-05-26 13:46:47 +01:00
  • 9c56f30dae Merge branch 'origin/develop' into Weblate. Weblate 2020-05-26 12:45:44 +00:00
  • 0cec16d3b1 Merge pull request #4632 from matrix-org/t3chguy/confusing_copy Michael Telatynski 2020-05-26 13:45:40 +01:00
  • 563a36e0a1 Remove unused CSS too David Baker 2020-05-26 13:42:00 +01:00
  • 4ebf5d66a7 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-26 12:41:21 +00:00
  • 6017481566 Translated using Weblate (Lithuanian) MamasLT 2020-05-26 11:43:56 +00:00
  • d1084afb92 Merge pull request #4643 from matrix-org/t3chguy/fix-memberavatar Michael Telatynski 2020-05-26 13:41:15 +01:00
  • 352727906e i18n David Baker 2020-05-26 13:40:36 +01:00
  • c74d890774 Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3 Michael Telatynski 2020-05-26 13:38:17 +01:00
  • 7e45a71a8a Remove EncryptedEventDialog David Baker 2020-05-26 13:37:57 +01:00
  • 0713139dc5 Merge branches 'develop' and 't3chguy/confusing_copy' of github.com:matrix-org/matrix-react-sdk into t3chguy/confusing_copy Michael Telatynski 2020-05-26 13:35:18 +01:00
  • f8d2124aa3 MemberAvatar should not have its own letter fallback, it should use BaseAvatar's Michael Telatynski 2020-05-26 13:33:47 +01:00
  • cce53d8ab9 revert default font size to 15px Bruno Windels 2020-05-26 14:11:36 +02:00
  • 6993e7d193 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-26 11:17:53 +00:00
  • 1b8a7a33a4 Translated using Weblate (Hungarian) Szimszon 2020-05-26 11:12:14 +00:00
  • 29347d0c6a Merge pull request #4630 from matrix-org/t3chguy/fix_upload_abort Michael Telatynski 2020-05-26 12:17:46 +01:00
  • ba3fe850e0 Implement review Jorik Schellekens 2020-05-26 12:09:23 +01:00
  • b27ab6663e Merge branch 'develop' into t3chguy/fix_upload_abort Michael Telatynski 2020-05-26 12:04:36 +01:00
  • 7f3eafea99 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-26 11:03:57 +00:00
  • a64de63f00 Merge pull request #4633 from matrix-org/t3chguy/group-view-guest Michael Telatynski 2020-05-26 12:03:52 +01:00
  • 406c79d06d Merge branch 'origin/develop' into Weblate. Weblate 2020-05-26 11:02:31 +00:00
  • 8062e5a6e8 Merge pull request #4634 from matrix-org/t3chguy/passphrase-copy Michael Telatynski 2020-05-26 12:02:27 +01:00
  • 1fb6d41bf4 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-26 11:02:12 +00:00
  • e049ead25f Merge pull request #4636 from matrix-org/t3chguy/emojipickera11y Michael Telatynski 2020-05-26 12:02:07 +01:00
  • 04f251628f Merge branch 'origin/develop' into Weblate. Weblate 2020-05-26 11:00:56 +00:00
  • 1f4aac9544 Merge pull request #4631 from matrix-org/t3chguy/emoji-picker-footer-height Michael Telatynski 2020-05-26 12:00:51 +01:00
  • 30dc76713a Merge branch 'origin/develop' into Weblate. Weblate 2020-05-26 11:00:06 +00:00
  • d7f8fdec52 Translated using Weblate (Lithuanian) MamasLT 2020-05-26 10:02:15 +00:00
  • c00fd326c5 Merge pull request #4613 from matrix-org/t3chguy/toasts1 Michael Telatynski 2020-05-26 11:59:58 +01:00
  • 1e9fc4ed8a Merge pull request #4620 from matrix-org/t3chguy/toasts3_1 Michael Telatynski 2020-05-26 11:59:27 +01:00
  • b9dc466b26 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-26 10:58:59 +00:00
  • f4d69a9844 Merge pull request #4626 from matrix-org/t3chguy/redact_react Michael Telatynski 2020-05-26 11:58:54 +01:00
  • be30a2fbab Merge pull request #93 from vector-im/t3chguy/flush-on-update Michael Telatynski 2020-05-26 11:58:22 +01:00
  • a8d9076dde Merge branch 'origin/develop' into Weblate. Weblate 2020-05-26 10:58:19 +00:00
  • 47af85b7b9 Merge pull request #4628 from matrix-org/t3chguy/message_sent Michael Telatynski 2020-05-26 11:58:14 +01:00
  • 29ff40eee5 Merge pull request #13808 from vector-im/t3chguy/arrow-funcs-super Michael Telatynski 2020-05-26 10:13:02 +01:00
  • 3ad3c3ca0a Fix super in arrow funcs Michael Telatynski 2020-05-26 10:04:49 +01:00
  • d3cdcc7f0f Merge branch 'origin/develop' into Weblate. Weblate 2020-05-26 09:04:18 +00:00
  • 7b646d5d39 Merge pull request #4640 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk David Baker 2020-05-26 10:04:11 +01:00
  • 6723e71eb2 Merge pull request #13806 from RiotTranslateBot/weblate-riot-web-riot-web David Baker 2020-05-26 09:43:28 +01:00
  • 803287f057 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-26 08:37:04 +00:00
  • 707e22ad09 Merge pull request #4402 from matrix-org/t3chguy/alias Michael Telatynski 2020-05-26 09:36:58 +01:00
  • 9f4691cb77 Translated using Weblate (Lithuanian) MamasLT 2020-05-25 23:48:47 +00:00
  • 94d3e4f045 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-25 22:24:18 +00:00
  • 3f2ab5a3a9 Merge pull request #4638 from matrix-org/travis/matrix-client-peg-ts Travis Ralston 2020-05-25 16:24:12 -06:00
  • 1c9b5eb42d Appease the tests Travis Ralston 2020-05-25 16:14:51 -06:00
  • e5c2d17015 Move the instance definition to the Window Travis Ralston 2020-05-25 16:06:05 -06:00
  • 0cec74cc2b Appease the linter (and the project) Travis Ralston 2020-05-25 15:59:15 -06:00
  • bd2d13edd2 Convert the MatrixClientPeg to TypeScript Travis Ralston 2020-05-25 15:52:05 -06:00
  • 982e81f9a3 Rename MatrixClientPeg to ts Travis Ralston 2020-05-25 15:43:21 -06:00
  • 20ae161f00 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-25 21:29:32 +00:00
  • 3a4c65553c Translated using Weblate (German) toastbroot 2020-05-25 20:21:49 +00:00
  • f15e111e9a Translated using Weblate (German) Kim Brose 2020-05-25 20:21:43 +00:00
  • 01cf6cacb3 Translated using Weblate (German) T. Küchel 2020-05-25 20:16:00 +00:00
  • ddcfe881c4 Merge pull request #4629 from matrix-org/t3chguy/fix-baseavatar-hooks Michael Telatynski 2020-05-25 22:29:22 +01:00
  • d6644cf950 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-25 18:05:57 +00:00
  • c8329a1acf Translated using Weblate (Lithuanian) MamasLT 2020-05-25 13:12:04 +00:00
  • 608a1feb03 Merge pull request #4637 from matrix-org/t3chguy/edit_highlights Michael Telatynski 2020-05-25 19:05:50 +01:00
  • 0861b1fbec remove redundant props Michael Telatynski 2020-05-25 19:05:02 +01:00
  • 148f215d4e clean up Michael Telatynski 2020-05-25 19:02:44 +01:00
  • 43c0148123 Fix @types/react conflict in matrix-react-sdk Jorik Schellekens 2020-05-25 18:37:30 +01:00
  • dfc73626fa Fix import Jorik Schellekens 2020-05-25 18:18:47 +01:00
  • 035c4fae50 Refactor Payloads Jorik Schellekens 2020-05-25 18:11:55 +01:00
  • fc1f14f5aa Appease the types Jorik Schellekens 2020-05-25 17:53:09 +01:00
  • 303691eb72 Missing export Jorik Schellekens 2020-05-25 17:37:07 +01:00
  • c60483728f Fix dispatcher import in ReplyTile.js Tulir Asokan 2020-05-25 19:33:30 +03:00
  • b4624baf2f Merge branch 'develop' into joriks/field-ts Jorik Schellekens 2020-05-25 17:29:25 +01:00
  • dfe277b78d Remove unnecessary right margin in reply blockquote Tulir Asokan 2020-05-25 19:24:03 +03:00
  • f34413c6ce update yarn lock Jorik Schellekens 2020-05-25 17:24:15 +01:00
  • 4e5680de85 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering Tulir Asokan 2020-05-25 19:21:19 +03:00
  • 30e2b01022 unlock react types Jorik Schellekens 2020-05-25 17:08:37 +01:00
  • d10d887996 Explain unsafe coerce Jorik Schellekens 2020-05-25 16:53:09 +01:00
  • 5c9398a6b1 Types exiliary files Jorik Schellekens 2020-05-25 16:47:57 +01:00
  • 1a47ceb322 Fix event highlight with edits Michael Telatynski 2020-05-25 16:17:46 +01:00