Travis Ralston
dbff2bb9f0
Merge pull request #3841 from matrix-org/travis/ftue/user-lists/5.2-i18n
...
Humanize the recent DM rooms ourselves for translations
2020-01-15 10:58:32 -07:00
Travis Ralston
d763d7e633
Merge branch 'develop' into travis/ftue/user-lists/5.2-i18n
2020-01-15 10:49:38 -07:00
Travis Ralston
0529efc5cd
Merge pull request #3840 from matrix-org/travis/ftue/user-lists/5.1-suggestions
...
Improve the quality of invite suggestions by filtering out DMs
2020-01-15 10:49:00 -07:00
Travis Ralston
c2b3661a69
Merge pull request #3845 from matrix-org/travis/fix-develop
...
Fix linter and tests on develop
2020-01-15 10:38:08 -07:00
Travis Ralston
8f37f8638d
Build the js-sdk for Jest tests
...
This is theoretically a fix for the tests failing post-sourcemaps.
2020-01-15 10:28:27 -07:00
Travis Ralston
457e63f24e
Fix reference to js-sdk lint config
2020-01-15 10:25:36 -07:00
Travis Ralston
7bfb3686cd
Merge pull request #3839 from matrix-org/travis/sourcemaps
...
Fix sourcemaps by refactoring the build system
2020-01-15 10:11:33 -07:00
Travis Ralston
8b6a5d37aa
Remove simulated error state used for screenshot
2020-01-14 23:35:45 -07:00
Travis Ralston
b9852c7264
Appease the linter
2020-01-14 23:35:07 -07:00
Travis Ralston
443744733d
Move DM creation logic into DMInviteDialog
...
Fixes https://github.com/vector-im/riot-web/issues/11645
The copy hasn't been reviewed by anyone and could probably use some work.
2020-01-14 23:32:00 -07:00
Michael Telatynski
d37c19d785
Fix timing of when Composer considers itself to be modified
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-15 00:27:54 +00:00
Michael Telatynski
5a5a0d2233
Merge branches 'develop' and 't3chguy/rightpanel' of github.com:matrix-org/matrix-react-sdk into t3chguy/rightpanel
2020-01-15 00:03:18 +00:00
David Baker
fa174512cc
Merge pull request #3837 from matrix-org/dbkr/dont_error_on_unknown_devices
...
Don't error on unverified/unknown devices.
2020-01-14 17:12:14 +00:00
Zoe
1fd1e4b953
Merge pull request #3835 from matrix-org/zip/11832-more-padlock-icons
...
Padlock icons in room header (behind feature_cross_signing)
2020-01-14 14:15:46 +00:00
David Baker
f87541a6a9
Merge pull request #3822 from matrix-org/dbkr/key_backup_resign
...
Don't allow upgrade from untrusted key backup.
2020-01-14 12:18:00 +00:00
David Baker
24552f567e
Add primary button to trigger restore flow
2020-01-14 11:52:00 +00:00
David Baker
c91af5ae49
i18n
2020-01-14 11:33:16 +00:00
David Baker
94e4d5bf1f
s/sign-in/session/
2020-01-14 11:32:30 +00:00
David Baker
44ca35296a
Consistent capitalisation
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2020-01-14 11:31:00 +00:00
Zoe
f617fb7bbe
Place RoomHeader privacy padlocks behind the crosssigning feature flag
2020-01-14 10:31:01 +00:00
Travis Ralston
76183fc8fd
Appease the linter
2020-01-13 21:21:18 -07:00
Travis Ralston
b69b284efa
Humanize the recent DM rooms ourselves for translations
2020-01-13 21:20:01 -07:00
Travis Ralston
9188183c9b
Improve the quality of invite suggestions by filtering out DMs
...
This helps the small rooms from being scored highly, bringing out users you've not seen in a long while.
2020-01-13 21:04:13 -07:00
Travis Ralston
90c7535a69
Export VIEWS from MatrixChat for riot-web tests
2020-01-13 20:15:58 -07:00
Travis Ralston
1e70af00a3
Fix GroupView test
...
It was counting the wrong number of updates for reasons I don't understand.
2020-01-13 20:15:58 -07:00
Travis Ralston
813b14018e
Fix CI build steps for new environment.
...
Some of the CI stuff requires the autogenerated files to be present. Easiest way to get them all is to build the thing. Previously this was done in an install stage, but we don't do that anymore.
2020-01-13 20:15:58 -07:00
David Baker
14501b748b
lint again
2020-01-13 21:58:26 +00:00
David Baker
9a1be1a24d
Don't try to set crypto options without crypto enabled
2020-01-13 21:54:14 +00:00
J. Ryan Stinnett
9cedfeb007
Merge pull request #3825 from aaronraimist/lock
...
Emoji verification: Change name of 🔒 to lock
2020-01-13 21:32:58 +00:00
Travis Ralston
bf6798e109
Appease the linter
2020-01-13 13:28:33 -07:00
David Baker
19777cfafc
Merge pull request #3838 from matrix-org/dbkr/padlocks_behind_labs_flag
...
Room padlock decorations only if cross-signing is enabled
2020-01-13 19:27:50 +00:00
Travis Ralston
5fd27a10bb
Merge branch 'develop' into travis/sourcemaps
2020-01-13 11:19:41 -07:00
Travis Ralston
528777049a
Merge pull request #3827 from matrix-org/travis/sm-e2e-tests
...
Enable end-to-end tests for sourcemaps (+Windows instructions)
2020-01-13 11:15:46 -07:00
David Baker
e47240d838
Lint Eastwood
2020-01-13 17:56:40 +00:00
David Baker
d53016e8fc
Room padlock decorations only if cross-signing is enabled
...
Put the padlock decorations behind the labs flag as without the
context of the shields on the room icons they can be a bit misleading
and make people think it means 'encrypted'.
2020-01-13 17:53:49 +00:00
David Baker
76fe87c941
Don't error on unverifie/unknownd devices.
...
When cross-signing is enabled, we no longer want to fail and
prompt the user to ack every device in the room. All the info should
be conveyed in the shield colour (although isn't fully just yet).
Fixes https://github.com/vector-im/riot-web/issues/11750
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1150
2020-01-13 17:41:58 +00:00
Zoe
397637d59d
used classnames module
2020-01-13 15:08:07 +00:00
Zoe
a56bf5398d
lint
2020-01-13 14:54:39 +00:00
Zoe
0bd2ecd798
lint
2020-01-13 14:51:10 +00:00
Zoe
e43174c636
Show padlock in room headers for invite-only rooms
...
Fixes #11832
2020-01-13 14:49:23 +00:00
Christopher
59ea865e8e
Added missing semicolon.
2020-01-13 14:29:42 +00:00
RiotRobot
389e1194ff
Merge branch 'master' into develop
2020-01-13 13:09:56 +00:00
RiotRobot
8091cadc46
v1.7.6
2020-01-13 13:06:31 +00:00
RiotRobot
d38c358235
Prepare changelog for v1.7.6
2020-01-13 13:06:30 +00:00
RiotRobot
9a3ca28978
js-sdk 3.0.0
2020-01-13 13:01:36 +00:00
David Baker
280253d58a
Merge pull request #3834 from matrix-org/dbkr/community-user-list-fire_rel
...
Repair community member info panel
2020-01-13 12:42:03 +00:00
David Baker
415c8679f9
Merge pull request #3833 from matrix-org/dbkr/feature-presence-indicator_rel
...
Add feature flag around the presence indicator in room list
2020-01-13 12:41:51 +00:00
Michael Telatynski
66b55495bb
Fix right panel buttons highlighting
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-13 12:40:45 +00:00
J. Ryan Stinnett
8fc85797a7
Guard against missing members in avatars
...
Part of https://github.com/vector-im/riot-web/issues/11744
2020-01-13 12:40:40 +00:00
J. Ryan Stinnett
dd652f6af3
Merge pull request #3832 from matrix-org/jryans/community-user-list-fire
...
Repair community member info panel
2020-01-13 12:38:24 +00:00