OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
29,116 Commits
219 Branches
563 Tags
477 MiB
Commit Graph

29116 Commits (e5228e279559a3147a76040ba7bf19ee7e3b9771)

Author SHA1 Message Date
Michael Telatynski b8080a7d2d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-08 13:04:59 +01:00
Michael Telatynski 841abc21e1 Roving Tab Index should not interfere with inputs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-08 10:25:03 +01:00
J. Ryan Stinnett 0466f1df76
Merge pull request #5298 from matrix-org/jryans/2020-10-polishing 
Visual tweaks from 2020-10-06 polishing
 2020-10-08 10:15:04 +01:00
Michael Telatynski b2d04deb83 fix tests for the new sessionStorage key 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-08 10:04:01 +01:00
J. Ryan Stinnett 576ea6df08 Use same colour variable as text 2020-10-08 10:01:05 +01:00
J. Ryan Stinnett 73ce2fac8a Add comment on colour 2020-10-08 09:56:58 +01:00
Michael Telatynski 017d2d40fe Update CIDER local and session storage keys to unbrick downgrade compat 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-08 09:51:31 +01:00
J. Ryan Stinnett 43ea5de320 Adjust Settings styles 2020-10-07 20:23:34 +01:00
J. Ryan Stinnett 3d0db1b022 Change invite icon 2020-10-07 20:08:59 +01:00
J. Ryan Stinnett 936344b012 Make back button a circle 2020-10-07 17:53:41 +01:00
J. Ryan Stinnett 5a4ca4578a Sprinkle some ts-ignore lines 2020-10-07 17:18:19 +01:00
J. Ryan Stinnett f77dace173 Shake lock file to attempt fixing CI 2020-10-07 17:07:44 +01:00
J. Ryan Stinnett 779e43b8dd
Merge pull request #5296 from matrix-org/jryans/sso-4s-integration 
Convert auth lifecycle to TS, remove dead ILAG code
 2020-10-07 15:42:42 +01:00
J. Ryan Stinnett 28e458075a Fix types after underscore changes 2020-10-07 15:10:11 +01:00
RiotRobot 4abaa107ab v3.6.0-rc.1 2020-10-07 14:30:51 +01:00
RiotRobot ffd7cddd0d Prepare changelog for v3.6.0-rc.1 2020-10-07 14:30:51 +01:00
RiotRobot 2fd9b9b3b9 Upgrade matrix-js-sdk to 8.5.0-rc.1 2020-10-07 14:23:52 +01:00
J. Ryan Stinnett 0b443c5280
Merge pull request #5297 from RiotTranslateBot/weblate-element-web-matrix-react-sdk 
Update from Weblate
 2020-10-07 13:38:51 +01:00
J. Ryan Stinnett 72bd72e524 Remove underscores 2020-10-07 13:32:30 +01:00
Weblate 4965886498 Merge branch 'origin/develop' into Weblate. 2020-10-07 12:16:50 +00:00
Michael Telatynski 7205e5d2e5
Merge pull request #5295 from matrix-org/t3chguy/fix/15403 
Fix edited replies being wrongly treated as big emoji
 2020-10-07 13:16:46 +01:00
J. Ryan Stinnett 40292884bf Regenerate component CSS index 2020-10-07 13:09:03 +01:00
J. Ryan Stinnett 4dd6e96bfd Regenerate strings 2020-10-07 13:00:27 +01:00
J. Ryan Stinnett a762317a3e Regenerate lint ignore file 2020-10-07 12:56:12 +01:00
J. Ryan Stinnett f2b72efe39 Remove various remaining bits of ILAG flows 
TypeScript helpfully pointed me towards this dead code, which has been floating
around unused for a while. If we want to bring back ILAG in the future, we can
always revive it from history.
 2020-10-07 12:53:59 +01:00
J. Ryan Stinnett 1b255e42c3 Convert src/Lifecycle.ts to TypeScript 2020-10-07 12:53:59 +01:00
J. Ryan Stinnett 11eb9b59e6 Convert src/Login.js to TypeScript 2020-10-07 11:47:27 +01:00
Weblate e172f71f29 Merge branch 'origin/develop' into Weblate. 2020-10-07 10:08:51 +00:00
LinAGKar 70632e8153 Translated using Weblate (Swedish) 
Currently translated at 100.0% (2374 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sv/
 2020-10-07 10:08:51 +00:00
Szimszon b37f6db909 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2374 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/hu/
 2020-10-07 10:08:50 +00:00
Xose M 8004b21e5e Translated using Weblate (Galician) 
Currently translated at 99.9% (2373 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/gl/
 2020-10-07 10:08:49 +00:00
Jeff Huang 88824c02d3 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2374 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hant/
 2020-10-07 10:08:49 +00:00
Michael Telatynski 709d33c21c
Merge pull request #5294 from matrix-org/t3chguy/fix/w2 
Fix StopGapWidget infinitely recursing
 2020-10-07 11:08:44 +01:00
Michael Telatynski 8a226781c4 Fix edited replies being wrongly treated as big emoji 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 11:08:43 +01:00
Michael Telatynski dbb011b8f1 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 10:53:17 +01:00
Michael Telatynski 0e42fc45e2 Resolve couple of React warnings/errors 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 10:40:20 +01:00
Michael Telatynski 67193b0ea7 Fix StopGapWidget infinitely recursing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 10:39:52 +01:00
Michael Telatynski 29e3881fb3 Iterate design and fix post-merge conflict 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 10:36:45 +01:00
Michael Telatynski c784039cf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 
 Conflicts:
	src/components/views/right_panel/WidgetCard.tsx
	src/stores/WidgetStore.ts
 2020-10-07 10:04:45 +01:00
Michael Telatynski 0d6edab708 Workaround Jest bug with ArrayBuffers 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 01:22:29 +01:00
Weblate 3304dff984 Merge branch 'origin/develop' into Weblate. 2020-10-06 23:15:01 +00:00
Michael Telatynski 430bceb91d
Merge pull request #5281 from matrix-org/t3chguy/fix/9836 
Fix editing and redactions not updating the Reply Thread
 2020-10-07 00:14:56 +01:00
Michael Telatynski a8d88e01fb Write Enzyme tests for SendMessageComposer state/history persistence behaviour 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 00:10:40 +01:00
Michael Telatynski 965debf442 extend mockClient in testutils 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 00:09:48 +01:00
Michael Telatynski ab518a469f Replace MatrixClientPeg with access to context in SendMessageComposer 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 00:09:09 +01:00
Michael Telatynski 13afb8d4f1 Update Jest and JSDOM 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 00:08:40 +01:00
Weblate 99d069f7ae Merge branch 'origin/develop' into Weblate. 2020-10-06 21:59:02 +00:00
Michael Telatynski 35c7ccfcbd
Merge pull request #5282 from matrix-org/t3chguy/fix/15380 
Hide Jump to Read Receipt button for users who have not yet sent an RR
 2020-10-06 22:58:56 +01:00
Michael Telatynski 1bd0d9e02b Iterate 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-06 22:53:34 +01:00
Michael Telatynski 2e45374cf8
Update src/components/views/right_panel/UserInfo.tsx 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-10-06 22:49:50 +01:00