PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
20651 commits 1 branch 0 tags 338 MiB
Commit graph

20651 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
5068d82488 Merge branch 'origin/develop' into Weblate. 2020-01-16 17:11:30 +00:00
Travis Ralston
3ed7beac78
Merge pull request #3804 from matrix-org/t3chguy/rightpanel 
'Members' button always toggle the right panel
 2020-01-16 10:11:24 -07:00
Travis Ralston
cd9fc72fff Merge branch 'develop' into t3chguy/rightpanel 2020-01-16 10:04:18 -07:00
Michael Telatynski
0f61aa57ff
Apply suggestions from code review 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2020-01-16 17:00:04 +00:00
Weblate
86715638ad Merge branch 'origin/develop' into Weblate. 2020-01-16 16:54:41 +00:00
Travis Ralston
64c4677699
Merge pull request #3842 from matrix-org/t3chguy/fix_isModified 
Fix timing of when Composer considers itself to be modified
 2020-01-16 09:54:36 -07:00
Weblate
557d8b0ee1 Merge branch 'origin/develop' into Weblate. 2020-01-16 16:53:30 +00:00
J. Ryan Stinnett
e375b1d31f
Merge pull request #3851 from matrix-org/jryans/download-file-icon 
Compute download file icon immediately
 2020-01-16 16:53:25 +00:00
Weblate
ca4d926867 Merge branch 'origin/develop' into Weblate. 2020-01-16 16:47:23 +00:00
Travis Ralston
564a30b7be
Merge pull request #3852 from matrix-org/travis/fix-member-avatar 
Fix not being able to open profiles from the timeline
 2020-01-16 09:47:17 -07:00
