mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 05:51:33 +03:00
Code Issues Projects Releases Packages Wiki Activity
18592 commits 219 branches 562 tags 474 MiB
Commit graph

18592 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
088f9e4cc5 Catch error from changing room power level requirements and show modal 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-09 12:50:05 +01:00
Weblate
4494f1c265 Merge branch 'origin/develop' into Weblate. 2019-09-09 11:28:23 +00:00
J. Ryan Stinnett
a03b224ff7
Merge pull request #3394 from matrix-org/jryans/bound-3pids-warning 
Add bound 3PID warning when changing IS as well
 2019-09-09 12:28:19 +01:00
J. Ryan Stinnett
360216941e
Merge pull request #3401 from matrix-org/jryans/bound-3pids-text 
Stregthen bound 3PID warning dialog
 2019-09-09 12:28:03 +01:00
Weblate
7b30e03202 Merge branch 'origin/develop' into Weblate. 2019-09-09 09:28:04 +00:00
J. Ryan Stinnett
24f1ec8abb
Merge pull request #3398 from matrix-org/jryans/is-input-tweak 
Stop setting IS input field on account change
 2019-09-09 10:28:00 +01:00
J. Ryan Stinnett
c3adddb5ac Change to paragraphs outside the strings 2019-09-09 10:27:02 +01:00
Michael Telatynski
ef2ff31a46 Fix replying from search results for this and all rooms 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-09 09:34:08 +01:00
Weblate
4d37c8dbf7 Merge branch 'origin/develop' into Weblate. 2019-09-09 08:06:55 +00:00
Bruno Windels
1422b1d73e
Merge pull request #3403 from matrix-org/bwindels/cider-italics 
New composer: use underscore for italics so it doesn't collide with bold when toggling
 2019-09-09 08:06:51 +00:00
Travis Ralston
e29184ae1d Support secret per-room hidden read receipts 2019-09-06 13:02:18 -06:00
Michael Telatynski
034c35b07e Switch to React 16.9 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-06 19:19:06 +01:00
Weblate
9abcfd49da Merge branch 'origin/develop' into Weblate. 2019-09-06 17:49:15 +00:00
Michael Telatynski
d8dbe28015
Merge pull request #3404 from matrix-org/t3chguy/react16_10 
Switch to createReactClass: views/elements & views/groups. React 16 :D
 2019-09-06 18:49:11 +01:00
Weblate
e6d6c9ce6f Merge branch 'origin/develop' into Weblate. 2019-09-06 17:46:30 +00:00
Michael Telatynski
6dbc9ee893
Merge pull request #3405 from matrix-org/t3chguy/react16_11 
Switch to createReactClass: *everything else*. React 16 :D
 2019-09-06 18:46:24 +01:00
Michael Telatynski
b243004a6c Switch to createReactClass: *everything else*. React 16 :D 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-06 18:38:11 +01:00
Michael Telatynski
d5db67be38 Switch to createReactClass: views/elements & views/groups. React 16 :D 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-06 18:35:52 +01:00
Weblate
2cb95a1d12 Merge branch 'origin/develop' into Weblate. 2019-09-06 17:18:35 +00:00
Michael Telatynski
13258132e7
Merge pull request #3400 from matrix-org/t3chguy/react16_9 
Switch to createReactClass: views/rooms and test/components. React 16 :D
 2019-09-06 18:18:32 +01:00
Bruno Windels
48247e66be use underscore for italics so it doesn't collide with bold when toggling 2019-09-06 17:52:37 +02:00
Weblate
49f3c9f6c5 Merge branch 'origin/develop' into Weblate. 2019-09-06 14:42:20 +00:00
Bruno Windels
fe482258ac
Merge pull request #3402 from matrix-org/bwindels/cider-toggle-inline-formatting 
New composer: support toggling inline formatting
 2019-09-06 14:42:16 +00:00
Weblate
5bce922259 Merge branch 'origin/develop' into Weblate. 2019-09-06 14:28:27 +00:00
Bruno Windels
14fff3be9a
Merge pull request #3399 from matrix-org/bwindels/fix-formatbar-edit-position 
Fix format bar not appearing in edit composer
 2019-09-06 14:28:23 +00:00
