PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
5813 commits 1 branch 0 tags 338 MiB
Commit graph

5813 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Richard Lewis
9f52c13bea Grant permission to load app widget. 2017-07-26 16:47:58 +01:00
Richard Lewis
76f4f88fcd App tile permissions -- broken 2017-07-26 11:28:43 +01:00
Luke Barnard
bcd1ab5cd4 Merge pull request #1245 from matrix-org/luke/feature-mentions-ambiguate 
Remove disambiguation from user mentions, add tooltip for mxid
 2017-07-24 17:36:42 +01:00
Luke Barnard
b6ba7f0116 Merge pull request #1242 from matrix-org/luke/fix-rte-pt-md-mentions 
Strip MD user mentions from the `body` of sent messages
 2017-07-24 17:25:59 +01:00
Luke Barnard
727b1ca545 Remove disambiguation from user mentions, add tooltip for mxid 
Also add a tooltip for room pills = room alias/ID

Requires: https://github.com/matrix-org/matrix-js-sdk/pull/513
 2017-07-24 15:08:22 +01:00
Luke Barnard
dc09ad8db4 Re-add NL 2017-07-24 14:50:44 +01:00
Luke Barnard
f7145941fd Add tests to assert correct MD mention link stripping 
Tab-completed @Mentions should only be sent as display names in the `body` of the event. The HTML should be unaffected, and always sent as an anchor tag.
 2017-07-24 14:42:20 +01:00
Luke Barnard
6945fa54ea Reimplement so that only tab-completed mentions are stripped 
Instead of blindly stripping all MD mentions, only strip those that were tab-completed. We do this by adding the `isCompleted` flag to the Entity data.
 2017-07-24 14:41:13 +01:00
Luke Barnard
397201a74d Remove subjective comment 2017-07-24 09:41:46 +01:00
Luke Barnard
e315b30f6a Merge branch 'develop' into luke/fix-rte-pt-md-mentions 2017-07-21 18:06:31 +01:00
Luke Barnard
eb0575d9c1 Merge pull request #1241 from matrix-org/luke/refactor-pills 
Factor out shared logic in two code-paths for pill rendering
 2017-07-21 17:54:20 +01:00
Luke Barnard
feaafc7a1a Remove logging 2017-07-21 17:18:48 +01:00
Luke Barnard
e8495f637f Strip MD mentions from the body of sent messages 
Because previously we just sent the display name and MD links are not very readable.
 2017-07-21 16:38:31 +01:00
Luke Barnard
03aba64b97 Merge branch 'luke/refactor-pills' of github.com:matrix-org/matrix-react-sdk into luke/refactor-pills 
Conflicts:
	src/components/views/elements/Pill.js
 2017-07-21 14:08:36 +01:00
Luke Barnard
7db7192701 Factor out shared logic in two code-paths for pill rendering 
This isn't an entirely side-effect-free refactoring:
 - the text of the timeline pills is now either the room ID/alias or user ID/ display name of the linked resource (which means that until we do a roundtrip to get user displaynames, mentions for users not in the current room will have their user IDs shown instead of what was in the link body).
 - timeline links to rooms without avatars are now rendered as links
 - fixed issue that would throw an error whilst rendering (i.e. unusable client) a room link to a room that the client doesn't know about
 2017-07-21 14:07:48 +01:00
Luke Barnard
8ef820054d Factor out shared logic in two code-paths for pill rendering 
This isn't an entirely side-effect-free refactoring:
 - the text of the timeline pills is now either the room ID/alias or user ID/ display name of the linked resource (which means that until we do a roundtrip to get user displaynames, mentions for users not in the current room will have their user IDs shown instead of what was in the link body).
 - timeline links to rooms without avatars are now rendered as links
 - fixed issue that would throw an error whilst rendering (i.e. unusable client) a room link to a room that the client doesn't know about
 2017-07-21 14:04:33 +01:00
Richard Lewis
b589fcc3b0 Merge pull request #1240 from matrix-org/rxl881/deleteWidgets 
Hide widget panel while it is being deleted.
 2017-07-21 11:14:42 +01:00
Luke Barnard
8c531a85e9 Merge pull request #1239 from matrix-org/luke/feature-rte-insert-pills-on-click-tl-profile 
Insert pill onClick of timeline profile
 2017-07-21 10:42:48 +01:00
Luke Barnard
bac22cfb7c Re-add removal of (IRC) suffix 2017-07-20 18:04:12 +01:00
Luke Barnard
08cc0c421d insert_displayname -> insert_mention 2017-07-20 18:02:54 +01:00
Luke Barnard
6d7bff83ca Update type Completion 2017-07-20 16:49:23 +01:00
Luke Barnard
0600c5b049 Pretend that insert_displayname is a completion on that user 
This has the advantage of us not reimplementing things and fixing the same bugs twice.
 2017-07-20 16:46:53 +01:00
Luke Barnard
4bee9bd8c7 Merge branch 'develop' into luke/feature-rte-insert-pills-on-click-tl-profile 2017-07-20 15:48:38 +01:00
Luke Barnard
0419eff230 Insert pill onClick of timeline profile 
When clicking someone in the timeline, insert a user pill instead of the plaintext "displayname:"
 2017-07-20 15:46:36 +01:00
Luke Barnard
26b16b076c Merge pull request #1238 from matrix-org/luke/fix-rte-md-mentions 
Insert MD links when autocompleting in MD mode
 2017-07-20 15:32:36 +01:00
Luke Barnard
d080490ed3 Merge branch 'luke/fix-rte-md-mentions' of github.com:matrix-org/matrix-react-sdk into luke/fix-rte-md-mentions 
Conflicts:
	src/components/views/rooms/MessageComposerInput.js
 2017-07-20 15:17:36 +01:00
Luke Barnard
e893f994e1 Default to first room alias and then roomID 2017-07-20 15:17:07 +01:00
Luke Barnard
b881efbc05 Default to first room alias and then roomID 2017-07-20 15:16:25 +01:00
Luke Barnard
84fe51a162 Insert MD links when autocompleting in MD mode 
These will appear decorated because they are inserted as entities. It was necessary to modify pills to have an explicit linkText that is derived from the `href` being pillified (and is thus no longer the inserted completion but rather the display name (or user ID) or room alias.
 2017-07-20 15:09:59 +01:00
Richard Lewis
563f5f7bac Merge pull request #1226 from matrix-org/rxl881/beta 
Show beta testing icon and help message for widgets tile.
 2017-07-20 14:04:53 +01:00
David Baker
199b771051 Merge pull request #1237 from matrix-org/luke/fix-rte-colon-parity 
Implement old composer feature that inserts ': ' or ' '
 2017-07-20 13:05:40 +01:00
Luke Barnard
0185119146 Merge pull request #1236 from matrix-org/luke/fix-rte-emoji-match-by-name 
Match emojis by long name
 2017-07-20 11:53:41 +01:00
Luke Barnard
352f70f9ce Implement old composer feature that inserts ': ' or ' ' 
after a user completion
 2017-07-20 11:52:18 +01:00