mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 17:51:33 +03:00
Code Issues Projects Releases Packages Wiki Activity
15932 commits 219 branches 562 tags 474 MiB
Commit graph

15932 commits

This branch
This branch
All branches
Author SHA1 Message Date
J. Ryan Stinnett
97019fbfb5
Merge pull request #3068 from matrix-org/jryans/reaction-row-button-live 
Fix live updates to reaction row buttons
 2019-06-05 17:20:30 +01:00
J. Ryan Stinnett
c8cd1f30dd Fix live updates to reaction row buttons 
This makes the reaction row buttons take the current count as prop as an easy
way of ensuring they always trigger an update when the count changes.

Fixes https://github.com/vector-im/riot-web/issues/9954
 2019-06-05 14:54:26 +01:00
Travis Ralston
85858c731c
Merge pull request #3065 from matrix-org/travis/fix-logout 
Don't refresh custom status on logout
 2019-06-05 07:25:08 -06:00
Travis Ralston
38a4031299
Merge pull request #3066 from matrix-org/travis/no-button-guest 
Add a logged in class to EmbeddedPage and react to MatrixClient changes
 2019-06-05 07:23:45 -06:00
Bruno Windels
940b2a7ef2
Merge pull request #3058 from matrix-org/bwindels/redactions-local-echo 
Don't show "can't redact" dialog on network error, with redaction having local echo & queuing now.
 2019-06-05 07:49:51 +00:00
Travis Ralston
4fc054e1c9 Add a logged in class to EmbeddedPage and react to MatrixClient changes 
See https://github.com/vector-im/riot-web/pull/9957

The two hacks introduced here are for different reasons, mostly related to the welcome page. If you land directly on the welcome page, the app's lifecycle is highly unlikely to have a bootstrapped client. This results in the loggedIn class being false. When the client is later set up (loaded from session, new guest account registered, etc) the context fails to update for the EmbeddedPage, and we need to give it a kick to re-render. It's arguable if we should even keep using the context here.
 2019-06-04 16:08:32 -06:00
Travis Ralston
6b2dbdf7ba Don't refresh custom status on logout 
The RoomTile gets remounted during logout due to the room stores being obliterated, however this causes the render() function to check if it should be showing custom status. If you have custom status enabled, and the person has a status set, the function errors due to no MatrixClient being available.

Fixes https://github.com/vector-im/riot-web/issues/9940
 2019-06-04 15:34:11 -06:00
Bruno Windels
ef7b7628ac use Room.redactionCancelled event 2019-06-04 21:37:57 +02:00
David Baker
b412103f21
Merge pull request #3062 from matrix-org/dbkr/dont_break_on_wrong_password 
Fix login page breaking on wrong password
 2019-06-04 18:02:22 +01:00
J. Ryan Stinnett
bf52bfae15
Merge pull request #3064 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2019-06-04 17:30:33 +01:00
Nathan Follens
ace94843ef 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 16:20:10 +00:00
Nathan Follens
5b5c0222e6 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 16:20:09 +00:00
Weblate
104d3a8b05 Merge branch 'origin/develop' into Weblate. 2019-06-04 15:54:08 +00:00
J. Ryan Stinnett
ba5fd8a49d
Merge pull request #3063 from matrix-org/jryans/js-sdk-for-lint 
Install latest JS SDK when linting
 2019-06-04 16:54:03 +01:00
J. Ryan Stinnett
ba37a55a6c Install latest JS SDK when linting 
Since React SDK's linting rules depend on JS SDK, we should use the latest
changes when linting as well in case there's been a recent rule change.
 2019-06-04 16:40:45 +01:00
Weblate
29935f1dfa Merge branch 'origin/develop' into Weblate. 2019-06-04 15:24:15 +00:00
Nathan Follens
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
Walter
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
Nathan Follens
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
J. Ryan Stinnett
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
J. Ryan Stinnett
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
J. Ryan Stinnett
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
Bruno Windels
62ad40d1d9
spelling 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-06-04 14:53:01 +00:00
Bruno Windels
629b776820 clarify why we dont need dialog on network error 2019-06-04 16:11:49 +02:00
Weblate
b5bba91055 Merge branch 'origin/develop' into Weblate. 2019-06-04 13:35:18 +00:00
J. Ryan Stinnett
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
David Baker
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
Weblate
828fc85f12 Merge branch 'origin/develop' into Weblate. 2019-06-04 12:50:35 +00:00
Nathan Follens
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
Kévin C
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
Nathan Follens
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
Jeff Huang
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
Besnik Bleta
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
David Baker
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
David Baker
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
Bruno Windels
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
J. Ryan Stinnett
e5abb2e089 Add more read receipt comments 2019-06-04 11:12:52 +01:00
Weblate
3458dd4ff6 Merge branch 'origin/develop' into Weblate. 2019-06-03 23:45:21 +00:00
Stanislav Lukeš
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
Travis Ralston
a6995ae10a
Merge pull request #3060 from matrix-org/hs/remove-settingsstore 
Renove SettingsStore reference in RoomSettingsDialog
 2019-06-03 17:45:16 -06:00
Will Hunt
d752389cfd
Renove SettingsStore 2019-06-03 23:31:28 +01:00
Weblate
ec56de09b2 Merge branch 'origin/develop' into Weblate. 2019-06-03 20:31:47 +00:00
Nathan Follens
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
Nathan Follens
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
Travis Ralston
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
Will Hunt
721607b696
Remove whitespace 2019-06-03 21:19:58 +01:00
Will Hunt
673a8fcb9d
Update src/Notifier.js 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2019-06-03 21:19:17 +01:00
J. Ryan Stinnett
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
Weblate
49574352fa Merge branch 'origin/develop' into Weblate. 2019-06-03 16:48:07 +00:00
J. Ryan Stinnett
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