Aaron Raimist
42c6818f95
Remove debugger;
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-02-21 22:00:00 -06:00
Aaron Raimist
d3367834d0
Fix redo keyboard shortcut on macOS
...
I added the correct macOS shortcut for redo which is Cmd+Shift+Z. I had to reorder the if statement so redo is checked first, otherwise it would detect the undo first and never check that I was actually trying to redo.
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-02-21 21:56:58 -06:00
Weblate
c88a443b50
Merge branch 'origin/develop' into Weblate.
2020-02-21 20:37:10 +00:00
Travis Ralston
d088879c12
Merge pull request #4109 from matrix-org/travis/invite-spaces
...
Filter out empty strings when pasting IDs into the invite dialog
2020-02-21 13:37:02 -07:00
Travis Ralston
c906b9eccf
Filter out empty strings when pasting IDs into the invite dialog
...
Fixes https://github.com/vector-im/riot-web/issues/12459
2020-02-21 13:26:37 -07:00
J. Ryan Stinnett
dc6a4854ce
Add shortcuts for beginning / end of composer
...
This adds Ctrl/Command+Home/End shortcuts for jumping to the start and end of
the composer contents.
Fixes https://github.com/vector-im/riot-web/issues/12438
2020-02-21 18:50:44 +00:00
Weblate
7dbf11c7d9
Merge branch 'origin/develop' into Weblate.
2020-02-21 17:34:08 +00:00
David Baker
82eefb69f6
Merge pull request #4107 from matrix-org/dbkr/move_bk_pipelines
...
Remove buildkite pipeline
2020-02-21 17:34:03 +00:00
David Baker
2e18c3c615
Remove buildkite pipeline
...
Now moved to the pipelines repo
2020-02-21 17:21:30 +00:00
Zoe
72789897a0
Quick n dirty verificatio request viewer in devtools
2020-02-21 17:15:53 +00:00
Weblate
538f6996dc
Merge branch 'origin/develop' into Weblate.
2020-02-21 17:05:18 +00:00
Travis Ralston
f74b283287
Merge pull request #4091 from matrix-org/travis/qr-binary
...
Use binary packing for verification QR codes
2020-02-21 10:05:12 -07:00
Weblate
54c41ed24a
Merge branch 'origin/develop' into Weblate.
2020-02-21 16:24:59 +00:00
Travis Ralston
4de2fdc5c3
Merge pull request #4099 from matrix-org/travis/invite-fixes
...
Fix several small bugs with the invite/DM dialog
2020-02-21 09:24:53 -07:00
Weblate
30233c0af4
Merge branch 'origin/develop' into Weblate.
2020-02-21 16:19:37 +00:00
Bruno Windels
3ea38b4de4
Merge pull request #4103 from matrix-org/bwindels/fixeslint
...
ignore e2e tests node_modules during linting
2020-02-21 16:19:31 +00:00
Weblate
515fc1fbac
Merge branch 'origin/develop' into Weblate.
2020-02-21 15:38:14 +00:00
Michael Telatynski
7add51e3e8
Merge pull request #4104 from matrix-org/t3chguy/null-guard-room-pills
...
Apply null-guard to room pills for when we can't fetch the room
2020-02-21 15:38:08 +00:00
Weblate
a523535948
Merge branch 'origin/develop' into Weblate.
2020-02-21 15:37:49 +00:00
Michael Telatynski
476c622a61
Merge pull request #4105 from matrix-org/t3chguy/fix_theme
...
Fix theme being overridden to light even after login is completed
2020-02-21 15:37:44 +00:00
Weblate
0d0e533c74
Merge branch 'origin/develop' into Weblate.
2020-02-21 15:19:58 +00:00
Hubert Chathi
953af6f036
add device and cross-signing public keys to rageshake info ( #4097 )
2020-02-21 10:19:53 -05:00
Michael Telatynski
4ed4d91b48
move to a more reusable code path
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-21 14:54:56 +00:00
Michael Telatynski
b77c2df2be
Fix theme being overridden to light even after login is completed
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-21 14:40:42 +00:00
Michael Telatynski
e799691573
Apply null-guard to room pills for when we can't fetch the room
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-21 14:14:24 +00:00
Weblate
faa6e8bf6e
Merge branch 'origin/develop' into Weblate.
2020-02-21 14:02:43 +00:00
Remi Reuvekamp
c1f40fa4ab
Translated using Weblate (Dutch)
...
Currently translated at 88.3% (1877 of 2126 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2020-02-21 14:02:43 +00:00
Osoitz
7dac6b9b65
Translated using Weblate (Basque)
...
Currently translated at 97.9% (2082 of 2126 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2020-02-21 14:02:40 +00:00
Miren
d4972e91a3
Translated using Weblate (Basque)
...
Currently translated at 97.9% (2082 of 2126 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2020-02-21 14:02:36 +00:00
Zoe
dcc8862d4c
Merge pull request #4100 from matrix-org/foldleft/12352-ssss-overwrite
...
Fix bug where SSSS could be overwritten if user never cross-signs
2020-02-21 14:02:29 +00:00
Bruno Windels
cda281044d
ignore node_modules in e2e tests
2020-02-21 14:18:28 +01:00
Bruno Windels
07d24038a3
fix lint
2020-02-21 14:11:30 +01:00
Bruno Windels
fada013f9e
this isn't doing anything because we don't have a room when the alias is not moderated
2020-02-21 14:06:57 +01:00
Bruno Windels
2b19648786
fix cp error and lint
2020-02-21 13:35:14 +01:00
Bruno Windels
3c3839f863
show a pill as a moderated alias (canonical or alt) if available
...
otherwise, display as the label in the link
2020-02-21 13:02:41 +01:00
Bruno Windels
4219d2fcf6
style a room pill even if we don't find the room
2020-02-21 13:02:41 +01:00
Bruno Windels
f6313b51e6
also look in alt_aliases to match a pill to a room
2020-02-21 13:02:41 +01:00
Bruno Windels
16815a752b
use alt_aliases instead of aliases to match a pill to a room
...
when deserializing a pill
2020-02-21 13:02:41 +01:00
Bruno Windels
8870da6c24
Add alt_aliases to room completion candidates
...
but don't match on name otherwise you see multiple entries per room
when searching for a room name
Also pass the roomId to the composer autocomplete, so
it's easier to we don't need to loop through all the rooms and
it's also easier accept room with local aliases as well in the future
2020-02-21 13:02:41 +01:00
Bruno Windels
558ae1128b
use alt_aliases rather than aliases for the display alias
2020-02-21 13:02:35 +01:00
Michael Telatynski
e6d8c4a576
Merge branches 'develop' and 't3chguy/alpha_room_list' of github.com:matrix-org/matrix-react-sdk into t3chguy/alpha_room_list
2020-02-21 11:18:45 +00:00
Zoe
7d319bab7f
fix ssss overwrite
2020-02-21 10:18:47 +00:00
Travis Ralston
bcb1d73c3c
Appease the linter
2020-02-20 23:21:35 -07:00
Travis Ralston
8ba274a382
Allow creating a room with only yourself in it
...
Fixes https://github.com/vector-im/riot-web/issues/12092
2020-02-20 23:16:21 -07:00
Travis Ralston
f491e4222a
Convert the user's last filter into a selection if possible
...
Fixes https://github.com/vector-im/riot-web/issues/12440
2020-02-20 23:10:43 -07:00
Travis Ralston
62aaa0db9a
Always insert suggestions for user IDs
...
Fixes https://github.com/vector-im/riot-web/issues/12419
2020-02-20 23:02:10 -07:00
Travis Ralston
00cc253594
Always suggest a pill for MXID-looking users
...
Part of https://github.com/vector-im/riot-web/issues/12440
2020-02-20 23:02:10 -07:00
Aaron Raimist
1739b7e0cc
Don't ask to enable analytics when Do Not Track is enabled
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-02-20 20:09:24 -06:00
Weblate
52f92c327a
Merge branch 'origin/develop' into Weblate.
2020-02-20 17:07:59 +00:00
Bruno Windels
744826db48
Merge pull request #4096 from matrix-org/bwindels/canonicalpill
...
Accept canonical alias for pills
2020-02-20 17:07:54 +00:00