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
2cc153c796
Merge remote-tracking branch 'origin/develop' into develop
2017-07-20 13:05:10 +00:00
55084d3aca
Merge pull request #4584 from vector-im/rxl881/beta
...
Styling for beta testing icon.
2017-07-20 14:05:06 +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
878ff9826a
Merge remote-tracking branch 'origin/develop' into develop
2017-07-20 10:50:26 +00:00
7e00a86048
Merge pull request #4650 from vector-im/rav/bump_indexeddb_timeot
...
Increase the timeout for clearing indexeddbs
2017-07-20 11:50:23 +01:00
e133160a68
Merge remote-tracking branch 'origin/develop' into develop
2017-07-20 10:25:25 +00:00
62579ed6b0
Add tracebacks to deploy exceptions
2017-07-20 11:25:19 +01:00
98e3746a1e
Merge remote-tracking branch 'origin/develop' into develop
2017-07-20 10:16:40 +00:00
01eef7eb41
Merge branch 'develop' of github.com:vector-im/riot-web into develop
2017-07-20 11:16:26 +01:00
ccf5d6fc90
Adjust pill CSS
...
-Remove space after mentions without pill background colour
-Increase space between pill avatar and first letter of the pill by 1px
2017-07-20 11:14:54 +01:00
055224693a
Merge remote-tracking branch 'origin/develop' into develop
2017-07-20 10:02:15 +00:00
9864ce5bb2
Support multiple config.json symlinks in redeploy.py ( #4644 )
...
* Support multiple config.json symlinks in redeploy.py
* Review comments
2017-07-20 11:02:10 +01:00
238afde00a
Increase the timeout for clearing indexeddbs
...
Chrome seems to take ages (like, 1500ms regularly) to clear out the indexeddbs,
and that's causing test timeouts. Bump the timeout to hack around it.
Also: clear both dbs in parallel (can't hurt, right?) and improve diagnostics
on the process.
2017-07-20 11:01:27 +01:00
b3df546cb9
Fix comment
2017-07-20 10:51:15 +01:00
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
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
4b67900225
Translated using Weblate (German)
...
Currently translated at 100.0% (207 of 207 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-07-19 20:52:22 +00: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
fb10357dd5
Merge remote-tracking branch 'origin/develop' into develop
2017-07-19 16:26:16 +00:00
f7d282fc8e
Merge pull request #4597 from vector-im/luke/css-matrixto-timeline-pills
...
Make some adjustments to mx_UserPill and mx_RoomPill
2017-07-19 17:26:13 +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
11ae3dd46c
Merge remote-tracking branch 'origin/develop' into develop
2017-07-19 16:16:06 +00:00
3544c2b0c8
Merge pull request #4639 from vector-im/luke/css-rte-pre
...
Apply CSS to <pre> tags to distinguish them from each other
2017-07-19 17:16:02 +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
edfa3c1980
Merge remote-tracking branch 'origin/develop' into develop
2017-07-19 13:27:40 +00:00
620f39c6a2
Translated using Weblate (Telugu)
...
Currently translated at 1.4% (3 of 207 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/te/
2017-07-19 13:27:40 +00:00
0c253e2437
Merge pull request #4643 from vector-im/luke/fix-room-tile-dnd
...
Use `catch` instead of `fail` to handle room tag error
2017-07-19 14:27:37 +01:00
53ae42ed68
Use catch instead of fail to handle room tag error
...
Because bluebird doesn't support fail
2017-07-19 14:11:22 +01:00
871c9e6d3e
Add bing mention pill CSS
...
Useful with https://github.com/matrix-org/matrix-react-sdk/pull/1234
2017-07-19 11:02:51 +01:00
b131637a11
Add mx_UserPill_me class to user pills that match credentials.userId
2017-07-19 11:00:26 +01:00
Luke Barnard
Luke Barnard
Weblate
Richard Lewis
David Baker
Richard van der Hoff
Kegan Dougal
Kegsay
Richard van der Hoff
LuPa
Bamstam
Bhuvan Krishna