Commit Graph

  • 5b35d6e570 Upgrade matrix-react-sdk to 2.3.0-rc.1 RiotRobot 2020-03-26 13:28:04 +00:00
  • 9269d9b669 Upgrade matrix-js-sdk to 5.2.0-rc.1 RiotRobot 2020-03-26 13:27:40 +00:00
  • 2fe0edd3eb v2.3.0-rc.1 RiotRobot 2020-03-26 13:21:11 +00:00
  • 91f706260b Prepare changelog for v2.3.0-rc.1 RiotRobot 2020-03-26 13:21:10 +00:00
  • 053a5a5ff4 Merge pull request #4269 from ThobyV/thobyv/hide-formatBar-on-highlight-backspacing-message Bruno Windels 2020-03-26 13:19:06 +00:00
  • 1713006958 recommit bwindels commited changes to refactor check logic after rebase mistake thobyv-kismat 2020-03-26 14:03:38 +01:00
  • a1c83a4f0e Upgrade matrix-js-sdk to 5.2.0-rc.1 RiotRobot 2020-03-26 13:02:54 +00:00
  • 6d90307ff7 Merge pull request #4277 from matrix-org/dbkr/trust_cross_signing_flag David Baker 2020-03-26 12:19:14 +00:00
  • ec32abbb89 Merge pull request #12890 from RiotTranslateBot/weblate-riot-web-riot-web J. Ryan Stinnett 2020-03-26 12:14:15 +00:00
  • 9933ecbbf6 Merge pull request #4282 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk J. Ryan Stinnett 2020-03-26 12:14:01 +00:00
  • b2fbee0ffd Merge branch 'origin/develop' into Weblate. Weblate 2020-03-26 12:05:03 +00:00
  • e2bb0a3b46 Merge pull request #4281 from matrix-org/dbkr/ssss_upgrade_copy David Baker 2020-03-26 12:04:58 +00:00
  • 26ffcb2669 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-26 12:04:56 +00:00
  • 091e094759 Merge pull request #4270 from matrix-org/dbkr/wait_for_upgrade_to_complete David Baker 2020-03-26 12:04:52 +00:00
  • c1884a26aa Merge branch 'origin/develop' into Weblate. Weblate 2020-03-26 12:03:29 +00:00
  • 1d109bb067 Merge pull request #12869 from vector-im/t3chguy/app_load_tweaks Michael Telatynski 2020-03-26 12:03:23 +00:00
  • 8fbdcbadb5 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-26 11:55:41 +00:00
  • 39fdde627d Merge pull request #4278 from matrix-org/t3chguy/e2e_copy Michael Telatynski 2020-03-26 11:55:36 +00:00
  • 35e443975d Merge branch 'origin/develop' into Weblate. Weblate 2020-03-26 11:43:07 +00:00
  • 1963270d64 Translated using Weblate (Hungarian) Szimszon 2020-03-25 19:36:43 +00:00
  • 3072bbb0d7 Translated using Weblate (Esperanto) Tirifto 2020-03-25 21:32:17 +00:00
  • 1697cdc5a1 Merge pull request #12730 from vector-im/jryans/review-policy J. Ryan Stinnett 2020-03-26 11:43:00 +00:00
  • 2bd112ca7c add delete support and to keyboard shortcuts thobyv-kismat 2020-03-26 08:37:46 +01:00
  • c95b23f3ec fix formatBar not hidden after highlight-backspacing text partially thobyv-kismat 2020-03-24 19:50:37 +01:00
  • da249cbc40 Merge remote-tracking branch 'origin/develop' into jryans/review-policy J. Ryan Stinnett 2020-03-26 11:34:29 +00:00
  • 5b94d8bbd7 Add line about UI for network activity J. Ryan Stinnett 2020-03-26 11:28:47 +00:00
  • f7e9cf4552 i18n David Baker 2020-03-26 11:15:07 +00:00
  • 8a64caa925 Merge branch 'dbkr/wait_for_upgrade_to_complete' into dbkr/ssss_upgrade_copy David Baker 2020-03-26 11:14:33 +00:00
  • 95828ce751 Remove duplicate import David Baker 2020-03-26 11:13:57 +00:00
  • 8532c72fce Update copy on SSSS symmetric upgrade toast David Baker 2020-03-26 11:12:00 +00:00
  • 4586971a82 Merge remote-tracking branch 'origin/develop' into dbkr/wait_for_upgrade_to_complete David Baker 2020-03-26 11:10:07 +00:00
  • 7f87f9674d Merge branch 'origin/develop' into Weblate. Weblate 2020-03-26 10:55:05 +00:00
  • 5986bbc561 Merge pull request #4280 from matrix-org/dbkr/fix_permalink_crash David Baker 2020-03-26 10:54:59 +00:00
  • 9c20bf22ce Fix soft-crash on bad permalinks David Baker 2020-03-26 10:45:26 +00:00
  • 785d0e99fb remove some remaining dead code Bruno Windels 2020-03-26 11:05:27 +01:00
  • aed85a2183 fix style lint Bruno Windels 2020-03-25 19:33:55 +01:00
  • 2186023e43 css adjustments because mx_AutoHideScrollBar_offset was removed Bruno Windels 2020-03-25 19:26:59 +01:00
  • 75cbc1dc07 Adjust IndicatorScrollbar to not rely on AutoHideScrollbar for overflow Bruno Windels 2020-03-25 19:26:15 +01:00
  • 0436507574 use transparent scrollbars on not hover to emulate scrolbar on hover Bruno Windels 2020-03-25 19:24:32 +01:00
  • fced02e1f8 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-26 10:08:30 +00:00
  • 883b0afea0 Translated using Weblate (Hungarian) Szimszon 2020-03-25 19:42:58 +00:00
  • 7d92430831 Translated using Weblate (Esperanto) Tirifto 2020-03-25 21:52:01 +00:00
  • f448f456e1 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-03-26 02:37:38 +00:00
  • 44ce5b5764 Merge pull request #4267 from matrix-org/bwindels/setupcrosssigningafterskip Bruno Windels 2020-03-26 10:08:15 +00:00
  • a9e7bf9899 Merge remote-tracking branch 'origin/develop' into dbkr/trust_cross_signing_flag David Baker 2020-03-26 09:40:09 +00:00
  • c41b39488b Automatically redirect to SSO when the user clicks through to Login Michael Telatynski 2020-03-25 23:35:36 +00:00
  • 7ca6a4b777 Iterate copy Michael Telatynski 2020-03-25 23:00:46 +00:00
  • be3167c870 always show Devices section Michael Telatynski 2020-03-25 22:44:09 +00:00
  • d098c91c30 Update cross-signing verification copy and fix i18n Michael Telatynski 2020-03-25 22:38:11 +00:00
  • 327b3c860b Adding the files would help David Baker 2020-03-25 18:47:57 +00:00
  • 25e7bde7bc Add a flag to control whether cross-signing signatures are trusted David Baker 2020-03-25 18:38:12 +00:00
  • bd91420366 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-25 17:56:56 +00:00
  • 2c1fbfb69c Translated using Weblate (German) @a2sc:matrix.org 2020-03-25 17:25:02 +00:00
  • 0fb4c51b2c Translated using Weblate (German) Max Klenk 2020-03-25 17:17:09 +00:00
  • 0fb96fda6e Merge pull request #4272 from matrix-org/bwindels/safaripersisted Bruno Windels 2020-03-25 17:56:47 +00:00
  • 0097134ade Update src/utils/StorageManager.js Bruno Windels 2020-03-25 17:56:35 +00:00
  • 8ad7ef42e9 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-25 16:28:15 +00:00
  • 6e8cfc2272 Merge pull request #4275 from matrix-org/foldleft/12704-key-sharing Zoe 2020-03-25 16:28:09 +00:00
  • f891f3e9fa lint Zoe 2020-03-25 16:08:26 +00:00
  • 8549755fd5 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-25 15:25:17 +00:00
  • 5c51063070 Merge pull request #12875 from vector-im/dbkr/fix_artifact_search David Baker 2020-03-25 15:25:12 +00:00
  • 758d021f97 Merge remote-tracking branch 'origin/develop' into dbkr/fix_artifact_search David Baker 2020-03-25 15:18:20 +00:00
  • 4d63c11f26 Respond to backup key sharing requests Zoe 2020-03-25 14:06:47 +00:00
  • fea600ba0a Fix artifact searching in redeployer David Baker 2020-03-25 15:12:53 +00:00
  • 6198ebee9f Merge branch 'origin/develop' into Weblate. Weblate 2020-03-25 15:00:11 +00:00
  • d869ac9a69 Merge pull request #4268 from matrix-org/jryans/robust-secret-share J. Ryan Stinnett 2020-03-25 15:00:04 +00:00
  • fd385f8450 simplify loadConfig Michael Telatynski 2020-03-25 14:37:28 +00:00
  • 92d8ee355d merge initial-load.ts into init.ts as its no longer used by Jitsi Michael Telatynski 2020-03-25 14:32:37 +00:00
  • 1f94b25d25 Fix copyrights Michael Telatynski 2020-03-25 14:28:07 +00:00
  • 8929cd9c08 Merge branches 'develop' and 't3chguy/app_load_tweaks' of github.com:vector-im/riot-web into t3chguy/app_load_tweaks Michael Telatynski 2020-03-25 14:26:48 +00:00
  • 24d85c5cd7 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-25 14:26:12 +00:00
  • 4b7cf489c8 Translated using Weblate (Turkish) Ege 2020-03-24 16:51:01 +00:00
  • 990a96b56d Translated using Weblate (Turkish) roket1428 2020-03-24 16:48:32 +00:00
  • cb23da12cb Translated using Weblate (Mongolian) Ganzo DG 2020-03-25 10:59:34 +00:00
  • e4c1db4f47 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-25 14:26:08 +00:00
  • 2b600e74c4 Translated using Weblate (Turkish) catborise 2020-03-25 13:23:47 +00:00
  • dec2f2a39e Merge pull request #12845 from vector-im/travis/config-wrapper Travis Ralston 2020-03-25 08:26:06 -06:00
  • a7913f4fe5 Merge pull request #4266 from matrix-org/travis/config-wrapper Travis Ralston 2020-03-25 08:26:01 -06:00
  • 9dd81216fb rename secret storage force-reset variable to avoid confusion Zoe 2020-03-25 14:21:17 +00:00
  • 6315907585 Typescript stuff. Michael Telatynski 2020-03-25 14:07:22 +00:00
  • 6fb9fc4e6f move loadLanguage to init.ts Michael Telatynski 2020-03-25 13:55:25 +00:00
  • df2b966acd move loadOlm to init.ts Michael Telatynski 2020-03-25 13:53:28 +00:00
  • b09b47543b Merge branches 'develop' and 't3chguy/app_load_tweaks' of github.com:vector-im/riot-web into t3chguy/app_load_tweaks Michael Telatynski 2020-03-25 12:45:10 +00:00
  • a808d26764 Enable webpack reuseExistingChunk Michael Telatynski 2020-03-25 12:41:33 +00:00
  • 78b167a7ea fix typo Bruno Windels 2020-03-25 13:40:09 +01:00
  • e669c681e2 Fetch both config.json-s at the same time, first one fails 99% of the time Michael Telatynski 2020-03-25 12:39:42 +00:00
  • 792a7b3953 don't throw here Bruno Windels 2020-03-25 13:07:07 +01:00
  • 2edaad5528 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-25 11:58:29 +00:00
  • b7013c6f5d Merge pull request #4273 from matrix-org/foldleft/12704-key-requests Zoe 2020-03-25 11:58:24 +00:00
  • 936a4a0022 lint Zoe 2020-03-25 11:47:07 +00:00
  • 8b2ae3e20f If cached keys are present in the key backup dialog, use them Zoe 2020-03-24 12:24:12 +00:00
  • 9a5f4d9b22 fall back, don't do both on FF Bruno Windels 2020-03-25 12:07:11 +01:00
  • f6e9c32c48 fall back to non-standard persisted api for Safari Bruno Windels 2020-03-25 12:04:09 +01:00
  • 222ddbcaf6 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-25 09:01:51 +00:00
  • 19b17db803 Translated using Weblate (Turkish) roket1428 2020-03-24 14:57:50 +00:00
  • 718eeeade6 Translated using Weblate (German) Kilian Koeltzsch 2020-03-24 19:48:03 +00:00
  • 297abac072 Translated using Weblate (French) Kévin C 2020-03-25 08:51:51 +00:00
  • c23aba51c3 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-03-25 04:19:03 +00:00
  • 8f10223be8 Translated using Weblate (Albanian) Besnik Bleta 2020-03-24 16:58:55 +00:00
  • 8521ed1a45 Merge pull request #4265 from ThobyV/thobyv/hide-formatbar-onEnter-highlighted-message Bruno Windels 2020-03-25 09:01:36 +00:00