OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
33,249 Commits
217 Branches
561 Tags
468 MiB
Commit Graph

33249 Commits (cf384c2a54536abfec81d9f83379ce620b09fb66)

Author SHA1 Message Date
Michael Telatynski de04d82395 Switch to using forms for implicit submission 2021-05-11 10:01:40 +01:00
J. Ryan Stinnett f74d4769ca
Merge pull request #6008 from matrix-org/jryans/upgrade-sanitize-types 
Upgrade sanitize types
 2021-05-11 09:49:22 +01:00
J. Ryan Stinnett 49f1dd37f2 Merge remote-tracking branch 'origin/develop' into jryans/upgrade-sanitize-types 2021-05-11 09:42:58 +01:00
J. Ryan Stinnett f3f6bf7c8f
Merge pull request #6007 from matrix-org/jryans/cheerio-upgrade 
Upgrade `cheerio` and resolve type errors
 2021-05-11 09:35:48 +01:00
Michael Telatynski 5eed9f6cba Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17227 2021-05-11 09:14:01 +01:00
Šimon Brandner 965af1a642
Initial SpaceTreeLevelLayoutStore implementation 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-11 08:08:02 +02:00
Jaiwanth 87d95d0cb1 Merge branch 'save-edited-state-messages' of github.com:jaiwanth-v/matrix-react-sdk into save-edited-state-messages 2021-05-11 11:12:32 +05:30
Šimon Brandner bc0ff5bbea
Merge branch 'develop' into fix/17164/remember-collapsed-state 2021-05-11 07:38:08 +02:00
Jaiwanth 4ea3fbc5ba Add comments and newlines back and resolve merge conflicts 2021-05-11 11:07:34 +05:30
Jaiwanth 376befd38e
Update src/components/views/rooms/EditMessageComposer.js 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-05-11 10:37:53 +05:30
Travis Ralston 7ac12d14af
Merge pull request #5865 from jaiwanth-v/edit-slashcommands 
Add slash commands support to edit message composer
 2021-05-10 20:16:44 -06:00
Travis Ralston 392cde719c
Merge pull request #5940 from DantrazTrev/err 
Fix the two todays problem
 2021-05-10 20:15:06 -06:00
Travis Ralston 12657f0fbc Merge branch 'develop' into edit-slashcommands 2021-05-10 20:09:33 -06:00
Travis Ralston beef07bdef Merge branch 'develop' into err 2021-05-10 20:08:19 -06:00
Travis Ralston 122565b3ac
Update src/components/views/rooms/EditMessageComposer.js 2021-05-10 20:03:20 -06:00
Travis Ralston 379d19e2e0
Lint 2021-05-10 19:56:30 -06:00
J. Ryan Stinnett 3e68d73597 Upgrade sanitize types 2021-05-10 17:43:10 +01:00
J. Ryan Stinnett 7821e00bc6 Revert to internal option 2021-05-10 17:36:33 +01:00
Germain Souquet 17f4945323 Merge branch 'develop' into gsouquet/cache-decrypt 2021-05-10 17:34:44 +01:00
Germain Souquet c96f11db7d appease linter 2021-05-10 17:22:33 +01:00
J. Ryan Stinnett 9c8e89ff79 Fix importing 2021-05-10 16:55:27 +01:00
Michael Telatynski 70d7a59ea2
Merge pull request #5969 from matrix-org/t3chguy/fix/17044.1 
Switch the Home Space out for an All rooms space
 2021-05-10 16:26:05 +01:00
Michael Telatynski 95b43d1284
Merge pull request #5985 from aaronraimist/blank-device-name 
Show device ID in UserInfo when there is no device name
 2021-05-10 16:19:56 +01:00
J. Ryan Stinnett f41fc7e46c Upgrade `cheerio` and resolve type errors 
This helps resolve some type errors with `domhandler`. In addition, we convert
to the new way of using `htmlparser2` with `cheerio`.
 2021-05-10 16:10:39 +01:00
