mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-24 10:15:43 +03:00
Code Issues Projects Releases Packages Wiki Activity
13113 commits 203 branches 553 tags 406 MiB
Commit graph

13113 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bruno Windels
1373b2f5e2 apparently room can be null here 2019-01-22 17:34:48 +01:00
Bruno Windels
3c8bd3fc78
Merge pull request #2456 from matrix-org/bwindels/extendtypingbartiming 
Avoid "jumpiness" with inline typing indicator
 2019-01-22 11:04:25 +00:00
Bruno Windels
f83411ea0b whitespace 2019-01-22 11:46:02 +01:00
Bruno Windels
0e0128c297 if instead of short-circuit and for readability 2019-01-22 11:37:18 +01:00
Bruno Windels
5d45d5dfac formatting 2019-01-22 11:37:09 +01:00
Travis Ralston
881353037e
forgot .length somehow 
Co-Authored-By: bwindels <bruno@windels.cloud>
 2019-01-22 10:34:54 +00:00
David Baker
49cc9f4b82
Merge pull request #2472 from matrix-org/dbkr/delint_compatpage_loggedinview 
De-lint CompatabilityPage & LoggedInView
 2019-01-22 10:23:23 +00:00
David Baker
ba1aa2037d Merge remote-tracking branch 'origin/experimental' into dbkr/delint_compatpage_loggedinview 2019-01-22 10:13:27 +00:00
J. Ryan Stinnett
1d01ac398c Rename mx_Login_box to mx_AuthPage_modal and fold into AuthPage 2019-01-21 19:11:43 -06:00
J. Ryan Stinnett
3bd765f63f Rename LoginPage, Header, Footer views to Auth* 2019-01-21 19:11:43 -06:00
J. Ryan Stinnett
c7354f483b Rename LoginBox to AuthButtons 
This component displays login and register buttons. It's currently used in the
composer when viewing a room as a guest.

The name is confusing because the login flow uses are very similarly named
`mx_Login_box` as a wrapping around forms, which is totally different than these
buttons.

Additionally, the components is moved to `views/auth` since it is very simple
and auth related.
 2019-01-21 19:11:43 -06:00
J. Ryan Stinnett
29be3ee4b5 Rename login directory to auth 2019-01-21 17:45:55 -06:00
J. Ryan Stinnett
6160db7a82
Merge pull request #2473 from jryans/rm-status-hacks 
Remove Status theme-specific hacks
 2019-01-21 15:05:05 -06:00
J. Ryan Stinnett
cd8c74a7c4 Rebuild strings 2019-01-21 15:03:55 -06:00
J. Ryan Stinnett
31808c23a8 Override Firefox UA style for placeholders 2019-01-21 15:01:26 -06:00
J. Ryan Stinnett
e714b2aed2 Remove Status theme-specific hacks 2019-01-21 13:59:22 -06:00
J. Ryan Stinnett
82dee37afe Fix styling regression in member list filter 2019-01-21 13:57:33 -06:00
J. Ryan Stinnett
23b3e74c1c Change to new field focused color 2019-01-21 13:47:16 -06:00
J. Ryan Stinnett
352107352e Tweak field input padding to match label position 2019-01-21 13:47:16 -06:00
J. Ryan Stinnett
1906cfd700 Tweak field label to be vertically centered 2019-01-21 13:47:16 -06:00
David Baker
bd011de1e5 De-lint CompatabilityPage & LoggedInView 
and remove from errorfiles
 2019-01-21 19:32:57 +00:00
David Baker
eecc37038a
Merge pull request #2469 from matrix-org/dbkr/warn_on_wrong_recovery_key 
Error if no sessions decrypted
 2019-01-21 19:18:33 +00:00
David Baker
31889ecfad Lint 2019-01-21 19:07:44 +00:00
David Baker
e42b0a9972 Make error string less redundant 2019-01-21 18:02:09 +00:00
David Baker
1a9c3f1ac7 Make error string less technical 2019-01-21 17:41:55 +00:00
David Baker
0a2b79b62d Error if no sessions decrypted 
Tell the user if they entered the wrong recovery key

Fixes https://github.com/vector-im/riot-web/issues/8143
 2019-01-21 16:51:30 +00:00
Bruno Windels
86357fde51 sort combined typing users by name so order is stable 2019-01-21 17:49:46 +01:00
Bruno Windels
25aa58f29f increase/clear min-height on timeline on new message(s) 
depending on whether the typing bar is visible
 2019-01-21 17:35:40 +01:00
