OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
17,096 Commits
218 Branches
563 Tags
476 MiB
Commit Graph

17096 Commits (9bbfb9c77c605f1c45e829045f0338af3e73a8ed)

Author SHA1 Message Date
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
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
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
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
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
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
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
Bruno Windels 995ae41e67 add line breaks 2019-08-02 13:40:16 +02:00
Bruno Windels ce32c9f28f
Merge pull request #3267 from matrix-org/bwindels/editor-history 
Undo/redo support for new editor
 2019-08-02 11:30:53 +00:00
David Baker 1c156f0a5a 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-02 11:22:42 +01:00
Bruno Windels 30fd027adf document editor 2019-08-02 12:19:46 +02:00
David Baker b1cc089062 Silence unnecessary warning 
Don't complain that we can't enable guest login if nobody asked us to
 2019-08-02 11:08:37 +01:00
Bruno Windels af3eebd0a6 add undo steps after word boundary (or capped) when typing or removing 2019-08-02 11:31:01 +02:00
J. Ryan Stinnett 348f6f971a Show terms modal when inviting by email 
This invokes the terms modal flow when inviting someone by email. Entering an
email triggers a lookup to the IS, and if it has terms you need to agree to,
then a separate modal is shown to complete this activity. You then come back to
invite screen after agreeing to the terms.

Fixes https://github.com/vector-im/riot-web/issues/10093
 2019-08-01 17:50:34 +01:00
J. Ryan Stinnett 7bb1e503cb
Merge pull request #3268 from matrix-org/jryans/is-account-info 
Check IS v2 account tokens for validity
 2019-08-01 17:43:18 +01:00
Bruno Windels 07b2e51dce put max step length in constant 2019-08-01 16:27:17 +02:00
J. Ryan Stinnett ca5a53729f
Merge pull request #3269 from matrix-org/jryans/dialog-button-borders 
Fix dialog button border colours
 2019-08-01 13:58:25 +01:00
J. Ryan Stinnett 701103aad7 Fix dialog button border colours 
This corrects dialog button borders to match other buttons by removing the green
border from disabled and danger states.

Fixes https://github.com/vector-im/riot-web/issues/10310
 2019-08-01 12:47:23 +01:00
J. Ryan Stinnett 36308b9ebf Check IS v2 account tokens for validity 
Fixes https://github.com/vector-im/riot-web/issues/10452
 2019-08-01 12:07:39 +01:00
Bruno Windels abde8b45d2 fix bug that prevented a line from being removed when undoing a newline 2019-08-01 11:28:40 +02:00
Bruno Windels 9d49a5bb73 pass caret to history manager upon initial render 
otherwise caret is put at editor start when undoing last step
 2019-08-01 11:28:01 +02:00
Bruno Windels 234404e598 add mod+z/y shortcuts, set editor state to what history manager returns 2019-08-01 11:27:09 +02:00
Bruno Windels 98bc0d24f4 push changes to history manager 2019-08-01 11:26:20 +02:00
Bruno Windels aa22c90f2c HistoryManager + unit tests 2019-08-01 11:25:04 +02:00
J. Ryan Stinnett e33109cb8c
Merge pull request #3266 from matrix-org/jryans/upgrade-deps-2019-07-31 
Upgrade dependencies
 2019-07-31 18:51:19 +01:00
J. Ryan Stinnett e5c3d91e53 Upgrade dependencies 2019-07-31 17:41:36 +01:00
RiotRobot db43a81c0a v1.5.0-rc.1 2019-07-31 16:46:26 +01:00