David Baker
8fd0ced215
Merge pull request #1258 from matrix-org/luke/feature-rte-enter-to-toggle-empty-block
...
Interpret a `split-block` as format toggle for an empty block
2017-07-28 15:33:45 +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
ccf3c1de7a
Add widget utility class. Add static method to determine if user can modify widgets in the specified room.
2017-07-27 23:37:33 +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
Richard Lewis
f7e9dd4118
Add edit translation
2017-07-27 19:56:28 +01:00
David Baker
ff0741d435
Merge pull request #1256 from matrix-org/luke/fix-rte-md-entity-weirdness
...
Instead of inserting MD for completion, convert the Entity later
2017-07-27 18:48:37 +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
997c7493eb
Add translations for delete widget and revoke widget access.
2017-07-27 17:46:45 +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
f2d0e3939c
Merge pull request #1253 from matrix-org/luke/improve-test-output-format
...
Attempt to improve test output to be more readable
2017-07-27 15:39:38 +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
0118d880ec
Attempt to improve test output to be more readable
...
- Add "logcapture" reporter to capture logs only for failed tests
- Add "spec" reporter to show each test status individually
- Add "summary" reporter to show the total number of successful/failed tests
2017-07-27 14:47:22 +01:00
David Baker
9be433d833
Merge pull request #1252 from matrix-org/luke/fix-search-results-event-ids
...
Only apply room pills to matrix.to room links, exclude event links
2017-07-27 13:26:34 +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
91e74b3333
Merge pull request #1251 from matrix-org/luke/fix-irc-suffix-user-pills
...
Fix user pills suffixes
2017-07-27 12:06:30 +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
3b8c408482
update comment to make explain behaviour better
2017-07-26 13:37:33 +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
762e6780d7
fix this hiding unbans as found by Luke's review
2017-07-26 11:51:41 +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
Luke Barnard
2138b4a705
Merge pull request #1249 from uhoreg/imgfix1
...
allow width, height, alt, title attributes in img
2017-07-25 16:09:01 +01:00
David Baker
fa7a9818c6
Fix i19n on truncatedlist & friends to be sane
...
Use the proper counterpart tool for plurals rather than if > 1.
Fix up all the translation files respectively.
2017-07-25 15:59:06 +01:00
Hubert Chathi
df71502dbb
allow width, height, alt, title attributes in img
...
fixes vector-im/riot-web#4646
Signed-off-by: Hubert Chathi <hubert@uhoreg.ca>
2017-07-25 10:43:40 -04:00
Luke Barnard
7e0fecbc8c
Scroll to the bottom of editor if on last line
...
Make the MessageComposerInput scroll to the bottom if we are on the last line of the contents.
fixes https://github.com/vector-im/riot-web/issues/4652
2017-07-25 15:22:10 +01:00
Luke Barnard
d7f4e7c8c0
Merge pull request #1247 from matrix-org/luke/fix-rte-offset-bug
...
Use `data-offset-key` in RTE decorators
2017-07-25 12:24:02 +01:00
Luke Barnard
eccdceae33
Rename `props` to `entityProps` for clarity
2017-07-25 11:43:12 +01:00
Luke Barnard
143994e44f
Use `data-offset-key` in RTE decorators
...
This makes sure the selection state is correct when moving the cursor through an entity in the composer but only in rich text mode. https://github.com/vector-im/riot-web/issues/4666 still persists despite this, probably because the text content inserted during a completion in markdown mode has a different length to the text node within the entity.
fixes vector-im/riot-web#4654
2017-07-25 11:25:33 +01:00
Luke Barnard
b372e5d55d
Merge pull request #1246 from matrix-org/luke/feature-async-pills
...
Get user pill profile remote data and show unrecognised rooms as links
2017-07-25 10:21:55 +01:00
Luke Barnard
76e281662b
Merge pull request #1229 from matrix-org/dbkr/groupview_edit
...
UI for editing groups
2017-07-25 10:13:49 +01:00
Luke Barnard
11f3a1db72
Merge branch 'luke/feature-async-pills' of github.com:matrix-org/matrix-react-sdk into luke/feature-async-pills
2017-07-25 09:37:47 +01:00
Luke Barnard
ac597996e0
Remove outdated comment
2017-07-25 09:37:18 +01:00