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

22941 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zoe
1395cb02ed Fixup alignment 2020-04-06 11:44:46 +01:00
Zoe
5ef06357f6 Merge branch 'develop' into foldleft/better-errors 2020-04-06 11:36:46 +01:00
Michael Telatynski
da8939107a
Merge pull request #4312 from matrix-org/t3chguy/xsigning/fix_userinfo_e2eicon 
Fix alignment of e2e icon in userinfo and expose full displayname in title
 2020-04-03 20:33:42 +01:00
Michael Telatynski
fe401ce4da
Merge branch 'develop' into t3chguy/xsigning/fix_userinfo_e2eicon 2020-04-03 18:38:30 +01:00
Bruno Windels
37781f2064
Merge pull request #4342 from matrix-org/bwindels/selfverifux 
Adjust copy & UX for self-verification
 2020-04-03 16:01:53 +00:00
Bruno Windels
adead76882 Merge branch 'develop' into bwindels/selfverifux 2020-04-03 17:53:07 +02:00
Bruno Windels
2cf55fb2a0 adjust start options styling 2020-04-03 17:32:09 +02:00
Bruno Windels
37289bc832 i18n 2020-04-03 17:05:20 +02:00
Bruno Windels
364421b088 adjust self-verification copy in incoming verif req toast 2020-04-03 17:04:58 +02:00
Bruno Windels
cdbd4da0e4 adjust copy for self-verification in verification panel 2020-04-03 17:04:29 +02:00
Bruno Windels
030d594e67 for self-verif, mention which device, not user we're verifying in panel 2020-04-03 17:03:37 +02:00
Bruno Windels
c15fa2ba0c
Merge pull request #4334 from matrix-org/bwindels/qr-reciprocate 
QR code reciprocation
 2020-04-03 12:28:41 +00:00
Bruno Windels
2698751429
Merge pull request #4339 from jungeonkim/develop 
Fix Hangul typing does not work properly
 2020-04-03 11:52:53 +00:00
JungEon Kim
94236de637 Fix Hangul typing does not work properly 
compositionstart event may fire in the meantime because
compositionend event is being processed asynchronously.

Signed-off-by: JungEon Kim <me@jungeon.kim>
 2020-04-03 20:43:34 +09:00
Bruno Windels
9407df3da0
Merge pull request #4336 from matrix-org/bwindels/fixverifytoastaftercompletesecurity 
Fix: dismiss setup encryption toast if cross-signing is ready
 2020-04-03 10:27:32 +00:00
J. Ryan Stinnett
cabaf36794
Merge pull request #4340 from matrix-org/jryans/read-marker-groupers 
Fix read marker visibility for grouped events
 2020-04-03 11:07:46 +01:00
J. Ryan Stinnett
86f39ee0ee Fix read marker visibility for grouped events 
The recent "groupers" which extracted out timeline grouping logic forgot to
pass through the last event state for read marker computation. This causes the
read marker to become visible when e.g. returning to room if it was last placed
inside a grouped set of events (currently room creation and membership events).

Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/4059
Related to https://github.com/vector-im/riot-web/issues/12338
 2020-04-03 01:14:31 +01:00
Jorik Schellekens
3ed457ea7d
Merge pull request #4305 from JorikSchellekens/joriks/font-scaling 
Make all 'font-size's and 'line-height's rem
 2020-04-02 17:40:39 +01:00
Bruno Windels
2ee780caa2 pass isSelf flag to sas component 2020-04-02 18:28:14 +02:00
Bruno Windels
6bb6885578 adjust sas copy to use device -> session 2020-04-02 18:28:01 +02:00
Bruno Windels
cc9c5cabb3 adapt encryption info to self-verification 
- hide text when shown in a dialog
 - adapt "waiting for ... to accept" text to self-verif
 2020-04-02 17:51:25 +02:00
Bruno Windels
081baa2359 set dialog title for self-verification 
use request.isSelfVerification helper
 2020-04-02 17:51:06 +02:00
