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

13652 Commits (82a7ecbf25a4b42e4ec3159e45b2d579922801bc)

Author SHA1 Message Date
Travis Ralston 82a7ecbf25
Merge pull request #2592 from matrix-org/travis/render-join-rules 
Render join rules and guest access changes in the timeline
 2019-02-08 09:32:32 -07:00
Travis Ralston 8cdfdd2e24 Merge branch 'develop' into travis/render-join-rules 2019-02-08 09:24:07 -07:00
Travis Ralston 85cfd48744 join rules -> join rule 2019-02-08 09:15:12 -07:00
Travis Ralston 78ea531a87
Merge pull request #2590 from matrix-org/travis/settings/fix-directory-publish 
Ensure toggle switches listen to property changes
 2019-02-08 08:00:47 -07:00
Travis Ralston 47b79c0cf6
Merge pull request #2593 from matrix-org/travis/settings/local-echo 
Local echo on room access settings
 2019-02-08 07:58:51 -07:00
Bruno Windels 0087765c2c
Merge pull request #2589 from matrix-org/bwindels/customtags-featureflag 
guard custom tags with feature flag
 2019-02-08 13:22:33 +00:00
Bruno Windels 3c5fb61350 Merge branch 'develop' into bwindels/customtags-featureflag 2019-02-08 12:12:43 +00:00
Bruno Windels 2eff03ba78 fix whitespace 2019-02-08 12:03:58 +00:00
Bruno Windels 00a1ca503c
Merge pull request #2588 from matrix-org/bwindels/removellfeatureflag 
remove ll feature flag, it's time!
 2019-02-08 12:02:58 +00:00
David Baker abcbd46fe1
Merge pull request #2583 from matrix-org/dbkr/trust_on_decrypt 
Trust on decrypt
 2019-02-08 11:36:53 +00:00
David Baker e805df7b4c Use fewer brs 2019-02-08 10:46:38 +00:00
David Baker d1e2418b75 Use error constant from the class 2019-02-08 10:43:39 +00:00
David Baker 539dd08c3b
Merge pull request #2586 from matrix-org/dbkr/sas_no_click 
Remove click-to-verify from SAS
 2019-02-08 10:18:26 +00:00
Bruno Windels 748040268a remove unused imports 2019-02-08 09:59:24 +00:00
Bruno Windels 2bcb54e749 remove strings from removed code 2019-02-08 09:29:11 +00:00
Travis Ralston f66c92b1fd Local echo on room access settings 
Includes a fix for the aliases warning appearing at the wrong time. 

Fixes https://github.com/vector-im/riot-web/issues/8406
Fixes https://github.com/vector-im/riot-web/issues/8434
 2019-02-07 14:01:34 -07:00
Travis Ralston 5d4406cbab Render join rules and guest access changes in the timeline 
Fixes https://github.com/vector-im/riot-web/issues/8435
 2019-02-07 12:14:58 -07:00
Travis Ralston 89a8422320 Ensure toggle switches listen to property changes 
They do local echo on changes to avoid jumping back and forth while requests are ongoing, however some areas modify the checked state after the toggle has mounted.

Fixes https://github.com/vector-im/riot-web/issues/8432
 2019-02-07 11:54:13 -07:00
Bruno Windels 90768ee3b7
Merge pull request #2587 from matrix-org/bwindels/fixcustomtagslayout 
Fix: make sure custom tag scroller doesn't overflow parent
 2019-02-07 18:49:00 +00:00
Bruno Windels cf7e1f9d88 remove import as well 2019-02-07 18:47:08 +00:00
Bruno Windels 8c32f88c1c remove homeserver ll check on toggling lab setting 2019-02-07 18:45:00 +00:00
Bruno Windels ac4ab11985 remove ll feature flag, it's time! 2019-02-07 18:24:07 +00:00
Bruno Windels e8533beafb guard custom tags with feature flag 2019-02-07 18:07:30 +00:00
David Baker 4728ddf515 Forgot the CSS file 2019-02-07 17:53:41 +00:00
Bruno Windels d4ed0bc038 make sure scroller doesn't overflow parent 2019-02-07 17:08:40 +00:00
David Baker 3a924d05b5 Remove click-to-verify from SAS 
The click-each-pair to verify was hard to discover, so remove it
 2019-02-07 17:01:55 +00:00
