PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
8590 commits 1 branch 0 tags 338 MiB
Commit graph

8590 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
338c9f7fbd Merge remote-tracking branch 'origin/develop' into develop 2018-02-09 12:24:49 +00:00
Марко М. Костић
22aedb6075 Translated using Weblate (Serbian) 
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
 2018-02-09 12:24:49 +00:00
Simó Albert i Beltran
52181fde95 Translated using Weblate (Catalan) 
Currently translated at 88.3% (871 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
 2018-02-09 12:24:48 +00:00
David Baker
3d174b0207 Merge branch 'release-v0.11.4' into develop 2018-02-09 12:24:36 +00:00
David Baker
3e4175f3e0 Add isUrlPermitted function 2018-02-09 12:20:05 +00:00
Osoitz
cf0d45a65b Translated using Weblate (Basque) 
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-02-09 10:28:52 +00:00
Марко М. Костић
16049bff3d Translated using Weblate (Serbian) 
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
 2018-02-08 21:16:29 +00:00
Weblate
8b693c08b7 Merge remote-tracking branch 'origin/develop' into develop 2018-02-08 10:31:18 +00:00
Марко М. Костић
5cf3d3176f Translated using Weblate (Serbian) 
Currently translated at 91.1% (899 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
 2018-02-08 10:31:18 +00:00
Luke Barnard
754b7fbad5
Merge pull request #1737 from matrix-org/rav/roomview_unmounted 
RoomView: guard against unmounting during peeking
 2018-02-08 10:31:12 +00:00
Richard van der Hoff
5823b32ab1
RoomView: guard against unmounting during peeking 
it's possible for the user to change room before the peek operation completes. Check if we've been unmounted before setting state.
 2018-02-08 10:01:24 +00:00
Weblate
b3cd0d6da0 Merge remote-tracking branch 'origin/develop' into develop 2018-02-07 16:09:51 +00:00
David Baker
d51f6ceea2
Merge pull request #1736 from matrix-org/luke/fix-hs-is-urls-reset 
Fix HS/IS URL reset when switching to Registration
 2018-02-07 16:09:43 +00:00
lukebarnard
45ad46b468 Fix HS/IS URL reset when switching to Registration 2018-02-07 15:58:29 +00:00
Weblate
cc30f0c15a Merge remote-tracking branch 'origin/develop' into develop 2018-02-07 12:04:39 +00:00
Robert A. Viana
34eae0fbde Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 67.0% (661 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
 2018-02-07 12:04:38 +00:00
Jeff Huang
8d21803df5 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-02-07 12:04:37 +00:00
Luke Barnard
9da708335a
Merge pull request #1734 from matrix-org/dbkr/fix_call_buttons_canary_2 
Fix the reject/accept call buttons in canary (mk2)
 2018-02-07 12:04:34 +00:00
David Baker
8eb4137ec3 missing semicolon 2018-02-07 11:51:41 +00:00
David Baker
2a68e3ea39 import sdk 2018-02-07 11:42:50 +00:00
Weblate
211cfedc21 Merge remote-tracking branch 'origin/develop' into develop 2018-02-07 10:16:40 +00:00
David Baker
383ef8b2ef
Merge pull request #1731 from matrix-org/dbkr/rate_limited_func_time_from_finish 
Make ratelimitedfunc time from the function's end
 2018-02-07 10:16:36 +00:00
David Baker
0a5bf07913 Use getComponent 2018-02-07 10:13:19 +00:00
Weblate
fd1daa70d3 Merge remote-tracking branch 'origin/develop' into develop 2018-02-07 09:54:36 +00:00
Марко М. Костић
b65e80fa53 Translated using Weblate (Serbian) 
Currently translated at 80.4% (793 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
 2018-02-07 09:54:36 +00:00
Szimszon
443c19c6e1 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-02-07 09:54:35 +00:00
Krombel
74a28a7496 Translated using Weblate (German) 
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-02-07 09:54:35 +00:00
Luke Barnard
b4896dc108
Merge pull request #1735 from matrix-org/luke/dialog-matrix-context 
Give dialogs a matrixClient context
 2018-02-07 09:54:31 +00:00
lukebarnard
c1649d1b75 Give dialogs a matrixClient context 
Dialogs are mounted outside of the main react tree of MatrixChat,
so they won't have its child context.
 2018-02-07 09:45:36 +00:00
Krombel
ae094bebe5 Translated using Weblate (German) 
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-02-07 09:40:38 +00:00
Peter Vágner
054849bc18 Translated using Weblate (Slovak) 
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2018-02-07 08:53:50 +00:00
Szimszon
1b196655fa Translated using Weblate (Hungarian) 
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-02-06 21:11:38 +00:00
Kévin C
ab88c1cf58 Translated using Weblate (French) 
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-02-06 19:11:45 +00:00
David Baker
424c367ecc Fix the reject/accept call buttons in canary (mk2) 
Fixes https://github.com/vector-im/riot-web/issues/6081 by making
the accept/reject buttons AccessibleButtons which they should be
anyway (presumably the role=button makes chrome do the right thing
with the events). Also swallow the onClick event otherwise that
propagates out to the room header and causes it to expand/collapse.
 2018-02-06 18:45:43 +00:00
Weblate
0601d65af7 Merge remote-tracking branch 'origin/develop' into develop 2018-02-06 17:50:58 +00:00
Luke Barnard
cf4ae681f4
Offline mode (#1723) 
* Allow the client to run without connection to HS (i.e. using indexeddb)

Allows running without having pushRules (it's safe not to have these 
when running from indexeddb sync.)

This means rooms will be displayed with "unknown" notifcation state.

This assumes anything that uses the push rules will get pushRule state
again when the client starts syncing again.

For recovering from being disconnected, 
* If an avatar has fallen back, try again on reconnection
* If a thumbnail image failed to load, retry on reconnect
* Load joined groups when reconnecting

Update tests to give MELS a context.matrixClient
 2018-02-06 17:50:53 +00:00
Weblate
23df00a53d Merge remote-tracking branch 'origin/develop' into develop 2018-02-06 15:26:54 +00:00
Luke Barnard
9625180fbe
Merge pull request #1732 from matrix-org/dbkr/fix_addpresspicker_keys 
Fix key bindings in address picker dialog
 2018-02-06 15:26:48 +00:00
David Baker
6162c0b360 Fix key bindings in address picker dialog 
Another regression from https://github.com/matrix-org/matrix-react-sdk/pull/1674

Fixes https://github.com/vector-im/riot-web/issues/5994
 2018-02-06 15:01:14 +00:00
David Baker
aab57d091d Make ratelimitedfunc time from the function's end 
Otherwise any function tghat takes longer than the delay to execute
will become eligible for execution again immediately after
finishing and therefore be able to spin.

This should help with https://github.com/vector-im/riot-web/issues/6060
(at least in the respect that it makes ratelimitedfunc do its job)
even if it's not the reason Riot started getting wedged.
 2018-02-06 14:39:13 +00:00
Andrey
6a858863fc Translated using Weblate (Russian) 
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-02-06 12:41:26 +00:00
Weblate
3a5e69d7b5 Merge remote-tracking branch 'origin/develop' into develop 2018-02-06 10:38:05 +00:00
Robert A. Viana
623cc10ab0 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 67.0% (660 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
 2018-02-06 10:38:04 +00:00
Luke Barnard
127eb61d36
Merge pull request #1730 from matrix-org/dbkr/display_name_change_message 
Fix display name change text
 2018-02-06 10:37:59 +00:00
David Baker
3398c29aa5 Revert unintentional package.josn change 2018-02-06 10:31:37 +00:00
David Baker
f1eb899cad Re-run i18n script & prune 2018-02-06 10:26:37 +00:00
David Baker
8458023bbc Fix display name change message 
(i18n file fixes coming separately for ease of review)

Fixes https://github.com/vector-im/riot-web/issues/5171
 2018-02-06 10:24:38 +00:00
Weblate
584e47a031 Merge remote-tracking branch 'origin/develop' into develop 2018-02-06 09:14:42 +00:00
Robert A. Viana
0f2ca3bd95 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 66.9% (659 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
 2018-02-06 09:14:42 +00:00
Luke Barnard
71aa4ee9e1
Merge pull request #1721 from matrix-org/t3chguy/composer_slashcmd_history 
Persist contentState when sending SlashCommand via MessageComposerInput
 2018-02-06 09:14:36 +00:00