Michael Telatynski
4b4b730233
fix and i18n the impl
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-02 13:41:26 +01:00
Michael Telatynski
fd454b476a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into set_default_federate_by_settings
2017-08-02 12:15:00 +01:00
Luke Barnard
a40a86669a
Merge pull request #1260 from matrix-org/luke/fix-rte-pills-not-updating
...
Use componentWillReceiveProps to update pill state when props change
2017-08-01 16:30:25 +01:00
Luke Barnard
630c2968eb
Use componentWillReceiveProps
2017-08-01 16:20:32 +01:00
Luke Barnard
71abd3aff8
Revert setting of key
2017-08-01 16:14:12 +01:00
Luke Barnard
7fcb8c5ff0
Merge pull request #1261 from matrix-org/luke/fix-agressive-emoji-auto-replace
...
Only auto-replace emoji following ^ or \s
2017-08-01 15:56:42 +01:00
Richard Lewis
546173d246
Fix scalar token
2017-08-01 15:53:42 +01:00
Luke Barnard
438b63bee2
Only auto-replace emoji following ^ or \s
...
So as not to cause issues when typing e.g. `This is what was tested: ` (the "d:" used to be transformed into an emoji)
2017-08-01 14:26:30 +01:00
Luke Barnard
9e71ba26c4
Add key prop to RTE decorated entities (Pills and links)
...
This will cause a re-render when the URL of the pill/link changes.
fixes vector-im/riot-web#4718
2017-08-01 13:51:08 +01:00
Richard Lewis
abae43b65e
Merge pull request #1257 from matrix-org/rxl881/widgetPermissions
...
Widget permissions
2017-08-01 12:13:09 +01:00
Richard Lewis
5f8e86197f
Check that wurl is scalar, before checking for curl
2017-08-01 12:00:03 +01:00
Richard Lewis
596efb6062
Fix missing comma
2017-08-01 11:42:50 +01:00
Richard Lewis
15f39040a0
Simplify canUserModifyWidgets API
2017-08-01 11:39:17 +01:00
Richard Lewis
a310ff3bab
Add ToDo item.
2017-07-28 18:21:23 +01:00
Richard Lewis
6aa1d923ce
Add comment
2017-07-28 16:48:13 +01:00
Richard Lewis
9935dd0051
Add comment to explain "fullWidth" component porperty.
2017-07-28 16:46:21 +01:00
Richard Lewis
8529a21f5c
Translate "Allow"
2017-07-28 16:42:07 +01:00
Richard Lewis
700ef34e95
Translate warning
2017-07-28 16:39:18 +01:00
Richard Lewis
4308d2c635
Inline setState.
2017-07-28 16:36:06 +01:00
Richard Lewis
50ad80ad86
Use ES6 style import
2017-07-28 16:24:32 +01:00
Richard Lewis
2e6fb1f956
Fix license header
2017-07-28 16:23:49 +01:00
Richard Lewis
6238c1d704
Fix default prop initialisation
2017-07-28 16:23:38 +01:00
Luke Barnard
8a5f2bf2ca
Interpret a split-block as format toggle for an empty block
...
(`split-block` is emitted when "return" is pressed)
part of fixing https://github.com/vector-im/riot-web/issues/4580
2017-07-28 14:46:57 +01:00
Richard Lewis
aff1cd9469
Add allow-presentation permission to iframe sandbox permissions
2017-07-28 11:14:04 +01:00
Richard Lewis
11335b1488
Rename variable to curlBase, for clarity
2017-07-28 10:18:06 +01:00
Richard Lewis
e1d9301eb4
Strip query parameters from content URLs
2017-07-28 10:01:58 +01:00
Richard Lewis
d69c9a36b3
Factor out check permissions code.
2017-07-27 23:38:26 +01:00
Richard Lewis
20a1693c71
Only display add app link if user has permission to add widgets in the room.
2017-07-27 23:38:02 +01:00
Richard Lewis
5e23d676b4
Remove comments.
2017-07-27 23:05:43 +01:00
Richard Lewis
51d160e7d6
Hide edit button when user does not have permission to edit.
2017-07-27 20:18:31 +01:00
Luke Barnard
6cb8b12cda
Instead of inserting MD for completion, convert the Entity later
...
This makes sure that the length of the range for a completed Entity = the length of the text in the decoration, which apparently draftjs assumes when calculating selection state offsets.
Fixes https://github.com/vector-im/riot-web/issues/4666
2017-07-27 18:17:41 +01:00
Richard Lewis
ab7fcbb5e7
Add function to determine if a user can modify widgets and style UI components as a result.
2017-07-27 18:10:28 +01:00
Richard Lewis
27923e300c
Add JSX wrapper.
2017-07-27 17:47:04 +01:00
Richard Lewis
9ee1f3962d
Set display URL from wurl if curl not specified.
2017-07-27 16:42:29 +01:00
Richard Lewis
8e4f1f0989
Add message spinner.
2017-07-27 16:41:52 +01:00
Richard Lewis
f2058e0a6c
Add message spinner component.
2017-07-27 16:41:20 +01:00
David Baker
92746f8cb5
Merge pull request #1254 from matrix-org/luke/fix-join-command
...
Fix /join #alias command in markdown mode
2017-07-27 15:43:02 +01:00
Luke Barnard
5c7891a25b
Remove logs
2017-07-27 15:26:36 +01:00
Luke Barnard
e71df44fc9
Fix /join #alias command in markdown mode
...
Tab-completing a room alias inserts a markdown link, which is now stripped before a command is parsed. We also strip the MD links when doing the autocompletion itself (getAutocompleteQuery).
There is still an issue where `/invite` will not work at all with tab-completion - the text of a user Pill is not the userID but rather the display name, which cannot be used as an argument to the command.
2017-07-27 15:18:06 +01:00
Luke Barnard
dff79c4688
Only apply room pills to matrix.to room links, exclude event links
...
This fixes https://github.com/vector-im/riot-web/issues/4680
and fixes https://github.com/vector-im/riot-web/issues/4670
2017-07-27 13:01:40 +01:00
Luke Barnard
4d4078be7e
Remove disambiguation from pills
2017-07-27 10:54:23 +01:00
Luke Barnard
f19fade448
Strip " (IRC)" from display names inserted into the timeline
2017-07-27 10:50:41 +01:00
Luke Barnard
c4f049effe
Merge pull request #1243 from matrix-org/t3chguy/hide-join-part-2
...
T3chguy/hide join part (attempt) 2
2017-07-26 17:15:43 +01:00
David Baker
9cb28ff33c
Merge pull request #1248 from matrix-org/luke/fix-rte-auto-scroll
...
Scroll to the bottom of editor if on last line
2017-07-26 16:58:36 +01:00
Richard Lewis
9f52c13bea
Grant permission to load app widget.
2017-07-26 16:47:58 +01:00
Michael Telatynski
2348c24369
revert the rm-always-moves-down loop as thats done Server side...
2017-07-26 14:33:48 +01:00
Michael Telatynski
3eb87e2aa3
change lastShownEventIndex -> lastShownEvent since some places
...
do not have the same i reference (namely MELS generation)
this way a member event at bottom of MELS (if is the last event
in the timeline will have last set appropriately)
2017-07-26 12:17:05 +01:00
Michael Telatynski
f42ae1662b
change wording of comment as per Luke's review
2017-07-26 11:46:59 +01:00
Richard Lewis
76f4f88fcd
App tile permissions -- broken
2017-07-26 11:28:43 +01:00
Luke Barnard
1ef2a2bcf9
Merge pull request #1250 from matrix-org/dbkr/fix_truncatedlist_i18n
...
Fix i18n on truncatedlist & friends to be sane
2017-07-25 16:17:44 +01:00
