Richard Lewis
003cf61388
Handle remove sticker picker errors.
2018-03-29 21:16:35 +01:00
Richard Lewis
2e6d6c83cd
Add back in body 'ref'
2018-03-29 21:16:12 +01:00
Richard Lewis
93804e80b8
Return promise
2018-03-29 20:37:24 +01:00
Richard Lewis
9a3f3562e1
Wait for setAccountData to complete.
2018-03-29 20:07:26 +01:00
Andrey
248d1d6c58
Translated using Weblate (Russian)
...
Currently translated at 100.0% (999 of 999 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-03-29 18:01:37 +00:00
Weblate
1447c04dda
Merge remote-tracking branch 'origin/develop' into develop
2018-03-29 17:33:49 +00:00
David Baker
a79c558763
Merge pull request #1818 from matrix-org/dbkr/dont_notify_bad_encrypted
...
Don't notify for bad encrypted messages
2018-03-29 18:33:44 +01:00
Richard Lewis
20cbc01698
Add callback handler for integration manager close.
2018-03-29 18:32:49 +01:00
David Baker
d6b3083c2f
Don't notify for bad encrypted messages
...
Continue to wait for decryption if the decryption process failed.
Because we weren't doing this, the first message in a megolm session
was generally failing to decrypt the first time because the keys often
arrive after the message.
Fixes https://github.com/vector-im/riot-web/issues/6284
This is is small & safe enough that we may want to consider
putting it in 0.14 if we're cutting another RC.
2018-03-29 18:18:53 +01:00
Richard Lewis
5ba18b5ee2
Avoid redefining function parameter
2018-03-29 18:13:23 +01:00
Richard Lewis
3d9bdb90ca
Consistent async / await / promises.
2018-03-29 17:56:12 +01:00
Richard Lewis
b1e7dcf216
Cleanup / simplify code.
2018-03-29 17:52:34 +01:00
Richard Lewis
6181ca642f
"Stickerpack" translation.
2018-03-29 17:47:53 +01:00
Richard Lewis
c8f9586c9b
Check for valid reference.
2018-03-29 17:35:21 +01:00
Michael Telatynski
8fa4a525d8
Merge remote-tracking branch 'origin/t3chguy/m.relates_to' into t3chguy/m.relates_to
2018-03-29 17:34:49 +01:00
Michael Telatynski
a390cecf92
fix missing null-guard
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-03-29 17:34:08 +01:00
Krombel
50a2756203
Translated using Weblate (German)
...
Currently translated at 100.0% (999 of 999 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-03-29 16:32:34 +00:00
Luke Barnard
c9283ad988
Merge branch 'luke/feature-group-set-joinable' of github.com:matrix-org/matrix-react-sdk into luke/feature-group-set-joinable
2018-03-29 17:28:44 +01:00
Richard Lewis
67f755efcb
Comment.
2018-03-29 17:26:54 +01:00
Richard Lewis
e21cc14e5b
Comment.
2018-03-29 17:26:19 +01:00
Richard Lewis
38c8bc7d9a
Consistent function naming.
2018-03-29 17:25:07 +01:00
Luke Barnard
2bc8d6d3a4
Use less confusing values on radio buttons
2018-03-29 17:25:06 +01:00
Richard Lewis
9c10d243e8
Add comment.
2018-03-29 17:09:03 +01:00
Richard Lewis
f383298267
Remove duplicate event handler.
2018-03-29 17:08:07 +01:00
Luke Barnard
e9193ff0b6
Merge branch 'develop' into luke/feature-group-set-joinable
2018-03-29 17:01:19 +01:00
Richard Lewis
cafbd2904e
Remove unused ref.
2018-03-29 16:57:21 +01:00
Luke Barnard
f42cdf6a4c
Add radio button for setting group is_joinable
...
which dictates whether the group can be joined without invitation.
2018-03-29 16:57:07 +01:00
Richard Lewis
aefccb134c
Ensure deleting is set to false.
2018-03-29 16:56:25 +01:00
Richard Lewis
35fcb2c9ab
Catch rather than 'done' error handler.
2018-03-29 16:56:02 +01:00
Richard Lewis
23a52bdb4c
Indentation.
2018-03-29 16:46:22 +01:00
Richard Lewis
a1581ad2dc
Don't swallow error.
2018-03-29 16:24:03 +01:00
Richard Lewis
5fc9b8a6b8
Indentation.
2018-03-29 16:23:20 +01:00
Kévin C
fdf38bb871
Translated using Weblate (French)
...
Currently translated at 100.0% (999 of 999 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-03-29 15:20:02 +00:00
Weblate
0bd24027f7
Merge remote-tracking branch 'origin/develop' into develop
2018-03-29 14:44:50 +00:00
Luke Barnard
1226ad3330
Merge pull request #1815 from matrix-org/luke/feature-group-join
...
Join this community button
2018-03-29 15:44:46 +01:00
Weblate
fc0b73c29a
Merge remote-tracking branch 'origin/develop' into develop
2018-03-29 14:43:59 +00:00
Luke Barnard
a92f822b04
Merge pull request #1816 from matrix-org/luke/reword-group-settings-delay-warning
...
Reword group setting delay
2018-03-29 15:43:54 +01:00
Luke Barnard
c4322892de
Reword group setting delay
2018-03-29 14:33:54 +01:00
Luke Barnard
2dea5cd233
run gen-i18n
2018-03-29 12:39:21 +01:00
Luke Barnard
385211528d
Implement "Join this community" button
...
for groups that have truthy summary.profile.is_joinable.
2018-03-29 12:39:09 +01:00
Richard Lewis
b4e70e30f3
Expects object, not naked ID.
2018-03-28 19:21:49 +01:00
Richard Lewis
4ac9653ab9
Refactor widget postMessage API.
2018-03-28 12:22:06 +01:00
Weblate
f942782ffe
Merge remote-tracking branch 'origin/develop' into develop
2018-03-28 11:00:38 +00:00
Luke Barnard
b40b417153
Merge pull request #1814 from matrix-org/luke/track-page-change-duration
...
Track duration of page changes
2018-03-28 12:00:32 +01:00
Luke Barnard
00167fbc06
Init page change state in willMount
2018-03-28 11:25:28 +01:00
Luke Barnard
8d994f2788
Merge branch 'develop' into luke/track-page-change-duration
2018-03-28 10:56:36 +01:00
Luke Barnard
f29b58aba5
Always expect generationTimeMs
2018-03-28 10:31:03 +01:00
Luke Barnard
187e8ab8a8
Remove unused variable
2018-03-28 10:27:24 +01:00
Luke Barnard
c8312dd5ae
Use a less fragile API to track page change performance
2018-03-28 10:25:28 +01:00
Michael Telatynski
fac89d9c58
Merge branch 'develop' into t3chguy/m.relates_to
2018-03-28 08:38:33 +00:00