OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
17,273 Commits
215 Branches
561 Tags
450 MiB
Commit Graph

17273 Commits (988162e48c5ad598ecbf7a3d3f1af5b0af0d4627)

Author SHA1 Message Date
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
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
Weblate 401411bc2c Merge branch 'origin/develop' into Weblate. 2019-08-05 11:02:50 +00: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
Weblate 43d820c1f3 Merge branch 'origin/develop' into Weblate. 2019-08-05 09:34:51 +00:00
Tuomas Hietala d4ef4e3d3f Translated using Weblate (Finnish) 
Currently translated at 99.6% (1689 of 1695 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-08-05 09:34:51 +00: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
Weblate ace85998cc Merge branch 'origin/develop' into Weblate. 2019-08-05 08:19:47 +00:00
RainSlide a588f8cf91 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 89.4% (1515 of 1695 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2019-08-05 08:19:47 +00: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
Alexey Murz Korepov aceea0facf Translated using Weblate (Russian) 
Currently translated at 100.0% (1695 of 1695 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2019-08-03 01:49:57 +00:00
Slavi Pantaleev e19a9688b4 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1695 of 1695 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2019-08-03 01:49:54 +00:00
ferhad.necef 62522b2b53 Translated using Weblate (Azerbaijani) 
Currently translated at 23.7% (401 of 1695 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/az/
 2019-08-03 01:49:53 +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