Commit Graph

  • 246b802206 Merge branch 'develop' into travis/3pid-invites Travis Ralston 2020-09-15 08:53:32 -06:00
  • 74f953cdd3 Merge branch 'origin/develop' into Weblate. Weblate 2020-09-15 14:52:25 +00:00
  • d11ce5fade Merge pull request #5207 from matrix-org/travis/ui-func/e2e-icons Travis Ralston 2020-09-15 08:52:19 -06:00
  • 40813a6b33 If no bug_report_endpoint_url, hide rageshaking from the App Michael Telatynski 2020-09-15 15:49:25 +01:00
  • 6c166f0560 If no bug_report_endpoint_url, hide rageshaking from the App Michael Telatynski 2020-09-15 15:49:25 +01:00
  • 3aeefa98f4 Merge branch 'origin/develop' into Weblate. Weblate 2020-09-15 13:09:45 +00:00
  • c605c3636b Translated using Weblate (Swedish) LinAGKar 2020-09-15 06:34:18 +00:00
  • 0e3c478e38 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-09-15 02:22:58 +00:00
  • d643f908b1 Translated using Weblate (Chinese (Simplified)) linsui 2020-09-15 03:57:38 +00:00
  • 9a3c30b1f1 Merge pull request #5203 from matrix-org/t3chguy/fix/15150 Michael Telatynski 2020-09-15 14:09:38 +01:00
  • 6b5426bddd Rename toolbar Notifier methods to prompt Michael Telatynski 2020-09-15 13:58:29 +01:00
  • 8e871c455c Fix german i18n test which was previously broken due to async Michael Telatynski 2020-09-15 13:24:20 +01:00
  • c76a5f2c52 Attempt to fix tests some more Michael Telatynski 2020-09-15 13:19:47 +01:00
  • 608249745a Attempt to fix tests some more Michael Telatynski 2020-09-15 13:19:47 +01:00
  • 5202037eeb Retry joinRoom up to 5 times in the case of a 504 GATEWAY TIMEOUT Michael Telatynski 2020-09-14 15:16:29 +01:00
  • 0cac6874d4 Update i18n Travis Ralston 2020-09-14 22:31:45 -06:00
  • 85979079f1 Add end-user documentation for UI features Travis Ralston 2020-09-14 22:28:57 -06:00
  • f4f30a3274 Introduce a concept of UI features, using it for URL previews at first Travis Ralston 2020-09-14 22:27:40 -06:00
  • b177843e45 Remove defunct "always show encryption icons" setting Travis Ralston 2020-09-14 22:03:54 -06:00
  • 61e8d3e3d7 Merge branch 'develop' into travis/3pid-invites Travis Ralston 2020-09-14 11:50:08 -06:00
  • 9bf4891182 Merge branch 'origin/develop' into Weblate. Weblate 2020-09-14 16:09:51 +00:00
  • ab91ce4b2d Merge pull request #5206 from matrix-org/t3chguy/fix/15170 Michael Telatynski 2020-09-14 17:09:46 +01:00
  • fd11b12652 Merge branch 'origin/develop' into Weblate. Weblate 2020-09-14 15:13:30 +00:00
  • df5cb15cf9 Reset matrix-react-sdk back to develop branch RiotRobot 2020-09-14 16:10:18 +01:00
  • 82cfc751af Reset matrix-js-sdk back to develop branch RiotRobot 2020-09-14 16:10:08 +01:00
  • 6784321ba4 Merge branch 'origin/develop' into Weblate. Weblate 2020-09-14 15:10:00 +00:00
  • 62bfc35a8d Merge branch 'master' into develop RiotRobot 2020-09-14 16:09:30 +01:00
  • 747126950b Merge branch 'master' into develop RiotRobot 2020-09-14 16:07:54 +01:00
  • df958ff56b Merge branch 'master' into develop RiotRobot 2020-09-14 16:05:19 +01:00
  • 89d4be6cb6 v1.7.7 RiotRobot 2020-09-14 16:05:02 +01:00
  • e9ecdde704 Prepare changelog for v1.7.7 RiotRobot 2020-09-14 16:05:02 +01:00
  • 2f4299e836 v1.7.7 v1.7.7 origin/release-v1.7.6 RiotRobot 2020-09-14 16:00:49 +01:00
  • 3d53908686 Prepare changelog for v1.7.7 RiotRobot 2020-09-14 16:00:49 +01:00
  • 0eccd03a78 Upgrade matrix-react-sdk to 3.4.1 RiotRobot 2020-09-14 15:57:32 +01:00
  • 4f930ac50c v3.4.1 RiotRobot 2020-09-14 15:49:09 +01:00
  • a5d42d1e2a Prepare changelog for v3.4.1 RiotRobot 2020-09-14 15:49:09 +01:00
  • e32cb175cb Fix Bridges tab crashing when the room does not have bridges Michael Telatynski 2020-09-14 15:44:00 +01:00
  • cf3917d638 Merge branch 'origin/develop' into Weblate. Weblate 2020-09-14 14:38:16 +00:00
  • e261a18183 Merge pull request #5202 from matrix-org/t3chguy/fix/15140 Michael Telatynski 2020-09-14 15:38:10 +01:00
  • 3b44958323 Merge branch 'origin/develop' into Weblate. Weblate 2020-09-14 14:38:08 +00:00
  • 9a3dfe5235 Translated using Weblate (Italian) random 2020-09-14 13:58:22 +00:00
  • c6a3b8b783 Merge pull request #5205 from matrix-org/t3chguy/fix/resizeNotifier-optional Michael Telatynski 2020-09-14 15:38:02 +01:00
  • e6e77633ad Fix crashes with cannot read isResizing of undefined Michael Telatynski 2020-09-14 15:20:06 +01:00
  • ca0ad0b7ed Don't count widgets which no longer exist towards pinned count Michael Telatynski 2020-09-14 14:03:51 +01:00
  • fa50b31fd2 Fix crashes with cannot read isResizing of undefined Michael Telatynski 2020-09-14 15:20:06 +01:00
  • 229967aa33 Retry joinRoom up to 5 times in the case of a 504 GATEWAY TIMEOUT Michael Telatynski 2020-09-14 15:16:29 +01:00
  • 493d3ae288 Don't show Notifications Prompt Toast if user has master rule enabled Michael Telatynski 2020-09-14 14:35:08 +01:00
  • 73608c4aa9 Don't count widgets which no longer exist towards pinned count Michael Telatynski 2020-09-14 14:03:51 +01:00
  • ebe0d2469e Merge branch 'origin/develop' into Weblate. Weblate 2020-09-14 12:51:48 +00:00
  • 8b2560dbef Reset matrix-react-sdk back to develop branch RiotRobot 2020-09-14 13:51:40 +01:00
  • 451842f2bf Reset matrix-js-sdk back to develop branch RiotRobot 2020-09-14 13:51:31 +01:00
  • 6879addc7a Merge branch 'origin/develop' into Weblate. Weblate 2020-09-14 12:51:13 +00:00
  • cd392425a4 Merge branch 'master' into develop RiotRobot 2020-09-14 13:49:30 +01:00
  • 70febe3109 v1.7.6 v1.7.6 RiotRobot 2020-09-14 13:46:13 +01:00
  • 9ed26c66a6 Prepare changelog for v1.7.6 RiotRobot 2020-09-14 13:46:13 +01:00
  • 0e6ae2514a Merge branch 'master' into develop RiotRobot 2020-09-14 13:45:34 +01:00
  • f5b51aecfe v1.7.6 RiotRobot 2020-09-14 13:45:15 +01:00
  • a88d1a838c Prepare changelog for v1.7.6 RiotRobot 2020-09-14 13:45:15 +01:00
  • 6d124e6c28 Upgrade matrix-react-sdk to 3.4.0 RiotRobot 2020-09-14 13:44:41 +01:00
  • baa6e396a0 Merge branch 'origin/develop' into Weblate. Weblate 2020-09-14 12:44:20 +00:00
  • f6a405ffd7 Translated using Weblate (Russian) Nikita Epifanov 2020-09-14 09:18:15 +00:00
  • 475ea4aa2a Translated using Weblate (Hungarian) Szimszon 2020-09-14 09:02:37 +00:00
  • 2317300a59 Translated using Weblate (German) Michael Albert 2020-09-14 10:49:24 +00:00
  • 99811bfc74 Translated using Weblate (Estonian) Priit Jõerüüt 2020-09-14 09:03:36 +00:00
  • c8a0d94b61 Upgrade matrix-js-sdk to 8.3.0 RiotRobot 2020-09-14 13:42:53 +01:00
  • 148cad6ea2 Reset matrix-js-sdk back to develop branch RiotRobot 2020-09-14 13:42:34 +01:00
  • c652ca56da Merge branch 'master' into develop RiotRobot 2020-09-14 13:41:29 +01:00
  • 099f50b10e v3.4.0 RiotRobot 2020-09-14 13:36:32 +01:00
  • c6eda819f0 Prepare changelog for v3.4.0 RiotRobot 2020-09-14 13:36:31 +01:00
  • ba73847296 Upgrade matrix-js-sdk to 8.3.0 RiotRobot 2020-09-14 13:31:41 +01:00
  • 07bcbc0d65 Merge branch 'origin/develop' into Weblate. Weblate 2020-09-14 08:45:09 +00:00
  • 06a8ab20fb Translated using Weblate (Spanish) discapacidad5 2020-09-13 20:35:59 +00:00
  • e5e7c873bc Translated using Weblate (Kabyle) Kahina Messaoudi 2020-09-13 21:16:40 +00:00
  • c68a980c59 Merge pull request #5193 from matrix-org/dbkr/remove_jitsi_widget_on_call_button David Baker 2020-09-14 09:44:45 +01:00
  • 6950159f22 Translated using Weblate (Italian) random 2020-09-12 09:59:05 +00:00
  • b857b1a239 Translated using Weblate (Hungarian) Szimszon 2020-09-11 18:14:04 +00:00
  • 91dc346e5b Translated using Weblate (German) @a2sc:matrix.org 2020-09-12 12:56:31 +00:00
  • 0923eeb2ad Translated using Weblate (Galician) XoseM 2020-09-12 06:36:39 +00:00
  • 80f8a18c2a Translated using Weblate (Arabic) Safa Alfulaij 2020-09-12 10:45:32 +00:00
  • 9f15bc2bbf Translated using Weblate (Arabic) Safa Alfulaij 2020-09-12 10:26:08 +00:00
  • ac300a293e Add jsdoc Travis Ralston 2020-09-11 21:09:42 -06:00
  • fc2173a789 Appease the linter Travis Ralston 2020-09-11 21:05:54 -06:00
  • 763309ae80 Show a spinner when processing a registration email confirmation Travis Ralston 2020-09-11 20:58:10 -06:00
  • 525ec6b709 Ensure we obliterate 3pid invites on logout Travis Ralston 2020-09-11 20:24:51 -06:00
  • 803badba1b Show the user's 3PID invite after they've reloaded the page Travis Ralston 2020-09-11 20:20:33 -06:00
  • a5d7b24805 Add a note for why oob_data isn't threaded yet Travis Ralston 2020-09-11 19:55:15 -06:00
  • b1cdf1bc9a Redirect to the registration page if there's a 3PID invite Travis Ralston 2020-09-11 19:53:52 -06:00
  • dc44b9ef59 Store and thread 3pid invite through the app Travis Ralston 2020-09-11 19:49:48 -06:00
  • fe0eea84dd Merge pull request #5196 from matrix-org/travis/e2e-iconography Travis Ralston 2020-09-11 10:05:38 -06:00
  • 8c35392b6e Merge branch 'origin/develop' into Weblate. Weblate 2020-09-11 15:12:51 +00:00
  • 0721ff85fe Translated using Weblate (German) @a2sc:matrix.org 2020-09-11 14:44:02 +00:00
  • 77f8c48dc4 Merge pull request #5195 from matrix-org/travis/iconography-update Travis Ralston 2020-09-11 09:12:46 -06:00
  • 652c037380 Use hooks better (from develop) Travis Ralston 2020-09-11 09:06:17 -06:00
  • 8862b8298c Use hooks better Travis Ralston 2020-09-11 09:04:06 -06:00
  • 8f3469237a Merge pull request #5200 from matrix-org/jryans/userinfo-scroll-release J. Ryan Stinnett 2020-09-11 15:48:58 +01:00
  • 7a26eb9840 Translated using Weblate (German) felix adernog 2020-09-11 14:43:50 +00:00
  • d5b8588cb4 Translated using Weblate (German) toastbroot 2020-09-11 14:39:32 +00:00
  • 4c7d2363ce Translated using Weblate (German) @a2sc:matrix.org 2020-09-11 14:10:51 +00:00
  • acdabe3ca0 Fix user info scrolling in new card view J. Ryan Stinnett 2020-09-11 11:39:58 +01:00
  • 35e71f4066 Merge pull request #5199 from matrix-org/jryans/stickerpicker-height-release J. Ryan Stinnett 2020-09-11 15:08:12 +01:00