Bruno Windels b50bfa1eda
Merge pull request #2585 from matrix-org/bwindels/throttlecustomtags 
Fix: throttle custom tags updating in LLP
 2019-02-07 16:15:57 +00:00
Bruno Windels c0b9d99385 only import throttle fn 2019-02-07 16:03:12 +00:00
Bruno Windels 35d9c02ecd throttle custom tags updating in LLP 2019-02-07 15:28:22 +00:00
Travis Ralston 5b4ebf3b76
Merge pull request #2579 from matrix-org/travis/settings/fix-ff-scroll 
Fix firefox scrolling settings tabs differently
 2019-02-07 08:14:08 -07:00
Travis Ralston 3e70212ec8
Merge pull request #2580 from matrix-org/travis/settings/fix-pl 
Actually change power levels when they are changed
 2019-02-07 08:13:35 -07:00
Bruno Windels 80731a9de4
Merge pull request #2584 from matrix-org/bwindels/fixrelogincustomtags 
Fix: logging in again breaks CustomRoomTagStore
 2019-02-07 15:07:49 +00:00
Bruno Windels d2ac434545 no need to update tags when app is booting, wait till sync 2019-02-07 14:41:39 +00:00
Bruno Windels 64bb6d2b1f dont remove tags prop from state on logout as we assume its always there 2019-02-07 14:41:19 +00:00
David Baker f79b777dd4 Trust on decrypt 
Add support for trust-on-decrypt (API change, recognise flag on
isKeyBackupTrusted). Catch rejection on wrong passphrase / recovery
key. Fix remembering whether we are restoring with key or passphrase.

Requires https://github.com/matrix-org/matrix-js-sdk/pull/836
 2019-02-07 14:39:47 +00:00
David Baker 594bd86a0c
Merge pull request #2582 from matrix-org/bwindels/fixnotifbadgeclickandcursor 
Fix: click on notif badge
 2019-02-07 14:12:00 +00:00
David Baker b7fd1336de
Merge pull request #2532 from boeserwolf/boeserwolf/get-set-topic 
Extend slash command '/topic' to display the room topic
 2019-02-07 13:45:59 +00:00
Bruno Windels 5b85f8928d show a hand cursor on the badge while we're at it 2019-02-07 13:40:50 +00:00
Bruno Windels 252a61379c its list, not lists 2019-02-07 13:40:29 +00:00
Bastian 179f9a1943 Use default options from sanitizeHtmlParams for sanitizeHtml() 
Signed-off-by: Bastian <matrix@noxware.de>
 2019-02-07 14:33:19 +01:00
Bruno Windels 7affcf7f4c
Merge pull request #2581 from matrix-org/bwindels/communitybadgefix 
Fix: community badges
 2019-02-07 12:29:49 +00:00
Bruno Windels 8eb1f15ed4 do more explicit check 2019-02-07 12:18:52 +00:00
Bruno Windels 62cdf40a39 dont assume a user has joined all the rooms in a community 2019-02-07 12:11:16 +00:00
Bruno Windels 87ddb8a453
Merge pull request #2575 from matrix-org/bwindels/customtags 
Bring back custom tags, also badges on communities
 2019-02-07 11:37:17 +00:00
Bruno Windels 52aab2be98 preserve outer this with arrow function 2019-02-07 11:12:34 +00:00
Bruno Windels 7b23fa7a4f implement PR feedback 2019-02-07 10:49:23 +00:00
J. Ryan Stinnett 30395f064d
Merge pull request #2578 from jryans/auth-reset-password 
Style reset password to match design
 2019-02-07 10:05:11 +00:00
J. Ryan Stinnett d03f4875f3 Update style for forgot password copy, add full stops 2019-02-07 09:57:31 +00:00
J. Ryan Stinnett 8b2f2c7d5c Remove unneeded refs from reset password 2019-02-07 09:44:28 +00:00
J. Ryan Stinnett e1b7af39dc Basic validation of HS URL for reset password 2019-02-07 09:36:43 +00:00