mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-25 12:16:00 +03:00
Code Issues Projects Releases Packages Wiki Activity
20751 commits 206 branches 547 tags 603 MiB
Commit graph

20751 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
d2d5c446e7 Merge branch 'origin/develop' into Weblate. 2020-01-22 21:14:31 +00:00
Michael Telatynski
7a028af359
Merge pull request #3902 from matrix-org/t3chguy/free_the_svg 
Be consistent about our settings svg, free the other one
 2020-01-22 21:14:25 +00:00
Weblate
523e6c7509 Merge branch 'origin/develop' into Weblate. 2020-01-22 20:57:27 +00:00
catborise
78ed8019d4 Translated using Weblate (Turkish) 
Currently translated at 72.6% (1482 of 2042 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-22 20:57:27 +00:00
Szimszon
cf5673be17 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2042 of 2042 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-22 20:57:24 +00:00
David Baker
a95cde106f
Merge pull request #3899 from matrix-org/dbkr/npm_prepare 
Change prepublish script to prepare
 2020-01-22 20:57:18 +00:00
Michael Telatynski
33b5d42c06 Be consistent about our settings svg, free the other one 2020-01-22 15:34:17 +00:00
Weblate
186def976f Merge branch 'origin/develop' into Weblate. 2020-01-22 15:26:26 +00:00
David Baker
2e0977fb0c
Merge pull request #3901 from matrix-org/dbkr/kill_react_sdk_version 
Remove the react-sdk version
 2020-01-22 15:26:22 +00:00
Weblate
b4116d8abd Merge branch 'origin/develop' into Weblate. 2020-01-22 15:26:06 +00:00
Michael Telatynski
cd412b1df4
Merge pull request #3900 from matrix-org/t3chguy/buildkite 
BuildKite: Retry end-to-end tests automatically once if they fail
 2020-01-22 15:26:01 +00:00
David Baker
7e52eb9f65 Unused import 2020-01-22 15:16:41 +00:00
David Baker
c04872dd9b i18n 2020-01-22 15:12:38 +00:00
Michael Telatynski
d04ba40efe fix syntax 2020-01-22 15:05:40 +00:00
David Baker
e3a28e3e44 Remove the react-sdk version 
I'm not sure if there was ever a point where this did work and
we had 'dist' and 'gitHead' properties in our package.json but
I can't find any trace of them now and I'm sick of this just being
there syaing '<local>' all the time.
 2020-01-22 15:05:25 +00:00
Michael Telatynski
088b1ea628 Retry end-to-end tests automatically once if they fail, flakey flake 2020-01-22 15:03:48 +00:00
Weblate
ebe0cc486c Merge branch 'origin/develop' into Weblate. 2020-01-22 14:32:15 +00:00
Michael Telatynski
97edb824bc
Merge pull request #3893 from matrix-org/t3chguy/double_slash 
Slash Command improvements around sending messages with leading slash
 2020-01-22 14:32:09 +00:00
Weblate
b5d20cc0a2 Merge branch 'origin/develop' into Weblate. 2020-01-22 14:25:44 +00:00
J. Ryan Stinnett
33533646d3
Merge pull request #3898 from matrix-org/jryans/extra-report-content 
Support admin configurable message when reporting content
 2020-01-22 14:25:39 +00:00
Michael Telatynski
516dd25797 fix typo in fallback codepath 2020-01-22 14:24:10 +00:00
David Baker
2842e8dee8 Change prepublish script to prepare 
prepublish is deprecated (prepare also runs for git checkouts, and
lib will need to be built in this case).
 2020-01-22 14:15:17 +00:00
J. Ryan Stinnett
fbb65f068a Support admin configurable message when reporting content 
This adds support for an admin-configured message in config.json to be shown in
the report content dialog to allow linking to community rules, etc.

Fixes https://github.com/vector-im/riot-web/issues/11992
 2020-01-22 14:07:18 +00:00
Michael Telatynski
e1e53f567f add more tests 2020-01-22 11:56:27 +00:00
Weblate
433d13277b Merge branch 'origin/develop' into Weblate. 2020-01-22 11:44:22 +00:00
random
5571164fe0 Translated using Weblate (Italian) 
Currently translated at 100.0% (2039 of 2039 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-01-22 11:44:21 +00:00
Zoe
684974372d
Merge pull request #3896 from matrix-org/zip/11986-only-warn-unverified 
Don't warn on unverified users; ensured behavior stays the same with flags off
 2020-01-22 11:44:14 +00:00
Weblate
e7a54ac3ea Merge branch 'origin/develop' into Weblate. 2020-01-22 11:24:31 +00:00
Szimszon
e923fdb149 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2039 of 2039 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-22 11:24:31 +00:00
Kévin C
d92ddebe5a Translated using Weblate (French) 
Currently translated at 100.0% (2039 of 2039 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-22 11:24:31 +00:00
Jeff Huang
78f7622fc5 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2039 of 2039 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-22 11:24:31 +00:00
Michael Telatynski
2a331c0a2b
Merge pull request #3895 from matrix-org/t3chguy/roving 
Fix roving room list for resizer and ff tabstop a11y
 2020-01-22 11:24:23 +00:00
Zoe
85ee6bd51f Don't warn on unverified users; ensured behavior stays the same with flags off 2020-01-22 11:22:20 +00:00
Michael Telatynski
fc724cfe70 fix tests some moar 2020-01-22 11:05:25 +00:00
Michael Telatynski
176605c302 update tests to match new rendering method 2020-01-22 10:49:58 +00:00
Michael Telatynski
37fb500e22 fix useCallback dependencies, delint 2020-01-22 10:41:10 +00:00
Michael Telatynski
2c6fe78012 Fix roving room list for resizer and ff tabstop a11y 2020-01-22 10:36:20 +00:00
Weblate
d2ff9b1abc Merge branch 'origin/develop' into Weblate. 2020-01-21 18:11:41 +00:00
Zoe
0809d7dcba
Merge pull request #3875 from matrix-org/zip/11880-message-shields 
Verify individual messages via cross-signing
 2020-01-21 18:11:36 +00:00
Weblate
2e94919236 Merge branch 'origin/develop' into Weblate. 2020-01-21 18:09:31 +00:00
Travis Ralston
5cb0dc41b7
Merge pull request #3882 from matrix-org/travis/fix-tests 
Fix layering of dependencies in riot-web and e2e tests
 2020-01-21 11:09:27 -07:00
Michael Telatynski
7b26067397 delint 2020-01-21 18:03:01 +00:00
Travis Ralston
708f62784f
Consistency 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-01-21 10:59:33 -07:00
Michael Telatynski
e455aa474d improve copy further 2020-01-21 17:58:53 +00:00
Michael Telatynski
a8df058ea6 tidy up, improve wording on modal 2020-01-21 17:54:27 +00:00
Travis Ralston
33220c2d72 Ensure generated files are present for riot-web tests 2020-01-21 10:53:17 -07:00
Weblate
36329495bb Merge branch 'origin/develop' into Weblate. 2020-01-21 17:36:37 +00:00
catborise
931c0885de Translated using Weblate (Turkish) 
Currently translated at 70.7% (1440 of 2038 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-21 17:36:36 +00:00
Michael Telatynski
587ff6ad75
Merge pull request #3844 from matrix-org/t3chguy/roving 
Implement Roving Tab Index and Room List as TreeView
 2020-01-21 17:36:30 +00:00
Zoe
2480f709b3 E2ESTATE -> E2E_STATE 2020-01-21 17:19:10 +00:00