Michael Telatynski
3859708114
re-add Unread shouldHideEvent code
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-21 19:51:13 +01:00
Michael Telatynski
8167c004a8
re-add core logic
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-21 19:38:01 +01:00
Michael Telatynski
928294eba3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/hide-join-part-2
2017-07-21 19:23:42 +01:00
Michael Telatynski
f036fd1d0f
first attempt at stubbing tests
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-21 19:16:30 +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
Alexandre Morignot
511ab7c9ea
Translated using Weblate (French)
...
Currently translated at 100.0% (916 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-07-20 20:12:48 +00: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
0cc890c020
WIP store history as raw content state
...
Not sure this solves any problems because we still have to convert from md and back
2017-07-20 18:01:39 +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
Luke Barnard
b3df546cb9
Fix comment
2017-07-20 10:51:15 +01:00
LuPa
206c771eb1
Translated using Weblate (Spanish)
...
Currently translated at 68.2% (625 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2017-07-20 09:15:25 +00:00
Luke Barnard
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
Richard van der Hoff
0e8ad75248
Merge pull request #1233 from matrix-org/rav/async_crypto
...
Prepare for asynchronous e2e APIs
2017-07-19 21:11:36 +01:00
Luke Barnard
2f293adad5
Fix userId undefined in pillifyLinks
2017-07-19 18:21:26 +01:00
Luke Barnard
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
Luke Barnard
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
Luke Barnard
5d1b33d2a8
Merge branch 'develop' into luke/feature-mention-pill
2017-07-19 17:22:03 +01:00
Luke Barnard
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
Luke Barnard
29b6d70aff
Merge branch 'develop' into luke/fix-rte-inline-code-format
2017-07-19 17:19:25 +01:00
Luke Barnard
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
Luke Barnard
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
Richard van der Hoff
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