OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
34,770 Commits
211 Branches
549 Tags
666 MiB
Commit Graph

34770 Commits (d3823305ccb68e2639f6c0ee0e4e860ce42b3f5a)

Author SHA1 Message Date
Michael Telatynski 29904a7ffc
Merge pull request #6263 from matrix-org/t3chguy/ts/4 2021-06-29 22:31:16 +01:00
Michael Telatynski 3fa89f3294
Merge pull request #6243 from matrix-org/t3chguy/ts/8 2021-06-29 22:27:16 +01:00
Michael Telatynski 6250d9ba61
Merge branch 'develop' into t3chguy/ts/4 2021-06-29 22:24:47 +01:00
Michael Telatynski a59e94b907 delint 2021-06-29 22:21:05 +01:00
Michael Telatynski 8f4879ea96 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8 
 Conflicts:
	src/components/structures/MessagePanel.tsx
	src/components/structures/ScrollPanel.tsx
	src/components/structures/TimelinePanel.tsx
	src/components/views/elements/ErrorBoundary.tsx
	src/components/views/elements/EventListSummary.tsx
	src/components/views/messages/TileErrorBoundary.tsx
 2021-06-29 22:14:40 +01:00
J. Ryan Stinnett 9d6d8fc666
Merge pull request #6285 from matrix-org/jryans/rework-linting-2 
Migrate to `eslint-plugin-matrix-org`
 2021-06-29 17:45:10 +01:00
Germain 55121f6e81
Merge pull request #6287 from matrix-org/gsouquet/fix-17836 
Avoid cyclic dependencies by moving watchers out of constructor
 2021-06-29 17:23:13 +01:00
Germain Souquet d035151116 Avoid cyclic dependencies by moving watchers out of constructor 2021-06-29 17:04:51 +01:00
Germain 9a37f29841
Merge pull request #6284 from matrix-org/gsouquet/fix-17826 
Add spacing between toast buttons with cross browser support in mind
 2021-06-29 15:32:14 +01:00
J. Ryan Stinnett 07f057f381 Keep indent rule enabled 2021-06-29 15:30:38 +01:00
J. Ryan Stinnett 782e793925 Merge remote-tracking branch 'origin/develop' into jryans/rework-linting-2 2021-06-29 15:27:24 +01:00
J. Ryan Stinnett 21b8c81eb8 Merge remote-tracking branch 'origin/develop' into jryans/rework-linting-2 2021-06-29 15:25:30 +01:00
Michael Telatynski 623317cd47 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8 
 Conflicts:
	src/components/structures/MessagePanel.tsx
	src/components/structures/TimelinePanel.tsx
 2021-06-29 15:22:54 +01:00
Germain 640fc591bb
Merge pull request #6279 from matrix-org/gsouquet/deprecate-tinter 
Deprecate Tinter and TintableSVG
 2021-06-29 15:22:48 +01:00
Germain 78f1748634
Merge pull request #6283 from matrix-org/gsouquet/filepanel-typescript 2021-06-29 15:15:29 +01:00
RiotRobot a48d453be1 v3.25.0-rc.1 2021-06-29 14:43:01 +01:00
RiotRobot 70fc518667 Prepare changelog for v3.25.0-rc.1 2021-06-29 14:43:00 +01:00
RiotRobot 18407fbce9 Upgrade matrix-js-sdk to 12.0.1-rc.1 2021-06-29 14:36:24 +01:00
David Baker 38e5ac787c
Merge pull request #6286 from RiotTranslateBot/weblate-element-web-matrix-react-sdk 
Translations update from Weblate
 2021-06-29 14:15:00 +01:00
