f3a4856593
Merge remote-tracking branch 'origin/develop' into dbkr/fix_slash_join
2017-09-14 23:09:26 +01: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
1f837d2ae1
Make /join join again
...
The auto_join parameter to view_room got broken at some point so
/join took you to the room and then sat there like a lemon.
Fixes https://github.com/vector-im/riot-web/issues/5029
2017-09-14 23:06:00 +01:00
4579d20fd0
Unignore people from the settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 15:33:36 -06:00
6b6e59e0dd
Display spinner not room preview after room create
...
After creating a room, display the activity spinner while we wait
for the room to come down the event stream.
This was the intention before but I can't see how it would have
worked: we were setting the 'joining' flag, but then resetting it
by claiming we were already joined in the view_room dispatch.
* Send 'joining' instead of 'joined' in view_room dispatch, which
will set the corresponding joining flag (ie. to indicate we've
sent a request to join the room). Remove the 'joined' flag.
* Reset 'joining' to false otherwise on a view_room dispatch to
prevent it from leaking between rooms (this may have been the
intention of the `if (payload.joined) newState.joining = false`?
Fixes https://github.com/vector-im/riot-web/issues/4701
2017-09-14 22:22:21 +01: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
f612b1933b
start MELS expanded if it contains a highlighted/permalinked event.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-14 17:53:47 +01:00
8dc2604d63
Show who redacted an event on hover
...
This should fix #3931 although it's not obvious who actually performed the redaction.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 09:03:05 -06:00
c9d8005a4d
Translated using Weblate (Basque)
...
Currently translated at 100.0% (855 of 855 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2017-09-14 10:23:17 +00:00
daabf06bdb
Merge remote-tracking branch 'origin/develop' into develop
2017-09-14 09:42:27 +00: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
5a2c74a893
Merge remote-tracking branch 'origin/develop' into develop
2017-09-14 09:38:30 +00: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
c890eea88a
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 80.7% (690 of 855 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2017-09-14 08:02:23 +00:00
09fdd2bf0e
Translated using Weblate (Russian)
...
Currently translated at 100.0% (855 of 855 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-09-14 05:11:57 +00:00
0f18528415
Merge remote-tracking branch 'origin/develop' into develop
2017-09-13 17:06:35 +00:00
b6c235b463
Translated using Weblate (Polish)
...
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/pl/
2017-09-13 17:06:34 +00: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
4ee023b4ef
Translated using Weblate (Finnish)
...
Currently translated at 40.8% (349 of 855 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2017-09-13 16:14:53 +00:00
5087da9247
Merge remote-tracking branch 'origin/develop' into luke/feature-flair
2017-09-13 16:52:12 +01:00
3c3328c5f1
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
2017-09-13 16:34:39 +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
57b1b42ec6
Translated using Weblate (German)
...
Currently translated at 100.0% (855 of 855 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-09-13 13:59:16 +00:00
6bcb160ba3
Merge remote-tracking branch 'origin/develop' into develop
2017-09-13 13:27:40 +00:00
5e65a9696c
Translated using Weblate (Polish)
...
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/pl/
2017-09-13 13:27:39 +00: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
3cb333efdf
Merge remote-tracking branch 'origin/develop' into develop
2017-09-13 13:27:09 +00:00
9d3ae94a01
Translated using Weblate (Polish)
...
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/pl/
2017-09-13 13:27:09 +00: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
af62af3a6f
Merge remote-tracking branch 'origin/develop' into develop
2017-09-13 12:39:04 +00:00
091dcdc131
Translated using Weblate (Polish)
...
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/pl/
2017-09-13 12:39:04 +00: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
09e232dda5
Translated using Weblate (Polish)
...
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/pl/
2017-09-13 10:49:56 +00:00
b450af5e3e
Translated using Weblate (Chinese (Traditional))
...
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/zh_Hant/
2017-09-12 23:20:48 +00: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
49723f03ea
Merge remote-tracking branch 'origin/develop' into develop
2017-09-12 14:33:56 +00: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
181a91282b
Translated using Weblate (Russian)
...
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/ru/
2017-09-12 13:28:33 +00: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
David Baker