mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-11-30 23:31:28 +03:00
Code Issues Projects Releases Packages Wiki Activity
22163 commits 217 branches 561 tags 443 MiB
Commit graph

22163 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
a50e4f624c
Merge pull request #4149 from matrix-org/travis/fix-directory-results 
Suggest the server's results as lower quality in the invite dialog
 2020-03-03 10:29:37 -07:00
Bruno Windels
5d6690f74b document scrollpanel and bacat scrolling 2020-03-03 17:59:02 +01:00
Weblate
4e347daa53 Merge branch 'origin/develop' into Weblate. 2020-03-03 15:07:47 +00:00
Bruno Windels
72af620d92
Merge pull request #4166 from matrix-org/bwindels/relativescrolling 
Adjust scroll offset with relative scrolling
 2020-03-03 15:07:42 +00:00
Bruno Windels
3e39cebb8f also use relative scrolling when eh ... doing relative scrolling 2020-03-03 15:44:59 +01:00
Bruno Windels
223956a206 add comment how offset from bottom is calculated 2020-03-03 15:42:44 +01:00
Bruno Windels
f9d2d45b24 use relative scrolling to compensate when changing height 2020-03-03 15:42:22 +01:00
J. Ryan Stinnett
59c4e36ba8 Lock interactive auth as busy until state change 
This keeps interactive auth locked as busy until a state change so that e.g.
accepting a terms step will remain "busy looking" until the next step of the
process appears.

Fixes https://github.com/vector-im/riot-web/issues/12546
 2020-03-03 14:40:22 +00:00
Weblate
e34bad1809 Merge branch 'origin/develop' into Weblate. 2020-03-03 14:23:00 +00:00
Szimszon
357ebb5289 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2140 of 2140 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-03-03 14:23:00 +00:00
Michael Telatynski
b23eaa1ce7
Merge pull request #4163 from matrix-org/t3chguy/double_download 
only automatically download in usercontent if user requested it
 2020-03-03 14:22:54 +00:00
