b9f597b75f
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1180 of 1180 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-05-23 10:16:09 +00:00
0baeedec9c
Merge remote-tracking branch 'origin/develop' into develop
2018-05-23 10:07:21 +00:00
a6e7a8106c
Translated using Weblate (Swedish)
...
Currently translated at 78.2% (923 of 1179 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-05-23 10:07:21 +00:00
a6cc0406dd
Merge pull request #1921 from matrix-org/luke/widget-cookie-warning
...
Add cookie warning to widget warning (AppPermission)
2018-05-23 11:07:16 +01:00
ef686a966d
Add cookie warning to widget warning (AppPermission)
2018-05-23 10:46:32 +01:00
c11635172e
Merge remote-tracking branch 'origin/develop' into develop
2018-05-23 09:17:19 +00:00
424dea1d4a
Translated using Weblate (Swedish)
...
Currently translated at 77.2% (909 of 1176 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-05-23 09:17:19 +00:00
c1a42637e7
Merge pull request #1919 from matrix-org/luke/consent-dialog
...
Terms and Conditions dialog
2018-05-23 10:17:14 +01:00
5b4a036e8c
bump dep
2018-05-23 03:53:05 +01:00
f40af434bc
unbreak Markdown.toPlaintext
2018-05-23 03:46:53 +01:00
95bfface99
comment out broken logic for stripping p tags & bump dep
2018-05-23 03:43:40 +01:00
079b1238a1
bump right dep
2018-05-23 03:20:59 +01:00
a822a1c9a0
bump dep
2018-05-23 03:19:33 +01:00
6f3634c33f
bump slate-md-serializer
2018-05-23 03:08:55 +01:00
edc8264cff
shift to custom slate-md-serializer
2018-05-23 02:48:57 +01:00
fc1c4996fc
slate-md-serializer 3.1.0 now escapes correctly
2018-05-23 02:15:34 +01:00
6fba8311f9
escape blockquotes correctly
...
and fix NPE
2018-05-23 02:09:37 +01:00
6ac2324874
fix wordwrap and pre formatting
2018-05-23 01:43:03 +01:00
794a60b9f8
refocus editor immediately after executing commands
...
and persist selections correctly across blur/focus
2018-05-23 01:36:21 +01:00
ab5a4f58a2
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (1176 of 1176 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-05-22 23:56:28 +00:00
e7a4ffaf45
fix emojioneifying autoconverted emoji
2018-05-23 00:52:00 +01:00
cace5e8bfc
fix bug where selection breaks after inserting emoji
2018-05-23 00:41:46 +01:00
975332633b
Translation.
2018-05-23 00:26:55 +01:00
97f57edba7
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1176 of 1176 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-05-22 19:13:01 +00:00
6df3371c6c
Add a "reload widget" button.
2018-05-22 19:14:54 +01:00
c9c3cf55de
Translated using Weblate (French)
...
Currently translated at 100.0% (1176 of 1176 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-05-22 17:09:32 +00:00
658e88c30f
Implement consent/terms and conditions dialog for /_matrix/consent flow
2018-05-22 18:03:56 +01:00
538979a4ee
Fix MVideoBody spinner
2018-05-22 17:13:45 +01:00
c249bee9b5
Grammar
2018-05-22 16:09:54 +01:00
f22094dc51
Merge remote-tracking branch 'origin/develop' into develop
2018-05-22 15:07:09 +00:00
c47c7b8d98
Merge pull request #1902 from matrix-org/t3chguy/room_settings_muted_users
...
improve privileged section users in room settings
2018-05-22 16:07:01 +01:00
e602213806
Add concept of priority modal to modal manager
2018-05-22 15:47:05 +01:00
31dcd85c08
Add customisable cancel button to QuestionDialog
2018-05-22 15:45:58 +01:00
fb5dd4a410
Remove spurious fixupHeight
2018-05-22 10:46:10 +01:00
e4f8c09c32
Only include placeholder in DOM when necessary
2018-05-22 10:43:16 +01:00
e8e847e799
Merge remote-tracking branch 'origin/develop' into develop
2018-05-22 08:42:12 +00:00
38f446a364
Translated using Weblate (Russian)
...
Currently translated at 99.8% (1173 of 1175 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-05-22 08:42:12 +00:00
a0bc681052
Translated using Weblate (Italian)
...
Currently translated at 99.4% (1169 of 1175 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2018-05-22 08:42:12 +00:00
1895f82d62
Merge pull request #1918 from matrix-org/dbkr/leave_room_warning_space
...
Space between sentences in 'leave room' warning
2018-05-22 09:42:06 +01:00
ae10491f95
Space between sentences in 'leave room' warning
2018-05-22 09:28:41 +01:00
e9ae3de00f
Merge branch 'develop' into luke/kill-mimage-fixupheight
2018-05-21 17:15:54 +01:00
836dc8b0ef
Factor out all shared logic between MStickerBody and MImageBody
...
The benefits of this:
- One code path for determining spinner/placeholder and it's position
for loading images/stickers. This includes spinner used in e2e
decryption of images.
- Very small definition for MStickerBody, only overriding the minimal
differences is has from MImageBody.
The disadvantages:
- Slightly more complicated MImageBody, but hopefully not less
readable.
2018-05-21 16:59:13 +01:00
11cea61661
refocus editor after clicking on autocompletes
2018-05-21 12:28:08 +01:00
35ab573bc5
Update sinon to 5.0.7
2018-05-21 18:44:00 +09:00
7de45f8b7b
make quoting work
2018-05-21 03:48:59 +01:00
4439a04689
fix lint
2018-05-20 23:43:42 +01:00
b616fd025e
comment out all the tests for now
2018-05-20 23:34:06 +01:00
e460cf35e0
hide formatting bar for MD editor
2018-05-20 22:48:40 +01:00
f981d7b729
unify buttons on the node type names, and make them work
2018-05-20 22:39:40 +01:00
d799b7e424
refactor roundtripping into a single place
...
and fix isRichTextEnabled to be correctly camelCased everywhere...
2018-05-20 16:30:39 +01:00
Szimszon