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

17932 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jeff Huang
88b129caeb Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1755 of 1755 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-08-30 15:16:35 +00:00
Besnik Bleta
e0cbe25425 Translated using Weblate (Albanian) 
Currently translated at 99.8% (1751 of 1755 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2019-08-30 15:16:34 +00:00
Michael Telatynski
de0719151f
Merge pull request #3351 from matrix-org/t3chguy/pl_control_e2e 
Expose power level toggle for enabling e2ee to room settings
 2019-08-30 16:16:30 +01:00
Michael Telatynski
00a06af419 Hide the E2EE PL selector if room is already encrypted 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-30 10:57:46 +01:00
Michael Telatynski
8967871b23 Merge branches 'develop' and 't3chguy/pl_control_e2e' of github.com:matrix-org/matrix-react-sdk into t3chguy/pl_control_e2e 
 Conflicts:
	src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
	src/i18n/strings/en_EN.json
 2019-08-30 10:56:47 +01:00
Bruno Windels
b16f983a1f put display name in user pill text fallback instead of mxid 2019-08-30 11:51:29 +02:00
Bruno Windels
42ba5f6f0a force model update after composition finishes 2019-08-30 11:37:42 +02:00
Michael Telatynski
abf111ecbd Migrate away from React.createClass for non-auth structures. React 16 :D 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-30 10:34:59 +01:00
Michael Telatynski
2e1fb4533c Migrate away from React.createClass for auth and views/auth. React 16 :D 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-30 10:27:51 +01:00
Weblate
c7677a4e2e Merge branch 'origin/develop' into Weblate. 2019-08-30 09:19:35 +00:00
송태섭
0ad1e5647f Translated using Weblate (Korean) 
Currently translated at 83.4% (1463 of 1754 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2019-08-30 09:19:35 +00:00
송태섭
0d20cea6b6 Translated using Weblate (Korean) 
Currently translated at 83.4% (1463 of 1754 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2019-08-30 09:19:35 +00:00
dccs
e0f536c5f1 Translated using Weblate (German) 
Currently translated at 87.5% (1534 of 1754 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-08-30 09:19:32 +00:00
J. Ryan Stinnett
27fdef557d
Merge pull request #3359 from matrix-org/jryans/features-without-is 
Allow connecting to an IS from address picker
 2019-08-30 10:19:28 +01:00
Weblate
9078c54be9 Merge branch 'origin/develop' into Weblate. 2019-08-30 08:18:02 +00:00
vargtas
364f248c37 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 14.0% (246 of 1754 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
 2019-08-30 08:18:02 +00:00
송태섭
bba5492829 Translated using Weblate (Korean) 
Currently translated at 80.3% (1409 of 1754 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2019-08-30 08:18:01 +00:00
Szimszon
c785a8e315 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1754 of 1754 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-08-30 08:17:52 +00:00
Bruno Windels
4779880a94
Merge pull request #3362 from matrix-org/bwindels/cider-no-enter-autocomplete 
New composer: don't capture enter to close autocomplete
 2019-08-30 08:17:47 +00:00
Weblate
a16cfb0125 Merge branch 'origin/develop' into Weblate. 2019-08-29 19:24:10 +00:00
Travis Ralston
7dd6471059
Merge pull request #3018 from Sorunome/soru/spoilers 
Add Spoilers as per MSC2010
 2019-08-29 13:24:06 -06:00
Bruno Windels
c144edfcac dont capture enter to close autocomplete 2019-08-29 18:39:35 +02:00
Weblate
655957bdd0 Merge branch 'origin/develop' into Weblate. 2019-08-29 16:31:32 +00:00
Bruno Windels
5105140902
Merge pull request #3358 from matrix-org/bwindels/cider-paste-images 
New composer: support pasting files
 2019-08-29 16:31:28 +00:00
Weblate
0a2e1e7c89 Merge branch 'origin/develop' into Weblate. 2019-08-29 16:31:09 +00:00
Bruno Windels
dc292d332d
Merge pull request #3357 from matrix-org/bwindels/cider-ime 
New composer: don't update model while doing IME compositions
 2019-08-29 16:31:05 +00:00
Weblate
ebde169899 Merge branch 'origin/develop' into Weblate. 2019-08-29 16:24:33 +00:00
송태섭
b32880413c Translated using Weblate (Korean) 
Currently translated at 68.9% (1208 of 1754 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2019-08-29 16:24:33 +00:00
Bruno Windels
c1d7ad40c5
Merge pull request #3356 from matrix-org/bwindels/cider-paste-newlines 
New composer: handle newlines properly when pasting
 2019-08-29 16:24:27 +00:00
Sorunome
4ae130bd27
add license header, descriptive comment and change to class 2019-08-29 18:13:52 +02:00
Bruno Windels
be79cdddb0 apply autocomplete changes to mock to fix editor unit tests 2019-08-29 18:00:38 +02:00
Bruno Windels
c9572250be only append colon to user-pill when at start of composer 
by passing position to autocomplete, so completion
can depend on where the pill-candidate appears.
 2019-08-29 17:47:14 +02:00
Bruno Windels
2ff2ff0e75 support autocomplete replacing text with multiple parts 
and append ": " to user pills
 2019-08-29 17:43:18 +02:00
Weblate
cef191a27d Merge branch 'origin/develop' into Weblate. 2019-08-29 14:33:45 +00:00
Walter
d84e9ee135 Translated using Weblate (Russian) 
Currently translated at 97.8% (1716 of 1754 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2019-08-29 14:33:45 +00:00
Kévin C
30126e73fb Translated using Weblate (French) 
Currently translated at 100.0% (1754 of 1754 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-08-29 14:33:44 +00:00
Jeff Huang
b45dc78613 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1754 of 1754 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-08-29 14:33:43 +00:00
Besnik Bleta
5f660c247b Translated using Weblate (Albanian) 
Currently translated at 99.8% (1750 of 1754 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2019-08-29 14:33:43 +00:00
Travis Ralston
eb22ddfea9
Merge pull request #3360 from matrix-org/dependabot/npm_and_yarn/eslint-utils-1.4.2 
Bump eslint-utils from 1.4.0 to 1.4.2
 2019-08-29 08:33:37 -06:00
J. Ryan Stinnett
166fb696c2 Allow connecting to an IS from address picker 
This allows those who previously disconnected from an IS to either choose the
default IS or a custom one from Settings via the address picker dialog.

Part of https://github.com/vector-im/riot-web/issues/10619
 2019-08-29 15:28:34 +01:00
J. Ryan Stinnett
752eb17893 Remove subtext in room invite dialog 
The subtext here was deemed redundant.

Part of https://github.com/vector-im/riot-web/issues/10619
 2019-08-29 15:28:34 +01:00
dependabot[bot]
8ff2c42f39
Bump eslint-utils from 1.4.0 to 1.4.2 
Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.4.0 to 1.4.2.
- [Release notes](https://github.com/mysticatea/eslint-utils/releases)
- [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.4.0...v1.4.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-08-29 14:23:57 +00:00
Bruno Windels
fe7ac11abc New composer: support pasting files 2019-08-29 16:19:05 +02:00
Bruno Windels
891ccf0f4c don't update model while doing IME composition 
this prevents the composition from being disrupted because
the DOM is modified, and also complete compositions are added
to the undo history like this.
 2019-08-29 13:56:21 +02:00
Bruno Windels
80523f5dbe still convert \n to NewlinePart when pasting/dropping 
before we skipped the complete validation (which creates NewlineParts)
when pasting or dropping text. We don't want to create PillCandidatePart
when inserting text like this, as it would open the auto-complete, but
newlines should still be applied. So instead of skipping validation,
pass the inputType to the validation code so they can only reject
pill candidate characters when not pasting.
 2019-08-29 13:00:31 +02:00
Bruno Windels
e531b29307 don't ignore BR elements when converting to editor dom to text 2019-08-29 13:00:31 +02:00
Sorunome
fe9ae46ffb
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into soru/spoilers 2019-08-28 20:23:24 +02:00
Weblate
f7266a9a44 Merge branch 'origin/develop' into Weblate. 2019-08-28 17:36:07 +00:00
J. Ryan Stinnett
599fccd9ce
Merge pull request #3343 from matrix-org/jryans/hide-is-field-during-auth 
Reveal custom IS field only when required
 2019-08-28 18:36:02 +01:00
Weblate
66b5f580d6 Merge branch 'origin/develop' into Weblate. 2019-08-28 16:49:33 +00:00