OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
13,812 Commits
215 Branches
561 Tags
462 MiB
Commit Graph

13812 Commits (12b6383831beb3fe94e0b6213bd6d5f3bf7e801d)

Author SHA1 Message Date
Bruno Windels 12b6383831
Merge pull request #2618 from matrix-org/bwindels/fixstickers 
Fix: stickers layout
 2019-02-13 09:17:21 +01:00
Bruno Windels 27a5211239
Merge pull request #2616 from matrix-org/bwindels/settingstoggle 
Fix: dont assume settings label only has one line
 2019-02-13 09:17:03 +01:00
Bruno Windels 5047d15a3b
Merge pull request #2615 from matrix-org/bwindels/breadcrumbs 
Labs feature: recent room breadcrumbs
 2019-02-13 09:16:40 +01:00
Bruno Windels 240dc3c1cc
Merge pull request #2612 from matrix-org/bwindels/roomlistlag 
Fix: roomlist reordering lags
 2019-02-13 09:15:46 +01:00
David Baker 785b4d649f
Merge pull request #2617 from matrix-org/dbkr/e2e_change_all_the_strings 
Change text in e2e UX to new copy
 2019-02-12 20:38:58 +00:00
David Baker 2eaba22d63 Better passphase confirm text 2019-02-12 20:14:43 +00:00
Matthew Hodgson 914b3e70d5 make warning triangle less random 2019-02-12 20:03:37 +00:00
David Baker dbd2f3daa2 Use sub for substitution variable name 2019-02-12 18:08:16 +00:00
David Baker 2c5da21adb KeyBackupPanel fixes 
* Separate out the emoji from the translateable string
 * Put back the delete button if you're not using the backup,
   otherwise you're stuck unable to use key backup at all if you
   lost your recovery secret and the device you set it up on.
 2019-02-12 18:06:36 +00:00
David Baker 6c1ed57b70 flag todo 2019-02-12 17:53:00 +00:00
David Baker e41fc55cca Add warnings about trusted computers 2019-02-12 16:34:06 +00:00
David Baker 3a0b8cb169 Lint 2019-02-12 16:03:46 +00:00
David Baker 9ec00f8d9b Change text in e2e UX to new copy 2019-02-12 16:01:38 +00:00
Bruno Windels f189ff54a8 hide delete & cancel button on stickers are they weren't visible before 2019-02-12 17:01:05 +01:00
Bruno Windels 92668628ec fix sticker layout 2019-02-12 16:55:37 +01:00
Bruno Windels 108cd6d671 dont assume settings label only has one line 2019-02-12 12:50:23 +01:00
Bruno Windels b467bfdced mention it only shows up after refresh (actually rerender) 2019-02-12 12:49:22 +01:00
Bruno Windels 24cb46a991 should be on the left with animations so the animate class can clear it 2019-02-12 12:22:50 +01:00
Bruno Windels 229d905835 copyright 2019-02-12 12:21:40 +01:00
Bruno Windels 2315e4bfb4 add animation when adding a room 2019-02-12 12:16:56 +01:00
David Baker c2247cdc67
Merge pull request #2613 from matrix-org/dbkr/sas_profile 
Add display name / avatar to incoming sas dialog
 2019-02-12 10:48:49 +00:00
David Baker b7fe1f9509
Merge pull request #2614 from matrix-org/dbkr/restore_on_new_backup_warning 
Restore backup on new recovery method dialog
 2019-02-12 10:47:17 +00:00
Bruno Windels 03c491416e put breadcrumbs behind feature flag 2019-02-12 11:41:24 +01:00
Bruno Windels 735c9d1121 hide breadcrumbs when collapsed 2019-02-12 11:31:50 +01:00
Bruno Windels 5efd92f3ec make rooms come in from left rather than the right 2019-02-12 11:26:46 +01:00
Bruno Windels aaea40a93d add breadcrumbs component 2019-02-12 11:04:25 +01:00
J. Ryan Stinnett fbc1779b21
Merge pull request #2611 from matrix-org/jryans/welcome-page-cleanup 
Welcome page cleanup
 2019-02-12 09:18:21 +00:00
J. Ryan Stinnett 44e34d9074 Explain roomId workaround 2019-02-12 08:59:38 +00:00
David Baker 6aef9fcc75 Restore backup on new recovery method dialog 
Rather than verifying
 2019-02-11 16:41:06 +00:00
Bruno Windels 7c72fddf80 Merge branch 'develop' into bwindels/roomlistlag 2019-02-11 17:06:16 +01:00
David Baker 99ae63c021 Add display name / avatar to incoming sas dialog 
Fetch the other user's profile & display it on an incoming verification
request
 2019-02-11 15:57:34 +00:00
Bruno Windels ab6535b135 lint 2019-02-11 16:27:29 +01:00
Bruno Windels fbc0bbfb6f clear hover flag after 1000ms of not moving the mouse 
as a fix for #8184
 2019-02-11 16:17:15 +01:00
Travis Ralston e7e322d513
Merge pull request #2604 from matrix-org/travis/settings/scale-up 
Scale up settings UI to be easier to read
 2019-02-11 07:58:10 -07:00
Bruno Windels d069f4a89a not the cause of the bug, but this seems wrong 2019-02-11 15:41:32 +01:00
Bruno Windels b6aa72da55 update RoomTile notificationCount through props so updates are consistent 2019-02-11 15:40:17 +01:00
J. Ryan Stinnett 9d3ba2b3d9 Guard against invalid room object on join 2019-02-11 14:33:19 +00:00
J. Ryan Stinnett 4101d4e9de Always change to LOGGED_IN view to show a room 2019-02-11 14:19:05 +00:00
Will Hunt 14e3d1dece
Merge pull request #2608 from matrix-org/hs/very-important 
!important shouldn't have a space
 2019-02-11 13:36:46 +00:00
J. Ryan Stinnett 477d5ac0dc View welcome behind modals when not showing logged in view 2019-02-11 13:31:27 +00:00
Will Hunt 119806bdbd
!important shouldn't have a space 
I wonder if this is making SCSS choke.
 2019-02-11 13:31:06 +00:00
David Baker 81ab955984
Merge pull request #2607 from matrix-org/dbkr/sas_not_working_prompt 
Add legacy verification button on wait
 2019-02-11 13:24:25 +00:00
David Baker ba597c65eb lint 2019-02-11 13:09:50 +00:00
J. Ryan Stinnett 97aa0b52fa Avoid room directory error without a client 2019-02-11 12:27:10 +00:00
David Baker 1cf0a6a049 Add legacy verification button on wait 
Add a way to bail out of interactive verification from the screen
where you're waiting for the other person to accept.
 2019-02-11 12:08:10 +00:00
David Baker cc8f60ed42
Merge pull request #2606 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2019-02-11 11:34:18 +00:00
Weblate 2f8bc270d3 Merge remote-tracking branch 'origin/develop' into develop 2019-02-11 10:26:04 +00:00
Valex 3484976cfa Translated using Weblate (Russian) 
Currently translated at 89.0% (1371 of 1539 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/

оборот 'и о программе' плохо читается. Следует явно отделить один пункт от другого, как в оригинале.
 2019-02-11 10:25:59 +00:00
Karol Kosek 8126802ba2 Translated using Weblate (Polish) 
Currently translated at 76.7% (1181 of 1539 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2019-02-11 10:25:59 +00:00
Daniel Løvbrøtte Olsen b3e4163544 Translated using Weblate (Norwegian Nynorsk) 
Currently translated at 70.6% (1087 of 1539 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
 2019-02-11 10:25:59 +00:00