Govindas d68fa223bc Translated using Weblate (Lithuanian) 
Currently translated at 65.5% (1941 of 2961 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lt/
 2021-06-29 13:08:42 +00:00
Weblate 0b4cb9af54 Merge branch 'origin/develop' into Weblate. 2021-06-29 13:02:29 +00:00
Priit Jõerüüt 8d79a10135 Translated using Weblate (Estonian) 
Currently translated at 99.8% (2988 of 2993 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-06-29 13:02:26 +00:00
Govindas 7df42b1bdb Translated using Weblate (Lithuanian) 
Currently translated at 65.1% (1951 of 2993 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lt/
 2021-06-29 13:02:24 +00:00
libexus f35fe7c57f Translated using Weblate (German) 
Currently translated at 99.8% (2988 of 2993 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-06-29 13:02:12 +00:00
J. Ryan Stinnett 0551becafd Fix long lines 2021-06-29 13:42:51 +01:00
J. Ryan Stinnett fe123fc605 Rework lint comments 2021-06-29 13:35:43 +01:00
J. Ryan Stinnett bbdd93f592 Auto-fix more errors 2021-06-29 13:26:09 +01:00
J. Ryan Stinnett b501665971 Fix parsing errors 2021-06-29 13:23:13 +01:00
J. Ryan Stinnett 2be40ad08a Use unquoted keys 2021-06-29 13:19:42 +01:00
J. Ryan Stinnett a4f8ca4f8a Switch to newer Babel specific config 2021-06-29 13:18:58 +01:00
J. Ryan Stinnett ae0a8b8da4 Auto-fix lint errors 2021-06-29 13:11:58 +01:00
J. Ryan Stinnett 4c5720a573 Update lint comments 2021-06-29 12:51:13 +01:00
J. Ryan Stinnett 71116bfa27 Migrate to `eslint-plugin-matrix-org` 
This migrates to the new plugin form of our custom ESLint configs. As part of
this, some packages are de-duplicated, configs streamlined, etc.
 2021-06-29 12:51:13 +01:00
J. Ryan Stinnett 2d3163fef5 Remove Flow support 
We no longer use Flow, so this removes linting and compiling support. New code
should use TypeScript for static typing.
 2021-06-29 12:31:44 +01:00
Germain Souquet db015519ed Code style changes for FilePanel 2021-06-29 12:19:27 +01:00
Germain 56e05041fd
Import curly spaces 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-06-29 12:13:41 +01:00
Germain Souquet 4cfdad8aa2 Add spacing between toast buttons with cross browser support in mind 2021-06-29 11:59:13 +01:00
Germain Souquet 652f57371a Migrate FilePanel to TypeScript 2021-06-29 11:38:19 +01:00
Michael Telatynski b70297c510
Merge pull request #6277 from matrix-org/t3chguy/fix/17793 
Fix back button on user info card after clicking a permalink
 2021-06-29 10:55:53 +01:00
Michael Telatynski b60c2c5d55 Fix e2e test right panel back behaviour 2021-06-29 10:37:30 +01:00
J. Ryan Stinnett 14ef38e057
Merge pull request #6280 from robintown/group-acls 
Group ACLs with MELS
 2021-06-29 10:02:12 +01:00
Michael Telatynski 0cc7f42f08
Merge pull request #6282 from matrix-org/t3chguy/fix/17738 
Fix editState not getting passed through
 2021-06-29 09:14:17 +01:00
Michael Telatynski 26592da09f
Merge pull request #5671 from weeman1337/msg-context-menu 2021-06-29 08:18:07 +01:00
Michael Telatynski 298bf30b18 Fix editState not getting passed through 2021-06-29 08:16:43 +01:00
Aaron Raimist 734dbae248 Merge branch 'develop' into string-pl 2021-06-28 22:49:13 -05:00
Aaron Raimist 434b313850 Merge branch 'develop' into string-pl 2021-06-28 22:13:51 -05:00
Travis Ralston 7a4ceec985 Restore clamped dimensions on voice recorder waveform 2021-06-28 21:02:42 -06:00
Travis Ralston d6cf2346fe Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240 2021-06-28 21:00:36 -06:00
Travis Ralston 964a97d59e Merge remote-tracking branch 'origin/develop' into travis/new-audio 2021-06-28 20:52:44 -06:00
Travis Ralston b6d9ecde8b
Merge pull request #6240 from matrix-org/gsouquet/voice-messages-waveform-perf 
Improve audio recording performance
 2021-06-28 20:49:21 -06:00