3c44af11f7
Revert changes to ChangeAvatar
...
This component was basically adding nothing for group editing
2017-07-21 14:06:08 +01:00
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
f2afd852d8
Make group editing work
2017-07-21 14:03:10 +01:00
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
571fada77e
Make group profile editing mostly work
...
apart from avatars
2017-07-21 11:12:15 +01:00
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
bac22cfb7c
Re-add removal of (IRC) suffix
2017-07-20 18:04:12 +01:00
08cc0c421d
insert_displayname -> insert_mention
2017-07-20 18:02:54 +01:00
6d7bff83ca
Update type Completion
2017-07-20 16:49:23 +01:00
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
4bee9bd8c7
Merge branch 'develop' into luke/feature-rte-insert-pills-on-click-tl-profile
2017-07-20 15:48:38 +01:00
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
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
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
e893f994e1
Default to first room alias and then roomID
2017-07-20 15:17:07 +01:00
b881efbc05
Default to first room alias and then roomID
2017-07-20 15:16:25 +01:00
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
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
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
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
352f70f9ce
Implement old composer feature that inserts ': ' or ' '
...
after a user completion
2017-07-20 11:52:18 +01:00
b3df546cb9
Fix comment
2017-07-20 10:51:15 +01:00
a7feb58b63
Match emojis by long name
...
For example, searching for `:tong` will now match `:stuck_out_tongue` because the query `:tong` has all non-word characters removed, becoming `tong` and is then matched against the (long) names of emojis such as `smiling face with open mouth and tightly-closed eyes`.
2017-07-20 10:01:58 +01:00
0e8ad75248
Merge pull request #1233 from matrix-org/rav/async_crypto
...
Prepare for asynchronous e2e APIs
2017-07-19 21:11:36 +01:00
2f293adad5
Fix userId undefined in pillifyLinks
2017-07-19 18:21:26 +01:00
ecaf6e5223
Merge pull request #1234 from matrix-org/luke/feature-mention-pill
...
Add mx_UserPill_me class to user pills that match credentials.userId
2017-07-19 17:56:24 +01:00
61d5d078dd
Merge pull request #1235 from matrix-org/luke/fix-rte-inline-code-format
...
Mimic ctrl+j of RT mode in MD mode
2017-07-19 17:44:56 +01:00
5d1b33d2a8
Merge branch 'develop' into luke/feature-mention-pill
2017-07-19 17:22:03 +01:00
3a53fabb87
Merge pull request #1228 from matrix-org/luke/feature-auto-complete-matrixto-pills
...
Implement composer completion user/room pill insertion
2017-07-19 17:19:47 +01:00
29b6d70aff
Merge branch 'develop' into luke/fix-rte-inline-code-format
2017-07-19 17:19:25 +01:00
d179398cf2
Merge pull request #1227 from matrix-org/luke/feature-matrixto-timeline-pills
...
Decorate matrix.to anchor tags as mx_UserPill and mx_RoomPill
2017-07-19 17:17:48 +01:00
75ca141cf9
Merge pull request #1232 from matrix-org/luke/fix-rte-backspace-unstyled-block
...
Interpret backspace at start of style block as block style toggle
2017-07-19 17:16:34 +01:00
8d7ff127f1
Merge pull request #1231 from matrix-org/luke/fix-rte-duplicate-autocompletions
...
Use _uniq instead of _sortedUniq for return unique matched results
2017-07-19 17:05:12 +01:00
c8722292e3
Don't truncate EmojiProvider completion pills
2017-07-19 16:20:57 +01:00
28c98d93d1
Mimic ctrl+j of RT mode in MD mode
...
by inspecting whether multiple lines are selected or the selection is empty. If either of these are true, insert a code block surrounding the selection, otherwise insert single backticks around the selection for inline code formatting.
2017-07-19 16:13:47 +01:00
b131637a11
Add mx_UserPill_me class to user pills that match credentials.userId
2017-07-19 11:00:26 +01:00
4998d1b359
Prepare for asynchronous e2e APIs
...
the js-sdk is making some of its APIs asynchronous, and adding an `initCrypto`
method which you have to call.
Particular methods we need to worry about are:
* `getStoredDevice`
* `getStoredDevicesForUser`
* `getEventSenderDeviceInfo`
* `isEventSenderVerified`
2017-07-18 23:47:36 +01:00
98ca937fef
Interpret backspace at start of style block as block style toggle
...
Part of fixing https://github.com/vector-im/riot-web/issues/4580
2017-07-18 17:52:04 +01:00
b185f43d3d
Use _uniq instead of _sortedUniq for return unique matched results
...
_sortedUniq claims to be like _uniq but optimised for sorted arrays - https://lodash.com/docs/4.17.4#sortedUniqBy . But in practice this isn't quite true, so stick with the unoptimised version.
2017-07-18 16:23:54 +01:00
8a818d250f
Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit
2017-07-18 11:34:48 +01:00
b9dfaf777e
Merge pull request #1230 from matrix-org/dbkr/fix_multi_invite
...
Fix inviting multiple people to a room
2017-07-18 11:34:33 +01:00
7cfef04c1f
Remove other promise notify
2017-07-18 11:27:21 +01:00
b261c89a63
Fix inviting multiple people to a room
...
Removes the promise notify as bluebird doesn't support it. It's
also not used anywhere now.
Fixes https://github.com/vector-im/riot-web/issues/4614
2017-07-18 11:11:42 +01:00
d207ee5244
Expand groups into variables with readable names
2017-07-17 19:31:36 +01:00
859239f881
Lint / comment out line correctly
2017-07-17 18:13:20 +01:00
7041106bf2
Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit
2017-07-17 17:23:02 +01:00
6f65128928
Disable edit button again
...
until we have an API to edit group profile info
2017-07-17 17:18:46 +01:00
1cd79fc918
Rename group settings to 'Edit Group'
2017-07-17 17:17:18 +01:00
29757fcf11
Merge branch 'luke/feature-matrixto-timeline-pills' into pills
2017-07-17 16:43:46 +01:00
897ff05d87
Implement composer completion user/room pill insertion
...
This modifies the composer completion such that completing a room or user will insert an IMMUTABLE matrix.to LINK Entity for the range that was replaced. Display names will not have a colon after their name anymore as it seemed strange that we would insert one after a pill.
2017-07-17 15:53:29 +01:00
David Baker