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

14439 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
ce9f3d8a57 Rename 2019-03-11 11:38:54 +00:00
David Baker
999ebe6a19 Missed the removes 
also fix more indenting
 2019-03-08 21:51:14 +00:00
David Baker
b404d21bba PR feedback 2019-03-08 17:41:04 +00:00
David Baker
7e424ce95b Fix call to stop() 2019-03-08 15:09:44 +00:00
David Baker
61ebf4d920 spurious semicolon 2019-03-08 13:52:04 +00:00
David Baker
ce1623691e Fix instantly sending RRs 
Splits UserActivity into a tristate of 'active' (last < 1s), 'passive' (lasts a
couple of mins) and neither. Read receipts are sent when 'active', read markers
are sent while 'passive'.

Also fixed a document / window mix-up on the 'blur' handler.

Also adds a unit test for UserActivity because it's quite complex now
(and changes UserActivity to make it testable by accessing the singleton
via sharedInstance() rather than exporting it directly).

Fixes https://github.com/vector-im/riot-web/issues/9023
 2019-03-08 12:46:38 +00:00
David Baker
2e081982ee
Merge pull request #2769 from matrix-org/dbkr/fix_instant_rrs 
Fix erroneously sending RRs, pt1.
 2019-03-08 11:53:10 +00:00
David Baker
de1ec06110 oops, didn't mean to leave this in 2019-03-08 10:44:48 +00:00
David Baker
89eb321ace copyright 2019-03-08 10:31:30 +00:00
David Baker
1cb6c3f3cf Fix erroneously sending RRs, pt1. 
Firefox fires the blur event on both document and window. Chrome
only fires it on window, so on chrome we were not seeing the window
being un-focused. window seems to be the standard so just use that.

This isn't the end of the story though since wer can get mousemove
events without the window ever having gained focus, in which case
we'll continue to think the user is active for another 2 mins when
in fact all they did was pass their cursor over the window.

https://github.com/vector-im/riot-web/issues/9023
 2019-03-08 10:23:18 +00:00
J. Ryan Stinnett
b0863768e4
Merge pull request #2765 from jryans/dropdown-redesign 
Tweak country dropdown for redesign
 2019-03-08 10:08:45 +00:00
J. Ryan Stinnett
109b912699
Merge pull request #2745 from matrix-org/anoa/emoji_with_spaces 
Prevent space characters from stopping big emoji messages
 2019-03-08 10:06:35 +00:00
J. Ryan Stinnett
d93e97bcd2 Remove span to regain explicit whitespace for country options 
This change restores whitespace between the country name and prefix code in the
country dropdown.
 2019-03-08 10:03:51 +00:00
J. Ryan Stinnett
1cefa44319 Redesign country dropdown to fit redesign 
This tweaks colors of the country dropdown to blend in better with the rest of
the design.

Fixes https://github.com/vector-im/riot-web/issues/9048
 2019-03-08 10:03:50 +00:00
J. Ryan Stinnett
4a1b723ab5 Fix dropdown arrow on select field for auth flows 2019-03-07 14:57:58 +00:00
J. Ryan Stinnett
19edc5c5a4
Merge pull request #2763 from jryans/dark-theme-auth-r2 
Tweak auth components when dark theme is default
 2019-03-07 10:06:30 +00:00
J. Ryan Stinnett
5658e96aed
Merge pull request #2756 from jryans/settings-phone-input 
Move country dropdown inside field in Settings
 2019-03-07 09:59:23 +00:00
Travis Ralston
bd887e177f Fix i18n: Missing strings 2019-03-06 10:42:58 -07:00
J. Ryan Stinnett
6441b2ed98 Ensure country dropdown uses light styling on auth 
If the dark theme is activated, the country dropdown defaults to those colors
where it doesn't fit in with the always-light auth flow. This restyles its
colors to be light.
 2019-03-06 16:45:54 +00:00
J. Ryan Stinnett
8beab58918 Use more nesting for auth body style overrides 
No styles are changed here. This just groups them under one parent block to
avoid repeating `.mx_AuthBody`.
 2019-03-06 16:37:16 +00:00
J. Ryan Stinnett
9d36ef0808 Fix background color of phone field label on dark theme 
This adds extra styles to reset the field label background color on registration
even if dark theme is used.
 2019-03-06 16:28:09 +00:00
David Baker
75f809bf06 Merge branch 'master' into develop 2019-03-06 15:47:48 +00:00
David Baker
d46b9dab87 v1.0.3 2019-03-06 15:46:47 +00:00
David Baker
e78ba0b772 Prepare changelog for v1.0.3 2019-03-06 15:46:17 +00:00
David Baker
1ed485b5b7
Merge pull request #2762 from matrix-org/dbkr/duplicated-people 
Don't duplicate direct chats from other tags
 2019-03-06 15:39:45 +00:00
