Commit graph

21456 commits

Author SHA1 Message Date
Michael Telatynski
26bba4416b Fix emoticon space completion for upper case emoticons like :D xD 2020-01-21 10:12:23 +00:00
Zoe
d34f1e52ad constants for e2estates 2020-01-21 10:08:53 +00:00
Damir Jelić
908a00a13d EventIndexPanel: Move the panel from the preferences to the security tab. 2020-01-21 10:06:04 +01:00
Damir Jelić
4913d579e3 EventIndexPanel: Reword the crawler state if no room is being crawled. 2020-01-21 09:24:20 +01:00
Travis Ralston
3b2f96bc04 Try explicitly mapping the directory 2020-01-20 18:02:54 -07:00
Travis Ralston
776b3af6bb Fix relative pathing on riot-web link 2020-01-20 16:33:22 -07:00
Travis Ralston
19615d3721 Disable minification of Riot in end-to-end tests 2020-01-20 16:33:13 -07:00
Travis Ralston
27412ba0b2 Fix end-to-end test layering too 2020-01-20 16:23:33 -07:00
Travis Ralston
3eeeb9c6af Remove irrelevant build steps 2020-01-20 16:20:02 -07:00
Travis Ralston
62b1dd77a6 Fix layering of the riot-web tests pipeline 2020-01-20 16:12:59 -07:00
Travis Ralston
4e018905fc Remove Chrome stuff (not needed for riot-web tests anymore) 2020-01-20 15:17:47 -07:00
Michael Telatynski
397e116efb Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/roving 2020-01-20 20:48:11 +00:00
Michael Telatynski
be6a382121 delint 2020-01-20 20:46:12 +00:00
J. Ryan Stinnett
5a67bd4b46 Repair cross-signing panel with async status
This repairs the cross-signing panel after recent changes that made the panel's
status an async function.

Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3864
Fixes https://github.com/vector-im/riot-web/issues/11952
2020-01-20 20:35:25 +00:00
Michael Telatynski
0bcfe5819f Integrate handleHomeEnd 2020-01-20 20:31:36 +00:00
J. Ryan Stinnett
e947a68e13 Remove temporary key backup button
This removes the temporary extra key backup setup button in Settings used for
testing with and without cross-signing. With this change, there's only one
button and the path you take is determined by the labs flag.