Bruno Windels
018f3d2a5c use box-sizing: border-box to make clientHeight === actual height 2019-01-21 17:30:02 +01:00
David Baker
250c7e0c4e
Merge pull request #2466 from matrix-org/dbkr/fix_direct_chat_button 
Fix settings direct chat
 2019-01-21 16:28:02 +00:00
David Baker
7e0f60505e Fix settings direct chat 
We were expecting this function to return a string user ID, but it
returned a user object

Make it return a user ID and add jsdoc to say what it returns.

Fixes https://github.com/vector-im/riot-web/issues/8180
 2019-01-21 16:02:25 +00:00
David Baker
b53c4d05ab
Merge pull request #2464 from matrix-org/dbkr/dont_show_verify_button_unknown_device 
Show verify button when we have a device to verify
 2019-01-21 15:04:50 +00:00
David Baker
4c381c32ee Show verify button when we have a device to verify 
rather than when we don't
 2019-01-21 11:34:13 +00:00
Matthew Hodgson
efcfaed335 switch to 35px high gradients 2019-01-20 14:31:06 +00:00
J. Ryan Stinnett
d7031c12f4
Merge pull request #2463 from jryans/field-component 
Redesign: Add a form field component
 2019-01-19 22:37:39 -06:00
J. Ryan Stinnett
728830e2fd Add rethemendex as script for easier access 2019-01-19 22:33:51 -06:00
Travis Ralston
36ffbef010
Tweak comment about field ID 
Co-Authored-By: jryans <jryans@gmail.com>
 2019-01-19 22:29:57 -06:00
J. Ryan Stinnett
efd5405267 Add a form field component for the redesign 
The label moves into the border on focus and after being filled. A valid color
is applied to the label and input border. Other states like invalid can be added
later as needed.

Adapted from @ara4n's experiment into a React component with a CSS only
approach.
 2019-01-19 22:13:53 -06:00
J. Ryan Stinnett
7c9509ceb8
Merge pull request #2460 from matrix-org/jryans/versioned-img-urls 
Load fonts and images via source-relative URLs and requires
 2019-01-18 14:27:55 -06:00
Bruno Windels
c9d5c4903b set min-height of messagelist to current height when showing typing bar 
this ensures the timeline never shrinks, and avoids jumpiness when
typing bar disappears again.
 2019-01-18 18:53:54 +01:00
J. Ryan Stinnett
8b05cca7d2 Add file-loader to Karma so assets will resolve in tests 2019-01-18 10:55:00 -06:00
David Baker
4b68ca141c
Merge pull request #2455 from matrix-org/dbkr/key_backup_status_unknown_device 
Say when backup is signed by unknown device
 2019-01-18 10:58:26 +00:00
David Baker
622d7427f7
Merge pull request #2458 from matrix-org/travis/upgrade-command 
Add an /upgraderoom command to make upgrading easier for development
 2019-01-18 10:00:53 +00:00
J. Ryan Stinnett
20e296b20e Convert image URLs in React to require calls 
This allows Webpack to insert the proper image URL after builds steps like
adding a hash and so on. The path you supply to `require` is relative to the JS
source file, just like any other would be.
 2019-01-17 22:06:49 -06:00
J. Ryan Stinnett
989227d435 Fix line length lint warnings 
I am about to run some code replacements that might make lines too long, so with
this change I know we're starting from 0 line length warnings.
 2019-01-17 22:06:49 -06:00
J. Ryan Stinnett
b2387f4cff Define SCSS variable for resource dir 
Adds a `$res` SCSS variable set to the path from the root SCSS file to the `res`
directory.

This is a different base path than previously used in CSS URLs (it goes up 3
directories instead of 2), because Webpack will now be resolving images relative
to the root SCSS file, so the path corresponds to a source tree location,
instead of a path in the build output tree.

Defining this variable has two main goals:

* URLs are a bit easier to read
* The path can be overridden, which is needed for external (riot-web) themes
 2019-01-17 22:06:49 -06:00
J. Ryan Stinnett
7678b9c43b Lift font SCSS partials to theme root 
This means that themes which include `light/css/_base.scss` (currently Dark and
Status) won't be forced to have Light's font-faces included.  This only really
matters for Status, which uses different fonts throughout.
 2019-01-17 21:50:45 -06:00
J. Ryan Stinnett
9a7a8da6c0 Use font-family from theme in all components 2019-01-17 21:50:45 -06:00
Travis Ralston
91c0d8bae3
Merge pull request #2457 from matrix-org/travis/develop2 
Merge develop->experimental
 2019-01-17 16:19:30 -07:00
Travis Ralston
7f6ce69c3e Merge branch 'experimental' into travis/develop2 2019-01-17 16:03:45 -07:00