OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
5,972 Commits
214 Branches
561 Tags
463 MiB
Commit Graph

5972 Commits (f4092cc9b4124c7b8015ceafa6b8d3e37aa8df03)

Author SHA1 Message Date
Richard Lewis 48faf72fdc Disable eslint rule 2017-08-01 21:00:18 +01:00
Luke Barnard ff378cc85a Merge pull request #1264 from matrix-org/luke/fix-rte-emoji-sorting 
Adjust emoji sorting such that exact matches/prefixes appear first
 2017-08-01 17:58:54 +01:00
Richard Lewis 2ab6bc84a7 Improve clarity 2017-08-01 17:49:41 +01:00
Richard Lewis f0224460d2 Fix comparison and handle case where app has permission to load but content is mixed protocol. 2017-08-01 17:48:02 +01:00
David Baker e6f3164348 Merge pull request #1262 from matrix-org/luke/upgrade-dep-draft-js 
Upgrade draft-js from 0.9.1 to 0.10.1
 2017-08-01 17:46:09 +01:00
Richard Lewis d29610bdd2 Fix boolean comparison. 2017-08-01 17:45:06 +01:00
Richard Lewis f57b0d4cc7 Fix invalid translation 2017-08-01 17:43:38 +01:00
Luke Barnard ff95542549 Adjust emoji sorting such that exact matches/prefixes appear first 
fixes https://github.com/vector-im/riot-web/issues/4704
 2017-08-01 17:36:41 +01:00
Richard Lewis bc4d979d1e Display warning if widget is mixed content 2017-08-01 17:29:29 +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 1001c39da9 Upgrade draft-js from 0.8.1 to 0.10.1 
This fixes vector-im/riot-web#4675

Some APIs have become deprecated in this version but are still usable ( see https://draftjs.org/docs/v0-10-api-migration.html )
 2017-08-01 16:02:28 +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 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
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