Bruno Windels
26bd694c6a support toggling inline formatting 2019-09-06 16:25:55 +02:00
J. Ryan Stinnett
3ad88604cc Stregthen bound 3PID warning dialog 
This tweaks the bound 3PID text and adds danger styling.

Fixes https://github.com/vector-im/riot-web/issues/10750
 2019-09-06 15:18:01 +01:00
Michael Telatynski
70ff2bc9cd Switch to createReactClass: views/rooms and test/components. React 16 :D 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-06 15:04:46 +01:00
Bruno Windels
4e98721ba9 take bounding box for positioning calculation 2019-09-06 15:56:46 +02:00
Weblate
870659d6da Merge branch 'origin/develop' into Weblate. 2019-09-06 13:54:55 +00:00
Walter
322cb15ab3 Translated using Weblate (Russian) 
Currently translated at 97.0% (1718 of 1772 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2019-09-06 13:54:54 +00:00
송태섭
1c3abeeb22 Translated using Weblate (Korean) 
Currently translated at 100.0% (1772 of 1772 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2019-09-06 13:54:54 +00:00
Szimszon
2ec94a4913 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1772 of 1772 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-09-06 13:54:54 +00:00
Michael Telatynski
7759a9f20e
Merge pull request #3397 from matrix-org/t3chguy/react16_8 
Correct case of propTypes property in ES6 React Components. React 16
 2019-09-06 14:54:50 +01:00
J. Ryan Stinnett
5fddb20d86 Stop setting IS input field on account change 
This stops setting a value in the IS input on account change. While it may have
been marginally useful if you have the form open and change on a different
device, it also seems to pick up changes on the current device, leading to
strange UX locally.

Fixes https://github.com/vector-im/riot-web/issues/10756
Fixes https://github.com/vector-im/riot-web/issues/10757
 2019-09-06 14:33:40 +01:00
Michael Telatynski
4db8ef4d89 Correct case of propTypes property in ES6 React Components. React 16 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-06 14:27:33 +01:00
J. Ryan Stinnett
11a5fca702 Remove logs 2019-09-06 13:44:44 +01:00
J. Ryan Stinnett
df03477907 Show change warning only when different from current 2019-09-06 11:54:08 +01:00
J. Ryan Stinnett
19fff51b01 Rework handling for terms CORS error 
Earlier changes in this branch removed the "next step" of saving from the
dialogs, so we need to fold in the CORS error case.
 2019-09-06 11:12:10 +01:00
Weblate
31027ba864 Merge branch 'origin/develop' into Weblate. 2019-09-06 10:05:24 +00:00
Kévin C
4201515863 Translated using Weblate (French) 
Currently translated at 100.0% (1772 of 1772 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-09-06 10:05:24 +00:00
Besnik Bleta
79d488b52a Translated using Weblate (Albanian) 
Currently translated at 99.8% (1768 of 1772 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2019-09-06 10:05:23 +00:00
Bruno Windels
4876f4c469
Merge pull request #3396 from matrix-org/bwindels/fix-formatbar-merge-error 
Fix error on load in composer
 2019-09-06 10:05:19 +00:00
Bruno Windels
dd1c01068f fix rename that didn't make it through rebasing 2019-09-06 11:58:27 +02:00
J. Ryan Stinnett
2ff592c542 Use existing modal promises 2019-09-06 10:48:24 +01:00
Weblate
48f844fb92 Merge branch 'origin/develop' into Weblate. 2019-09-06 09:28:22 +00:00
Bruno Windels
5014b606db
Merge pull request #3391 from matrix-org/bwindels/cider-format-history 
New composer: ensure undo history is persisted before applying formatting
 2019-09-06 09:28:18 +00:00
Weblate
5916b48f41 Merge branch 'origin/develop' into Weblate. 2019-09-06 09:22:41 +00:00
Bruno Windels
df4762871a
Merge pull request #3392 from matrix-org/bwindels/cider-paste-plain 
New composer: fix pasting from word processors
 2019-09-06 09:22:37 +00:00
Weblate
69d6ff26fa Merge branch 'origin/develop' into Weblate. 2019-09-06 09:22:14 +00:00