Travis Ralston
1986f13275
Merge pull request #3934 from matrix-org/travis/cross-signing-info
...
Add null check for cross-signing info in verification panel
2020-01-24 09:49:30 -07:00
Travis Ralston
540a7f5c02
less duplication
2020-01-24 09:41:47 -07:00
Travis Ralston
91d59556db
Also check for our own key ID
2020-01-24 09:37:12 -07:00
Travis Ralston
f8e0dcf264
Add null check for cross-signing info in verification panel
2020-01-24 09:33:55 -07:00
Weblate
f51d3b196d
Merge branch 'origin/develop' into Weblate.
2020-01-24 15:57:49 +00:00
Travis Ralston
169ca4a4da
Merge pull request #3926 from matrix-org/travis/event-tile-trace
...
Add trace logging to figure out which component is causing weird events
2020-01-24 08:57:43 -07:00
Weblate
72f24b127d
Merge branch 'origin/develop' into Weblate.
2020-01-24 15:57:33 +00:00
Travis Ralston
9722b34c35
Merge pull request #3906 from matrix-org/travis/user-lists-labs
...
Remove user lists feature flag, making it the default
2020-01-24 08:57:27 -07:00
Weblate
5ccf5573da
Merge branch 'origin/develop' into Weblate.
2020-01-24 15:57:24 +00:00
Travis Ralston
ddafd010ee
Merge pull request #3925 from matrix-org/travis/invite-polish
...
Last bit of polish for user lists
2020-01-24 08:57:18 -07:00
Travis Ralston
abc2808b62
Fix i18n post-merge
2020-01-24 08:57:03 -07:00
Travis Ralston
5f2df15987
Merge branch 'develop' into travis/invite-polish
2020-01-24 08:56:18 -07:00
Weblate
72e7ac4a7a
Merge branch 'origin/develop' into Weblate.
2020-01-24 15:55:45 +00:00
Travis Ralston
eb2402609a
Merge pull request #3871 from matrix-org/travis/qr-verif-rp
...
QR code verification
2020-01-24 08:55:40 -07:00
Weblate
36b8ab0bf0
Merge branch 'origin/develop' into Weblate.
2020-01-24 15:09:36 +00:00
David Baker
9887ba13b5
Merge pull request #3933 from matrix-org/dbkr/stop_giving_jeff_bezos_all_our_money
...
Do less unnecessary work on CI
2020-01-24 15:09:31 +00:00
David Baker
26aaa58e3c
Comments are great
2020-01-24 14:58:46 +00:00
David Baker
b17f38856c
More quote failing
2020-01-24 14:56:00 +00:00
David Baker
de5c47960c
quotes
2020-01-24 14:51:11 +00:00
David Baker
19c49eedec
reskindex for tests
2020-01-24 14:36:12 +00:00
David Baker
57ee99d6f7
chmod
2020-01-24 14:30:41 +00:00
David Baker
5536384866
Do less unnecessary work on CI
...
We were checking out & installing the develop js-sdk explicitly
in cases where we didn't need it at all. We were babeling the src
folder many, many times over (in some cases twice in the same job)
and never using the output at all.
2020-01-24 14:21:28 +00:00
Weblate
4243e2e713
Merge branch 'origin/develop' into Weblate.
2020-01-24 14:19:57 +00:00
David Baker
75f5326db2
Merge pull request #3932 from matrix-org/dbkr/reenable_stylelint
...
Re-enable stylelint on CI
2020-01-24 14:19:53 +00:00
David Baker
098d097922
Re-enable stylelint on CI
2020-01-24 14:03:31 +00:00
Weblate
5ed599f6d7
Merge branch 'origin/develop' into Weblate.
2020-01-24 13:54:56 +00:00
Zoe
543be90eda
Merge pull request #3931 from matrix-org/foldleft/12035-room-decoration-design-pass
...
Design pass for room icons
2020-01-24 13:54:51 +00:00
Damir Jelić
cbfde4d78f
Merge branch 'poljar/seshat-filepanel' into develop
2020-01-24 14:44:24 +01:00
Weblate
b0bfef3b47
Merge branch 'origin/develop' into Weblate.
2020-01-24 13:44:01 +00:00
random
a46646105f
Translated using Weblate (Italian)
...
Currently translated at 100.0% (2057 of 2057 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-01-24 13:44:01 +00:00
Zoe
75da5b7944
Design pass for room icons
2020-01-24 13:37:47 +00:00
Weblate
6a1ab4fe17
Merge branch 'origin/develop' into Weblate.
2020-01-24 13:31:14 +00:00
random
be98f24051
Translated using Weblate (Italian)
...
Currently translated at 98.8% (2032 of 2057 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-01-24 13:31:14 +00:00
David Baker
7de5f09f9f
Merge pull request #3928 from matrix-org/dbkr/split_out_asyncwrapper
...
Split AsyncWrapper out from Modal
2020-01-24 13:31:09 +00:00
Weblate
edc13aad82
Merge branch 'origin/develop' into Weblate.
2020-01-24 13:30:31 +00:00
random
6ebeb0a376
Translated using Weblate (Italian)
...
Currently translated at 98.7% (2031 of 2057 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-01-24 13:30:31 +00:00
David Baker
330f606513
Merge pull request #3930 from matrix-org/bwindels/fixnoroom
...
Fix error in verification code on develop
2020-01-24 13:30:25 +00:00
Weblate
da2b29b6e5
Merge branch 'origin/develop' into Weblate.
2020-01-24 13:27:04 +00:00
Zoe
131aacd3ab
Merge pull request #3929 from matrix-org/zip/11840-tooltips-on-padlocks
...
Seperates out the padlock icon, and adds a tooltip
2020-01-24 13:26:59 +00:00
Damir Jelić
37f289b120
EventIndex: Add docstrings for the FilePanel methods.
2020-01-24 14:24:25 +01:00
Damir Jelić
3534cd4202
FilePanel: Add comments to explain what's going on with the event index.
2020-01-24 14:23:43 +01:00
Bruno Windels
66768416a6
dont assume the room exist ... not sure why though
2020-01-24 14:20:48 +01:00
Weblate
27ffa88ff8
Merge branch 'origin/develop' into Weblate.
2020-01-24 13:18:15 +00:00
Michael Telatynski
2c40b73ff6
Merge pull request #3910 from matrix-org/t3chguy/cross-signing-composer
...
Cross Signing redesign for composer
2020-01-24 13:18:09 +00:00
David Baker
590ff29e60
Unused import
2020-01-24 13:15:57 +00:00
David Baker
c5ecd83bc1
remove .orig file
2020-01-24 12:34:50 +00:00
David Baker
dbf1c9a02a
Apparently i18n...
2020-01-24 12:34:03 +00:00
David Baker
688f7029d2
Split AsyncWrapper out from Modal
...
So we can use it outside of modals & dialogs
2020-01-24 12:28:03 +00:00
Zoe
a6fcbcacf6
Seperates out the padlock icon, and adds a tooltip
...
Fixes https://github.com/vector-im/riot-web/issues/11840
2020-01-24 12:06:21 +00:00
Weblate
f4e5b69aa3
Merge branch 'origin/develop' into Weblate.
2020-01-24 11:24:39 +00:00
