Commit Graph

  • 543be90eda Merge pull request #3931 from matrix-org/foldleft/12035-room-decoration-design-pass Zoe 2020-01-24 13:54:51 +00:00
  • b0bfef3b47 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 13:44:01 +00:00
  • cbfde4d78f Merge branch 'poljar/seshat-filepanel' into develop Damir Jelić 2020-01-24 14:44:24 +01:00
  • a46646105f Translated using Weblate (Italian) random 2020-01-24 13:31:48 +00:00
  • 192f2b8892 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 13:40:37 +00:00
  • 7aff020d4d Merge branch 'poljar/seshat-ui' into develop Damir Jelić 2020-01-24 14:40:54 +01:00
  • 3d804665da Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 13:39:07 +00:00
  • c0558f3527 Merge branch 'poljar/seshat-filepanel' into develop Damir Jelić 2020-01-24 14:38:20 +01:00
  • 75da5b7944 Design pass for room icons Zoe 2020-01-24 12:59:46 +00:00
  • 6a1ab4fe17 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 13:31:14 +00:00
  • be98f24051 Translated using Weblate (Italian) random 2020-01-24 13:31:06 +00:00
  • 7de5f09f9f Merge pull request #3928 from matrix-org/dbkr/split_out_asyncwrapper David Baker 2020-01-24 13:31:09 +00:00
  • edc13aad82 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 13:30:31 +00:00
  • 6ebeb0a376 Translated using Weblate (Italian) random 2020-01-24 13:30:03 +00:00
  • 330f606513 Merge pull request #3930 from matrix-org/bwindels/fixnoroom David Baker 2020-01-24 13:30:25 +00:00
  • da2b29b6e5 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 13:27:04 +00:00
  • 131aacd3ab Merge pull request #3929 from matrix-org/zip/11840-tooltips-on-padlocks Zoe 2020-01-24 13:26:59 +00:00
  • 37f289b120 EventIndex: Add docstrings for the FilePanel methods. Damir Jelić 2020-01-24 14:24:25 +01:00
  • 3534cd4202 FilePanel: Add comments to explain what's going on with the event index. Damir Jelić 2020-01-24 14:23:43 +01:00
  • 66768416a6 dont assume the room exist ... not sure why though Bruno Windels 2020-01-24 14:20:48 +01:00
  • 27ffa88ff8 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 13:18:15 +00:00
  • 2c40b73ff6 Merge pull request #3910 from matrix-org/t3chguy/cross-signing-composer Michael Telatynski 2020-01-24 13:18:09 +00:00
  • 590ff29e60 Unused import David Baker 2020-01-24 13:15:57 +00:00
  • c5ecd83bc1 remove .orig file David Baker 2020-01-24 12:34:50 +00:00
  • dbf1c9a02a Apparently i18n... David Baker 2020-01-24 12:34:03 +00:00
  • 688f7029d2 Split AsyncWrapper out from Modal David Baker 2020-01-24 12:28:03 +00:00
  • a6fcbcacf6 Seperates out the padlock icon, and adds a tooltip Zoe 2020-01-24 12:04:08 +00:00
  • 210616c737 Phase 1, split out UserInfo into a generic Pane, use for EncInfo Michael Telatynski 2020-01-24 11:45:39 +00:00
  • f4e5b69aa3 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 11:24:39 +00:00
  • b66154330c Merge pull request #3927 from matrix-org/bwindels/fixverifyowndevice Bruno Windels 2020-01-24 11:24:33 +00:00
  • 423786807f Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 11:14:59 +00:00
  • 1d686fe49e Merge pull request #3908 from matrix-org/zip/11935-room-list-decoration Zoe 2020-01-24 11:14:53 +00:00
  • 6cce65a2a5 fix lint Bruno Windels 2020-01-24 12:08:47 +01:00
  • ecfecfe559 EventIndex: Fix a small style issue. Damir Jelić 2020-01-24 12:07:03 +01:00
  • 395c82b1e5 Update src/components/structures/RoomView.js Zoe 2020-01-24 11:04:40 +00:00
  • 512bd4b0b2 show to_device verification in dialog, not right panel Bruno Windels 2020-01-24 11:59:17 +01:00
  • 2483337e89 don't use removed .event property anymore on verification request Bruno Windels 2020-01-24 11:57:57 +01:00
  • 029369a04b EventIndexPanel: Small style fix. Damir Jelić 2020-01-24 11:56:43 +01:00
  • ee133a9c71 DisableEventIndexDialog: Remove an unused import. Damir Jelić 2020-01-24 11:56:19 +01:00
  • 0c3d507455 EventIndex: Cancel the crawler early after a message request. Damir Jelić 2020-01-24 11:46:46 +01:00
  • ffe5d411db EventIndexPanel: Add a link to the download page of Riot Desktop. Damir Jelić 2020-01-24 11:44:56 +01:00
  • 38b1663755 EventIndex: Subclass the event emitter instead of putting one in a property. Damir Jelić 2020-01-24 11:28:33 +01:00
  • 6f919eaeec DisableEventIndexDialog: Use the correct spinner. Damir Jelić 2020-01-24 11:27:56 +01:00
  • d6a5d701fe Translated using Weblate (Hungarian) Balázs Meskó 2020-01-23 10:15:09 +00:00
  • b7c9f5307d Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 10:22:22 +00:00
  • 0078c2f099 Merge pull request #3914 from matrix-org/t3chguy/userinfo_scroll Michael Telatynski 2020-01-24 10:22:17 +00:00
  • 825b6f7b7d EventIndexPeg: Style fix for a docstring. Damir Jelić 2020-01-24 11:16:49 +01:00
  • d9e933c915 EventIndex: Style fixes for the docstrings. Damir Jelić 2020-01-24 11:15:57 +01:00
  • 660240e2c0 EventIndexPanel: Use formatCount to format the room count. Damir Jelić 2020-01-24 11:13:09 +01:00
  • b72ab57e1b add <Tooltip/> to <E2EIcon/> Michael Telatynski 2020-01-24 10:13:03 +00:00
  • 128c0b7300 ManageEventIndexDialog: Use formatCount to format the message and room count. Damir Jelić 2020-01-24 11:11:53 +01:00
  • 71024d1418 ManageEventIndexDialog: Properly indent the content of the BaseDialog. Damir Jelić 2020-01-24 11:03:40 +01:00
  • cba7764784 DisableEventIndexDialog: Use the DialogButtons element for the buttons. Damir Jelić 2020-01-24 11:00:28 +01:00
  • c0d034a1c4 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 09:50:30 +00:00
  • 50b05551ba Merge pull request #3916 from matrix-org/dbkr/security_dialog_noheader David Baker 2020-01-24 09:50:25 +00:00
  • 20da361acd Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 09:38:33 +00:00
  • 169852adec Translated using Weblate (French) Kévin C 2020-01-24 08:23:03 +00:00
  • 81caa12b16 Merge pull request #3917 from matrix-org/dbkr/complete_security_detect_success David Baker 2020-01-24 09:38:25 +00:00
  • 99252e08b0 Unintentional commit David Baker 2020-01-24 09:37:43 +00:00
  • cd4e75c378 Unnecessary blank line David Baker 2020-01-24 09:36:22 +00:00
  • 72a58d0c2c DisableEventIndexDialog: Properly indent the content of the BaseDialog. Damir Jelić 2020-01-24 09:59:26 +01:00
  • b59863781f DisableEventIndexDialog: Fix a typo. Damir Jelić 2020-01-24 09:58:17 +01:00
  • 93facca479 ManageEventIndex: Rename the file to contain the Dialog suffix. Damir Jelić 2020-01-24 09:54:46 +01:00
  • f763ae3c7b DisableEventIndex: Rename the file to contain the Dialog suffix. Damir Jelić 2020-01-24 09:50:58 +01:00
  • 4ea2d4f90e ManageEventIndex: Rewrite the docs and rename the dialog class. Damir Jelić 2020-01-24 09:45:29 +01:00
  • d30fd3eac0 DisableEventIndex: Rename the class. Damir Jelić 2020-01-24 09:39:56 +01:00
  • 86a098fcd9 DisableEventIndex: Remove a blank line and rewrite a doc comment. Damir Jelić 2020-01-24 09:35:31 +01:00
  • 12fa94106e Actually add the secret to the QR code url Travis Ralston 2020-01-23 20:19:17 -07:00
  • b7e680ba51 Fix key ID Travis Ralston 2020-01-23 20:14:27 -07:00
  • 0ce9da5d36 Appease the linter Travis Ralston 2020-01-23 20:12:24 -07:00
  • ebcc4d573b Add trace logging to figure out which component is causing weird events Travis Ralston 2020-01-23 20:10:31 -07:00
  • b682e7d908 Generate a QR code for apps to scan Travis Ralston 2020-01-23 20:05:32 -07:00
  • 586a240e41 Don't use private keys for QR code Travis Ralston 2020-01-20 23:10:35 -07:00
  • 1ec746c014 Add verification with QR codes Travis Ralston 2020-01-17 19:53:33 -07:00
  • 32f9a4e623 Add some debugging around the recently DM'd users Travis Ralston 2020-01-23 17:35:36 -07:00
  • 442ab9f301 Clear the filter when a suggestion is accepted/added Travis Ralston 2020-01-23 17:27:37 -07:00
  • b5f22001b1 Fix copy Travis Ralston 2020-01-23 17:22:39 -07:00
  • a34507f6e1 Remove DMs flag from the config too Travis Ralston 2020-01-23 17:15:53 -07:00
  • 12b8bd7344 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-23 23:43:08 +00:00
  • d3960b8c54 Merge pull request #3924 from matrix-org/travis/sso-pw Travis Ralston 2020-01-23 16:43:01 -07:00
  • 1394331133 Fix booleans Travis Ralston 2020-01-23 16:33:33 -07:00
  • c22bfa84b7 Hide password section if you can't change your password Travis Ralston 2020-01-23 16:29:55 -07:00
  • bdcf9452d4 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-23 23:02:57 +00:00
  • beb2503542 Merge pull request #3922 from matrix-org/travis/fix-copy Travis Ralston 2020-01-23 16:02:52 -07:00
  • dbcfa86d7f Merge pull request #3923 from matrix-org/travis/fix-copy-release Travis Ralston 2020-01-23 16:02:49 -07:00
  • 6adfa35445 Ensure a plaintext version of the composer ends up on the clipboard Travis Ralston 2020-01-23 15:53:32 -07:00
  • 915c4efeac Ensure a plaintext version of the composer ends up on the clipboard Travis Ralston 2020-01-23 15:53:32 -07:00
  • 22a6bcfc17 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-23 22:46:16 +00:00
  • 40cb9e5dd9 Merge pull request #3920 from matrix-org/travis/fix-build Travis Ralston 2020-01-23 15:46:11 -07:00
  • d899dcc2ee Merge pull request #3921 from matrix-org/travis/fix-build-release Travis Ralston 2020-01-23 15:46:04 -07:00
  • a330ee186a Move & upgrade babel runtime into dependencies (like it wants) Travis Ralston 2020-01-23 15:38:06 -07:00
  • 4aa3be9b42 Move & upgrade babel runtime into dependencies (like it wants) Travis Ralston 2020-01-23 15:38:06 -07:00
  • d807a1b21e Merge branch 'origin/develop' into Weblate. Weblate 2020-01-23 22:09:15 +00:00
  • db58199e03 Merge pull request #3919 from matrix-org/travis/alias-release Travis Ralston 2020-01-23 15:09:12 -07:00
  • ed93761b00 Merge pull request #3918 from matrix-org/travis/aliases Travis Ralston 2020-01-23 15:09:08 -07:00
  • 6f6d149a70 Don't list every single alias when there's many Travis Ralston 2020-01-23 14:59:52 -07:00
  • 18f8f8858c Don't list every single alias when there's many Travis Ralston 2020-01-23 14:59:52 -07:00
  • adb3066567 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-23 22:00:13 +00:00
  • 1ac82a9f16 Revert "Don't list every single alias when there's many" Travis Ralston 2020-01-23 14:59:52 -07:00
  • 813947fbde Merge branch 'origin/develop' into Weblate. Weblate 2020-01-23 22:00:02 +00:00