mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-05 05:38:41 +03:00
Code Issues Projects Releases Packages Wiki Activity
17632 commits 219 branches 562 tags 474 MiB
Commit graph

17632 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
RiotRobot
7fd5fc00e3 Prepare changelog for v1.5.0-rc.1 2019-07-31 16:46:26 +01:00
RiotRobot
6834083d88 Upgrade to JS SDK 2.3.0-rc.1 2019-07-31 16:36:02 +01:00
J. Ryan Stinnett
a3da9070e6
Merge pull request #3265 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2019-07-31 15:41:41 +01:00
Weblate
f83fc7484d Merge branch 'origin/develop' into Weblate. 2019-07-31 13:24:47 +00:00
Michael Telatynski
4694a9bf12
Merge pull request #3263 from matrix-org/t3chguy/prop-types 
Replace React.PropTypes with usage of the `prop-types` package
 2019-07-31 14:24:27 +01:00
Weblate
29bc73efa5 Merge branch 'origin/develop' into Weblate. 2019-07-31 12:48:10 +00:00
Bruno Windels
85076e4e05
Merge pull request #3264 from matrix-org/bwindels/diff-visuals 
strikethrough & underline deletions & insertions
 2019-07-31 12:47:50 +00:00
Bruno Windels
c093b6ed9c strikethrough & underline deletions & insertions 2019-07-31 14:44:48 +02:00
Weblate
1564e31d2f Merge branch 'origin/develop' into Weblate. 2019-07-31 11:57:52 +00:00
ferhad.necef
73bb9c8bd6 Translated using Weblate (Azerbaijani) 
Currently translated at 23.5% (398 of 1695 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/az/
 2019-07-31 11:57:52 +00:00
Bruno Windels
3e07d29926
Merge pull request #3261 from matrix-org/bwindels/edithistorywarning 
Get rid of warning of required prop
 2019-07-31 11:57:47 +00:00
Michael Telatynski
201d7fb448 Merge branches 'develop' and 't3chguy/prop-types' of github.com:matrix-org/matrix-react-sdk into t3chguy/prop-types 
# Conflicts:
#	test/components/structures/MessagePanel-test.js
 2019-07-31 12:21:00 +01:00
Michael Telatynski
1087e04bb5 Replace React.PropTypes with usage of the prop-types package 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-31 12:19:29 +01:00
Weblate
7ed9de9b77 Merge branch 'origin/develop' into Weblate. 2019-07-31 10:51:41 +00:00
Bruno Windels
678c9a7213
Merge pull request #3262 from matrix-org/bwindels/fixhtmldiffs 
Fix html diffs repeating text sometimes
 2019-07-31 10:51:37 +00:00
Weblate
0e604eff22 Merge branch 'origin/develop' into Weblate. 2019-07-31 10:43:32 +00:00
hieronymousch
307af7aa10 Translated using Weblate (Dutch) 
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/nl/
 2019-07-31 10:43:32 +00:00
Osoitz
2412277626 Translated using Weblate (Basque) 
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/eu/
 2019-07-31 10:43:31 +00:00
J. Ryan Stinnett
fb77802d54
Merge pull request #3260 from matrix-org/t3chguy/hide_msg_action_buttons_on_perms 
Introduce RoomContext for sharing state between RoomView and children
 2019-07-31 11:43:26 +01:00
Bruno Windels
95f9e48f91 workaround diff-dom returning redundant diff actions 2019-07-31 12:25:04 +02:00