Commit Graph

5827 Commits (598411dd03892189a04fcf35937541abe80173d5)

Author SHA1 Message Date
David Baker 598411dd03 Add translation 2017-07-25 17:22:05 +01:00
David Baker 7469a9ae2a Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-07-25 17:20:16 +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
David Baker c2034d5335 Add user list to groups 2017-07-25 15:56:16 +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 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
Luke Barnard 026582bcf7 Add unmounted guard 2017-07-25 09:22:08 +01:00
Luke Barnard 5efd5bf927 done -> then, style 2017-07-25 09:20:14 +01:00
Luke Barnard d13c4b510c Merge branch 'develop' into luke/feature-async-pills 2017-07-24 17:39:35 +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 61c16569cb Get user pill profile remote data
Instead of relying on the local avatar/displayname of a user, request the data from the server and update the pill if it shows up.

This required a slight refactor which means we're not doing everything in `render` now. Also I noticed unknown rooms weren't being rendered _at all_! So now you get something that looks like a normal link but with the room alias/ID in it.
2017-07-24 17:18:29 +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
David Baker f9cff50ef5 _loadGroupFromServer doesn't return a promise 2017-07-21 14:41:29 +01:00
David Baker d48924e768 Lint 2017-07-21 14:30:09 +01:00
David Baker be7228996a This should be null rather than false 2017-07-21 14:18:28 +01:00
David Baker 4eda2ab083 Swap classes instead of using 0 height elements 2017-07-21 14:13:57 +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
David Baker 3c44af11f7 Revert changes to ChangeAvatar
This component was basically adding nothing for group editing
2017-07-21 14:06:08 +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
David Baker f2afd852d8 Make group editing work 2017-07-21 14:03:10 +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
David Baker 571fada77e Make group profile editing mostly work
apart from avatars
2017-07-21 11:12:15 +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