Michael Telatynski
c0b68ccd53 only automatically download in usercontent if user requested it 2020-03-03 13:23:33 +00:00
Weblate
b6e2a48538 Merge branch 'origin/develop' into Weblate. 2020-03-03 11:46:03 +00:00
Kévin C
7430277e13 Translated using Weblate (French) 
Currently translated at 100.0% (2140 of 2140 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-03-03 11:46:03 +00:00
Michael Telatynski
ca274dde4a
Merge pull request #4162 from matrix-org/t3chguy/double_download 
Fix having to decrypt & download in two steps
 2020-03-03 11:45:57 +00:00
Michael Telatynski
0e65d54af2 Fix having to decrypt & download in two steps 2020-03-03 11:03:40 +00:00
J. Ryan Stinnett
88f351d5ca Keep sign in button disabled on success 
This changes password login to keep the sign in button locked when proceeding
successfully to avoid the possibility of double device sign in.

Part of https://github.com/vector-im/riot-web/issues/12546
 2020-03-03 10:42:08 +00:00
Weblate
afe68efa5c Merge branch 'origin/develop' into Weblate. 2020-03-03 10:20:56 +00:00
Karol Kosek
96f125ebdc Translated using Weblate (Polish) 
Currently translated at 63.3% (1355 of 2140 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2020-03-03 10:20:56 +00:00
J. Ryan Stinnett
7b477d04bf
Merge pull request #4161 from matrix-org/jryans/release-bash 
Use bash for release script
 2020-03-03 10:20:49 +00:00
Travis Ralston
d95f843cd0 Don't group blank membership changes 
We already drop noop membership changes when they don't make it into a MELS, so we just need to make the MELS aware enough to drop messages early that are noops.

Fixes https://github.com/vector-im/riot-web/issues/12575
 2020-03-02 17:52:20 -07:00
Mark Striemer
df9710907c Add en_US string 2020-03-02 15:45:16 -06:00
Mark Striemer
07348a65ad Include a mark as read X under the scroll to unread button 2020-03-02 13:59:14 -06:00
Weblate
a7fdbe9eca Merge branch 'origin/develop' into Weblate. 2020-03-02 19:56:05 +00:00
Michael Telatynski
db3721b10b
Merge pull request #4157 from matrix-org/t3chguy/rls 
Revert to manual sorting for custom tag rooms
 2020-03-02 19:55:59 +00:00
J. Ryan Stinnett
677dce75c5 Use bash for release script 
This fixes this repo to use bash for this script, matching the other repos.
 2020-03-02 17:48:39 +00:00
Weblate
23a320cfba Merge branch 'origin/develop' into Weblate. 2020-03-02 17:46:31 +00:00
RiotRobot
00dc187f71 Reset matrix-js-sdk back to develop 2020-03-02 17:43:21 +00:00
Weblate
68289f717f Merge branch 'origin/develop' into Weblate. 2020-03-02 17:40:25 +00:00
RiotRobot
55419a1bf5 Merge branch 'master' into develop 2020-03-02 17:39:51 +00:00
RiotRobot
134ca31b25 v2.2.0 2020-03-02 17:33:23 +00:00
RiotRobot
51b10702f0 Prepare changelog for v2.2.0 2020-03-02 17:33:23 +00:00
RiotRobot
7fcad8c82c Upgrade matrix-js-sdk to 5.1.0 2020-03-02 17:29:36 +00:00
Weblate
759be7000b Merge branch 'origin/develop' into Weblate. 2020-03-02 16:59:57 +00:00
Travis Ralston
680beb858e
Merge pull request #4150 from matrix-org/travis/fix-cutoff 
Fix the last char of people's names being cut off in the invite dialog
 2020-03-02 09:59:51 -07:00
Weblate
f09706ef94 Merge branch 'origin/develop' into Weblate. 2020-03-02 16:35:04 +00:00
Michael Telatynski
6ba9f78888
Merge pull request #4154 from matrix-org/t3chguy/whois_cmd 
Add /whois SlashCommand to open UserInfo
 2020-03-02 16:34:58 +00:00
Michael Telatynski
4d9d5a1ab7 improve comments 2020-03-02 15:05:56 +00:00
Michael Telatynski
f8045e428b riot-desktop open SSO in browser so user doesn't have to auth twice 2020-03-02 14:59:54 +00:00
Michael Telatynski
8ec83d4a77 Revert to manual sorting for custom tag rooms 2020-03-02 11:20:28 +00:00
Weblate
0ee1b829cb Merge branch 'origin/develop' into Weblate. 2020-03-02 11:04:50 +00:00
Michael Telatynski
5f1d8588e0
Merge pull request #4155 from matrix-org/t3chguy/fix_pills 
word-break in pills and wrap the background correctly
 2020-03-02 11:04:45 +00:00
Weblate
8800274d61 Merge branch 'origin/develop' into Weblate. 2020-03-02 11:00:03 +00:00
catborise
c6eef5fe5b Translated using Weblate (Turkish) 
Currently translated at 75.3% (1610 of 2139 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-03-02 11:00:03 +00:00
tctovsli
72ad0a8dbc Translated using Weblate (Norwegian Nynorsk) 
Currently translated at 50.9% (1089 of 2139 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
 2020-03-02 10:59:58 +00:00
call_xz
f589277bb8 Translated using Weblate (Japanese) 
Currently translated at 54.7% (1169 of 2139 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2020-03-02 10:59:58 +00:00
Szimszon
270d31d4a9 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2139 of 2139 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-03-02 10:59:57 +00:00
Tentarial
4d07480cce Translated using Weblate (German) 
Currently translated at 75.7% (1619 of 2139 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-02 10:59:57 +00:00
Kévin C
ef017fe8f2 Translated using Weblate (French) 
Currently translated at 100.0% (2139 of 2139 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-03-02 10:59:56 +00:00
axel simon
6c77b563f2 Translated using Weblate (French) 
Currently translated at 100.0% (2139 of 2139 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-03-02 10:59:55 +00:00