Commit Graph

  • abe5a7f4c9 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-04 09:05:35 +00:00
  • b05f6d1281 Translated using Weblate (German) natowi 2019-07-04 06:26:59 +00:00
  • b36dc74452 Translated using Weblate (German) doktorhorst 2019-07-04 06:18:49 +00:00
  • 3f28f2e4a6 Merge pull request #3174 from matrix-org/bwindels/edit-history-error Bruno Windels 2019-07-04 09:05:29 +00:00
  • 521bc90b5f Appease the linter Travis Ralston 2019-07-03 16:51:09 -06:00
  • 42e6287bdb Implement basic soft logout handling Travis Ralston 2019-07-03 16:46:37 -06:00
  • 6e502478e3 v1.2.3-rc.1 v1.2.3-rc.1 RiotRobot 2019-07-03 17:48:55 +01:00
  • 72052b913f Prepare changelog for v1.2.3-rc.1 RiotRobot 2019-07-03 17:48:55 +01:00
  • 1ce8f3844b v1.2.3-rc.1 RiotRobot 2019-07-03 17:47:41 +01:00
  • 751316f388 Upgrade to JS SDK 2.1.0-rc.1 and React SDK 1.3.0-rc.1 RiotRobot 2019-07-03 17:25:05 +01:00
  • a36c520362 v1.3.0-rc.1 RiotRobot 2019-07-03 16:56:10 +01:00
  • d3c993543f Prepare changelog for v1.3.0-rc.1 RiotRobot 2019-07-03 16:56:10 +01:00
  • 4dc8de0e71 log server errors in edit history dialog Bruno Windels 2019-07-03 17:53:32 +02:00
  • e7e6af2592 use existing strings Bruno Windels 2019-07-03 17:51:16 +02:00
  • 137c531d51 Upgrade to JS SDK 2.1.0-rc.1 RiotRobot 2019-07-03 16:45:05 +01:00
  • 1533d50157 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-03 15:28:26 +00:00
  • e1282081bf Merge pull request #10247 from vector-im/jryans/update-base-url J. Ryan Stinnett 2019-07-03 16:28:21 +01:00
  • 9f4dc1936b Merge branch 'origin/develop' into Weblate. Weblate 2019-07-03 15:06:43 +00:00
  • ba5cae554c Upgrade electron-builder, electron-builder-squirrel-windows to latest J. Ryan Stinnett 2019-07-03 16:06:12 +01:00
  • 668d24111c Merge pull request #3173 from matrix-org/t3chguy/MELS_3pid David Baker 2019-07-03 16:02:10 +01:00
  • b43a04634a Merge pull request #3172 from matrix-org/t3chguy/invites_list David Baker 2019-07-03 16:01:01 +01:00
  • bdbc65209c Merge branch 'origin/develop' into Weblate. Weblate 2019-07-03 14:53:35 +00:00
  • 87bf899396 Translated using Weblate (Italian) random 2019-07-03 09:27:03 +00:00
  • 089ef6f7cd Translated using Weblate (Bulgarian) Slavi Pantaleev 2019-07-03 08:23:05 +00:00
  • ea665da391 Upgrade to Electron 4.2.6 J. Ryan Stinnett 2019-07-03 15:53:23 +01:00
  • c9bd1b8510 Change update URL to match new host J. Ryan Stinnett 2019-07-03 15:47:52 +01:00
  • d7cc3159b2 Merge pull request #3176 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk J. Ryan Stinnett 2019-07-03 15:40:23 +01:00
  • d22b0e5934 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-03 14:33:48 +00:00
  • 0d809d66af Translated using Weblate (Italian) random 2019-07-03 09:22:56 +00:00
  • b658053f33 Translated using Weblate (French) Kévin C 2019-07-03 13:05:11 +00:00
  • baefc6f232 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-07-03 12:37:28 +00:00
  • 1d22f901a0 Translated using Weblate (Albanian) Besnik Bleta 2019-07-03 09:59:41 +00:00
  • 7dbd17c137 Merge pull request #3150 from matrix-org/travis/less-typing Travis Ralston 2019-07-03 08:33:42 -06:00
  • 344cc079c5 show /relations error in edit history dialog Bruno Windels 2019-07-03 12:16:58 +02:00
  • b70f3bf48e Merge branch 'origin/develop' into Weblate. Weblate 2019-07-03 09:03:04 +00:00
  • 21bf7e51e1 Translated using Weblate (German) kristbaum 2019-07-02 17:30:35 +00:00
  • 3c0698ea0e Translated using Weblate (Finnish) Samu Voutilainen 2019-07-03 07:57:16 +00:00
  • dcc3bb58be Translated using Weblate (Bulgarian) Slavi Pantaleev 2019-07-03 08:24:26 +00:00
  • 7f2c6b46ca Translated using Weblate (Albanian) Besnik Bleta 2019-07-03 08:03:07 +00:00
  • 353f5a205c Merge pull request #3170 from matrix-org/bwindels/handle-associated-failures Bruno Windels 2019-07-03 09:02:58 +00:00
  • cca82635f3 whitespace Bruno Windels 2019-07-03 10:32:37 +02:00
  • 429b8e94df MELS handle m.room.third_party_invite Michael Telatynski 2019-07-03 08:58:34 +01:00
  • 430dd40b8d Translated using Weblate (Finnish) Tulir Asokan 2019-07-03 07:55:22 +00:00
  • 906b46940a Translated using Weblate (Finnish) Stefan Parviainen 2019-07-03 07:52:36 +00:00
  • bc4bff64f6 Fix logic around MemberList invites section, specifically regarding 3pid Michael Telatynski 2019-07-03 08:38:08 +01:00
  • b7192f55d9 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-02 17:28:16 +00:00
  • 6640ff7bf6 Translated using Weblate (German) BenjaminVettori 2019-07-02 17:18:01 +00:00
  • be7fd945ab Translated using Weblate (German) kristbaum 2019-07-02 17:17:53 +00:00
  • cf8eeedcc7 Merge pull request #3169 from matrix-org/jryans/reactions-tooltip-tweaks J. Ryan Stinnett 2019-07-02 18:28:09 +01:00
  • 49bf550975 Translated using Weblate (German) BenjaminVettori 2019-07-02 17:17:05 +00:00
  • 37890c1328 Translated using Weblate (German) natowi 2019-07-02 17:16:56 +00:00
  • af32c303de Translated using Weblate (German) kristbaum 2019-07-02 17:14:22 +00:00
  • f905707263 Translated using Weblate (German) BenjaminVettori 2019-07-02 17:14:17 +00:00
  • cb1f661e04 Translated using Weblate (German) kristbaum 2019-07-02 17:14:08 +00:00
  • ed2f3e230e Translated using Weblate (German) natowi 2019-07-02 17:13:25 +00:00
  • 077ae9e6d6 Translated using Weblate (German) BenjaminVettori 2019-07-02 17:12:36 +00:00
  • e3f5746d52 Translated using Weblate (German) kristbaum 2019-07-02 17:12:22 +00:00
  • 20af120a67 Translated using Weblate (German) natowi 2019-07-02 17:03:55 +00:00
  • c641da1dfe Translated using Weblate (German) BenjaminVettori 2019-07-02 17:03:38 +00:00
  • fc3c4fccc2 set background on highlighted messages Bruno Windels 2019-07-02 18:31:11 +02:00
  • daa2250023 fix lint Bruno Windels 2019-07-02 18:30:57 +02:00
  • 3fd96008c3 Fixup: dont assume there is a prior edit Bruno Windels 2019-07-02 17:34:07 +02:00
  • 14caed62d0 make sure scrollpanel is mounted before checking scroll Bruno Windels 2019-07-02 17:29:37 +02:00
  • 47d031865a Translated using Weblate (West Flemish) Nathan Follens 2019-07-01 14:04:59 +00:00
  • 0f7aa2ee36 Translated using Weblate (Hungarian) Szimszon 2019-07-01 13:47:09 +00:00
  • 2e1682fbf6 Translated using Weblate (German) kristbaum 2019-07-01 14:39:38 +00:00
  • 6c460f7601 Translated using Weblate (French) Kévin C 2019-07-01 11:26:27 +00:00
  • fc06d2464a Translated using Weblate (Dutch) Nathan Follens 2019-07-01 14:03:32 +00:00
  • 2ff500c222 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-07-01 13:23:15 +00:00
  • 71c43a9e86 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-02 14:38:43 +00:00
  • a4275e6d89 Merge pull request #3171 from matrix-org/jryans/login-field-border J. Ryan Stinnett 2019-07-02 15:38:39 +01:00
  • 7fc1288614 Fix login type selector border J. Ryan Stinnett 2019-07-02 15:09:48 +01:00
  • 1d54911581 Merge pull request #3159 from matrix-org/travis/pick-server-tombstone Travis Ralston 2019-07-02 07:52:40 -06:00
  • 0c0a3c6133 Merge pull request #3160 from matrix-org/travis/keyshare-mute Travis Ralston 2019-07-02 07:52:12 -06:00
  • 357ad3d50c cancel pending edit when sending new edit Bruno Windels 2019-07-02 14:52:29 +02:00
  • d0d327620b hide reactions for redacted events Bruno Windels 2019-07-02 13:56:27 +02:00
  • 7b5c3a20ad Merge branch 'origin/develop' into Weblate. Weblate 2019-07-02 09:34:55 +00:00
  • a4587c5013 Merge pull request #3165 from matrix-org/t3chguy/tooltip_accessible_button J. Ryan Stinnett 2019-07-02 10:34:51 +01:00
  • 0d5556313c Merge branch 'origin/develop' into Weblate. Weblate 2019-07-02 09:28:37 +00:00
  • 904a096f72 Update AccessibleTooltipButton.js Michael Telatynski 2019-07-02 10:28:36 +01:00
  • 0d51c86071 Merge pull request #3166 from matrix-org/t3chguy/word_break_device_id David Baker 2019-07-02 10:28:32 +01:00
  • 515ed2e1bb Also cancel associated events when canceling sending from ctx menu Bruno Windels 2019-07-01 18:13:05 +02:00
  • dd94bf799d Improve interactive tooltip hover behaviour J. Ryan Stinnett 2019-07-01 17:47:30 +01:00
  • 1a4bdbaf96 add (s) for singular to tr Bruno Windels 2019-07-01 18:12:42 +02:00
  • 60a3899fe0 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-01 15:47:52 +00:00
  • 38bfe8b1ce Merge pull request #3161 from matrix-org/travis/fix-via-join Travis Ralston 2019-07-01 09:47:46 -06:00
  • ba4c0197f1 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-01 15:47:32 +00:00
  • 64f0a7cbe7 Merge pull request #3162 from matrix-org/travis/cleanup-breadcrumbs Travis Ralston 2019-07-01 09:47:28 -06:00
  • 4be16a380a only show resend options if event hasn't been redacted Bruno Windels 2019-07-01 17:39:30 +02:00
  • 0d79b03f53 support resending reactions Bruno Windels 2019-07-01 17:39:00 +02:00
  • 8160759a52 show the various resend options as different menu items Bruno Windels 2019-07-01 17:37:32 +02:00
  • 40b7963c4d Merge branch 'origin/develop' into Weblate. Weblate 2019-07-01 09:48:58 +00:00
  • a1b5c8ab89 Merge pull request #3168 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk David Baker 2019-07-01 10:48:53 +01:00
  • 0d9998a009 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-01 09:42:40 +00:00
  • e746c49020 Merge pull request #3135 from matrix-org/t3chguy/fix_MELS_labs J. Ryan Stinnett 2019-07-01 10:42:36 +01:00
  • 9de26ed062 Merge pull request #10219 from RiotTranslateBot/weblate-riot-web-riot-web David Baker 2019-07-01 10:40:32 +01:00
  • 026f356f89 Translated using Weblate (West Flemish) Nathan Follens 2019-06-30 21:28:21 +00:00
  • 81995f36f1 Translated using Weblate (Hungarian) Szimszon 2019-07-01 05:57:49 +00:00
  • 8d61cb1d1e Translated using Weblate (Dutch) Nathan Follens 2019-06-30 21:28:12 +00:00
  • d66d3ca4d2 support resending redaction in context menu Bruno Windels 2019-06-27 17:52:42 +02:00