29935f1dfa
Merge branch 'origin/develop' into Weblate.
2019-06-04 15:24:15 +00:00
2c11ca20ab
Translated using Weblate (West Flemish)
...
Currently translated at 99.6% (1634 of 1641 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/vls/
2019-06-04 15:24:15 +00:00
a9b9b8d0f9
Translated using Weblate (Russian)
...
Currently translated at 99.6% (1634 of 1641 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2019-06-04 15:24:12 +00:00
9f540e35bf
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (1641 of 1641 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2019-06-04 15:24:10 +00:00
4956dcf45e
Merge pull request #3056 from matrix-org/jryans/read-receipts-relations-review
...
Ensure we always show read receipts even with hidden events
2019-06-04 16:24:05 +01:00
8e811fc78e
Use the existing room object
...
For some reason, we were getting the room object for every event during read
receipt processing, even though it has been passed in as a prop already.
2019-06-04 16:01:02 +01:00
06547ef5b3
Cache hidden events setting
...
Settings is too expensive to query in a hot code path, so this caches the value
on the MessagePanel component instead.
2019-06-04 16:01:02 +01:00
62ad40d1d9
spelling
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-06-04 14:53:01 +00:00
629b776820
clarify why we dont need dialog on network error
2019-06-04 16:11:49 +02:00
b5bba91055
Merge branch 'origin/develop' into Weblate.
2019-06-04 13:35:18 +00:00
bea845a80d
Merge pull request #3059 from matrix-org/jryans/read-receipts-relations-send-review
...
Advance read receipts into trailing events without tiles
2019-06-04 14:35:14 +01:00
9897e99195
Fix login page breaking on wrong password
...
Fixes https://github.com/vector-im/riot-web/issues/9942
2019-06-04 13:51:33 +01:00
828fc85f12
Merge branch 'origin/develop' into Weblate.
2019-06-04 12:50:35 +00:00
7226f53338
Translated using Weblate (West Flemish)
...
Currently translated at 99.6% (1634 of 1641 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/vls/
2019-06-04 12:50:35 +00:00
02b613a31c
Translated using Weblate (French)
...
Currently translated at 100.0% (1641 of 1641 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-06-04 12:50:30 +00:00
cdd0e52340
Translated using Weblate (Dutch)
...
Currently translated at 99.5% (1633 of 1641 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2019-06-04 12:50:29 +00:00
158bfe5548
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (1641 of 1641 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-06-04 12:50:29 +00:00
0cc272e770
Translated using Weblate (Albanian)
...
Currently translated at 99.6% (1635 of 1641 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2019-06-04 12:50:29 +00:00
1618813652
Merge pull request #3061 from matrix-org/dbkr/remove_unused_errortext_prop
...
Remove unused errorText prop
2019-06-04 13:50:24 +01:00
e1fa53e5d4
Remove unused errorText prop
...
Login is only used from MatrixChat and that doesn't specify it
2019-06-04 13:30:36 +01:00
a11deffe5e
only show "can't redact" dialog when not a network error
...
as the redaction is queued now and might be sent later
2019-06-04 13:32:14 +02:00
e5abb2e089
Add more read receipt comments
2019-06-04 11:12:52 +01:00
3458dd4ff6
Merge branch 'origin/develop' into Weblate.
2019-06-03 23:45:21 +00:00
e53d05dc26
Translated using Weblate (Czech)
...
Currently translated at 99.9% (1640 of 1641 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2019-06-03 23:45:20 +00:00
a6995ae10a
Merge pull request #3060 from matrix-org/hs/remove-settingsstore
...
Renove SettingsStore reference in RoomSettingsDialog
2019-06-03 17:45:16 -06:00
d752389cfd
Renove SettingsStore
2019-06-03 23:31:28 +01:00
ec56de09b2
Merge branch 'origin/develop' into Weblate.
2019-06-03 20:31:47 +00:00
5b8b462ed7
Translated using Weblate (West Flemish)
...
Currently translated at 100.0% (1634 of 1634 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/vls/
2019-06-03 20:31:47 +00:00
d41fcacf9e
Translated using Weblate (Dutch)
...
Currently translated at 99.9% (1633 of 1634 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2019-06-03 20:31:43 +00:00
635b1ff612
Merge pull request #2928 from Half-Shot/hs/custom-notif-sounds
...
Custom notification sounds for rooms
2019-06-03 14:31:38 -06:00
721607b696
Remove whitespace
2019-06-03 21:19:58 +01:00
673a8fcb9d
Update src/Notifier.js
...
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-06-03 21:19:17 +01:00
96b213e7cb
Advance read receipts into trailing events without tiles
...
This changes read receipt sending logic to allow it advance further into events
without tiles (such as edits or reactions) that may exist after the last
displayed event.
By allowing the read receipt to advance past such events, this also marks as
read any related notifications. For example, edits trigger notifications by
default since they are `m.room.message` events, and with this change, such edit
notifications can finally be marked read.
Part of https://github.com/vector-im/riot-web/issues/9745
2019-06-03 18:25:35 +01:00
49574352fa
Merge branch 'origin/develop' into Weblate.
2019-06-03 16:48:07 +00:00
42c8a9b5f9
Merge pull request #3054 from matrix-org/jryans/unread-room-coomments
...
Fix comments in unread room tracking
2019-06-03 17:48:03 +01:00
456c416a33
Merge branch 'origin/develop' into Weblate.
2019-06-03 16:44:00 +00:00
0064e42e89
Translated using Weblate (West Flemish)
...
Currently translated at 100.0% (1634 of 1634 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/vls/
2019-06-03 16:44:00 +00:00
b5ed2ff75c
Translated using Weblate (Dutch)
...
Currently translated at 99.9% (1633 of 1634 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2019-06-03 16:43:57 +00:00
b13f6b8c52
Merge pull request #3057 from matrix-org/jryans/show-hidden-replacements
...
Allow source tile handler for replacements
2019-06-03 17:43:53 +01:00
300095f50f
Remove labs flag for custom notif sounds
2019-06-03 17:35:15 +01:00
b309ebf99d
Allow source tile handler for replacements
...
If the debugging mode of showing hidden events in the timeline is enabled, we
should also show replacements using the same view source tile as we do for
reactions. This allows easy debugging of replacement event data and also makes
the edit event look visually distinct from regular messages.
Fixes https://github.com/vector-im/riot-web/issues/9937
2019-06-03 16:29:20 +01:00
d97437c9ba
Merge branch 'origin/develop' into Weblate.
2019-06-03 15:14:50 +00:00
496d67473c
Translated using Weblate (West Flemish)
...
Currently translated at 99.9% (1633 of 1634 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/vls/
2019-06-03 15:14:50 +00:00
30f3ffcb82
Translated using Weblate (Russian)
...
Currently translated at 98.2% (1605 of 1634 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2019-06-03 15:14:46 +00:00
5d26f8e38e
Translated using Weblate (Dutch)
...
Currently translated at 99.9% (1633 of 1634 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2019-06-03 15:14:45 +00:00
12684c396c
Merge pull request #3055 from matrix-org/jryans/message-panel-linting
...
Fix linting in MessagePanel
2019-06-03 16:14:41 +01:00
4cea2f0af1
Ensure we always have receipts for users we've seen
...
This adds additional receipt storage to so that we can handle cases where the
receipts and events lists get out of sync. If we ever find a user who previously
had a receipt but momentarily no longer does, we recover their previous receipt
and go with that until we hear something new.
Part of https://github.com/vector-im/riot-web/issues/9745
2019-06-03 15:05:03 +01:00
f8eb449dd7
Show read receipts for hidden events on last shown event
...
This changes how we determine read receipts for the entire message panel. We now
calculate read receipts for all events up front, which makes it easier to handle
hidden events by moving their read receipts up to the last shown event for
display purposes.
Part of https://github.com/vector-im/riot-web/issues/9745
2019-06-03 15:05:03 +01:00
91e86d2b02
Fix linting in MessagePanel
2019-06-03 15:03:59 +01:00
1a37055fc3
Fix comments in unread room tracking
...
A few comments mention read marker where they really mean read receipt.
2019-06-03 15:01:28 +01:00
Weblate