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

Commit Graph

  • 33406d1709 Merge pull request #13329 from vector-im/t3chguy/app_load4 Michael Telatynski 2020-04-30 17:48:43 +01:00
  • c19338b1d3 Merge pull request #4462 from matrix-org/t3chguy/app_load4 Michael Telatynski 2020-04-30 17:48:42 +01:00
  • 9c916cc544 Merge branches 'develop' and 't3chguy/app_load4' of github.com:matrix-org/matrix-react-sdk into t3chguy/app_load4 Michael Telatynski 2020-04-30 17:41:14 +01:00
  • 04d73fcec9 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-30 16:40:56 +00:00
  • 7b775a8d93 Merge pull request #4271 from aaronraimist/esc-mark-as-read Travis Ralston 2020-04-30 10:40:50 -06:00
  • d583bd7614 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-30 16:21:19 +00:00
  • 834be6f796 Translated using Weblate (German) @a2sc:matrix.org 2020-04-30 16:02:42 +00:00
  • e56ce8d885 Merge pull request #4534 from matrix-org/jryans/key-backup-network-fail J. Ryan Stinnett 2020-04-30 17:21:13 +01:00
  • 5568bb15c4 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-30 16:20:44 +00:00
  • ba6e1d924f Merge pull request #13465 from vector-im/jryans/update-default-device-format J. Ryan Stinnett 2020-04-30 17:20:39 +01:00
  • 1ad54a4dae Tweak default device name to be more compact J. Ryan Stinnett 2020-04-30 16:50:01 +01:00
  • edb4f9bf05 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-30 15:45:18 +00:00
  • c3b0a24bdd Translated using Weblate (Slovak) yuuki-san 2020-04-29 17:47:20 +00:00
  • fd5aea20ef Translated using Weblate (Bulgarian) Slavi Pantaleev 2020-04-30 06:07:48 +00:00
  • 9fb5a6de3d Merge pull request #13460 from vector-im/jryans/stylise-macos J. Ryan Stinnett 2020-04-30 16:45:11 +01:00
  • 5d6b88e40b Merge branch 'origin/develop' into Weblate. Weblate 2020-04-30 15:37:11 +00:00
  • 0cb7573643 Merge pull request #4536 from matrix-org/dbkr/a_toast_to_you_sir_rel David Baker 2020-04-30 16:37:10 +01:00
  • fced07682e Translated using Weblate (German) @a2sc:matrix.org 2020-04-30 15:04:31 +00:00
  • fb2b37f0fe Translated using Weblate (German) SophieKrueger 2020-04-30 14:59:47 +00:00
  • c7e663832a Merge pull request #4535 from matrix-org/dbkr/a_toast_to_you_sir David Baker 2020-04-30 16:37:04 +01:00
  • 6ef5b78806 Add device name to unverified session toast David Baker 2020-04-30 16:09:38 +01:00
  • 3240b3bd60 Add device name to unverified session toast David Baker 2020-04-30 16:09:38 +01:00
  • ab40d5b732 Update copyright header J. Ryan Stinnett 2020-04-30 16:02:37 +01:00
  • dec5ea1637 Tweak default device name on macOS J. Ryan Stinnett 2020-04-30 15:58:53 +01:00
  • d3ce4072d4 Only show key backup reminder when confirmed by server to be missing J. Ryan Stinnett 2020-04-30 15:41:49 +01:00
  • 8ce1b3d367 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-30 13:09:53 +00:00
  • 3acb952d9a Merge pull request #4507 from matrix-org/foldleft/13167-spinner-progress Zoe 2020-04-30 14:09:47 +01:00
  • 4110e2dfa3 Move codebase into riot-web Zoe 2020-04-30 13:51:50 +01:00
  • 126b71dd30 Translated using Weblate (Estonian) Priit Jõerüüt 2020-04-30 10:51:56 +00:00
  • 29df8a8a2e v1.6.0-rc.5 v1.6.0-rc.5 RiotRobot 2020-04-30 11:37:43 +01:00
  • 429f36ebfc Prepare changelog for v1.6.0-rc.5 RiotRobot 2020-04-30 11:37:42 +01:00
  • 5844cb9428 v1.6.0-rc.5 RiotRobot 2020-04-30 11:34:37 +01:00
  • 3c7de2c08f Upgrade matrix-react-sdk to 2.5.0-rc.5 RiotRobot 2020-04-30 11:34:11 +01:00
  • ecc73905c1 Upgrade matrix-js-sdk to 6.0.0-rc.1 RiotRobot 2020-04-30 11:33:23 +01:00
  • 619fbd6adc v2.5.0-rc.5 RiotRobot 2020-04-30 11:30:14 +01:00
  • b7f2c7b813 Prepare changelog for v2.5.0-rc.5 RiotRobot 2020-04-30 11:30:13 +01:00
  • 63f30c57e4 v1.6.0-rc.5 RiotRobot 2020-04-30 11:25:21 +01:00
  • 929638ad64 Prepare changelog for v1.6.0-rc.5 RiotRobot 2020-04-30 11:25:20 +01:00
  • d621c32230 Upgrade matrix-js-sdk to 6.0.0-rc.1 RiotRobot 2020-04-30 11:24:49 +01:00
  • 5a29bf569d Upgrade matrix-js-sdk to 6.0.0-rc.1 RiotRobot 2020-04-30 11:21:33 +01:00
  • 19d0bf0d3b Merge pull request #4533 from matrix-org/dbkr/remove_unnecessary_return_rel David Baker 2020-04-30 11:13:21 +01:00
  • ad83318da7 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-30 10:13:20 +00:00
  • 6f844977f5 Translated using Weblate (French) Louis 2020-04-30 09:36:39 +00:00
  • e210f570f0 Merge pull request #4532 from matrix-org/dbkr/remove_unnecessary_return David Baker 2020-04-30 11:13:14 +01:00
  • 4f95c89ffc Fix device verification toasts not disappearing David Baker 2020-04-30 11:00:35 +01:00
  • e845409167 Fix device verification toasts not disappearing David Baker 2020-04-30 11:00:35 +01:00
  • db36b7e1d5 Merge pull request #4526 from matrix-org/jryans/reset-from-access-rc J. Ryan Stinnett 2020-04-30 10:17:12 +01:00
  • 3d996a91a7 Merge pull request #4530 from matrix-org/dbkr/toast_copy_update_again_rel David Baker 2020-04-30 10:01:25 +01:00
  • 99538b2033 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-30 09:01:21 +00:00
  • 0eb39d8756 Merge pull request #4529 from matrix-org/dbkr/toast_copy_update_again David Baker 2020-04-30 10:01:16 +01:00
  • aa9da54bed yarn i18n David Baker 2020-04-30 09:44:15 +01:00
  • 5ecd874e82 yarn i18n David Baker 2020-04-30 09:44:15 +01:00
  • ede1e1026c Merge branch 'origin/develop' into Weblate. Weblate 2020-04-30 08:26:30 +00:00
  • 9a2a57fe99 Translated using Weblate (Slovak) yuuki-san 2020-04-29 18:06:39 +00:00
  • fec4429d7d Translated using Weblate (French) grrgui 2020-04-29 17:37:20 +00:00
  • e33a4a2452 Translated using Weblate (French) Louis 2020-04-29 17:36:00 +00:00
  • 2a4c6f3da9 Translated using Weblate (French) axel simon 2020-04-29 17:33:30 +00:00
  • 87cd39109f Translated using Weblate (Czech) yuuki-san 2020-04-29 18:20:53 +00:00
  • feee969edc Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-04-30 02:41:06 +00:00
  • 4d66e251ae Translated using Weblate (Bulgarian) Slavi Pantaleev 2020-04-30 06:17:03 +00:00
  • 00d7e77379 Merge pull request #4518 from matrix-org/bwindels/recheckthemeonlogin Bruno Windels 2020-04-30 08:26:15 +00:00
  • 8be07abf6c Translated using Weblate (Estonian) Priit Jõerüüt 2020-04-29 21:27:33 +00:00
  • 49ac4963c5 Translated using Weblate (Estonian) Priit Jõerüüt 2020-04-29 20:55:43 +00:00
  • dab4ca64fc Translated using Weblate (Estonian) Priit Jõerüüt 2020-04-29 19:43:59 +00:00
  • 9d699c66d0 Translated using Weblate (Estonian) Priit Jõerüüt 2020-04-29 19:19:22 +00:00
  • c97eab24c7 Update toast copy again David Baker 2020-04-29 19:07:10 +01:00
  • 683d6804ca Update toast copy again David Baker 2020-04-29 19:07:10 +01:00
  • cea8f59fb3 Translated using Weblate (Estonian) Priit Jõerüüt 2020-04-29 17:09:48 +00:00
  • 7af2d27ced Merge pull request #4528 from matrix-org/dbkr/longtoast_is_no_longer_long_rel David Baker 2020-04-29 18:14:26 +01:00
  • 6b04ae2cf6 Merge pull request #4527 from matrix-org/dbkr/sessions_there_on_login_are_old_rel David Baker 2020-04-29 18:14:19 +01:00
  • 189a78d184 Put overflows back David Baker 2020-04-29 17:38:32 +01:00
  • ba233dc372 Reduce maximum width of toasts & allow multiple lines David Baker 2020-04-29 17:28:45 +01:00
  • ddb4aec5ed Merge branch 'origin/develop' into Weblate. Weblate 2020-04-29 17:08:20 +00:00
  • c58bb2af0f Merge pull request #4525 from matrix-org/dbkr/longtoast_is_no_longer_long David Baker 2020-04-29 18:08:15 +01:00
  • 1cac7b778d Translated using Weblate (Estonian) Priit Jõerüüt 2020-04-29 16:56:46 +00:00
  • 886b30a265 also recheck Bruno Windels 2020-04-29 15:07:00 +02:00
  • 38124ba9d0 Comment typo David Baker 2020-04-29 17:33:18 +01:00
  • 19170945b1 Treat sessions that are there when we log in as old David Baker 2020-04-29 17:16:04 +01:00
  • e3da750de0 Allow resetting storage from the access dialog J. Ryan Stinnett 2020-04-29 15:19:09 +01:00
  • b46415ce62 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-29 16:42:22 +00:00
  • 3502b90aeb Merge pull request #4524 from matrix-org/dbkr/sessions_there_on_login_are_old David Baker 2020-04-29 17:42:16 +01:00
  • eca1187c2e Merge branch 'origin/develop' into Weblate. Weblate 2020-04-29 16:41:45 +00:00
  • 1f79f5ded6 Translated using Weblate (French) Louis 2020-04-29 15:24:20 +00:00
  • eebcf748e1 Translated using Weblate (Estonian) Priit Jõerüüt 2020-04-29 15:50:21 +00:00
  • 0e371b65d1 Merge pull request #4521 from matrix-org/jryans/reset-from-access J. Ryan Stinnett 2020-04-29 17:41:35 +01:00
  • 34d6eb591f Put overflows back David Baker 2020-04-29 17:38:32 +01:00
  • c41af152ac Comment typo David Baker 2020-04-29 17:33:18 +01:00
  • 13d0e26ec4 Reduce maximum width of toasts & allow multiple lines David Baker 2020-04-29 17:28:45 +01:00
  • a70efea69e Treat sessions that are there when we log in as old David Baker 2020-04-29 17:16:04 +01:00
  • 5fd81ab6d4 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-29 15:02:59 +00:00
  • de9c8b0537 Merge pull request #4523 from matrix-org/dbkr/toast_copy_again_rel David Baker 2020-04-29 16:02:56 +01:00
  • dfb34a2e76 Merge pull request #4522 from matrix-org/dbkr/toast_copy_again David Baker 2020-04-29 16:02:53 +01:00
  • d691386ef0 Lint David Baker 2020-04-29 15:54:32 +01:00
  • 283a15c0b3 Lint David Baker 2020-04-29 15:54:32 +01:00
  • 691066af94 Update (bulk) unverified device toast copy David Baker 2020-04-29 15:31:41 +01:00
  • 9ac4fa92fd Update (bulk) unverified device toast copy David Baker 2020-04-29 15:31:41 +01:00
  • 5986edbbb2 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-29 14:28:35 +00:00
  • 33390e3659 Merge pull request #4520 from matrix-org/dbkr/new_device_toast_more_important_rel David Baker 2020-04-29 15:28:35 +01:00
  • 5b2ff19f59 Translated using Weblate (Estonian) Priit Jõerüüt 2020-04-29 13:59:03 +00:00
  • 1bd1e25047 Merge pull request #4519 from matrix-org/dbkr/new_device_toast_more_important David Baker 2020-04-29 15:28:28 +01:00