Commit graph

14184 commits

Author SHA1 Message Date
J. Ryan Stinnett
b846ac5800 Rework ServerTypeSelector to only emit changes after initial setup
`ServerTypeSelector` would call its `onChange` prop both at construction
(because it computed the default selected type and consumers might want to know)
as well as on actual user change. This ended up complicating consumer code, as
they want to differentiate between initial state and changes made by the user.

To simplify things, `ServerTypeSelector` now exports a function to compute the
server type from HS URL, which can be useful for setting its initially selected
type. The consumer now provides that type via a prop, and `onChange` is now only
called for actual user changes, simplifying the logic in `Registration` which
uses `ServerTypeSelector`.

In addition, some usages of `customHsUrl` vs. `defaultHsUrl` in `Registration`
are simplified to be `customHsUrl` only (since it already includes a fallback to
the default URL in `MatrixChat`).
2019-02-20 11:23:51 +00:00
J. Ryan Stinnett
9292a46db0 Update comment about Modular server type selection
Modular now sets `disable_custom_urls`, so the server type selector is not shown
for Modular-hosted Riot.
2019-02-20 10:24:03 +00:00
Bruno Windels
44bedb2084 fix unit tests without breaking the build 2019-02-20 09:36:18 +01:00
Bruno Windels
338eafab2b
Merge pull request #2664 from tebatalla/patch-1
Fix off by one error for username colors
2019-02-20 08:42:28 +01:00
Travis Ralston
8008f66d4b
Merge pull request #2665 from aaronraimist/dark-unsent-message-color
Set event-sending-color in dark theme
2019-02-19 19:17:58 -07:00
Aaron Raimist
c16791814e
Set event-sending-color in dark theme
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-02-19 19:58:11 -06:00
Travis Ralston
64103b7af4 More micro optimizations to make the hot paths faster 2019-02-19 15:15:39 -07:00
Travis Ralston
561d1f37ec Stick a couple micro optimizations into the setRoomCategory hot path 2019-02-19 14:56:56 -07:00
Travis Ralston
7b732ceb43 Merge branch 'develop' into travis/better-room-sorting 2019-02-19 14:35:14 -07:00
Tomas Batalla
b90e33b81b
Fix off by one error for username colors
The hash result would only have a range of 0..7, but the css of color variants is 1..8
2019-02-19 10:52:59 -08:00
J. Ryan Stinnett
6b46057283
Merge pull request #2663 from jryans/enable-captcha-desktop
Allow captchas on Riot desktop builds
2019-02-19 18:20:15 +00:00
J. Ryan Stinnett
cba3897944
Merge pull request #2661 from jryans/captcha-stuck
Show link to login even during UI auth
2019-02-19 18:17:51 +00:00
J. Ryan Stinnett
edf10dbdde
Merge pull request #2659 from jryans/dark-theme-more-2
Dark theme follow ups round 2
2019-02-19 17:51:29 +00:00
J. Ryan Stinnett
d8c5163f49
Merge pull request #2662 from jryans/light-theme-name
Rename default theme to light theme
2019-02-19 15:03:55 +00:00
J. Ryan Stinnett
1cde4abe6a Improve text layout above captcha 2019-02-19 13:59:15 +00:00
J. Ryan Stinnett
3c156218da Allow captchas on Riot desktop builds 2019-02-19 13:57:31 +00:00
J. Ryan Stinnett
198dee9abd Rename default theme to light theme 2019-02-19 13:27:35 +00:00
J. Ryan Stinnett
4c83d898bd Show link to login even during UI auth
This gives users an escape hatch in case something goes wrong with the UI auth
step, and they'd like to go somewhere else in the auth process.
2019-02-19 13:13:21 +00:00
J. Ryan Stinnett
e7a84b33e8
Merge pull request #2653 from matrix-org/benp/prevent-accidental-username-clicking
make mx_SenderProfile inline-block, reduces clickable area around usernames
2019-02-19 12:26:27 +00:00
J. Ryan Stinnett
b7cb16242b Tweak light theme color values 2019-02-19 11:49:49 +00:00
Travis Ralston
424de00109
Merge pull request #2648 from matrix-org/travis/fix-room-settings
Add a bit of safety around reading events for room settings
2019-02-18 21:34:45 -07:00
J. Ryan Stinnett
5fb990eb5f Convert Markdown button to SVG mask
This makes it easier to theme via CSS, which helps with the dark theme.
2019-02-18 18:26:52 +00:00
Bruno Windels
6bf8269bcd riot-web is a subdirectory when running the tests 2019-02-18 17:26:09 +01:00
J. Ryan Stinnett
09ed795c79 Allow theming member info minimise button 2019-02-18 16:02:10 +00:00
Bruno Windels
f51d25c394 declare LANGUAGES_FILE as global in eslint config 2019-02-18 16:36:11 +01:00
Bruno Windels
33858c8aff move this path to webpack config file
otherwise react-sdk wouldn't be able to build anymore
without riot-web in a specific location
2019-02-18 16:26:04 +01:00
Bruno Windels
f240efb36d get cache-busted url for languages.json through file-loader requiring it 2019-02-18 16:13:24 +01:00
J. Ryan Stinnett
19977b052f Add new var for dark panel bg color 2019-02-18 13:50:17 +00:00
J. Ryan Stinnett
fdd88b60a6 Lift panel input styling up to common 2019-02-18 13:43:18 +00:00
J. Ryan Stinnett
98a3ecbcb5 Tweak placeholder styles to also affect member search 2019-02-18 13:34:25 +00:00
J. Ryan Stinnett
96f1538420 Remove bad syntax for input placeholder styles 2019-02-18 12:20:47 +00:00
J. Ryan Stinnett
3475b6faed Remove light styles that duplicate common 2019-02-18 12:19:46 +00:00
J. Ryan Stinnett
e16f29b1e0 Use darker color of photo lightboxes for dialogs on dark theme 2019-02-18 12:14:55 +00:00
J. Ryan Stinnett
52bd1edd72 Tweak room and group pill color for dark theme 2019-02-18 11:41:23 +00:00
J. Ryan Stinnett
402992cee4 Adjust add room button for dark theme 2019-02-18 11:34:25 +00:00
J. Ryan Stinnett
c490606f15 Revert back to previous base color on dark theme 2019-02-18 11:34:25 +00:00
J. Ryan Stinnett
fa3662257d Tweak widget bar color for dark theme 2019-02-18 11:34:25 +00:00
J. Ryan Stinnett
07f49e8ddb
Merge pull request #2654 from aaronraimist/dark-bg-color-update
Update dark theme bg-color to show hover effect on messages
2019-02-18 11:11:29 +00:00
Aaron Raimist
9318c4ec78
Update dark theme bg-color to show hover effect on messages
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-02-16 12:55:35 -06:00
Travis Ralston
25525f93d2
Merge pull request #2655 from aaronraimist/fix-pre-dark
Make pre use the same text color as code
2019-02-16 11:36:26 -07:00
Aaron Raimist
9bc0ae7fc5
Add comment
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-02-16 12:28:42 -06:00
Travis Ralston
cb15bc968c Remove excessive dispatch binding 2019-02-15 23:41:48 -07:00
Travis Ralston
53fa59f5a4 Remove old debugging code
The algorithm is correctly applied when these are removed.
2019-02-15 23:40:23 -07:00
Travis Ralston
da4d1cfed4 Merge branch 'develop' into travis/better-room-sorting 2019-02-15 23:32:15 -07:00
Travis Ralston
b27f3688f1
Merge pull request #2649 from AndrewJDR/reinstate_lowered_opacity_for_offline_avatars
Bring back the lowered opacity for offline/unavailable avatars.
2019-02-15 22:42:25 -07:00
Travis Ralston
1e55b1e579
Merge pull request #2656 from aaronraimist/dark-set-h3-color
Set h3-color in dark theme
2019-02-15 22:30:40 -07:00
Aaron Raimist
459f9d4fbc
Set h3-color in dark theme
This is things like "INVITED" in memberlist

Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-02-15 21:56:47 -06:00
Aaron Raimist
eb908dbd0d
Make pre use the same text color as code
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-02-15 21:38:49 -06:00
Travis Ralston
0f3ba4e6a8
Merge pull request #2652 from aaronraimist/scisors
Fix typo "Scisors" -> "Scissors"
2019-02-15 12:30:17 -07:00
Aaron Raimist
1e01f1b52a
Fix typo "Scisors" -> "Scissors"
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-02-15 11:26:14 -06:00