Michael Telatynski c96bb374ea Allow user to progress through space setup wizard using Enter/Return 2021-05-10 16:06:23 +01:00
Germain Souquet f1a6f6fd7f make breadcrumb room events decryption more idiomatic 2021-05-10 15:48:39 +01:00
RiotRobot 1b372b17e0 Reset matrix-js-sdk back to develop branch 2021-05-10 15:23:03 +01:00
RiotRobot 82642f17fd Resetting package fields for development 2021-05-10 15:22:30 +01:00
RiotRobot 3e534b5d30 Merge branch 'master' into develop 2021-05-10 15:22:12 +01:00
Germain Souquet d0d2907a07 Decrypt events ahead of storing them in the index 2021-05-10 15:19:46 +01:00
J. Ryan Stinnett 03b3456c89
Merge pull request #6005 from matrix-org/jryans/sanitize-upgrade 
Switch back to release version of `sanitize-html`
 2021-05-10 15:15:47 +01:00
RiotRobot f68013524c v3.20.0 2021-05-10 15:02:08 +01:00
RiotRobot a1572e9ea3 Prepare changelog for v3.20.0 2021-05-10 15:02:07 +01:00
J. Ryan Stinnett 7f4c525d62 Switch back to release version of `sanitize-html` 
The limit depth option has been available in a released version for a while now.
 2021-05-10 14:57:35 +01:00
RiotRobot a11c3a22c9 Upgrade matrix-js-sdk to 10.1.0 2021-05-10 14:55:31 +01:00
J. Ryan Stinnett 01a3c42d16
Merge pull request #5998 from matrix-org/dependabot/npm_and_yarn/hosted-git-info-2.8.9 
Bump hosted-git-info from 2.8.8 to 2.8.9
 2021-05-10 14:50:50 +01:00
Michael Telatynski 3a75eb1226 Fix handling of enter/return in space creation menu 2021-05-10 14:39:10 +01:00
J. Ryan Stinnett 15035bd670
Merge pull request #6004 from matrix-org/jryans/image-metadata-release 
[Release] Don't use the event's metadata to calc the scale of an image
 2021-05-10 13:12:04 +01:00
Šimon Brandner 3b97e52246 Simplifie code a bit 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-10 13:08:32 +01:00
Šimon Brandner 9a5a3b30ca Don't try to use the event's metadata to calc the scale 
That has lead to https://github.com/vector-im/element-web/issues/17184

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-10 13:08:32 +01:00
J. Ryan Stinnett 4311d91372
Merge pull request #5982 from SimonBrandner/fix/17184/dont-use-event-meta 
Don't use the event's metadata to calc the scale of an image
 2021-05-10 13:06:08 +01:00
J. Ryan Stinnett 45acf70b00
Merge pull request #5981 from matrix-org/jryans/upload-preview-mimetype 
Adjust MIME type of upload confirmation if needed
 2021-05-10 10:21:35 +01:00
Jaiwanth 1f77048750 Minor refactor 2021-05-09 16:12:04 +05:30
Jaiwanth 6f98aa06c4 Save edited state when switching rooms 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-05-09 13:42:01 +05:30
dependabot[bot] 70b2f841d9
Bump hosted-git-info from 2.8.8 to 2.8.9 
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-09 00:09:15 +00:00
Ayush PS 2ad0032f72 Added regression tests for Natural headers 2021-05-09 01:10:54 +05:30
Besnik Bleta 7bd06d5d3a Translated using Weblate (Albanian) 
Currently translated at 99.5% (2919 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-05-08 08:35:06 +00:00
XoseM 91e05b9152 Translated using Weblate (Galician) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2021-05-08 08:35:03 +00:00
Šimon Brandner 4b49281aaa Translated using Weblate (Czech) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-05-08 08:34:59 +00:00
waclaw66 60091a663f Translated using Weblate (Czech) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-05-08 08:34:59 +00:00