Commit Graph

  • d3cf4f132c Merge pull request #4036 from matrix-org/jryans/mkey-remove J. Ryan Stinnett 2020-02-05 09:38:48 +00:00
  • 110c5f0e61 Fix listener removal in verification tile J. Ryan Stinnett 2020-02-04 23:13:55 +00:00
  • b92fe59436 Improve event indexing status strings for translation J. Ryan Stinnett 2020-02-04 00:01:58 +00:00
  • 3716545085 Typo David Baker 2020-02-04 22:19:28 +00:00
  • f89ae19d76 Merge pull request #4028 from matrix-org/foldleft/12114-less-alarming-on-own-devices Zoe 2020-02-04 17:09:16 +00:00
  • c50bd8d30e Merge pull request #4007 from hellcp/patch-1 Bruno Windels 2020-02-04 16:30:10 +00:00
  • d585dbab02 Merge branches 'develop' and 't3chguy/s1' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/s1 Michael Telatynski 2020-02-04 15:48:04 +00:00
  • e23a3e98be Only enumerate settings handlers which are supported currently Michael Telatynski 2020-02-04 15:27:38 +00:00
  • 153703426a I have removed the newline at the end of file to pass tests rtestard 2020-02-04 16:02:49 +01:00
  • f023bcfd63 I have modified padlocks styling when the left panel is collapsed rtestard 2020-02-04 15:05:26 +01:00
  • d822104159 Merge pull request #4010 from matrix-org/foldleft/11968-verify-verification Zoe 2020-02-04 13:47:32 +00:00
  • 032efafe2e Rejig things around to catch Promises not being a thing at all Michael Telatynski 2020-02-04 13:35:05 +00:00
  • fff35fd2c9 Merge pull request #4031 from matrix-org/t3chguy/missing_dep Michael Telatynski 2020-02-04 11:32:32 +00:00
  • 3a2cf87791 Merge pull request #4032 from matrix-org/t3chguy/watcher_id Michael Telatynski 2020-02-04 11:32:12 +00:00
  • 544479a6ee test code cleaned up slightly Zoe 2020-02-04 11:31:16 +00:00
  • 150fe7a45a Tests for MKeyVerificationConclusion Zoe 2020-02-04 11:25:19 +00:00
  • f6c7df8c69 Keep date in Watcher IDs Michael Telatynski 2020-02-04 11:14:49 +00:00
  • e65404b631 Explicitly (not transitively) depend on minimist as bin script uses it Michael Telatynski 2020-02-04 11:13:18 +00:00
  • 087bcf0ae6 fix declaration order Michael Telatynski 2020-02-04 11:11:06 +00:00
  • cdc1202bbe Add custom browser checks outside of Modernizr Michael Telatynski 2020-02-04 11:08:52 +00:00
  • bceca49cdc Update vendored modernizr Michael Telatynski 2020-02-04 11:00:47 +00:00
  • 2d8a2c5210 Merge branches 'develop' and 't3chguy/watcher_id' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/watcher_id Michael Telatynski 2020-02-04 10:47:53 +00:00
  • 3dd5986656 Merge branches 'develop' and 't3chguy/missing_dep' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/missing_dep Michael Telatynski 2020-02-04 10:47:27 +00:00
  • a8f7e381eb SettingsStore, use a counter instead of wall clock for watcher ids Michael Telatynski 2020-02-04 10:41:48 +00:00
  • b099c983d6 Use minimist instead of optimist as it is deprecated Michael Telatynski 2020-02-04 10:16:39 +00:00
  • bf9d5b7f01 Merge pull request #4027 from matrix-org/travis/fix-room-list Travis Ralston 2020-02-04 09:36:12 +00:00
  • fab54ab936 Merge pull request #3998 from matrix-org/zip/12038-toast-timeouts Zoe 2020-02-04 09:30:47 +00:00
  • 1df6837649 Missing semicolon BobVul 2020-02-04 10:38:43 +11:00
  • 41f4b38fe8 Do not show alarming red shields on large encrypted rooms for your own device Zoe 2020-02-03 16:51:36 +00:00
  • 79a362b385 Fix the remainder of the cookie links David Baker 2020-02-03 16:25:50 +00:00
  • 0fdba02e07 ElectronPlatform: Add the indexSize method. David Baker 2020-02-03 16:23:42 +00:00
  • ab91a311c4 ElectronPlatform: Add the ability to load file events from the event index David Baker 2020-02-03 16:21:35 +00:00
  • a3021fce0a Updates URL for Electron Command Line Switches David Baker 2020-02-03 16:20:09 +00:00
  • b7b9779b65 electron-main: Provide a better error message if Seshat isn't installed. David Baker 2020-02-03 16:19:16 +00:00
  • aa6eabcf57 Don't crash immediately if the room directory chunk is null/empty Travis Ralston 2020-02-03 15:49:18 +00:00
  • 9bfed510b1 Merge pull request #4026 from matrix-org/dbkr/tagorderstore_leak David Baker 2020-02-03 15:39:12 +00:00
  • 11cb3a60b2 Fix listener leak in TagPanel David Baker 2020-02-03 13:33:44 +00:00
  • f0d306b07c Merge pull request #4025 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk David Baker 2020-02-03 10:02:57 +00:00
  • fb6bb2fd6b Translated using Weblate (Turkish) catborise 2020-02-01 16:37:51 +00:00
  • f0bd75fcfb Translated using Weblate (Italian) random 2020-02-03 09:36:31 +00:00
  • c879d4c0ab Translated using Weblate (Hungarian) Szimszon 2020-02-01 19:50:09 +00:00
  • ee9f3c9e18 Translated using Weblate (French) Kévin C 2020-02-01 12:55:26 +00:00
  • a71c368994 Translated using Weblate (Dutch) J. A. Durieux 2020-02-02 20:55:40 +00:00
  • a31be025cf Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-02-01 13:26:22 +00:00
  • 20fc8514a5 I have added spacing, as devices are very hard to read otherwise unknown 2020-02-02 18:47:16 +01:00
  • aa52118fa1 the width was not properly set to other languages than english, a min-width will keep the proper size of the button while leaving some room for more word expensive languages such as french unknown 2020-02-02 17:31:06 +01:00
  • 9cf53aa9d8 Only return formatted text when necessary (for escaped chars) Bob 2020-02-02 16:34:19 +11:00
  • 5dfabb9f18 Merge branch 'origin/develop' into Weblate. Weblate 2020-02-01 12:49:20 +00:00
  • ffc3cdf7b5 Tweak emoji sizes J. Ryan Stinnett 2020-02-01 13:48:52 +01:00
  • 949eb73c9f Merge branch 'origin/develop' into Weblate. Weblate 2020-02-01 12:28:35 +00:00
  • bc2fa4d31b Translated using Weblate (Basque) Osoitz 2020-02-01 11:21:44 +00:00
  • 8b0e8571be Merge pull request #4023 from matrix-org/dbkr/honor_islogin_system_theme David Baker 2020-02-01 12:28:23 +00:00
  • a3ef0aa6e8 Honour the isLogin flag in theme.js David Baker 2020-02-01 12:09:41 +00:00
  • 1db608e713 Merge branch 'origin/develop' into Weblate. Weblate 2020-02-01 11:18:54 +00:00
  • e946f5f4b8 Translated using Weblate (Spanish) lissitz 2020-02-01 00:22:47 +00:00
  • 455b4f9a40 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-02-01 02:23:12 +00:00
  • dad44d0b1f Translated using Weblate (Basque) Osoitz 2020-02-01 09:30:58 +00:00
  • 4c426faedc Merge pull request #4022 from matrix-org/poljar/eventindex-roomcount Matthew Hodgson 2020-02-01 12:18:44 +01:00
  • d8576f23de ManageEventINdexDialog: Fix a line length issue. Damir Jelić 2020-02-01 12:11:49 +01:00
  • 75fe3c2219 ManageEventIndexDialog: Show how many rooms are being currently crawled. Damir Jelić 2020-02-01 12:00:04 +01:00
  • 00ca4458f6 Merge branch 'origin/develop' into Weblate. Weblate 2020-02-01 00:22:25 +00:00
  • 6e33d35e87 Translated using Weblate (Spanish) lissitz 2020-01-31 20:46:17 +00:00
  • 8c9af0dec6 Translated using Weblate (Czech) lissitz 2020-02-01 00:06:30 +00:00
  • 98c8986ead Merge pull request #4021 from matrix-org/travis/fix-scan-temp Travis Ralston 2020-02-01 00:22:10 +00:00
  • 26e41ec97c Merge branch 'origin/develop' into Weblate. Weblate 2020-01-31 19:13:21 +00:00
  • 3f706c0eda Translated using Weblate (Turkish) catborise 2020-01-31 19:02:04 +00:00
  • ade8015b2a Merge pull request #4020 from matrix-org/poljar/eventindex-er Matthew Hodgson 2020-01-31 20:13:15 +01:00
  • 01c1c2364b ManageEventIndexDialog: Add back a control for the crawler sleep time. Damir Jelić 2020-01-31 18:44:52 +01:00
  • 5eb510387c EventIndex: Don't process checkpoints that don't have a valid token. Damir Jelić 2020-01-31 16:37:30 +01:00
  • 0e5fec5feb EventIndex: Catch errors when removing a crawler checkpoint. Damir Jelić 2020-01-31 15:37:06 +01:00
  • 2b62c6773d Advertise that we can scan QR codes even though we can't Travis Ralston 2020-01-31 17:10:06 +00:00
  • a84a7f9271 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-31 16:23:56 +00:00
  • aa35fc4273 Translated using Weblate (French) Kévin C 2020-01-31 15:14:00 +00:00
  • 9d343a4705 Merge pull request #4018 from matrix-org/dbkr/truncate_sas David Baker 2020-01-31 16:23:50 +00:00
  • 29024c5172 Truncate SAS emoji labels to fit David Baker 2020-01-31 15:28:58 +00:00
  • c3e6a30789 Merge branch 'develop' of git+ssh://github.com/vector-im/riot-web into develop Matthew Hodgson 2020-01-31 15:22:44 +00:00
  • 87913e6c98 yarn electron nowadays does yarn build already Matthew Hodgson 2020-01-31 15:22:16 +00:00
  • 7d418e16ff Merge branch 'origin/develop' into Weblate. Weblate 2020-01-31 15:13:24 +00:00
  • 2584772bfb Merge pull request #4017 from matrix-org/jryans/e2e-copy-changes J. Ryan Stinnett 2020-01-31 15:13:18 +00:00
  • 0c6170fc24 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-31 15:12:59 +00:00
  • fcfac9b6ed Translated using Weblate (French) Kévin C 2020-01-31 14:48:59 +00:00
  • 16f72140b9 Merge pull request #4016 from matrix-org/jryans/verif-status-text J. Ryan Stinnett 2020-01-31 15:12:52 +00:00
  • d5811cad28 Change UI auth title for cross-signing J. Ryan Stinnett 2020-01-31 15:04:51 +00:00
  • 141aa989bb Merge branch 'origin/develop' into Weblate. Weblate 2020-01-31 14:48:02 +00:00
  • 7234925fa0 Translated using Weblate (French) Kévin C 2020-01-31 13:50:10 +00:00
  • 2d61a9d392 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-01-31 13:44:35 +00:00
  • 501a310e8e Merge pull request #4015 from matrix-org/dbkr/hold_me_closer_tiny_padlock David Baker 2020-01-31 14:47:49 +00:00
  • 00fa5aad85 Enable padlock flag by default J. Ryan Stinnett 2020-01-31 14:31:01 +00:00
  • 0fad5a62b4 Fix user trust text to match what was checked J. Ryan Stinnett 2020-01-31 14:06:55 +00:00
  • 2dbceca8b3 Fix size of invite only icon David Baker 2020-01-31 13:46:42 +00:00
  • 251fed9c52 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-31 13:44:18 +00:00
  • dacf900a9f Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-01-31 13:38:24 +00:00
  • 11008cfabf Merge pull request #4013 from matrix-org/jryans/padlock-flag J. Ryan Stinnett 2020-01-31 13:44:12 +00:00
  • 2818de4d4a Merge pull request #12173 from vector-im/jryans/padlock-flag J. Ryan Stinnett 2020-01-31 13:44:04 +00:00
  • e9f8700d6b Document padlock flag J. Ryan Stinnett 2020-01-31 13:36:16 +00:00
  • 7b95b3a36b Merge branch 'origin/develop' into Weblate. Weblate 2020-01-31 13:30:18 +00:00
  • 85489c4ec5 Merge pull request #4014 from matrix-org/dbkr/theme_is_login_override David Baker 2020-01-31 13:30:12 +00:00
  • e3f9de0cf4 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-31 13:22:28 +00:00
  • 636b3696ed Merge pull request #4011 from matrix-org/jryans/comp-sec-title J. Ryan Stinnett 2020-01-31 13:22:22 +00:00
  • cb9362456f remove setter David Baker 2020-01-31 13:18:01 +00:00