mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-23 17:56:01 +03:00
Code Issues Projects Releases Packages Wiki Activity
13626 commits 203 branches 553 tags 406 MiB
Commit graph

13626 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bruno Windels
e8533beafb guard custom tags with feature flag 2019-02-07 18:07:30 +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
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
David Baker
f517928d76
Merge pull request #2577 from matrix-org/dbkr/backup_dont_fail_if_no_keys 
Key Backup: Don't fail if no keys
 2019-02-07 09:30:28 +00:00
Travis Ralston
2e852da72e Actually change power levels when they are changed 2019-02-06 15:06:15 -07:00
Travis Ralston
9ca1e875a3 Fix firefox scrolling settings tabs differently 
Fixes https://github.com/vector-im/riot-web/issues/8408
 2019-02-06 14:11:09 -07:00
Bastian
951f0fc816 Fix error if topicEvents is undefined 
Signed-off-by: Bastian <matrix@noxware.de>
 2019-02-06 20:10:56 +01:00
Bastian
aa0ae88076 Replace QuestionDialog with InfoDialog 
Signed-off-by: Bastian <matrix@noxware.de>
 2019-02-06 19:43:59 +01:00
Bastian
d77f10e085 Reformat 
Signed-off-by: Bastian <matrix@noxware.de>
 2019-02-06 19:37:23 +01:00
Bastian
7428e97910 Clean up InfoButton 
Signed-off-by: Bastian <matrix@noxware.de>
 2019-02-06 19:35:48 +01:00
Travis Ralston
8b5e4a4f52
Merge pull request #2554 from matrix-org/travis/settings/delete-the-old 
Remove old user and room settings
 2019-02-06 11:35:02 -07:00
J. Ryan Stinnett
2b7ecd3de7 Go to forgot phase on error 2019-02-06 18:32:28 +00:00
J. Ryan Stinnett
9f9f0d4168 Move server details to a separate phase of forgot password 2019-02-06 18:30:07 +00:00
Bastian
4dcbb6fc0f Update copyright 
Signed-off-by: Bastian <matrix@noxware.de>
 2019-02-06 19:27:53 +01:00
J. Ryan Stinnett
7680667334 Avoid controlled component error with empty strings 2019-02-06 18:26:44 +00:00
J. Ryan Stinnett
0e543a362e Move errors to top of reset password 2019-02-06 18:10:06 +00:00
Travis Ralston
04f2375273 Add issue references to things 2019-02-06 11:06:02 -07:00
David Baker
ce565f109a Key Backup: Don't fail if no keys 
Only fail if there were any keys in the backup (which does mean
that the backup will always succeed if there aren't any keys which
could also be misleading, but is probably not as bad and can probably
be fixed with Trust on Decrypt).

Also cheekily fix the error message so it talks about passphrases
if you used a passphrase and recovery keys if you used a recovery key.
 2019-02-06 18:03:47 +00:00
Travis Ralston
e13149ed2c regen i18n due to merge 2019-02-06 11:02:56 -07:00
Travis Ralston
b2c161c7c1 Merge branch 'develop' into travis/settings/delete-the-old 2019-02-06 11:02:21 -07:00
J. Ryan Stinnett
3afc455f3c Extract each phase to a separate function 2019-02-06 18:00:58 +00:00
Bruno Windels
0f7b73bc1b
Merge pull request #2576 from matrix-org/bwindels/debouncefiltermore 
increase debouncing of filtering because its quite laggy atm
 2019-02-06 17:31:19 +00:00
Bruno Windels
d501ce0553 increase debouncing of filtering because its quite laggy atm 2019-02-06 17:25:56 +00:00
Bruno Windels
699023ea40 prevent tagtiles jumping when selected 2019-02-06 16:53:48 +00:00
J. Ryan Stinnett
a61de03a88 Remove left over TODO 2019-02-06 16:32:22 +00:00
J. Ryan Stinnett
b20f1d1240 Convert forgot password to phases like the other flows 2019-02-06 16:30:53 +00:00
J. Ryan Stinnett
8aff6b2e45 Add your account header to reset password 2019-02-06 16:14:21 +00:00
J. Ryan Stinnett
8e12c4a3b8 Normalize URL naming for reset password 2019-02-06 15:58:31 +00:00
J. Ryan Stinnett
8c6dc002f3 Add new footer text to reset password 2019-02-06 15:46:25 +00:00