Travis Ralston
2cd6d1ec6a Don't duplicate direct chats from other tags 
Fixes https://github.com/vector-im/riot-web/issues/8971
 2019-03-06 15:38:31 +00:00
David Baker
0b0b16da5c
Merge pull request #2761 from matrix-org/dbkr/rls-debugging 
Include tag name when warning about rooms running off lists
 2019-03-06 15:38:03 +00:00
Travis Ralston
ff72c3ba63 Include tag name when warning about rooms running off lists 2019-03-06 15:37:06 +00:00
David Baker
5c0c2fa8f3
Merge pull request #2760 from matrix-org/dbkr/upgraded-rooms 
Always insert rooms into lists when they get lost
 2019-03-06 15:36:31 +00:00
Travis Ralston
2ad11437d5 More clearly fix issues with room insertion to lists 
Instead of having a catch-all insert, try and fix the common cases with a bit more care.
 2019-03-06 15:35:35 +00:00
Travis Ralston
a34f3780f3 Always insert rooms into lists when they get lost 
Room upgrades, direct chats, etc all end up being lost in these scenarios. Instead of losing them to the list, try and put them into a relevant spot of the list.

Fixes https://github.com/vector-im/riot-web/issues/9020
 2019-03-06 15:35:29 +00:00
David Baker
1a7c313de7
Merge pull request #2759 from matrix-org/dbkr/fix_ctrl_k 
Fix the ctrl+k shortcut
 2019-03-06 15:13:57 +00:00
Andrew Morgan
79b7592dd5 Convert whitespace regex to const 2019-03-06 14:55:21 +00:00
David Baker
3a41206e90 Fix the ctrl+k shortcut 
Fixes https://github.com/vector-im/riot-web/issues/9029
 2019-03-06 14:53:52 +00:00
David Baker
aebdff70ee
Merge pull request #2758 from matrix-org/dbkr/deps_190206 
npm audit fix --force
 2019-03-06 14:44:49 +00:00
David Baker
fb3163a8d2 npnm audit --fix --force 
Doesn't appear to break anything...
 2019-03-06 14:07:26 +00:00
David Baker
1e7af106b0 Merge branch 'master' into develop 2019-03-06 11:28:54 +00:00
David Baker
ce1a985233 v1.0.2 2019-03-06 11:26:42 +00:00
David Baker
4a785263e2 Prepare changelog for v1.0.2 2019-03-06 11:26:41 +00:00
J. Ryan Stinnett
13957bb5e7 Move country dropdown inside field in Settings 
This updates the Settings phone input to match the new styling used on auth
flows.

Fixes https://github.com/vector-im/riot-web/issues/9049
 2019-03-06 11:26:05 +00:00
J. Ryan Stinnett
5120ff83be Enable show prefix for phone input in Settings 
This fixes an unrelated bug where the currently selected country's prefix number
wasn't being displayed. Since other country dropdown's show the prefix, and this
is also for phone numbers, it seems good to also show it here as well.
 2019-03-06 11:22:29 +00:00
David Baker
d83bce15a6 releaseed js-sdk 2019-03-06 11:19:06 +00:00
J. Ryan Stinnett
8bf5e1d19f
Merge pull request #2749 from jryans/auth-field 
Use Field component in auth flows
 2019-03-06 11:18:24 +00:00
J. Ryan Stinnett
dde36459e6 Simplify field row / field styles 2019-03-06 11:11:24 +00:00
J. Ryan Stinnett
35ee9c9ac7 One line for prefix container 2019-03-06 10:58:54 +00:00
David Baker
051e5d392c
Merge pull request #2755 from matrix-org/dbkr/hosting_link_only_if_group_admin 
Only show hosting link if group admin
 2019-03-06 10:58:01 +00:00
J. Ryan Stinnett
df9888614b Normalize whitespace in PasswordLogin 2019-03-06 10:57:38 +00:00
David Baker
9a57e5c2f6
Merge pull request #2754 from matrix-org/dbkr/hosting_link_only_matrix_org 
Only show hosting link if domain == matrix.org
 2019-03-06 10:38:08 +00:00
David Baker
23f22617ed Only show hosting link if group admin 2019-03-06 10:32:30 +00:00
David Baker
610a6d935a Only show hosting link if domain == matrix.org 
Fixes https://github.com/vector-im/riot-web/issues/9059
 2019-03-06 10:22:19 +00:00