bb229d33a4
Add onClick to user pills
...
instead of using the converted matrix.to href. This is undesirable and a better solution would be to fix routing in Riot in general and then change user pills to do something like `/room/../member/@userId`.
2017-08-14 14:44:08 +01:00
2844b574d5
Re-add useful comment
2017-08-14 14:41:03 +01:00
b59de7964c
Wait for first sync before dispatching view_user on /user
...
the RightPanel will be mounted once we're done doing the first sync, so wait until then and then dispatch a view_user. This is not very nice but it's what we do for view_room.
2017-08-14 14:37:49 +01:00
d9e8292a5e
Revert "At /user, view member of current room"
2017-08-14 14:06:54 +01:00
3d5d7fa9c8
Lint
2017-08-14 13:59:12 +01:00
c97ae5c2e1
Override matrix-apps to be disabled
...
- ignores localStorage setting
- hides feature from labs section in user settings
2017-08-14 12:29:42 +01:00
cbd8018ac8
Support semi-perma-disabling of lab features
...
Adding `override: true` will remove the feature from the labs section, and force Riot to always use the default value (i.e. ignoring localStorage). This is useful removing features entirely when they might be deliberately not working but we still want to do a release.
2017-08-14 12:26:31 +01:00
ab7aeccd35
Translated using Weblate (Russian)
...
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/ru/
2017-08-13 18:07:28 +00:00
d4a5bd86e6
Translated using Weblate (Korean)
...
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/ko/
2017-08-13 04:05:38 +00:00
0e2d5a798f
Translated using Weblate (Korean)
...
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/ko/
2017-08-13 03:59:17 +00:00
4a1ba01f44
fix deprecation warning
2017-08-13 00:56:37 +00:00
018c8721f4
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-08-11 21:11:46 +00:00
305adf8b62
Translated using Weblate (Italian)
...
Currently translated at 19.2% (176 of 915 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2017-08-11 13:02:45 +00:00
02217c8bd2
Merge pull request #1290 from matrix-org/luke/fix-user-url-no-middle-panel
...
At /user, view member of current room
2017-08-11 10:49:22 +01:00
8b4e00330a
Translated using Weblate (Hungarian)
...
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/hu/
2017-08-11 09:44:03 +00:00
454ec40b00
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes
2017-08-11 10:35:20 +01:00
0323151bee
Show a dialog if the maximum number of widgets allowed has been reached.
2017-08-10 23:53:43 +01:00
975aa0f08a
Added translation using Weblate (Indonesian)
2017-08-10 22:24:12 +00:00
12966d06cd
Merge pull request #1255 from matrix-org/t3chguy/i18n_analytics
...
un-i18n Modal Analytics
2017-08-10 15:35:46 +01:00
d3ba1f40dc
Merge pull request #1272 from matrix-org/t3chguy/hide_other_events
...
allow hiding of avatar/display name changes
2017-08-10 15:35:11 +01:00
89254e77f4
When no member, use `null` `roomId`
2017-08-10 15:23:14 +01:00
5450d6b9ca
remove redundant check and add comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 15:22:53 +01:00
41843f021d
don't track two more potential risks
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 15:21:01 +01:00
56ea528f43
don't track error messages .2
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 15:17:52 +01:00
625ca96d86
add comment about why state key must be not undefined
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 14:01:24 +01:00
a6064c53d3
export shouldHideEvent fn named
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 14:00:26 +01:00
ab3abd2f7f
fix string casing
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 13:59:55 +01:00
1603360c13
s/Membership/Member/
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 13:58:19 +01:00
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
07633fe67f
At /user, view member of current room
...
With the fallback of existing behaviour, which is UserView (no middle panel and no avatar, display name).
To improve, MemberInfo should probably track the current roomId and userId and then update the view asynchronously by re-fetching the member object when either roomId or userId change.
Also, it should be hitting the profile API to get the user's avatar if a room hasn't been specified.
2017-08-10 13:12:50 +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
185379b037
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes
2017-08-09 14:07:45 +01:00
4bc25f12cb
Move manage integrations button in to stand-alone component
2017-08-09 11:44:24 +01:00
610b2a3a42
For mentions, always use rawDisplayName and remove (IRC)
2017-08-09 10:40:06 +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
9f8e8ae1fd
Split timeline updates in to different PR.
2017-08-08 17:34:54 +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
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
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
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
18ae5fd129
Send messages on widget addition and deletion
2017-08-06 11:01:14 +01:00
308d932b2f
CancelClick prop.
2017-08-06 10:29:43 +01:00
a22e768343
Move room settings button to RoomHeader
2017-08-06 10:01:48 +01:00
1973b2bbe7
Switch app drawer icons
2017-08-05 00:00:19 +01:00
ffdffb643d
allow hiding of avatar/display name changes
2017-08-04 17:22:01 +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
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
4835123256
Added translation using Weblate (Japanese)
2017-08-03 09:15:56 +00:00
5872f2389f
Translated using Weblate (Basque)
...
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/eu/
2017-08-03 06:30:46 +00:00
da2b3c067b
Translated using Weblate (Chinese (Traditional))
...
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/zh_Hant/
2017-08-03 06:11:15 +00: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
700dd51584
Merge pull request #1267 from matrix-org/luke/fix-complete-after-blocks
...
Account for `\n` after each block
2017-08-02 16:41:47 +01:00
c914f1607b
scalar-develop is a scalar URL
2017-08-02 14:35:14 +01:00
1512aff326
Add comments
2017-08-02 11:06:02 +01:00
2c86086444
Account for `\n` after each block
...
when converting from text offsets to selection state.
fixes vector-im/riot-web#4728
2017-08-02 10:51:34 +01:00
72c1cf9288
When sorting completions, use matched string, not entire query
...
Otherwise the results vary depending on where you start autocompleting in your message. We only care about the matched string.
2017-08-02 10:09:00 +01:00
dbade448c1
Don't try to match query against roomId
...
We only care about aliases.
2017-08-02 09:40:00 +01:00
8053d2933a
Order room completions more intuitively
...
by index of the query in displayedAlias and then length of displayedAlias. (So that aliases where the query appears earlier in the string appear first and if the query is in the same index for two aliases, the shorter one appears first).
2017-08-02 09:35:07 +01:00
48faf72fdc
Disable eslint rule
2017-08-01 21:00:18 +01:00
2ab6bc84a7
Improve clarity
2017-08-01 17:49:41 +01:00
f0224460d2
Fix comparison and handle case where app has permission to load but content is mixed protocol.
2017-08-01 17:48:02 +01:00
d29610bdd2
Fix boolean comparison.
2017-08-01 17:45:06 +01:00
f57b0d4cc7
Fix invalid translation
2017-08-01 17:43:38 +01:00
ff95542549
Adjust emoji sorting such that exact matches/prefixes appear first
...
fixes https://github.com/vector-im/riot-web/issues/4704
2017-08-01 17:36:41 +01:00
bc4d979d1e
Display warning if widget is mixed content
2017-08-01 17:29:29 +01:00
240a3545d0
Translated using Weblate (Basque)
...
Currently translated at 29.2% (268 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2017-08-01 16:11:16 +00:00
2a82201551
Translated using Weblate (Basque)
...
Currently translated at 17.1% (157 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2017-08-01 16:06:46 +00:00
a40a86669a
Merge pull request #1260 from matrix-org/luke/fix-rte-pills-not-updating
...
Use componentWillReceiveProps to update pill state when props change
2017-08-01 16:30:25 +01:00
435455c9f0
Added translation using Weblate (Basque)
2017-08-01 15:29:58 +00:00
630c2968eb
Use componentWillReceiveProps
2017-08-01 16:20:32 +01:00
71abd3aff8
Revert setting of `key`
2017-08-01 16:14:12 +01:00
7fcb8c5ff0
Merge pull request #1261 from matrix-org/luke/fix-agressive-emoji-auto-replace
...
Only auto-replace emoji following ^ or \s
2017-08-01 15:56:42 +01:00
546173d246
Fix scalar token
2017-08-01 15:53:42 +01:00
438b63bee2
Only auto-replace emoji following ^ or \s
...
So as not to cause issues when typing e.g. `This is what was tested: ` (the "d:" used to be transformed into an emoji)
2017-08-01 14:26:30 +01:00
9e71ba26c4
Add `key` prop to RTE decorated entities (Pills and links)
...
This will cause a re-render when the URL of the pill/link changes.
fixes vector-im/riot-web#4718
2017-08-01 13:51:08 +01:00
abae43b65e
Merge pull request #1257 from matrix-org/rxl881/widgetPermissions
...
Widget permissions
2017-08-01 12:13:09 +01:00
5f8e86197f
Check that wurl is scalar, before checking for curl
2017-08-01 12:00:03 +01:00
596efb6062
Fix missing comma
2017-08-01 11:42:50 +01:00
46755de962
Fix event type.
2017-08-01 11:41:41 +01:00
15f39040a0
Simplify canUserModifyWidgets API
2017-08-01 11:39:17 +01:00
62af06104d
resolve -> reject because semantics.
2017-07-31 14:22:05 +01:00
f310d4446c
i18n the title of the set mxid dialog
2017-07-31 13:31:07 +01:00
25d1d21d93
copy logic from RegistrationForm to detect invalid localparts
2017-07-31 13:28:43 +01:00
4bdaa15c47
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics
2017-07-28 21:01:59 +01:00
a310ff3bab
Add ToDo item.
2017-07-28 18:21:23 +01:00
6aa1d923ce
Add comment
2017-07-28 16:48:13 +01:00
9935dd0051
Add comment to explain "fullWidth" component porperty.
2017-07-28 16:46:21 +01:00
8529a21f5c
Translate "Allow"
2017-07-28 16:42:07 +01:00
700ef34e95
Translate warning
2017-07-28 16:39:18 +01:00
4308d2c635
Inline setState.
2017-07-28 16:36:06 +01:00
50ad80ad86
Use ES6 style import
2017-07-28 16:24:32 +01:00
2e6fb1f956
Fix license header
2017-07-28 16:23:49 +01:00
6238c1d704
Fix default prop initialisation
2017-07-28 16:23:38 +01:00
6f57fe96f2
Add JS doc to indicate that the function may throw an error.
2017-07-28 16:19:20 +01:00
a901ca5308
Remove invalid OM license header.
2017-07-28 16:17:18 +01:00
8a5f2bf2ca
Interpret a `split-block` as format toggle for an empty block
...
(`split-block` is emitted when "return" is pressed)
part of fixing https://github.com/vector-im/riot-web/issues/4580
2017-07-28 14:46:57 +01:00
aff1cd9469
Add allow-presentation permission to iframe sandbox permissions
2017-07-28 11:14:04 +01:00
11335b1488
Rename variable to curlBase, for clarity
2017-07-28 10:18:06 +01:00
e1d9301eb4
Strip query parameters from content URLs
2017-07-28 10:01:58 +01:00
f4f85d053d
Translated using Weblate (Russian)
...
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/ru/
2017-07-28 07:20:47 +00:00
c0d312af10
Translated using Weblate (Russian)
...
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/ru/
2017-07-28 03:16:55 +00:00
9bbe3871e7
Translated using Weblate (Russian)
...
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/ru/
2017-07-28 00:25:06 +00:00
d69c9a36b3
Factor out check permissions code.
2017-07-27 23:38:26 +01:00
20a1693c71
Only display add app link if user has permission to add widgets in the room.
2017-07-27 23:38:02 +01:00
ccf3c1de7a
Add widget utility class. Add static method to determine if user can modify widgets in the specified room.
2017-07-27 23:37:33 +01:00
5e23d676b4
Remove comments.
2017-07-27 23:05:43 +01:00
51d160e7d6
Hide edit button when user does not have permission to edit.
2017-07-27 20:18:31 +01:00
f7e9dd4118
Add edit translation
2017-07-27 19:56:28 +01:00
6cb8b12cda
Instead of inserting MD for completion, convert the Entity later
...
This makes sure that the length of the range for a completed Entity = the length of the text in the decoration, which apparently draftjs assumes when calculating selection state offsets.
Fixes https://github.com/vector-im/riot-web/issues/4666
2017-07-27 18:17:41 +01:00
ab7fcbb5e7
Add function to determine if a user can modify widgets and style UI components as a result.
2017-07-27 18:10:28 +01:00
27923e300c
Add JSX wrapper.
2017-07-27 17:47:04 +01:00
997c7493eb
Add translations for delete widget and revoke widget access.
2017-07-27 17:46:45 +01:00
bf98c0da7c
un-i18n Modal Analytics
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-27 17:19:18 +01:00
9ee1f3962d
Set display URL from wurl if curl not specified.
2017-07-27 16:42:29 +01:00
8e4f1f0989
Add message spinner.
2017-07-27 16:41:52 +01:00
f2058e0a6c
Add message spinner component.
2017-07-27 16:41:20 +01:00
92746f8cb5
Merge pull request #1254 from matrix-org/luke/fix-join-command
...
Fix /join #alias command in markdown mode
2017-07-27 15:43:02 +01:00
5c7891a25b
Remove logs
2017-07-27 15:26:36 +01:00
e71df44fc9
Fix /join #alias command in markdown mode
...
Tab-completing a room alias inserts a markdown link, which is now stripped before a command is parsed. We also strip the MD links when doing the autocompletion itself (getAutocompleteQuery).
There is still an issue where `/invite` will not work at all with tab-completion - the text of a user Pill is not the userID but rather the display name, which cannot be used as an argument to the command.
2017-07-27 15:18:06 +01:00
dff79c4688
Only apply room pills to matrix.to room links, exclude event links
...
This fixes https://github.com/vector-im/riot-web/issues/4680
and fixes https://github.com/vector-im/riot-web/issues/4670
2017-07-27 13:01:40 +01:00
6e7adedf1e
Translated using Weblate (Russian)
...
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/ru/
2017-07-27 11:33:52 +00:00
4d4078be7e
Remove disambiguation from pills
2017-07-27 10:54:23 +01:00
f19fade448
Strip " (IRC)" from display names inserted into the timeline
2017-07-27 10:50:41 +01:00
35ce336c35
Translated using Weblate (Spanish)
...
Currently translated at 69.2% (634 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2017-07-26 18:21:48 +00:00
c4f049effe
Merge pull request #1243 from matrix-org/t3chguy/hide-join-part-2
...
T3chguy/hide join part (attempt) 2
2017-07-26 17:15:43 +01:00
9cb28ff33c
Merge pull request #1248 from matrix-org/luke/fix-rte-auto-scroll
...
Scroll to the bottom of editor if on last line
2017-07-26 16:58:36 +01:00
9f52c13bea
Grant permission to load app widget.
2017-07-26 16:47:58 +01:00
2348c24369
revert the rm-always-moves-down loop as thats done Server side...
2017-07-26 14:33:48 +01:00
3b8c408482
update comment to make explain behaviour better
2017-07-26 13:37:33 +01:00
3eb87e2aa3
change lastShownEventIndex -> lastShownEvent since some places
...
do not have the same i reference (namely MELS generation)
this way a member event at bottom of MELS (if is the last event
in the timeline will have last set appropriately)
2017-07-26 12:17:05 +01:00
762e6780d7
fix this hiding unbans as found by Luke's review
2017-07-26 11:51:41 +01:00
f42ae1662b
change wording of comment as per Luke's review
2017-07-26 11:46:59 +01:00
76f4f88fcd
App tile permissions -- broken
2017-07-26 11:28:43 +01:00
fc00eaf546
Merge branch 'develop' into luke/store-history-as-raw-content
2017-07-25 17:19:35 +01:00
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
2138b4a705
Merge pull request #1249 from uhoreg/imgfix1
...
allow width, height, alt, title attributes in img
2017-07-25 16:09:01 +01:00
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
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
7e0fecbc8c
Scroll to the bottom of editor if on last line
...
Make the MessageComposerInput scroll to the bottom if we are on the last line of the contents.
fixes https://github.com/vector-im/riot-web/issues/4652
2017-07-25 15:22:10 +01:00
eccdceae33
Rename `props` to `entityProps` for clarity
2017-07-25 11:43:12 +01:00
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
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
76e281662b
Merge pull request #1229 from matrix-org/dbkr/groupview_edit
...
UI for editing groups
2017-07-25 10:13:49 +01:00
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
ac597996e0
Remove outdated comment
2017-07-25 09:37:18 +01:00
026582bcf7
Add unmounted guard
2017-07-25 09:22:08 +01:00
5efd5bf927
done -> then, style
2017-07-25 09:20:14 +01:00
d13c4b510c
Merge branch 'develop' into luke/feature-async-pills
2017-07-24 17:39:35 +01:00
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
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
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
dc09ad8db4
Re-add NL
2017-07-24 14:50:44 +01:00
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
397201a74d
Remove subjective comment
2017-07-24 09:41:46 +01:00
b15f3c08ea
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-22 14:12:05 +00:00
8e66e64621
fix for loop - check happens before pre-inc so cause issues at end of TL
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-22 13:16:16 +01:00
c9b547368b
add algo to ensure that RM always moves forwards
...
this is needed so that if a client which does not hide any events
sets and RM at bottom of timeline, then riot-web which hides events
sets the RM it'd set it at X-N where X is bottom and N is the amount of
hidden events at bottom of the timeline, this way now an RM will
fall through to the hidden events below a seen event.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-22 13:10:57 +01:00
b976649b5b
re-add i18n string
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-22 12:52:19 +01:00
a4abd1baa7
fix comment and remove unused const
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-22 12:03:32 +01:00
ae973e1e99
unrevert some more...
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-22 11:37:21 +01:00
3631870c96
Translated using Weblate (Latvian)
...
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/lv/
2017-07-22 03:05:04 +00:00
7e355f7cda
unrevert most of the logic.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-21 23:18:18 +01:00
1fa4fe0b9a
remove comments/commented code
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-21 22:51:31 +01:00
5808fce60e
fix logic ordering
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-21 22:45:19 +01:00
17758cd1db
attempt to incorporate more code #2
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-21 20:43:03 +01:00
e47e14ed19
attempt to incorporate more code #1
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-21 20:22:01 +01:00
3859708114
re-add Unread shouldHideEvent code
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-21 19:51:13 +01:00
8167c004a8
re-add core logic
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-21 19:38:01 +01:00
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
e315b30f6a
Merge branch 'develop' into luke/fix-rte-pt-md-mentions
2017-07-21 18:06:31 +01:00
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
feaafc7a1a
Remove logging
2017-07-21 17:18:48 +01:00
Luke Barnard