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

Commit Graph

  • 323d0762fc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/irc-ui Jorik Schellekens 2020-05-19 18:03:44 +01:00
  • 2e325191bc Merge remote-tracking branch 'nv/develop' into joriks/irc-ui Jorik Schellekens 2020-05-19 17:18:36 +01:00
  • 286828b3bb Disable irc mode in notifiactions panel Jorik Schellekens 2020-05-19 16:15:13 +01:00
  • 94b5fb1b64 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-19 14:58:09 +00:00
  • 894412ca4c Translated using Weblate (German) Kim Brose 2020-05-19 14:51:57 +00:00
  • dda0d2102c Translated using Weblate (Esperanto) Tirifto 2020-05-19 13:00:53 +00:00
  • 465948e402 Merge pull request #4607 from matrix-org/dbkr/remove_rageshake_ssss_key_upgrade_check David Baker 2020-05-19 15:58:03 +01:00
  • 4bf2e5fd8e Remove SSSS key upgrade check from rageshake David Baker 2020-05-19 15:40:26 +01:00
  • af2eed2228 Fix room alias lookup vs peeking race condition Michael Telatynski 2020-05-19 13:17:34 +01:00
  • 87b0c09b0c Merge branch 'origin/develop' into Weblate. Weblate 2020-05-19 10:58:05 +00:00
  • 3cd0381202 Translated using Weblate (Russian) rkfg 2020-05-19 10:34:45 +00:00
  • e7d37228f2 Merge pull request #4603 from matrix-org/t3chguy/add_room_tooltip Michael Telatynski 2020-05-19 11:57:59 +01:00
  • 0016d8e744 Add e2ee_default_for_private_rooms to control default e2ee behaviour Michael Telatynski 2020-05-19 11:36:44 +01:00
  • 72513697af Merge branch 'origin/develop' into Weblate. Weblate 2020-05-19 10:36:26 +00:00
  • 16ecc007d6 Reset matrix-react-sdk back to develop branch RiotRobot 2020-05-19 11:36:17 +01:00
  • 92b94af9ed Reset matrix-js-sdk back to develop branch RiotRobot 2020-05-19 11:36:07 +01:00
  • 4addf64551 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-19 10:35:50 +00:00
  • ef0076bd83 Merge branch 'master' into develop RiotRobot 2020-05-19 11:34:45 +01:00
  • 482d6a7fb3 v1.6.1 v1.6.1 RiotRobot 2020-05-19 11:31:35 +01:00
  • 02784379f8 Prepare changelog for v1.6.1 RiotRobot 2020-05-19 11:31:35 +01:00
  • a9fbc190bf Upgrade matrix-react-sdk to 2.6.0 RiotRobot 2020-05-19 11:28:08 +01:00
  • f35ec09b54 Upgrade matrix-js-sdk to 6.1.0 RiotRobot 2020-05-19 11:27:41 +01:00
  • 2700fa9515 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-19 10:25:16 +00:00
  • 833eccf5cd Reset matrix-js-sdk back to develop branch RiotRobot 2020-05-19 11:25:07 +01:00
  • 3e3ddd4263 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-19 10:24:42 +00:00
  • 82ca614fa7 Translated using Weblate (Estonian) Priit Jõerüüt 2020-05-19 06:50:47 +00:00
  • 19e496cacc Merge branch 'master' into develop RiotRobot 2020-05-19 11:23:16 +01:00
  • 26e6447be5 v2.6.0 RiotRobot 2020-05-19 11:22:00 +01:00
  • bc8a53a7d7 Prepare changelog for v2.6.0 RiotRobot 2020-05-19 11:21:59 +01:00
  • 3e8feef642 Reset matrix-js-sdk back to develop branch RiotRobot 2020-05-19 11:16:19 +01:00
  • 48ab056785 Merge branch 'master' into develop RiotRobot 2020-05-19 11:15:22 +01:00
  • defac64eff v1.6.1 RiotRobot 2020-05-19 11:14:58 +01:00
  • 4069800a92 Prepare changelog for v1.6.1 RiotRobot 2020-05-19 11:14:58 +01:00
  • 406839e89a Upgrade matrix-js-sdk to 6.1.0 RiotRobot 2020-05-19 11:13:57 +01:00
  • 89318e403a Upgrade matrix-js-sdk to 6.1.0 RiotRobot 2020-05-19 11:11:17 +01:00
  • 38920e7f30 Merge branch 'develop' into travis/room-list-2 Travis Ralston 2020-05-18 23:23:59 -06:00
  • 86dca5292c Merge branch 'origin/develop' into Weblate. Weblate 2020-05-19 05:22:44 +00:00
  • b9c31b27a2 Translated using Weblate (Slovak) yuuki-san 2020-05-18 10:14:36 +00:00
  • 81db5900f0 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-19 05:22:41 +00:00
  • 6d99c08e59 Merge pull request #13666 from vector-im/travis/dispatcher-types Travis Ralston 2020-05-18 23:22:35 -06:00
  • 9aff2e836e Merge pull request #4593 from matrix-org/travis/dispatcher-types Travis Ralston 2020-05-18 23:22:32 -06:00
  • 7bb7f30b8f missed one Jorik Schellekens 2020-05-18 22:02:22 +01:00
  • bba6b2c441 Appease i18n Jorik Schellekens 2020-05-18 17:06:54 +01:00
  • 4deeef5fca Remove ability to remove avatars Jorik Schellekens 2020-05-18 16:57:00 +01:00
  • 5380e76b7b lint Jorik Schellekens 2020-05-18 16:43:47 +01:00
  • 17f535e5f8 Fix review problems Jorik Schellekens 2020-05-18 16:37:10 +01:00
  • b4e2e54dc1 make test more specific Michael Telatynski 2020-05-18 12:06:20 +01:00
  • 6eee39c153 Fix /op Slash Command Michael Telatynski 2020-05-18 12:04:13 +01:00
  • 89297a5133 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-18 10:08:16 +00:00
  • a8e92589ad Translated using Weblate (Slovak) yuuki-san 2020-05-18 09:17:10 +00:00
  • 1eea203db6 Merge pull request #4599 from matrix-org/t3chguy/progress_colour Michael Telatynski 2020-05-18 11:08:08 +01:00
  • 54640dcaac Merge pull request #4590 from matrix-org/t3chguy/userview Michael Telatynski 2020-05-18 11:07:49 +01:00
  • a864643d98 Label the create room button something better than "Add room" Michael Telatynski 2020-05-18 10:37:02 +01:00
  • 657c10f1b5 Merge pull request #4602 from matrix-org/t3chguy/cherry-pick/5 Michael Telatynski 2020-05-18 10:24:57 +01:00
  • b513cafc98 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-18 09:23:51 +00:00
  • 1f1c1279ea Merge pull request #13704 from RiotTranslateBot/weblate-riot-web-riot-web David Baker 2020-05-18 10:23:46 +01:00
  • 0191e0710c Merge pull request #4601 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk David Baker 2020-05-18 10:23:35 +01:00
  • 8be2fdf99c Merge branch 'origin/develop' into Weblate. Weblate 2020-05-18 09:19:29 +00:00
  • c565af1ade Merge pull request #13649 from vector-im/t3chguy/favico Michael Telatynski 2020-05-18 10:19:23 +01:00
  • b6ac8cb28d Revert "ImageView make clicking off it easier" Michael Telatynski 2020-05-13 06:36:14 +01:00
  • 5ea4cc1c5b Translated using Weblate (Slovak) yuuki-san 2020-05-18 08:31:13 +00:00
  • 7c5842c208 Translated using Weblate (Galician) Xose M 2020-05-17 09:37:45 +00:00
  • 0662c231a5 Translated using Weblate (Estonian) Priit Jõerüüt 2020-05-16 18:13:05 +00:00
  • 3ffa333f31 Translated using Weblate (Chinese (Simplified)) Pepper.Cabbit.Snoopy 2020-05-17 09:23:01 +00:00
  • 4e92d09cca Merge branch 'origin/develop' into Weblate. Weblate 2020-05-17 21:45:07 +00:00
  • c442a89253 Translated using Weblate (Galician) Xose M 2020-05-17 09:26:03 +00:00
  • 96a550b88a Merge pull request #13688 from vector-im/jryans/rm-electron-scripts J. Ryan Stinnett 2020-05-17 22:45:00 +01:00
  • 0feb55ff4f Translated using Weblate (Estonian) Priit Jõerüüt 2020-05-16 12:47:57 +00:00
  • 0da3534ef5 Translated using Weblate (Latvian) Reinis Mednis 2020-05-16 02:46:27 +00:00
  • c09745e183 Translated using Weblate (Hungarian) Szimszon 2020-05-15 15:44:38 +00:00
  • 7a17172f50 Translated using Weblate (Finnish) Tuomas Hietala 2020-05-15 12:36:29 +00:00
  • 343f19f3b0 Translated using Weblate (Albanian) Besnik Bleta 2020-05-15 07:42:37 +00:00
  • 40f40251f1 Remove Electron packaging scripts J. Ryan Stinnett 2020-05-15 17:56:23 +01:00
  • 798e7a1f86 Merge branch 'develop' into travis/dispatcher-types Travis Ralston 2020-05-15 09:56:02 -06:00
  • 7260e34d1c Merge branch 'origin/develop' into Weblate. Weblate 2020-05-15 13:33:32 +00:00
  • 16bdbfd67d Translated using Weblate (Italian) random 2020-05-15 08:07:07 +00:00
  • ae9d700c93 Translated using Weblate (Hungarian) Szimszon 2020-05-15 11:25:44 +00:00
  • b27ac71680 Translated using Weblate (French) Kévin C 2020-05-15 06:26:53 +00:00
  • 7d15fea5f9 Translated using Weblate (Finnish) Tuomas Hietala 2020-05-15 12:01:35 +00:00
  • 9542851c25 Translated using Weblate (Estonian) Priit Jõerüüt 2020-05-14 23:00:36 +00:00
  • acfacb9b95 Translated using Weblate (Esperanto) Tirifto 2020-05-14 21:10:34 +00:00
  • 7ae10d0ba8 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-05-15 01:55:37 +00:00
  • 4ef32598ed Translated using Weblate (Albanian) Besnik Bleta 2020-05-15 07:36:23 +00:00
  • 07eed94b35 Merge pull request #4600 from matrix-org/dbkr/fix_email_sent_to_blank David Baker 2020-05-15 14:33:20 +01:00
  • 523067e5f9 Make email auth component fail better if server claims email isn't validated David Baker 2020-05-15 13:32:12 +01:00
  • e79959a4ec try fix tests Michael Telatynski 2020-05-15 00:31:30 +01:00
  • 59f1657b43 Add jest-canvas-mock Michael Telatynski 2020-05-15 00:25:19 +01:00
  • 5844bee8f2 Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks Michael Telatynski 2020-05-15 00:16:41 +01:00
  • c3fde65a1b Enable new room list labs flag Travis Ralston 2020-05-14 14:28:43 -06:00
  • 429494aad4 Enable room list labs flag Travis Ralston 2020-05-14 14:26:09 -06:00
  • 81010a4f2f Add docs for room list labs flag Travis Ralston 2020-05-14 14:24:34 -06:00
  • e3f2e97b9f Merge branch 'travis/dispatcher-types' into travis/room-list-2 Travis Ralston 2020-05-14 14:21:43 -06:00
  • 21e471375e Revert "Add temporary timing functions to old RoomListStore" Travis Ralston 2020-03-12 13:34:56 -06:00
  • 5feadbc18e Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/favico Michael Telatynski 2020-05-14 21:20:04 +01:00
  • 5cfe29de66 Update AsyncStore's docs to be slightly more clear Travis Ralston 2020-05-14 14:20:01 -06:00
  • 4532ddbb2d Add support for badge override opts Michael Telatynski 2020-05-14 21:19:54 +01:00
  • b7ba9b3c41 Replace ChaoticAlgorithm with NaturalAlgorithm for list behaviour Travis Ralston 2020-05-14 14:16:26 -06:00
  • 51165dc669 Translated using Weblate (Estonian) Priit Jõerüüt 2020-05-14 18:56:29 +00:00
  • 91a997da14 Replace ChaoticAlgorithm for tag sorting with deterministic behaviour Travis Ralston 2020-05-14 14:06:48 -06:00
  • 89c16603fc Remove the now inlined ZxcvbnProgressBar.tsx Michael Telatynski 2020-05-14 21:06:18 +01:00