Bruno Windels
009941a6ac Merge branch 'bwindels/qr-reciprocate' into bwindels/selfverifux 2020-04-02 16:57:44 +02:00
Bruno Windels
fffd5a4a5e fix stylelint 2020-04-02 16:46:29 +02:00
Bruno Windels
1baaafe7b9 some comments to explain the mess 2020-04-02 16:44:42 +02:00
Bruno Windels
0307361fa2 more polish for self-verification 2020-04-02 16:42:39 +02:00
David Baker
9944ce71b6
Merge pull request #4337 from matrix-org/dbkr/fix_inhibit_login_case 
Fix spurious extra devices on registration
 2020-04-02 15:29:55 +01:00
David Baker
705fd57a4b Fix spurious extra devices on registration 
We send a parameter to prevent being immediately logged in after
registration, but we regressed it from snake case to camelcase
during the course of cross-signing dev.

Fixes https://github.com/vector-im/riot-web/issues/12865
 2020-04-02 15:09:33 +01:00
Bruno Windels
ee61a3aff6 dismiss setup encryption toast if cross-signing is ready 2020-04-02 16:07:55 +02:00
Jorik Schellekens
202ad9f98a Remove sort and include new scss file in components 2020-04-02 13:42:59 +01:00
Jorik Schellekens
df1a8b288b Change copyright 2020-04-02 13:35:12 +01:00
Bruno Windels
31ca52dede fix stylelint 2020-04-02 13:44:19 +02:00
Bruno Windels
1f65cfb7f6 polish design and disable buttons after click 2020-04-02 13:44:19 +02:00
Bruno Windels
ccf6c9efdc fixup: more i18n 2020-04-02 13:44:19 +02:00
Bruno Windels
a4f448d4ca update i18n 2020-04-02 13:44:19 +02:00
Bruno Windels
119fd2f519 fixup: these are actually on the verifier 2020-04-02 13:44:19 +02:00
Bruno Windels
fd04f248c4 fix proptype typo 2020-04-02 13:44:19 +02:00
Bruno Windels
00b1afe0fa first go at reciprocate UX 2020-04-02 13:44:19 +02:00
Bruno Windels
1353ddaa96 move qr code data generation to js-sdk 2020-04-02 13:41:19 +02:00
David Baker
5cce31b39e
Merge pull request #4333 from matrix-org/dbkr/fix_edit_composer 
Fix the edit messager composer
 2020-04-02 11:59:51 +01:00
David Baker
74186740ee Fix the edit messager composer 
Broken in https://github.com/matrix-org/matrix-react-sdk/pull/4313
Fixes https://github.com/vector-im/riot-web/issues/13001
 2020-04-02 11:30:43 +01:00
Michael Telatynski
6db51cf9aa
Merge pull request #4321 from matrix-org/t3chguy/room_settings_notif_icon 
Fix Room Settings Dialog Notifications tab icon
 2020-04-02 09:50:57 +01:00
Travis Ralston
f7fa86f3ac
Merge pull request #4331 from matrix-org/travis/react-warnings/5-misc-cases 
Fix various cases of React warnings by silencing them
 2020-04-01 18:56:38 -06:00
Michael Telatynski
9ff587520c
Merge pull request #4332 from matrix-org/t3chguy/userinfo_regression 
Only apply padding to standard textual buttons (kind buttons)
 2020-04-02 00:50:51 +01:00
Michael Telatynski
faa4f54c97 Only apply padding to standard textual buttons (kind buttons) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-02 00:12:48 +01:00
Travis Ralston
c5cf04f6d2 More appeasing of the linter 2020-04-01 16:25:59 -06:00
Travis Ralston
8e405dda2e Fix soft crash when editing message 
Fixes https://github.com/matrix-org/riot-web-rageshakes/issues/2504
 2020-04-01 16:22:42 -06:00
Travis Ralston
31ec984c86 Actually appease the linter 2020-04-01 14:49:39 -06:00
Travis Ralston
5c2841323e Appease the linter by turning it off 2020-04-01 14:45:54 -06:00
Travis Ralston
f2c41a5da7 Silence another console.warn that should have been a log 2020-04-01 14:40:51 -06:00