OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
17,668 Commits
210 Branches
549 Tags
658 MiB
Commit Graph

17668 Commits (a03b224ff7e1a350c6e269bf84bb21f891162699)

Author SHA1 Message Date
J. Ryan Stinnett a03b224ff7
Merge pull request #3394 from matrix-org/jryans/bound-3pids-warning 
Add bound 3PID warning when changing IS as well
 2019-09-09 12:28:19 +01:00
J. Ryan Stinnett 360216941e
Merge pull request #3401 from matrix-org/jryans/bound-3pids-text 
Stregthen bound 3PID warning dialog
 2019-09-09 12:28:03 +01:00
J. Ryan Stinnett 24f1ec8abb
Merge pull request #3398 from matrix-org/jryans/is-input-tweak 
Stop setting IS input field on account change
 2019-09-09 10:28:00 +01:00
J. Ryan Stinnett c3adddb5ac Change to paragraphs outside the strings 2019-09-09 10:27:02 +01:00
Bruno Windels 1422b1d73e
Merge pull request #3403 from matrix-org/bwindels/cider-italics 
New composer: use underscore for italics so it doesn't collide with bold when toggling
 2019-09-09 08:06:51 +00:00
Michael Telatynski d8dbe28015
Merge pull request #3404 from matrix-org/t3chguy/react16_10 
Switch to createReactClass: views/elements & views/groups. React 16 :D
 2019-09-06 18:49:11 +01:00
Michael Telatynski 6dbc9ee893
Merge pull request #3405 from matrix-org/t3chguy/react16_11 
Switch to createReactClass: *everything else*. React 16 :D
 2019-09-06 18:46:24 +01:00
Michael Telatynski b243004a6c Switch to createReactClass: *everything else*. React 16 :D 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-06 18:38:11 +01:00
Michael Telatynski d5db67be38 Switch to createReactClass: views/elements & views/groups. React 16 :D 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-06 18:35:52 +01:00
Michael Telatynski 13258132e7
Merge pull request #3400 from matrix-org/t3chguy/react16_9 
Switch to createReactClass: views/rooms and test/components. React 16 :D
 2019-09-06 18:18:32 +01:00
Bruno Windels 48247e66be use underscore for italics so it doesn't collide with bold when toggling 2019-09-06 17:52:37 +02:00
Bruno Windels fe482258ac
Merge pull request #3402 from matrix-org/bwindels/cider-toggle-inline-formatting 
New composer: support toggling inline formatting
 2019-09-06 14:42:16 +00:00
Bruno Windels 14fff3be9a
Merge pull request #3399 from matrix-org/bwindels/fix-formatbar-edit-position 
Fix format bar not appearing in edit composer
 2019-09-06 14:28:23 +00:00
Bruno Windels 26bd694c6a support toggling inline formatting 2019-09-06 16:25:55 +02:00
J. Ryan Stinnett 3ad88604cc Stregthen bound 3PID warning dialog 
This tweaks the bound 3PID text and adds danger styling.

Fixes https://github.com/vector-im/riot-web/issues/10750
 2019-09-06 15:18:01 +01:00
Michael Telatynski 70ff2bc9cd Switch to createReactClass: views/rooms and test/components. React 16 :D 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-06 15:04:46 +01:00
Bruno Windels 4e98721ba9 take bounding box for positioning calculation 2019-09-06 15:56:46 +02:00
Michael Telatynski 7759a9f20e
Merge pull request #3397 from matrix-org/t3chguy/react16_8 
Correct case of propTypes property in ES6 React Components. React 16
 2019-09-06 14:54:50 +01:00
J. Ryan Stinnett 5fddb20d86 Stop setting IS input field on account change 
This stops setting a value in the IS input on account change. While it may have
been marginally useful if you have the form open and change on a different
device, it also seems to pick up changes on the current device, leading to
strange UX locally.

Fixes https://github.com/vector-im/riot-web/issues/10756
Fixes https://github.com/vector-im/riot-web/issues/10757
 2019-09-06 14:33:40 +01:00
Michael Telatynski 4db8ef4d89 Correct case of propTypes property in ES6 React Components. React 16 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-06 14:27:33 +01:00
J. Ryan Stinnett 11a5fca702 Remove logs 2019-09-06 13:44:44 +01:00
J. Ryan Stinnett df03477907 Show change warning only when different from current 2019-09-06 11:54:08 +01:00
J. Ryan Stinnett 19fff51b01 Rework handling for terms CORS error 
Earlier changes in this branch removed the "next step" of saving from the
dialogs, so we need to fold in the CORS error case.
 2019-09-06 11:12:10 +01:00
