Commit Graph

6007 Commits (e48c4911b8103e9219fc8f3e4f79d1409516704e)

Author SHA1 Message Date
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 46755de962 Fix event type. 2017-08-01 11:41:41 +01:00
Richard Lewis 15f39040a0 Simplify canUserModifyWidgets API 2017-08-01 11:39:17 +01:00
Michael Telatynski 62af06104d
resolve -> reject because semantics. 2017-07-31 14:22:05 +01:00
Michael Telatynski f310d4446c
i18n the title of the set mxid dialog 2017-07-31 13:31:07 +01:00
Michael Telatynski 25d1d21d93
copy logic from RegistrationForm to detect invalid localparts 2017-07-31 13:28:43 +01:00
Michael Telatynski 4bdaa15c47
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics 2017-07-28 21:01:59 +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
Richard Lewis 6f57fe96f2 Add JS doc to indicate that the function may throw an error. 2017-07-28 16:19:20 +01:00
Richard Lewis a901ca5308 Remove invalid OM license header. 2017-07-28 16:17:18 +01:00
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
Michael Telatynski bf98c0da7c
un-i18n Modal Analytics
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-27 17:19:18 +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