PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
18938 commits 1 branch 0 tags 338 MiB
Commit graph

18938 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
a3dbf881e8
Merge pull request #3557 from matrix-org/jryans/scroll-unmount-guard 
Abort scroll updates when already unmounted
 2019-10-21 17:05:53 +01:00
Michael Telatynski
c5d5cd72bc
Merge pull request #3465 from matrix-org/t3chguy/nvl/userinfo 
UserInfo consolidation of GroupMemberInfo and MemberInfo panels
 2019-10-21 15:50:08 +01:00
Bruno Windels
b237ecab29
Merge pull request #3552 from maunium/fix-html-parsing-for-edit 
Fix some things in the edit HTML parser
 2019-10-21 09:25:53 +00:00
David Baker
f7b2bba62d
Merge pull request #3559 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2019-10-21 10:07:40 +01:00
Weblate
241dc42cb0 Merge branch 'origin/develop' into Weblate. 2019-10-21 08:31:46 +00:00
송태섭
caafd6e5c9 Translated using Weblate (Korean) 
Currently translated at 100.0% (1850 of 1850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2019-10-21 08:31:46 +00:00
Kévin C
43cd00c73d Translated using Weblate (French) 
Currently translated at 100.0% (1850 of 1850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-10-21 08:31:45 +00:00
Bruno Windels
fc175a971c
Merge pull request #3537 from matrix-org/bwindels/merge-e2e-tests 
Merge end-to-end tests
 2019-10-21 08:31:35 +00:00
Weblate
1c6d11e4de Merge branch 'origin/develop' into Weblate. 2019-10-20 10:21:33 +00:00
송태섭
392d112a88 Translated using Weblate (Korean) 
Currently translated at 100.0% (1838 of 1838 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2019-10-20 10:21:33 +00:00
Michael Albert
9c1c8fe89c Translated using Weblate (German) 
Currently translated at 83.8% (1540 of 1838 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-10-20 10:21:32 +00:00
Kévin C
014866c63f Translated using Weblate (French) 
Currently translated at 100.0% (1838 of 1838 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-10-20 10:21:32 +00:00
Jeff Huang
dcb45d30b4 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1838 of 1838 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-10-20 10:21:31 +00:00
Besnik Bleta
1613c39a70 Translated using Weblate (Albanian) 
Currently translated at 99.7% (1833 of 1838 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2019-10-20 10:21:31 +00:00
Matthew Hodgson
e632b520f2
Merge pull request #3554 from maunium/emoji-picker 
Add full emoji picker for reactions
 2019-10-20 11:21:24 +01:00
Tulir Asokan
b2deb548d3 Translate search button titles 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2019-10-20 12:41:16 +03:00
Tulir Asokan
438ad54701 Remove space between emojis in picker 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2019-10-20 12:31:28 +03:00
Tulir Asokan
10732e8e73 Fix license headers 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2019-10-20 12:31:21 +03:00
Tulir Asokan
be829980f6 Split inline SVGs to their own files 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2019-10-20 12:13:32 +03:00
Michael Telatynski
4de0b3c177 Clean up useEventEmitter 2019-10-19 16:48:39 +01:00
Michael Telatynski
02f8b18346 Merge branch 't3chguy/nvl/userinfo' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/nvl/userinfo 
 Conflicts:
	src/components/views/right_panel/UserInfo.js
 2019-10-19 16:42:00 +01:00
Michael Telatynski
0e6359ab24 replace @use-it/event-listener as it doesn't like Node EE's 2019-10-19 16:39:06 +01:00
J. Ryan Stinnett
3a428efb60 Abort scroll updates when already unmounted 
This checks whether we're unmounted before updating scroll state, as we use
async functions and timeouts in this area.

Fixes https://github.com/vector-im/riot-web/issues/11150
 2019-10-18 18:01:57 +01:00
Tulir Asokan
75bcc3f849
Update src/editor/deserialize.js 
Co-Authored-By: Bruno Windels <bruno@windels.cloud>
 2019-10-18 19:58:55 +03:00
Weblate
acb397db71 Merge branch 'origin/develop' into Weblate. 2019-10-18 16:09:48 +00:00
Michael Telatynski
4494e3b61b
Merge pull request #3555 from matrix-org/t3chguy/a11y3 
Accessibility fixes to autocomplete and tabpanels
 2019-10-18 17:09:44 +01:00
Weblate
74d30611b1 Merge branch 'origin/develop' into Weblate. 2019-10-18 15:53:29 +00:00
J. Ryan Stinnett
7ac14e48dc
Merge pull request #3549 from matrix-org/jryans/disconnect-dead-is 
Show warning dialog when changing unreachable IS
 2019-10-18 16:53:25 +01:00
Bruno Windels
b03ebb964b split up installing static webserver and riot copy 
so we can just do the latter for the e2e tests on CI
 2019-10-18 17:18:18 +02:00
Weblate
52225b238d Merge branch 'origin/develop' into Weblate. 2019-10-18 15:12:33 +00:00
J. Ryan Stinnett
5333201823 Change back to develop branch for deps 2019-10-18 16:12:20 +01:00
Weblate
7e07c410bc Merge branch 'origin/develop' into Weblate. 2019-10-18 13:49:54 +00:00
Walter
0c6daf4f19 Translated using Weblate (Russian) 
Currently translated at 95.2% (1743 of 1831 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2019-10-18 13:49:54 +00:00
RiotRobot
d05ef40694 Merge branch 'master' into develop 2019-10-18 14:49:40 +01:00
RiotRobot
86a564b2f0 v1.7.0 2019-10-18 14:48:34 +01:00
RiotRobot
2557d89385 Prepare changelog for v1.7.0 2019-10-18 14:48:33 +01:00
RiotRobot
21bb1dc837 Upgrade to JS SDK v2.4.2 2019-10-18 14:43:08 +01:00
Bruno Windels
dca968375d
Update test/end-to-end-tests/run.sh 2019-10-18 12:33:42 +00:00
Bruno Windels
3d15026da3
Update test/end-to-end-tests/run.sh 2019-10-18 12:33:32 +00:00
Bruno Windels
e2e7303cc3
Update README.md 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-10-18 12:29:17 +00:00
Bruno Windels
15a75737ff
Update test/end-to-end-tests/README.md 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-10-18 12:29:09 +00:00
Bruno Windels
76c7f58235
Update test/end-to-end-tests/README.md 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-10-18 12:28:58 +00:00
Bruno Windels
142a32b528
Update test/end-to-end-tests/README.md 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-10-18 12:28:47 +00:00
Bruno Windels
06e69d114f
Update test/end-to-end-tests/README.md 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-10-18 12:28:31 +00:00
Bruno Windels
5025a0ffea
Update test/end-to-end-tests/README.md 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-10-18 12:28:12 +00:00
Bruno Windels
8a028029ee
Update test/end-to-end-tests/install.sh 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-10-18 12:28:04 +00:00
Bruno Windels
6236909d93
Update test/end-to-end-tests/README.md 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-10-18 12:27:52 +00:00
Bruno Windels
683947e0b7
Update test/end-to-end-tests/README.md 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-10-18 12:27:43 +00:00
J. Ryan Stinnett
579ada3ca2 Add an overall reachability timeout of 10s 
This adds a reachability timeout of 10s when checking the IS for 3PID bindings.
This ensures we stop in a reasonable time, rather than waiting for a long list
of requests to eventually timeout via some general mechanism.

Part of https://github.com/vector-im/riot-web/issues/10909
 2019-10-18 12:40:50 +01:00
Michael Telatynski
7e4d429fa3 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-17 19:18:14 +01:00