Will Hunt
020d210cb0
Use uk.half-shot.*
2019-04-23 16:23:58 +01:00
Will Hunt
9de8920869
Remove trailing space
2019-04-22 23:04:03 +01:00
Will Hunt
874b61e451
Merge branch 'hs/custom-notif-sounds' of github.com:Half-Shot/matrix-react-sdk into hs/custom-notif-sounds
2019-04-21 18:05:27 +01:00
Will Hunt
8258e93337
Use m.notification.sound
2019-04-21 18:03:54 +01:00
Will Hunt
0f2cd6ea73
Stick behind a feature flag
2019-04-21 18:01:26 +01:00
Katie Wolfe
b11050d327
Check for sound before logging it
...
Co-Authored-By: Half-Shot <will@half-shot.uk>
2019-04-21 12:35:59 +01:00
Will Hunt
776210c135
Use settings store
2019-04-19 22:31:51 +01:00
Will Hunt
d33df45c5e
Linting
2019-04-19 22:06:56 +01:00
Will Hunt
63ab7736ca
Add a fancy room tab and uploader
2019-04-19 16:27:30 +01:00
Will Hunt
cd8647188f
Support account level custom sounds too
2019-04-19 14:10:10 +01:00
Will Hunt
b0bacdba15
Simplyify
2019-04-19 13:21:58 +01:00
Will Hunt
f14d96e069
Look in room account data for custom notif sounds
2019-04-19 12:37:04 +01:00
J. Ryan Stinnett
9917bed942
Merge pull request #2883 from YaoiFangirl420/cleanup_message_composer
...
Cleanup message composer render() method
2019-04-18 10:14:01 +01:00
Bruno Windels
0fbe10a816
Merge pull request #2925 from matrix-org/bwindels/stylepreviewbar
...
Redesigned room preview bar
2019-04-18 08:50:56 +00:00
Bruno Windels
faecceb3b4
remove manual order so component order follows markup order
2019-04-18 09:20:26 +02:00
Bruno Windels
dd911d18cb
dont show right panel when previewing a room without invite, as its empty
2019-04-17 19:29:39 +02:00
Bruno Windels
0a463472b3
update prop types (and fix typo)
2019-04-17 19:05:52 +02:00
Bruno Windels
190143ca6c
dispatch for user screen
2019-04-17 18:26:07 +02:00
Bruno Windels
d5cc835a93
PR feedback
2019-04-17 18:23:49 +02:00
Travis Ralston
9f494fcc58
Merge pull request #2907 from matrix-org/anoa/no_big_pills_pls
...
Prevent user pills containing only emoji from embiggening
2019-04-17 10:15:16 -06:00
J. Ryan Stinnett
232fd8656b
Merge pull request #2923 from rosston/alt-enter-mac
...
Make alt-enter insert new line on macOS
2019-04-17 16:19:57 +01:00
J. Ryan Stinnett
65784afb91
Merge pull request #2924 from jryans/password-on-server-name
...
Test `defaultServerName` before showing it on forgot password
2019-04-17 15:23:03 +01:00
Bruno Windels
c5986395ef
propagate env to e2e tests so they can get correct branch of e2e tests
2019-04-17 14:13:12 +02:00
Bruno Windels
66e10e904d
remove obsolete translations
2019-04-17 11:46:20 +02:00
Bruno Windels
8e750e18d7
add class for message case for e2e tests
2019-04-17 11:46:04 +02:00
Bruno Windels
22874f62ab
Merge branch 'develop' into bwindels/stylepreviewbar
2019-04-17 11:06:21 +02:00
Bruno Windels
1100320351
make non-member inviter name also bold
2019-04-17 11:02:58 +02:00
Bruno Windels
86620839ae
make username clickable
2019-04-17 10:57:45 +02:00
J. Ryan Stinnett
adc23faf4b
Test defaultServerName before showing it on forgot password
...
The Forgot Password screen wasn't checking the default server name for a value
before showing it, leading to a possible "Your Matrix account on <blank>"
message.
Fixes https://github.com/vector-im/riot-web/issues/9507
2019-04-17 09:35:45 +01:00
Bruno Windels
8a371080d7
colored inviter name and layout
2019-04-17 10:22:35 +02:00
Bruno Windels
eeaa7143ac
move name coloring out of sender profile
...
so we can reuse it in room preview bar
2019-04-17 10:21:30 +02:00
Travis Ralston
e0c976e96e
Merge branch 'develop' into cleanup_message_composer
2019-04-16 11:18:52 -06:00
Bruno Windels
56ade1ead5
WIP on showing inviter avatar
2019-04-16 18:48:47 +02:00
Bruno Windels
f9a2b76966
show room name where available when header isn't visible (no preview)
2019-04-16 17:50:20 +02:00
Bruno Windels
eeb9b4b2e3
don't show re-join upon kicked when we know you can't
2019-04-16 17:23:45 +02:00
Bruno Windels
dbb73439e4
also return Joining when internally busy looking something up
2019-04-16 17:23:24 +02:00
Bruno Windels
523311b50c
saner order for message case detection (can't be joining when kicked)
2019-04-16 17:23:01 +02:00
Travis Ralston
65020a56c1
Merge pull request #2922 from matrix-org/travis/merge-config
...
Add a function to append/overwrite objects in the config on the fly
2019-04-16 09:14:24 -06:00
Bruno Windels
e40757a801
make sure long subtitles dont overflow
2019-04-16 16:19:50 +02:00
Ross Brandes
15e68c3ba1
Make alt-enter insert new line on macOS
...
Alt-enter is a common macOS shortcut for inserting a new line in an
input that has a separate action tied to the enter key.
Signed-off-by: Ross Brandes <ross.brandes@gmail.com>
2019-04-15 21:15:38 -04:00
Travis Ralston
a11cf88e07
Add a function to append/overwrite objects in the config on the fly
...
Intended to be used to overwrite settings which may be calculated rather than provided.
2019-04-15 14:46:00 -06:00
Travis Ralston
f6154bc7cd
Merge pull request #2921 from eyetime-international-ltd/hotfix/fix_static_title
...
use SdkConfig brand name instead of static "Riot"
2019-04-15 11:46:15 -06:00
Travis Ralston
26928a48e3
Merge pull request #2898 from matrix-org/travis/upgrades/permalinks
...
Use dedicated permalink creators in search results with multiple rooms
2019-04-15 11:27:58 -06:00
Bruno Windels
36951dd7b7
cleanup spinner props and use always preview bar when room operation is in progress
2019-04-15 18:49:00 +02:00
Bruno Windels
7459e19f06
fix lint
2019-04-15 17:56:36 +02:00
Bruno Windels
fd6c594a8f
put auth buttons in preview bar
2019-04-15 17:52:17 +02:00
Bruno Windels
c1ff5f2fba
implement style
2019-04-15 17:11:26 +02:00
Bruno Windels
1d0c402093
improve error messages, etc
2019-04-15 17:11:17 +02:00
J. Ryan Stinnett
1dc9e485ad
Merge pull request #2917 from jryans/key-backup-restore-button
...
Clarify that use backup means restore
2019-04-15 15:29:24 +01:00
J. Ryan Stinnett
2054d53782
Tweaked wording after discussing with @lampholder
2019-04-15 15:10:48 +01:00
