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

17351 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tirifto
4aaf67d514 Translated using Weblate (Esperanto) 
Currently translated at 99.9% (1695 of 1696 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2019-08-07 14:07:35 +00:00
Nathan Follens
d7fff4db8c Translated using Weblate (Dutch) 
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/nl/
 2019-08-07 14:07:34 +00:00
Slavi Pantaleev
f7cc8d638e Translated using Weblate (Bulgarian) 
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/bg/
 2019-08-07 14:07:34 +00:00
David Baker
c09f86f347 re-run i18n 2019-08-07 13:37:24 +01:00
David Baker
9fa5e01f2f Disable password reset if no ID server 2019-08-07 13:30:52 +01:00
David Baker
d31f1ea7f2 Disable addign threepids if no IS configured 2019-08-07 11:51:42 +01:00
David Baker
bcf53c6e33 Make invite work without an IS 
Also fix it so you can't try to invite a room ID to a room
 2019-08-07 11:41:00 +01:00
David Baker
366f7e277a Make registration work without an IS. 2019-08-07 11:15:56 +01:00
Bruno Windels
66ef08120e
Merge pull request #3282 from matrix-org/bwindels/extract-common-editor-code 
Split MessageEditor up in edit-specifics & reusable parts for main composer
 2019-08-07 07:58:52 +00:00
Travis Ralston
610baff09a
Merge pull request #2668 from azuenko/develop 
Fix waste of space of collapsed left panel
 2019-08-06 13:54:04 -06:00
Michael Telatynski
f6dbeef204
Merge pull request #3257 from matrix-org/t3chguy/slashcommands_help 
Add help slash command
 2019-08-06 18:50:49 +01:00
Michael Telatynski
5e76019b63 fix i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-06 18:35:33 +01:00
Michael Telatynski
c022f58f3b
Merge pull request #3278 from matrix-org/t3chguy/electron_keep_alt_menu 
Allow setting in electron whether or not to auto hide menu bar
 2019-08-06 18:20:22 +01:00
Michael Telatynski
daf1a794e6
Merge pull request #3276 from matrix-org/t3chguy/react16_1 
Progress towards React 16 compatibility
 2019-08-06 18:09:30 +01:00
Michael Telatynski
1e8b304b3c Remove /tint completely and dedup copyright 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-06 18:08:17 +01:00
Michael Telatynski
5d048972ab delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-06 18:06:47 +01:00
Michael Telatynski
ae834f8d05 Split out SlashCommandHelpDialog, group by category and style it 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-06 18:03:38 +01:00
Michael Telatynski
64afaa1df5
Merge pull request #3284 from matrix-org/t3chguy/invite_hide_settings_context_button 
Hide settings button on Room Tile Context Menu for myMembership=invite
 2019-08-06 17:18:56 +01:00
Michael Telatynski
2fd371e1dd prune i18n and get rid of /help header 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-06 17:07:56 +01:00
Michael Telatynski
734ca0df6e get rid of /tint for now 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-06 17:04:02 +01:00
Michael Telatynski
71338d5140 Hide settings button on Room Tile Context Menu for myMembership=invite 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-06 16:25:29 +01:00
Michael Telatynski
8c446bbd29
Merge pull request #3279 from matrix-org/t3chguy/remove_withMatrixClient 
Remove withMatrixClient as we are committed to using Contexts
 2019-08-06 14:12:14 +01:00
Michael Telatynski
d99fb4796f avoid using import * as Matrix 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-06 14:04:33 +01:00
J. Ryan Stinnett
accb1eea9f Move existing 3PID settings UX to account directory 2019-08-06 13:03:49 +01:00
J. Ryan Stinnett
aa0a2a579e Add copyright headers 2019-08-06 12:43:30 +01:00
Weblate
0140fb5a47 Merge branch 'origin/develop' into Weblate. 2019-08-05 17:56:20 +00:00
J. Ryan Stinnett
ba3e9e3f84
Merge pull request #3283 from matrix-org/jryans/user-settings-toggle-3pid 
Update existing 3PID management UX
 2019-08-05 18:56:15 +01:00
Anton Zuenko
a3eb45e0b9 Fix waste of space of collapsed left panel 
Signed-off-by: Anton Zuenko <anton@zuenko.ru>
 2019-08-05 18:03:20 +02:00
J. Ryan Stinnett
11f2b4320d Update existing 3PID management UX 
This tweaks the appearance of the existing 3PID management UX to use a different
style for the remove button. This styling will more closely match the soon to be
added 3PID discovery settings.

Part of https://github.com/vector-im/riot-web/issues/10159
 2019-08-05 16:34:04 +01:00
Weblate
d00be1be01 Merge branch 'origin/develop' into Weblate. 2019-08-05 13:37:31 +00:00
Jeff Huang
9bbfb9c77c Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2019-08-05 13:37:31 +00:00
RiotRobot
ab05d8c7a4 Merge branch 'master' into develop 2019-08-05 14:37:17 +01:00
RiotRobot
0e973bf211 Merge branch 'release-v1.5.1' 2019-08-05 14:36:48 +01:00
RiotRobot
9016be22a4 v1.5.1 2019-08-05 14:33:58 +01:00
RiotRobot
92aec936a0 Prepare changelog for v1.5.1 2019-08-05 14:33:58 +01:00
Bruno Windels
a24e41c34f make i18n build pass (unrelated) 2019-08-05 15:33:42 +02:00
Bruno Windels
299cf8542c Split MessageEditor in edit-specifics & reusable part for main composer 2019-08-05 15:31:18 +02:00
David Baker
b2d4054958
Merge pull request #3281 from matrix-org/dbkr/user-deactivated-2 
Let user know their account has been deactivated upon trying to login
 2019-08-05 14:16:57 +01:00
Bruno Windels
b531bb58ca Let user know their account has been deactivated upon trying to login 2019-08-05 13:55:55 +01:00
Weblate
82fce3e6fe Merge branch 'origin/develop' into Weblate. 2019-08-05 12:23:44 +00:00
David Baker
e8fcfbe2bf
Merge pull request #3280 from matrix-org/bwindels/user-deactivated 
Let user know their account has been deactivated upon trying to login
 2019-08-05 13:23:40 +01:00
Bruno Windels
7a5167b1a3 Let user know their account has been deactivated upon trying to login 2019-08-05 13:48:25 +02:00