Commit Graph

34700 Commits

Author SHA1 Message Date
Paulo Pinto 09d08882e3 Standardise casing of identity server
Replace instances of 'Identity Server' with 'Identity server', when at start of
sentence, or 'identity server' when not.

Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-13 16:28:43 +01:00
Paulo Pinto 7a8400e5c7 Standardise spelling and casing of homeserver
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-13 16:28:43 +01:00
J. Ryan Stinnett 130aee0416 Merge pull request #6343 from matrix-org/jryans/customise-aliases
Add alias and directory customisation points
2021-07-12 12:09:17 +01:00
J. Ryan Stinnett 38cbbfb99e Add time to comment 2021-07-12 11:56:47 +01:00
J. Ryan Stinnett d584e70662 Revert ToggleSwitch cursor changes 2021-07-12 11:56:06 +01:00
Michael Telatynski 7533d8e82c Merge pull request #6354 from matrix-org/t3chguy/fix/12281 2021-07-12 11:53:27 +01:00
Michael Telatynski cecc43281b i18n 2021-07-12 11:33:33 +01:00
Michael Telatynski 27f74dd3f1 Fix multiinviter user already in room and clean up code 2021-07-12 11:32:06 +01:00
Michael Telatynski a3ea120150 Merge pull request #6341 from matrix-org/t3chguy/fix/17910 2021-07-12 10:55:00 +01:00
Michael Telatynski 2ef714b9eb remove unused import 2021-07-12 10:49:19 +01:00
Michael Telatynski 83a4a20cfb Merge pull request #5679 from SimonBrandner/quit-sticker-picker 2021-07-12 09:31:37 +01:00
Germain ebd64eb53c Merge pull request #6350 from SimonBrandner/fix/dont-auto-detect-lang/12366
Don't autodetect language in inline code blocks
2021-07-12 09:28:52 +01:00
Michael Telatynski f049edf605 Merge branch 'develop' into quit-sticker-picker 2021-07-12 09:26:11 +01:00
Germain 8a816bb096 Merge pull request #6331 from matrix-org/gsouquet/ghost-button-background
Make ghost button background transparent
2021-07-12 09:07:52 +01:00
Michael Telatynski cdc75f3709 Merge pull request #6346 from matrix-org/t3chguy/fix/17935
only consider valid & loaded url previews for show N more prompt
2021-07-12 08:56:15 +01:00
Michael Telatynski f5f4be88f0 Update tests to expect LinkPreviewGroup behaviour 2021-07-12 08:34:26 +01:00
Michael Telatynski 4f82f6aa1f Merge pull request #6335 from matrix-org/t3chguy/fix/6884
Extract MXCs from _matrix/media/r0/ URLs for inline images in messages
2021-07-12 08:24:40 +01:00
Šimon Brandner cd125506b6 Auto-detect language only if enabled and only for codeblocks
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-11 11:18:06 +02:00
Michael Telatynski e3e7d41d5c only consider valid & loaded url previews for show N more prompt 2021-07-10 19:41:50 +01:00
Michael Telatynski 829169ec87 Merge pull request #6342 from matrix-org/t3chguy/fix/vrlp
Fix small visual regression with the site name on url previews
2021-07-09 18:05:48 +01:00
J. Ryan Stinnett 201b7f193c Only show pointer cursor for enabled switches 2021-07-09 17:56:16 +01:00
J. Ryan Stinnett ff7f3f47be Add directory publish customisation point
This will help certain environments, such as P2P, where directory publishing can
be allowed freely.
2021-07-09 17:51:18 +01:00
J. Ryan Stinnett 8177dbfb56 Add display alias customisation point
This will allow environments such as P2P to tweak the preferred display alias if
needed.
2021-07-09 17:11:17 +01:00
J. Ryan Stinnett 4b9d4ad1e3 Centralise display alias getters 2021-07-09 17:06:54 +01:00
Germain e9600e9f57 Merge pull request #5952 from SimonBrandner/fix/17130/draggable-pip 2021-07-09 15:52:12 +01:00
Šimon Brandner a90b8f32f1 Add some tests
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 16:45:04 +02:00
Šimon Brandner d9b8f0d540 Add docs
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 15:58:35 +02:00
Michael Telatynski 8072007782 Fix small visual regression with the site name on url previews 2021-07-09 14:50:55 +01:00
Šimon Brandner ba3d7f9bee Use marked execution
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 15:50:52 +02:00
Michael Telatynski a7aa87a9fc Fix right panel not closing user info when changing rooms 2021-07-09 14:43:07 +01:00
Šimon Brandner 007548aa7f Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip 2021-07-09 15:36:14 +02:00
Germain a1c3f25fe5 Merge pull request #6340 from SimonBrandner/feature/media-devices 2021-07-09 14:09:11 +01:00
Michael Telatynski c38fa9ded2 Merge pull request #6339 from matrix-org/t3chguy/update-modernizr
Simplify typescript definition for Modernizr
2021-07-09 13:59:22 +01:00
Šimon Brandner cdeb0be847 i18n
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 14:22:41 +02:00
Šimon Brandner 96100ffaf3 Fix styling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 14:19:27 +02:00
Šimon Brandner dbc37675a0 Simplifie the code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 14:15:36 +02:00
Šimon Brandner 1b209a9cb3 Add setDevice() method
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 14:13:31 +02:00
Šimon Brandner cd95be147c Finish TS conversion
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 13:45:39 +02:00
Michael Telatynski 2998018876 Merge pull request #6322 from SimonBrandner/feature/remember-server/17739
Remember the last used server for room directory searches
2021-07-09 12:36:54 +01:00
Šimon Brandner dadfba9075 Add MediaDeviceKindEnum
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 13:08:39 +02:00
Šimon Brandner 866c1b76bd Basic TS conversion
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 12:57:42 +02:00
Michael Telatynski 318a68e761 Update Modernizr and stop it from polluting classes on the html tag 2021-07-09 11:49:05 +01:00
Šimon Brandner 046b3f325c Iterate PR
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 12:31:44 +02:00
Šimon Brandner 40954313e4 Merge branch 'feature/remember-server/17739' of https://github.com/SimonBrandner/matrix-react-sdk into feature/remember-server/17739 2021-07-09 10:44:45 +02:00
Šimon Brandner 6dcf860181 Refresh the room list only if validation failed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 10:44:20 +02:00
Šimon Brandner 84b00b5c38 Make the code more readable
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 10:39:02 +02:00
Šimon Brandner f78ede9324 Merge remote-tracking branch 'upstream/develop' into feature/remember-server/17739 2021-07-09 10:33:24 +02:00
Šimon Brandner 88a5969f2d Remove a word
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-09 10:32:43 +02:00
Michael Telatynski ac309a0d08 Merge pull request #6332 from SimonBrandner/fix/focus-composer-reaction/11023 2021-07-09 09:05:54 +01:00
Michael Telatynski ac0162c218 Merge pull request #6336 from matrix-org/t3chguy/fix/pins 2021-07-09 09:02:18 +01:00