Travis Ralston
4ea2a2fee4 Merge branch 'develop' into t3chguy/fix_isModified 2020-01-16 09:46:28 -07:00
Weblate
4e6e10ecc4 Merge branch 'origin/develop' into Weblate. 2020-01-16 16:42:33 +00:00
random
f8d12b11f5 Translated using Weblate (Italian) 
Currently translated at 100.0% (2018 of 2018 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-01-16 16:42:33 +00:00
Kévin C
086b3f811e Translated using Weblate (French) 
Currently translated at 100.0% (2018 of 2018 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-16 16:42:30 +00:00
Samu Voutilainen
eb6c7ec275 Translated using Weblate (Finnish) 
Currently translated at 98.5% (1988 of 2018 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2020-01-16 16:42:29 +00:00
J. Ryan Stinnett
89230395eb
Merge pull request #3847 from matrix-org/jryans/cross-signing-setup 
Add post-login complete security flow
 2020-01-16 16:42:23 +00:00
Travis Ralston
869fd0b2c9 Fix not being able to open profiles from the timeline 
MemberAvatar was referencing the wrong dispatcher (it was imported as `dis`, like everywhere else, not `dispatcher`).

Fixes https://github.com/vector-im/riot-web/issues/11887
 2020-01-16 09:40:11 -07:00
Zoe
82c5349c4e Updated to properly handle logic 2020-01-16 16:31:50 +00:00
J. Ryan Stinnett
0ef362a793 Request mock should send truthy for errors 2020-01-16 14:06:54 +00:00
J. Ryan Stinnett
dab31d724d Support uri option in request mock 2020-01-16 14:01:15 +00:00
J. Ryan Stinnett
0dfd58c784 Compute download file icon immediately 
Build process changes may have changed the load order, so this tintable is now
registered too late (after the theme is set).

Fixes https://github.com/vector-im/riot-web/issues/11881
 2020-01-16 14:00:48 +00:00
J. Ryan Stinnett
5926e277c4 Avoid logged in event race 2020-01-16 11:52:02 +00:00
Zoe
9ac3cb6fd0 Merge remote-tracking branch 'origin/develop' into zip/11225-shields-distinguish-encrypt-from-verify 2020-01-16 11:23:57 +00:00
Zoe
ff05041a5a Update room shield icons to represent encrypted but unverified chats in less alarmed tones 2020-01-16 11:10:23 +00:00
Travis Ralston
1b4ab856c9 Assume the position is at the end when the offset has no last part 
We get an NPE when the user cuts their entire message, and this fixes it.
 2020-01-15 21:05:00 -07:00
Travis Ralston
b137cd21d3 Replace the selected range instead of force-setting it 
This gives people the option of cutting parts or all of their message.
 2020-01-15 21:04:18 -07:00
Michael Telatynski
4504d9b790 add tests 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-16 03:15:52 +00:00
Travis Ralston
be3ef2b50e Remove all text when cutting in the composer 
The previous function did in fact remove the elements, but left the model thinking there was a zero-length string. This approach deletes the text from the model and the DOM, resulting in the placeholder being shown when cutting all the text.

Part of https://github.com/vector-im/riot-web/issues/11378
 2020-01-15 19:08:14 -07:00
Michael Telatynski
2230b7732a rearrange 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-16 01:45:16 +00:00
Michael Telatynski
781db63fa6 split out home/end handling into a helper as not all roving-tab-index widgets want it 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-16 01:35:42 +00:00
Michael Telatynski
8c1fdf4cab tidy up 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-16 01:25:44 +00:00
Michael Telatynski
2b37fe7624 do some renaming 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-16 00:40:08 +00:00
Michael Telatynski
e6ab18c9ba Merge branches 'develop' and 't3chguy/roving' of github.com:matrix-org/matrix-react-sdk into t3chguy/roving 
 Conflicts:
	src/components/views/rooms/RoomList.js
 2020-01-16 00:31:43 +00:00
Weblate
e3ca5e5061 Merge branch 'origin/develop' into Weblate. 2020-01-15 22:36:41 +00:00
Alexey Murz Korepov
ed9bce21f5 Translated using Weblate (Russian) 
Currently translated at 89.1% (1798 of 2018 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-01-15 22:36:40 +00:00
Szimszon
3afa2b1d5b Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2018 of 2018 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-15 22:36:40 +00:00
Travis Ralston
cad9562f8d
Merge pull request #3828 from krkc/develop 
Added cut/copy and pasting user pills from editor.
 2020-01-15 15:36:33 -07:00
J. Ryan Stinnett
71fa3222fe
Fix component index import 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2020-01-15 22:11:22 +00:00
J. Ryan Stinnett
6e027badc0
Tweak comparison 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2020-01-15 22:10:59 +00:00
J. Ryan Stinnett
27ee90cad5 Add post-login complete security flow 
This adds a step after login to complete security for your new session. At the
moment, the only verification method is entering your SSSS passphrase, but nicer
paths will be added soon.

This new step only appears when crypto is available and the account has
cross-signing enabled in SSSS.

Fixes https://github.com/vector-im/riot-web/issues/11214
 2020-01-15 21:53:36 +00:00
Weblate
e96d02e5c0 Merge branch 'origin/develop' into Weblate. 2020-01-15 19:44:41 +00:00
Osoitz
6f351ed225 Translated using Weblate (Basque) 
Currently translated at 100.0% (2018 of 2018 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-01-15 19:44:41 +00:00
Travis Ralston
070e59e1ce
Merge pull request #3846 from matrix-org/travis/fix-help-tab 
Fix imports for help & support tab
 2020-01-15 12:44:35 -07:00
Travis Ralston
dd88809622 Fix imports for help & support tab 
This was missed, somehow, in the sourcemaps stuff. The tab currently breaks the dialog on load.
 2020-01-15 12:02:34 -07:00
Weblate
66750641a8 Merge branch 'origin/develop' into Weblate. 2020-01-15 17:58:36 +00:00
Travis Ralston
dbff2bb9f0
Merge pull request #3841 from matrix-org/travis/ftue/user-lists/5.2-i18n 
Humanize the recent DM rooms ourselves for translations
 2020-01-15 10:58:32 -07:00
Travis Ralston
d763d7e633 Merge branch 'develop' into travis/ftue/user-lists/5.2-i18n 2020-01-15 10:49:38 -07:00
Weblate
954b45d12a Merge branch 'origin/develop' into Weblate. 2020-01-15 17:49:04 +00:00
Travis Ralston
0529efc5cd
Merge pull request #3840 from matrix-org/travis/ftue/user-lists/5.1-suggestions 
Improve the quality of invite suggestions by filtering out DMs
 2020-01-15 10:49:00 -07:00
Weblate
8d8125307a Merge branch 'origin/develop' into Weblate. 2020-01-15 17:38:12 +00:00