1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-11 01:21:03 +03:00
Commit Graph

6463 Commits

Author SHA1 Message Date
0363f73e28 Fix the MessagePanel test
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 20:57:28 -06:00
3c71898237 Add /(un)ignore to autocomplete
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 20:30:40 -06:00
6e00f70320 Hide read receipts and typing notifs for ignored users
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 20:25:51 -06:00
2e72d6cd7c Hide events that were sent by ignored users
This code only kicks in if the user was ignored after an event was sent. The homeserver should prevent other events from coming in.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 20:16:56 -06:00
3889df6b08 Add (un)ignore button to MemberInfo
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 19:42:09 -06:00
13a251e29c Give feedback for /ignore and /unignore
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 16:21:36 -06:00
2d517079d9 Add unresponsive /ignore and /unignore commands
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 16:08:51 -06:00
2bc866b997 Clean up UserSettings for linting
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 16:08:20 -06:00
4579d20fd0 Unignore people from the settings
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 15:33:36 -06:00
4df16e8245 Display which users are ignored in the user settings
Adds https://github.com/vector-im/riot-web/issues/1767

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 12:51:53 -06:00
94ec11d3e1 Merge pull request #1384 from matrix-org/dbkr/fix_oobdata
Fix the avatar / room name in room preview
2017-09-14 10:42:24 +01:00
bb8538cd1a Merge pull request #1381 from matrix-org/dbkr/remove_spurious_cancel_button
Remove spurious cancel button
2017-09-14 10:38:26 +01:00
db31033089 Merge pull request #1386 from matrix-org/dbkr/fix_email_dm
Fix starting a chat by email address
2017-09-13 18:06:31 +01:00
34134f0d43 Fix starting a chat by email address
Regression introduced whilst refactoring for groups support.
2017-09-13 17:37:43 +01:00
ffb3d718d3 Fix the avatar / room name in room preview
When clicking on rooms from the room directory. When RoomViewStore
resolved the room alias, it threw away the out-of-band data in the
process. This must have been broken as part of the ILAG /
RoomViewStore stuff.
2017-09-13 15:48:53 +01:00
081a900524 Merge pull request #1363 from matrix-org/t3chguy/on_copy_tooltip
respond on copy code block
2017-09-13 14:27:35 +01:00
2c0dae8c52 Merge pull request #1383 from matrix-org/t3chguy/fix-dateutils
fix DateUtils inconsistency with 12/24h
2017-09-13 14:27:04 +01:00
fea7af11b4 Merge remote-tracking branch 'origin/t3chguy/on_copy_tooltip' into t3chguy/on_copy_tooltip 2017-09-13 14:18:56 +01:00
d3bfdf495c initialize value with false to prevent undefined.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-13 14:18:31 +01:00
49724cd413 Merge pull request #1382 from matrix-org/t3chguy/sub-sup
allow sending sub,sup and whitelist them on receive
2017-09-13 13:39:00 +01:00
c810665b92 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix-dateutils 2017-09-13 13:24:48 +01:00
1b73707e05 fix DateUtils inconsistency with 12/24h
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-13 13:20:24 +01:00
39470c44a3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/sub-sup 2017-09-13 12:15:12 +01:00
a0855a2869 allow sending sub,sup and whitelist them on receive
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-13 12:04:46 +01:00
8abd35f581 Remove spurious cancel button
That appeared if you clicked on a room from the room directory
(it didn't do anything). It's only supposed to be shown when
editing room settings.
2017-09-12 15:48:13 +01:00
8ad69eee49 Merge pull request #1380 from matrix-org/dbkr/update_roomlist_event_decrypted
Update roomlist when an event is decrypted
2017-09-12 15:33:52 +01:00
757bc9fe32 Update roomlist when an event is decrypted
Events are now decrypted asynchronously, so are not decrypted
at the time of the Room.timeline which is when our RoomList
got the chance to update. It needs to update once the event has
been decrypted.

Ideally we would not update the whole room list order, but this is
how all the room list re-ordering happens right now, so staying
consistent with this.

Fixes https://github.com/vector-im/riot-web/issues/5020
2017-09-12 14:47:26 +01:00
558cb8fda0 Merge pull request #1379 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-09-12 12:57:28 +01:00
130a2fe978 Translated using Weblate (Polish)
Currently translated at 96.1% (820 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2017-09-12 11:51:44 +00:00
1e400fd9a6 Translated using Weblate (Czech)
Currently translated at 25.7% (220 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2017-09-12 11:51:44 +00:00
e84d30cd11 Translated using Weblate (Polish)
Currently translated at 96.1% (820 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2017-09-12 11:42:09 +00:00
b2a22bc8e3 Translated using Weblate (Polish)
Currently translated at 96.1% (820 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2017-09-12 11:39:15 +00:00
ae64d32b70 Merge remote-tracking branch 'origin/develop' into develop 2017-09-12 10:56:28 +00:00
75e8e247ae Translated using Weblate (Swedish)
Currently translated at 50.0% (427 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2017-09-12 10:56:26 +00:00
24009eb7b0 Translated using Weblate (Polish)
Currently translated at 95.7% (817 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2017-09-12 10:56:26 +00:00
3fca607d07 Translated using Weblate (Hungarian)
Currently translated at 99.7% (851 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-09-12 10:56:26 +00:00
5a73b4c51b Translated using Weblate (German)
Currently translated at 100.0% (853 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-09-12 10:56:26 +00:00
fd0e8314b1 Translated using Weblate (Finnish)
Currently translated at 10.9% (93 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2017-09-12 10:56:26 +00:00
50db05c614 Translated using Weblate (Dutch)
Currently translated at 99.7% (851 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2017-09-12 10:56:25 +00:00
79f834d184 Translated using Weblate (Basque)
Currently translated at 99.6% (850 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2017-09-12 10:56:25 +00:00
dd952ad432 Translated using Weblate (Polish)
Currently translated at 95.6% (816 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2017-09-12 10:56:24 +00:00
ac8adbb1a2 Translated using Weblate (Polish)
Currently translated at 95.6% (816 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2017-09-12 10:54:54 +00:00
d90aa6ec20 Merge pull request #1368 from matrix-org/t3chguy/fix_theme
fix radio for theme selection
2017-09-12 11:54:49 +01:00
dc88a5ba5e Translated using Weblate (German)
Currently translated at 100.0% (853 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-09-12 10:41:58 +00:00
33c8907267 Merge remote-tracking branch 'origin/develop' into develop 2017-09-12 09:52:22 +00:00
802f53dc24 Merge pull request #1378 from matrix-org/t3chguy/zh_Hans-1
fix some more zh_Hans - remove entirely broken lines
2017-09-12 10:52:08 +01:00
0b6d352cf4 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
Conflicts:
	src/i18n/strings/de_DE.json
	src/i18n/strings/fi.json
	src/i18n/strings/hu.json
	src/i18n/strings/nl.json
	src/i18n/strings/pl.json
	src/i18n/strings/ru.json
	src/i18n/strings/zh_Hant.json
2017-09-12 09:33:58 +00:00
9920cd4f55 fix some more zh_Hans - remove entirely broken lines 2017-09-12 10:24:56 +01:00
0cdb9322e9 Translated using Weblate (Spanish)
Currently translated at 80.7% (785 of 972 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2017-09-12 09:10:07 +00:00
f124a9069b Translated using Weblate (Polish)
Currently translated at 97.3% (946 of 972 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2017-09-12 09:10:07 +00:00