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
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
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
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
610baff09a
Merge pull request #2668 from azuenko/develop
...
Fix waste of space of collapsed left panel
2019-08-06 13:54:04 -06:00
f6dbeef204
Merge pull request #3257 from matrix-org/t3chguy/slashcommands_help
...
Add help slash command
2019-08-06 18:50:49 +01:00
5e76019b63
fix i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-06 18:35:33 +01:00
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
daf1a794e6
Merge pull request #3276 from matrix-org/t3chguy/react16_1
...
Progress towards React 16 compatibility
2019-08-06 18:09:30 +01:00
1e8b304b3c
Remove /tint completely and dedup copyright
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-06 18:08:17 +01:00
5d048972ab
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-06 18:06:47 +01:00
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
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
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
734ca0df6e
get rid of /tint for now
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-06 17:04:02 +01:00
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
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
d99fb4796f
avoid using import * as Matrix
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-06 14:04:33 +01:00
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
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
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
ab05d8c7a4
Merge branch 'master' into develop
2019-08-05 14:37:17 +01:00
0e973bf211
Merge branch 'release-v1.5.1'
2019-08-05 14:36:48 +01:00
9016be22a4
v1.5.1
2019-08-05 14:33:58 +01:00
92aec936a0
Prepare changelog for v1.5.1
2019-08-05 14:33:58 +01:00
a24e41c34f
make i18n build pass (unrelated)
2019-08-05 15:33:42 +02:00
299cf8542c
Split MessageEditor in edit-specifics & reusable part for main composer
2019-08-05 15:31:18 +02:00
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
b531bb58ca
Let user know their account has been deactivated upon trying to login
2019-08-05 13:55:55 +01:00
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
7a5167b1a3
Let user know their account has been deactivated upon trying to login
2019-08-05 13:48:25 +02:00
224dac3ffb
Remove withMatrixClient as we are committed to using Contexts
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-05 12:26:31 +01:00
6c1268f5a6
Merge branch 'master' into develop
2019-08-05 12:02:22 +01:00
fbd2ba8863
v1.5.0
2019-08-05 12:01:29 +01:00
1682f3a6ba
Prepare changelog for v1.5.0
2019-08-05 12:01:29 +01:00
1e9881dd7d
Allow setting in electron whether or not to auto hide menu bar
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-05 11:58:53 +01:00
ec9be798ae
released js-sdk
2019-08-05 11:58:25 +01:00
4f48f89704
Merge pull request #3277 from matrix-org/dbkr/dont_load_guest_session_2
...
Don't load guest sessions on post-registration login link
2019-08-05 11:23:04 +01:00
d4f0c38253
Use options object
2019-08-05 11:16:12 +01:00
da49dd4409
Don't load guest sessions on post-registration login link
...
If guest access was enabled, clicking the login link on the 'registration
completed' page would just load the guest account you had before registering.
Fixes https://github.com/vector-im/riot-web/issues/10482
2019-08-05 11:16:07 +01:00
e400053b69
s/hasCloseX/hasCloseButton/
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-05 10:45:49 +01:00
f80cbebb9d
Don't switch rooms when forgetting a room ( #3275 )
...
Don't randomly change to another room upon forgetting a room.
2019-08-05 10:34:46 +01:00
aa98a6dfcb
Start using create-react-class polyfill
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-05 10:08:30 +01:00
debc124714
Use the documented syntax for default props in CreateReactClass
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-05 10:08:07 +01:00
64d542dc4a
Update react-gemini-scrollbar to include React 16.8 compatibility
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-05 10:07:25 +01:00
98c0232a96
Merge pull request #3274 from matrix-org/bwindels/fixpostcodeblocknewline
...
Fix newline not being appended to code block while converting message to markdown
2019-08-05 08:19:42 +00:00
5f45bbd6b7
Merge pull request #3273 from matrix-org/dbkr/dont_load_guest_session
...
Don't load guest sessions on post-registration login link
2019-08-02 17:46:00 +01:00
9ef24352d0
Use options object
2019-08-02 16:44:49 +01:00
c1f6d82a4c
Merge pull request #3271 from matrix-org/jryans/is-terms-prompt-on-use
...
Show terms modal when inviting by email
2019-08-02 15:41:23 +01:00
c53708b245
set lastNode directly when not decending
2019-08-02 16:36:09 +02:00
Travis Ralston