59210564b7
Fix upload cancel in e2e rooms
...
This is a bit of a mess of passing promises around - we weren't
taking the right promise to pass to cancelUpload.
Also e2e uploads take time to read into memory & encrypt, so allow
cancelling them during those phases too, even though we can't abort
those phases before they're done - we do mark the upload as cancelled
though so filter the current uploads for cancelled ones.
Fixes https://github.com/vector-im/riot-web/issues/4891
2019-04-08 17:53:39 +01:00
054011f5f8
Merge pull request #2890 from jryans/guard-missing-crypto
...
Set E2E room status to warning when crypto is disabled
2019-04-08 16:56:19 +01:00
670f6e4f99
Simplify settings dialog CSS
...
Stop the settings dialogs from requiring special styles on the
mx_Dialog which required passing in a classname from anywhere the
settings dialogs were opened (although this still requires
static=true). Some of the things have now been adopted for all dialogs
(border-radius), others have been moved to within the dialog content.
2019-04-08 16:48:42 +01:00
20c31082b5
Set E2E room status to warning when crypto is disabled
...
When crypto is disabled for the current device, we can't tell whether there are
unverified devices since we aren't tracking devices at all.
Let's be safe and default to the warning state.
See also https://github.com/matrix-org/matrix-js-sdk/pull/889
2019-04-08 16:28:19 +01:00
381c2f613d
Merge branch 'master' into develop
2019-04-08 16:13:48 +02:00
21de0235b0
v1.0.7
2019-04-08 16:13:03 +02:00
192951c7e2
Prepare changelog for v1.0.7
2019-04-08 16:13:03 +02:00
ab02c80ede
bump js-sdk to 1.0.4
2019-04-08 16:08:46 +02:00
77515f0b58
Remove duplicate space in credits
2019-04-08 14:40:08 +01:00
d400ebde65
add new dependencies to lock file
2019-04-08 15:34:51 +02:00
de4788a3d5
Merge pull request #2888 from matrix-org/dbkr/dbkr/settings_dialog_width_2
...
Move SettingsDialog width override to fixedWidth
2019-04-08 14:28:29 +01:00
20aedce62f
more lint
2019-04-08 15:26:11 +02:00
7b5658e3b1
Fix CSS silliness
...
Meant to replace the existing block rather than add another one
with the same name! Also meant vw rather than width.
2019-04-08 14:21:12 +01:00
833b46d040
Move SettingsDialog width override to fixedWidth
...
Move the width overrides to the container so it's the same thing
dictating its size as the rest of the dialogs
2019-04-08 14:17:18 +01:00
45f3282b1b
cleanup and linting
2019-04-08 14:57:39 +02:00
a53d9f59fe
Merge pull request #2882 from matrix-org/travis/permalink-explosion
...
Prevent the permalink creator from causing cascading failure
2019-04-08 06:56:13 -06:00
4ec2035f09
Merge pull request #2881 from matrix-org/travis/split-as-directory
...
Don't include all networks by default in the room directory
2019-04-08 06:55:39 -06:00
c245eae390
Merge pull request #2886 from matrix-org/dbkr/fix_fixedwidth_dialog
...
Fix fixed width dialogs
2019-04-08 13:53:58 +01:00
3fdf822d46
Fix fixed width dialogs
...
Move the max-width to the fixedWidth div rather than the dialog,
otherwise the fixedWidth keeps getting bigger with bigger windows
but the dialog doesn't so it scrolls.
2019-04-08 13:37:29 +01:00
af83bdb317
Merge pull request #2885 from matrix-org/dbkr/fix_settings_dialog_layout
...
Fix settings dialog layout
2019-04-08 12:11:26 +01:00
c87c4ef5a4
Fix settings dialog layout
...
The close 'x' was ending up off the right hand side which made
everything else overlap with the left panel, depending on how wide
your window was.
This isn't the end of the dialog problems but it will at least stop
settings from being mangled on develop.
2019-04-08 11:56:08 +01:00
b63cbe20ce
Merge pull request #2884 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate
2019-04-08 09:57:39 +01:00
6af2c00002
Merge branch 'origin/develop' into Weblate.
2019-04-08 08:35:19 +00:00
5020d86c69
Translated using Weblate (Swedish)
...
Currently translated at 82.3% (1303 of 1582 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2019-04-08 08:35:16 +00:00
3e300edac5
Translated using Weblate (Romanian)
...
Currently translated at 5.4% (86 of 1582 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/ro/
2019-04-08 08:35:11 +00:00
67488165dd
Translated using Weblate (Italian)
...
Currently translated at 100.0% (1582 of 1582 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-04-08 08:35:03 +00:00
e0406f7e65
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1582 of 1582 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-04-08 08:35:00 +00:00
c426db40c4
Translated using Weblate (French)
...
Currently translated at 99.8% (1580 of 1582 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-04-08 08:34:57 +00:00
723085f93c
Translated using Weblate (Finnish)
...
Currently translated at 100.0% (1582 of 1582 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-04-08 08:34:57 +00:00
dbaca901c1
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (1582 of 1582 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2019-04-08 08:34:57 +00:00
e1aff26abd
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (1582 of 1582 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-04-08 08:34:53 +00:00
49eb88ab04
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 100.0% (1582 of 1582 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2019-04-08 08:34:50 +00:00
661ee51b92
Translated using Weblate (Basque)
...
Currently translated at 99.1% (1569 of 1582 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2019-04-08 08:34:47 +00:00
3fe6d51fbe
Merge pull request #2868 from matrix-org/dbkr/dialog_redesign
...
Design tweaks to dialogs
2019-04-08 09:33:34 +01:00
70c768d476
Added translation using Weblate (Slovenian)
2019-04-07 19:35:47 +00:00
b8551f00b2
Prevent the permalink creator from causing cascading failure
2019-04-05 15:39:04 -06:00
2ca281f6b7
Merge pull request #2880 from matrix-org/travis/remove-try-app-link
...
Remove 'try the app' link from login
2019-04-05 11:12:17 -06:00
67d22ab331
Merge pull request #2870 from jryans/degraded-storage
...
Track store failures after startup
2019-04-05 18:08:21 +01:00
0e7688da98
Remove dead Login.loginAsGuest()
2019-04-05 11:00:25 -06:00
b59de78129
Don't include all networks by default in the room directory
...
Fixes https://github.com/vector-im/riot-web/issues/9285
2019-04-05 10:50:01 -06:00
650185e578
Remove 'try the app' link from login
...
Fixes https://github.com/vector-im/riot-web/issues/8384
This will be re-addressed in https://github.com/vector-im/riot-web/issues/9388 or similar. Because the implementation is undefined, the dead code is being removed instead of just left dead.
2019-04-05 10:35:11 -06:00
6a8b98eb71
Merge pull request #2877 from matrix-org/travis/breadcrumbs/scroll-left
...
Translate vertical scrolling to horizontal movement in breadcrumbs
2019-04-05 09:51:13 -06:00
98c0b72319
Merge pull request #2873 from matrix-org/travis/breadcrumbs/telemetry
...
Add telemetry for breadcrumbs and have the setting apply without refresh
2019-04-05 09:47:48 -06:00
17a57eb3e5
Bind the onWheel listener directly to props
...
React doesn't seem to care if this is null/undefined.
2019-04-05 09:43:29 -06:00
1c41c3dd63
Only update analytics when there's a change
...
Also, the arguments are the previous state, not the new state.
2019-04-05 09:40:21 -06:00
addafe224f
need to disable sandbox because ci tests run as root and puppeteer wont let you do stupid stuff by accident
2019-04-05 17:39:41 +02:00
e2edae3383
Merge branch 'develop' into travis/breadcrumbs/telemetry
2019-04-05 09:35:38 -06:00
4eeaf05e81
no sandbox didn't work, lets try installing a gazilion deps from the puppeteer page
2019-04-05 17:29:33 +02:00
41c403c9a6
Merge pull request #2879 from matrix-org/dbkr/file_upload_fallout
...
Fix a few bugs introduced in file upload rework
2019-04-05 15:48:45 +01:00
af0dee0d65
disable sandbox to run under debian
2019-04-05 16:45:41 +02:00
David Baker