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

17169 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Michael Telatynski
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
RiotRobot
6c1268f5a6 Merge branch 'master' into develop 2019-08-05 12:02:22 +01:00
RiotRobot
fbd2ba8863 v1.5.0 2019-08-05 12:01:29 +01:00
RiotRobot
1682f3a6ba Prepare changelog for v1.5.0 2019-08-05 12:01:29 +01:00
Michael Telatynski
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
RiotRobot
ec9be798ae released js-sdk 2019-08-05 11:58:25 +01:00
David Baker
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
David Baker
d4f0c38253 Use options object 2019-08-05 11:16:12 +01:00
David Baker
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
Michael Telatynski
e400053b69 s/hasCloseX/hasCloseButton/ 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-05 10:45:49 +01:00
Andrew Morgan
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
Michael Telatynski
aa98a6dfcb Start using create-react-class polyfill 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-05 10:08:30 +01:00
Michael Telatynski
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
Michael Telatynski
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
Bruno Windels
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
David Baker
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
David Baker
9ef24352d0 Use options object 2019-08-02 16:44:49 +01:00
J. Ryan Stinnett
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
Bruno Windels
c53708b245 set lastNode directly when not decending 2019-08-02 16:36:09 +02:00
J. Ryan Stinnett
7ccc218a98 Tweak control flow to avoid duplicate terms prompts 2019-08-02 15:21:53 +01:00
J. Ryan Stinnett
a85efe5f65 Tweak import 2019-08-02 14:43:36 +01:00
Bruno Windels
793b91be5b
Merge pull request #3272 from matrix-org/bwindels/editor-doc 
Add developer documentation for the new editor
 2019-08-02 11:48:04 +00:00
Bruno Windels
dae6fae3d6 describe caret nodes 2019-08-02 13:45:52 +02:00
Bruno Windels
ad776fbfca describe all reasons why we need a custom textify algorithm 2019-08-02 13:45:35 +02:00