b19c1010aa
Merge branches 'develop' and 't3chguy/i18n_analytics' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# src/Analytics.js
2017-08-10 13:54:55 +01:00
67f9c3774d
make string more human-friendly
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 13:51:47 +01:00
24599ace32
don't track error messages
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 13:49:11 +01:00
60c1ba4f4d
Add LanguageDropdown to LoginPage ( #1284 )
2017-08-10 13:29:10 +01:00
b2fd4be166
Merge pull request #1289 from matrix-org/luke/fix-quote-innerText
...
Quote by taking the innerText of eventTiles
2017-08-10 10:35:49 +01:00
678c472b75
Quote by taking the innerText of eventTiles
...
because using `body` gives inconsistent results - sometimes it will contain markdown and sometimes not, and this may not correspond with the `formatted_body`.
TODO: Do quoting proper - using `in_response_to`.
2017-08-10 10:14:14 +01:00
390e77ee22
Merge pull request #1288 from matrix-org/luke/track-richtext-mode
...
Track whether the user has richtext mode enabled
2017-08-10 09:31:09 +01:00
fc6977e68d
Track RT mode once we've retrieved the setting from account data
2017-08-09 19:00:38 +01:00
e121440d05
Track whether the user has richtext mode enabled
2017-08-09 18:39:06 +01:00
f4092cc9b4
Merge pull request #1287 from matrix-org/luke/fix-hide-autocomp-on-selection-change
...
Hide autocomplete when RTE selection state (cursor) changes
2017-08-09 18:21:25 +01:00
794bf820cc
Merge pull request #1259 from matrix-org/t3chguy/fix-select-mxid-dialog
...
Fix Set MXID Dialog woes
2017-08-09 17:53:50 +01:00
2d47d3d2c3
Hide autocomplete when RTE selection state (cursor) changes
2017-08-09 17:36:35 +01:00
579090a4e3
add comment
2017-08-09 16:37:38 +01:00
f496d2de8b
Merge pull request #1285 from matrix-org/luke/fix-rte-mention-ambiguation
...
For mentions, always use rawDisplayName and remove (IRC)
2017-08-09 11:54:50 +01:00
610b2a3a42
For mentions, always use rawDisplayName and remove (IRC)
2017-08-09 10:40:06 +01:00
102b02054b
Merge pull request #1283 from matrix-org/rav/matrix_chat_optimisations
...
Make MatrixChat do fewer render cycles during mount
2017-08-09 09:32:54 +01:00
38114711fd
Make MatrixChat do fewer render cycles during mount
...
This is mostly with the intent of making the login tests more reliable, but it
seems generally worthwhile:
* keep screenAfterLogin in the object props rather than `state` so that we can
clear it without triggering a rerender
* also move our record of the window width to the object props, and call
`handleResize` from componentWillMount rather than componentDidMount so that
we don't trigger a rerender by updating `state.width`
* Remove update of unused `loading` state
2017-08-08 22:31:40 +01:00
8426ada24c
Merge pull request #1282 from matrix-org/rav/show_unencrypted_messages_as_unencrypted
...
Show unencrypted messages as unencrypted
2017-08-08 18:11:56 +01:00
da85cb9f45
Show unencrypted messages as unencrypted
...
Previously, we were special-casing outgoing messages such that they were shown
as encrypted even when encryption had failed for some reason.
There's no need for this: outgoing messages have a working isEncrypted() method
which we can use to show whether the event has been encrypted yet. Arguably we
could do better than an open padlock for events in the 'encrypting' send state,
but I'm not really sure what.
2017-08-08 17:49:41 +01:00
34adda590b
Merge pull request #1280 from matrix-org/luke/fix-rte-prevent-completion-pills-in-commands
...
Disable autocompletions for users and rooms when entering a command
2017-08-08 17:48:56 +01:00
b76b6791b2
Merge pull request #1279 from matrix-org/luke/fix-quoting-messages-with-mentions
...
Always use message `body` when quoting
2017-08-08 17:47:25 +01:00
b82fd02eb7
Merge pull request #1281 from matrix-org/luke/fix-autocomplete-cancel
...
When `hide`ing autocomplete, also remove completion state
2017-08-08 17:46:48 +01:00
cb8a66b5a1
When `hide`ing autocomplete, also remove completion state
2017-08-08 17:25:11 +01:00
a72f38799f
Disable autocompletions for users and rooms when entering a command
...
This only affects commands that take a room alias or user ID as an argument. (Leaving commands such as `/me` unaffected)
2017-08-08 15:58:15 +01:00
503fa6a7b3
Always use message `body` when quoting
...
(not formatted_body)
This is because draft-js has regressed with a bug that causes some entities to not exist within a given ContentState - see vector-im/riot-web#4756
2017-08-08 14:59:56 +01:00
ca2273519d
Merge pull request #1277 from matrix-org/luke/feature-pills-hide-avatar-setting
...
Add optional setting for hiding avatars in <Pill>s
2017-08-08 14:01:34 +01:00
08fba3bb75
Merge pull request #1278 from matrix-org/luke/fix-rte-key-bindings
...
Mandate ctrl/meta ONLY for a subset of key bindings
2017-08-08 13:51:02 +01:00
bef6726290
Lint
2017-08-08 13:42:51 +01:00
91a1cc4431
Mandate ctrl/meta ONLY for a subset of key bindings
...
Because by default dratf-js doesn't check that other modifiers are _not_ pressed.
2017-08-08 13:36:43 +01:00
b08d32371d
Add optional setting for hiding avatars in <Pill>s
...
As part of https://github.com/vector-im/riot-web/issues/4640#issuecomment-316659445
2017-08-08 11:13:29 +01:00
3639fc0c3c
Merge pull request #1276 from matrix-org/luke/fix-rte-completion-raw-disp-name
...
Use the rawDisplayName for the user provider completion
2017-08-08 10:38:24 +01:00
1743c047bd
Use the rawDisplayName for the user provider completion
...
to make sure that the length of text in the decoration (See <Pill>) is equal to the length of text in the completion (underlying text range that the Entity covers).
2017-08-08 10:28:11 +01:00
aa4cc882e9
Merge pull request #1275 from matrix-org/luke/fix-rte-ctrl-a-backspace
...
Fix ctrl+a, backspace toggling block format
2017-08-07 17:58:07 +01:00
7018deee44
Fix ctrl+a, backspace toggling block format
...
Now it will delete the selected range (and not toggle the block format). Fixes vector-im/riot-web#4753
2017-08-07 17:16:42 +01:00
8af6d6fc9f
Merge pull request #1274 from matrix-org/luke/fix-rte-keyboard-intercepts
...
Allow default for ctrl+shift+b, ctrl+shift+u in RTE
2017-08-07 16:38:04 +01:00
641fda0162
Adjust comment
2017-08-07 16:29:22 +01:00
d9d8f2055f
Allow default for ctrl+shift+b, ctrl+shift+u in RTE
...
fixes vector-im/riot-web#4750
2017-08-07 16:23:37 +01:00
91c96c1c27
Update draft-js-export-* deps to be compatible with draft-js >0.10.0
2017-08-04 15:08:03 +01:00
fb8d6c962d
Use npm 6
2017-08-04 11:28:42 +01:00
b06922b6fc
Merge pull request #1270 from matrix-org/luke/fix-md-unescaped-tokens
...
MD-escape URLs/alises/user IDs prior to parsing markdown
2017-08-04 10:30:30 +01:00
ee18ddb700
MD-escape URLs/alises/user IDs prior to parsing markdown
...
So that MD characters in them do not result in formatting being applied.
Fixes https://github.com/vector-im/riot-web/issues/3428
Fixes https://github.com/vector-im/riot-web/issues/4674
2017-08-04 10:02:22 +01:00
ee5fc12cb0
Merge pull request #1269 from matrix-org/luke/upgrade-dep-draft-js-0.11.0
...
Upgrade draft-js to 0.11.0-alpha
2017-08-03 15:55:52 +01:00
a27eefd893
Fix a couple of more errors due to API changes
2017-08-03 15:20:44 +01:00
901cbf495d
Update decorator strategy API in accordance with recent changes to 0.11.0
...
See 590cdc6c54https://draftjs.org/docs/v0-10-api-migration.html
2017-08-03 12:02:29 +01:00
1d1cd5f691
Reflect API change for decorator strategy
2017-08-03 11:36:07 +01:00
fb5dc295aa
Reflect API change for getting an Entity
2017-08-03 11:29:26 +01:00
124795006c
Reflect API change for creating an Entity
2017-08-03 11:18:56 +01:00
4f0cf7d6ec
Update npm dep of draft-js to 0.11.0-alpha
2017-08-03 11:16:32 +01:00
5752345b80
Merge pull request #1263 from matrix-org/rxl881/warnings
...
Display warning if widget is mixed content
2017-08-02 17:30:46 +01:00
7599bde1f6
Fix logging line length.
2017-08-02 17:05:46 +01:00
Michael Telatynski