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

17193 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
8e33b52bd2 Merge branch 'origin/develop' into Weblate. 2019-08-12 13:19:21 +00:00
Michael Telatynski
691b9145ee
Merge pull request #3303 from matrix-org/t3chguy/ModularServerConfig_extend_ServerConfig 
Deduplicate code in ModularServerConfig by extending ServerConfig
 2019-08-12 14:19:17 +01:00
Weblate
9636bc5a33 Merge branch 'origin/develop' into Weblate. 2019-08-12 12:48:47 +00:00
Tuomas Hietala
36a396247a Translated using Weblate (Finnish) 
Currently translated at 99.1% (1693 of 1709 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-08-12 12:48:47 +00:00
Michael Telatynski
76f5977a2a
Merge pull request #3299 from matrix-org/t3chguy/fix_registrationForm_defaultValue_Field 
RegistrationForm: the Fields are controlled, fix default values
 2019-08-12 13:48:42 +01:00
Jeff Huang
66e6ed2d17 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1709 of 1709 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-08-12 04:07:53 +00:00
Besnik Bleta
e346c17006 Translated using Weblate (Albanian) 
Currently translated at 99.5% (1701 of 1709 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2019-08-12 04:07:52 +00:00
Michael Telatynski
3e08bf6ecb Deduplicate code in ModularServerConfig by extending ServerConfig 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-11 03:34:12 +01:00
Weblate
18dbccb062 Merge branch 'origin/develop' into Weblate. 2019-08-09 17:16:44 +00:00
Michael Telatynski
75bcd61934
Merge pull request #3298 from matrix-org/t3chguy/Modal.createX_promise 
change Modal async/await signature to use raw promises
 2019-08-09 18:16:40 +01:00
Michael Telatynski
242f23c753 RegistrationForm: the Fields are controlled, fix default values 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-09 18:08:17 +01:00
Michael Telatynski
49c7730503 change Modal async/await signature to use raw promises 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-09 17:29:22 +01:00
Weblate
f5480a2e99 Merge branch 'origin/develop' into Weblate. 2019-08-09 16:16:25 +00:00
Michael Telatynski
a9afdec24a
Merge pull request #3297 from matrix-org/t3chguy/Modal.createX_promise 
Modal.createX return thenable which extends onFinished, for async/await
 2019-08-09 17:16:21 +01:00
Weblate
f520957051 Merge branch 'origin/develop' into Weblate. 2019-08-09 15:55:12 +00:00
Michael Telatynski
13c7149592
Merge pull request #3294 from matrix-org/t3chguy/mount-guard 
Add mount-guards to MImageBody
 2019-08-09 16:55:08 +01:00
Weblate
d629f9a177 Merge branch 'origin/develop' into Weblate. 2019-08-09 15:54:56 +00:00
Michael Telatynski
cc0b698c92
Merge pull request #3296 from matrix-org/t3chguy/remove_legacyLoginParams 
Get rid of support for legacy login params
 2019-08-09 16:54:51 +01:00
Michael Telatynski
7fe078c07a Modal.createX return thenable which extends onFinished, for async/await 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-09 16:47:22 +01:00
Weblate
930e7b15b9 Merge branch 'origin/develop' into Weblate. 2019-08-09 14:39:04 +00:00
Kévin C
0050ed7e73 Translated using Weblate (French) 
Currently translated at 100.0% (1709 of 1709 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-08-09 14:39:04 +00:00
David Baker
d297018d9a
Merge pull request #3295 from matrix-org/dbkr/debounce_field 
Change throttle to debounce
 2019-08-09 15:38:58 +01:00
Michael Telatynski
787e9feeff Get rid of support for legacy login params 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-09 15:34:32 +01:00
David Baker
fcdbce1dda Change throttle to debounce 
And add an explanation of whyI think one's more apropriate than the
other for this.
 2019-08-09 15:30:05 +01:00
Michael Telatynski
72a83a8e6e Add mount-guards to MImageBody 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-09 14:51:07 +01:00
Weblate
8be1066b2f Merge branch 'origin/develop' into Weblate. 2019-08-08 23:31:43 +00:00
Travis Ralston
78744b8bcf
Merge pull request #3293 from matrix-org/travis/fix-karma 
Misc fixes to karma webpack
 2019-08-08 17:31:39 -06:00
Travis Ralston
ac9682a75b Actually use argument in karma tests 2019-08-08 16:00:14 -06:00
Travis Ralston
a6347af320 Fix karma complaining about woff2 files 2019-08-08 16:00:07 -06:00
Weblate
0b8ee2d196 Merge branch 'origin/develop' into Weblate. 2019-08-08 16:48:55 +00:00
J. Ryan Stinnett
3214ed8829
Merge pull request #3289 from matrix-org/jryans/rm-bind-at-reg 
Remove 3PID binding during registration
 2019-08-08 17:48:50 +01:00
Weblate
8a36973695 Merge branch 'origin/develop' into Weblate. 2019-08-08 16:48:23 +00:00
J. Ryan Stinnett
c2f81a00c4
Merge pull request #3288 from matrix-org/jryans/user-settings-toggle-3pid 
Add controls for toggling discovery in user settings
 2019-08-08 17:48:17 +01:00
J. Ryan Stinnett
38e64ce966 Remove 3PID binding during registration 
This disables 3PID binding at registration time, so users won't be discoverable
by 3PID by default. Instead, new discovery controls in settings allow you to
opt-in.

Fixes https://github.com/vector-im/riot-web/issues/10424
 2019-08-08 16:25:48 +01:00
Weblate
250f0d9dda Merge branch 'origin/develop' into Weblate. 2019-08-08 15:01:53 +00:00
Jeff Huang
c2effe47c4 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1697 of 1697 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-08-08 15:01:53 +00:00
J. Ryan Stinnett
e0fb0de83d Relock gemini-scrollbar deps 2019-08-08 16:01:41 +01:00
Weblate
5fbb95c2a4 Merge branch 'origin/develop' into Weblate. 2019-08-08 13:26:21 +00:00
Travis Ralston
07d6fa7fdb
Merge pull request #3286 from matrix-org/travis/immutable-dms/basic 
Reuse DMs whenever possible instead of asking to reuse them
 2019-08-08 07:26:17 -06:00
J. Ryan Stinnett
11cf7493d9 Disable binding 3PIDs when adding to account 
Binding 3PIDs on the IS is now handled by a separate step in the Discovery
section of settings.

Fixes https://github.com/vector-im/riot-web/issues/10510
 2019-08-08 11:52:21 +01:00
J. Ryan Stinnett
178d6605c4 Add controls for toggling discovery in user settings 
This adds controls for each 3PID to allow the user to choose whether it's bound
on the IS.

Fixes https://github.com/vector-im/riot-web/issues/10159
 2019-08-08 11:35:35 +01:00
Weblate
6dea2519ae Merge branch 'origin/develop' into Weblate. 2019-08-08 08:48:49 +00:00
David Baker
54ca7b708e
Merge pull request #3285 from matrix-org/dbkr/work_without_is 
Work with no ID server set
 2019-08-08 09:48:44 +01:00
Travis Ralston
f85898cdca Remove ChatCreateOrReuseDialog 
Part of https://github.com/vector-im/riot-web/issues/10416

All usages of the dialog have been replaced with new DM logic.
 2019-08-07 12:18:41 -06:00
Travis Ralston
24705d02b7 Replace DM logic in view_start_chat_or_reuse 
Part of https://github.com/vector-im/riot-web/issues/10416

This code is used by the welcome bot logic and the groups/communities section of the app. goHomeOnCancel can be removed because no matter what happens we'll end up in a room with the user (and we aren't showing a dialog anymore).
 2019-08-07 12:13:59 -06:00
Travis Ralston
3144b9f1a2 Disable 'Start New Chat' button in MemberInfo if we already have chats 
Part of https://github.com/vector-im/riot-web/issues/10416
 2019-08-07 12:06:27 -06:00
Travis Ralston
2ecabd2195 Reuse direct chats when starting new ones 
Part of https://github.com/vector-im/riot-web/issues/10416

This section of code applies to the + button next to PEOPLE in the room list.
 2019-08-07 12:01:51 -06:00
Nathan Follens
35d2aac269 Translated using Weblate (West Flemish) 
Currently translated at 100.0% (1696 of 1696 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/vls/
 2019-08-07 14:07:36 +00:00
Walter
e163df17e2 Translated using Weblate (Russian) 
Currently translated at 100.0% (1696 of 1696 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2019-08-07 14:07:35 +00:00
Kévin C
06649d6d54 Translated using Weblate (French) 
Currently translated at 100.0% (1696 of 1696 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-08-07 14:07:35 +00:00