Fixes https://github.com/vector-im/riot-web/issues/11890
2020-01-20 20:21:03 +00:00
Weblate
bdd28bf922 Merge branch 'origin/develop' into Weblate. 2020-01-20 17:53:24 +00:00
Travis Ralston
7193e7dcb0
Merge pull request #3866 from matrix-org/travis/ftue/user-lists/7-suggestions
Score users who have recently spoken higher in invite suggestions
2020-01-20 10:53:18 -07:00
RiotRobot
4521ef1a7b v2.0.0-rc.2 2020-01-20 17:27:00 +00:00
RiotRobot
71f96770c6 Prepare changelog for v2.0.0-rc.2 2020-01-20 17:27:00 +00:00
Zoe
befd4e1f5a shout more for unknown devices, but keep the tooltip 2020-01-20 17:25:08 +00:00
David Baker
5a06bac6d7
Merge pull request #3877 from matrix-org/dbkr/prepublish_rel
Add prepublish script
2020-01-20 17:21:42 +00:00
David Baker
d3ae65698f Add prepublish script
https://github.com/matrix-org/matrix-react-sdk/pull/3723 removed
the prepare script which was how the SDK got built before being
published. Add it back as a more modern prepublish script.
2020-01-20 17:20:57 +00:00
Weblate
fa3b9584dd Merge branch 'origin/develop' into Weblate. 2020-01-20 17:18:40 +00:00
random
8df07334c3 Translated using Weblate (Italian)
Currently translated at 100.0% (2035 of 2035 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-01-20 17:18:40 +00:00
Bruno Windels
95a0ebaf06
Merge pull request #3796 from matrix-org/bwindels/verification-right-panel
Initial support for verification in right panel
2020-01-20 17:18:32 +00:00
Zoe
12c4e45387 User verified but device deleted isn't a useful state 2020-01-20 17:15:38 +00:00
Travis Ralston
7c877fb9c4 Reinstate client variable that is actually used 2020-01-20 10:08:35 -07:00
Travis Ralston
727ca8ba77 Don't double check ourselves 2020-01-20 10:04:14 -07:00
Travis Ralston
20ec2a63d4
Merge pull request #3868 from matrix-org/travis/ftue/user-lists/8.1-dialog-hieght
Prevent the invite dialog from jumping around when elements change
2020-01-20 10:01:41 -07:00
Damir Jelić
8de149704e EventIndexPanel: Dynamically update the indexer stats. 2020-01-20 17:43:55 +01:00
Damir Jelić
1b9b30d4ea EventIndexPanel: Get more stats for our indexer, not just the size. 2020-01-20 17:42:24 +01:00
Travis Ralston
551b2907d8 Fix variable usage and naming 2020-01-20 09:29:33 -07:00
David Baker
bab2c982ab
Merge pull request #3876 from matrix-org/dbkr/prepublish
Add prepublish script
2020-01-20 16:04:21 +00:00
David Baker
34c69a59b2 Add prepublish script
https://github.com/matrix-org/matrix-react-sdk/pull/3723 removed
the prepare script which was how the SDK got built before being
published. Add it back as a more modern prepublish script.
2020-01-20 15:26:34 +00:00
Zoe
51fb3b494f lint and i18n 2020-01-20 15:25:28 +00:00
Zoe
f77eb07849 Verify individual messages via cross-signing
Fixes #11880
2020-01-20 15:16:41 +00:00
RiotRobot
4ee2fce1f1 v2.0.0-rc.1 2020-01-20 14:34:07 +00:00
RiotRobot
6c8f20df60 Prepare changelog for v2.0.0-rc.1 2020-01-20 14:34:07 +00:00
David Baker
d2ef6ba3f5 js-sdk 4.0.0-rc.1 2020-01-20 14:27:19 +00:00
David Baker
a849826a41
Merge pull request #3874 from matrix-org/dbkr/fix_editor_modified_flag_2
Fix arrows keys moving through edit history
2020-01-20 13:42:44 +00:00
David Baker
277f107924 Set flag before mutating on cut too 2020-01-20 13:03:09 +00:00
David Baker
2ed5d89c9f Fix arrows keys moving through edit history
Different fix that fixes https://github.com/vector-im/riot-web/issues/11817
by setting the flag before the callback rather than having the update
method set the flag.

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/3842
Fixes https://github.com/vector-im/riot-web/issues/11917
2020-01-20 12:20:21 +00:00
J. Ryan Stinnett
15749621a5 Fix rageshake submission after build changes
We aren't able to depend on `require` in this context anymore.

Fixes https://github.com/vector-im/riot-web/issues/11938
2020-01-20 12:06:48 +00:00
Damir Jelić
4cf44cf5a5 EventIndex/FilePanel: Allow longer lines. 2020-01-20 12:43:20 +01:00
Damir Jelić
0b4b9d8d5d EventIndex: Simplify the json event getting logic. 2020-01-20 12:42:46 +01:00
Damir Jelić
b4c8a686ce EventIndex: Don't import the whole js-sdk. 2020-01-20 12:41:55 +01:00
J. Ryan Stinnett
d35788476a
Merge pull request #3867 from matrix-org/travis/fix-messagepanel-ref
Fix error about MessagePanel not being available for read markers
2020-01-20 11:38:27 +00:00
J. Ryan Stinnett
86a0a2e806
Merge pull request #3864 from matrix-org/jryans/complete-sec-confused
Adjust secret storage to work before sync
2020-01-20 11:31:01 +00:00
David Baker
965feee86f
Merge pull request #3872 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate
2020-01-20 10:11:42 +00:00