Bruno Windels 4876f4c469
Merge pull request #3396 from matrix-org/bwindels/fix-formatbar-merge-error 
Fix error on load in composer
 2019-09-06 10:05:19 +00:00
Bruno Windels dd1c01068f fix rename that didn't make it through rebasing 2019-09-06 11:58:27 +02:00
J. Ryan Stinnett 2ff592c542 Use existing modal promises 2019-09-06 10:48:24 +01:00
Bruno Windels 5014b606db
Merge pull request #3391 from matrix-org/bwindels/cider-format-history 
New composer: ensure undo history is persisted before applying formatting
 2019-09-06 09:28:18 +00:00
Bruno Windels df4762871a
Merge pull request #3392 from matrix-org/bwindels/cider-paste-plain 
New composer: fix pasting from word processors
 2019-09-06 09:22:37 +00:00
Bruno Windels 6b104f6344
Merge pull request #3393 from matrix-org/bwindels/cider-fix-lastcaret 
New composer: fix needing to push arrow-up twice after sending first message after switching to a room
 2019-09-06 09:22:10 +00:00
Bruno Windels 9dac91a70d ensure step before formatting is persisted in undo history 2019-09-06 11:20:24 +02:00
Bruno Windels 8820546f49
Merge pull request #3390 from matrix-org/bwindels/selection-color 
Remove accent color as selection color
 2019-09-06 09:12:42 +00:00
Bruno Windels 0252c7ae37 force pasting as plain text in new composer 2019-09-06 11:10:41 +02:00
Bruno Windels 556ccf45dc
Merge pull request #3389 from matrix-org/bwindels/cider-format-shortcuts 
New composer: formatting keyboard shortcuts
 2019-09-06 09:09:47 +00:00
Bruno Windels 2596281a7c update last caret from update callback instead of input event 
many editor updates are not caused by an input event, so
the last caret wasn't always up to date.

Updating the caret from the update callback ensures that every
time the editor contents is changed, the last caret is updated.
 2019-09-06 11:09:01 +02:00
Bruno Windels f4938f9d11 dont format empty ranges 2019-09-06 10:59:41 +02:00
Bruno Windels 06143ba7a1 show keyboard shortcuts in format button tooltip 2019-09-06 10:59:41 +02:00
Bruno Windels bdcea6f21e add shortcuts for formatting 2019-09-06 10:59:41 +02:00
Bruno Windels de787c798c
Merge pull request #3387 from matrix-org/bwindels/cider-formatbar-tooltips 
New composer: format bar tooltips
 2019-09-06 08:52:00 +00:00
Bruno Windels 042822c90a copyright is solely assigned to matrix foundation now, copy paste error 2019-09-06 10:39:19 +02:00
Bruno Windels d6a493a2b1 fixup: language strings moved 2019-09-06 10:39:19 +02:00
Bruno Windels b4b9c7d072 Add tooltip for format buttons 2019-09-06 10:39:19 +02:00
Bruno Windels da29057fd8 move format bar to own component 2019-09-06 10:39:19 +02:00
Bruno Windels 02681d50b9
Merge pull request #3386 from matrix-org/bwindels/cider-formatbar 
New composer: show format bar on selection
 2019-09-06 08:38:01 +00:00
Bruno Windels 92c0c1a4e2 add comment about positioning the format bar 2019-09-06 10:29:18 +02:00
Bruno Windels d2949babcd copyright is solely assigned to matrix foundation now, copy paste error 2019-09-06 10:29:12 +02:00
J. Ryan Stinnett d5552e4a17 Add bound 3PID warning when changing IS as well 
This extends the bound 3PID warning from the disconnect button to also appear
when changing the IS as well. At the moment, the text is a bit terse, but will
be improved separately.

Fixes https://github.com/vector-im/riot-web/issues/10749
 2019-09-05 17:52:46 +01:00
Bruno Windels 124b7135cd make sure the update callback gets a caret when calling reset 2019-09-05 17:54:08 +02:00
J. Ryan Stinnett 46ee52a406
Merge pull request #3388 from matrix-org/jryans/bound-3pids-warning 
Add new agreed URLs to account data instead of overwriting
 2019-09-05 15:02:15 +01:00
Bruno Windels 39bbf9af24 remove accent color as selection color 2019-09-05 15:40:33 +02:00
Travis Ralston 26eb617bec
Merge pull request #3384 from matrix-org/travis/fix-pl 
Fix member power levels in room settings
 2019-09-05 07:16:52 -06:00