Commit Graph

15976 Commits (a47a46bd9f528600668cc93685d8372044ee0f5a)

Author SHA1 Message Date
J. Ryan Stinnett a47a46bd9f
Merge pull request #3084 from matrix-org/jryans/update-action-bar-on-decrypt
Recheck message actions on decrypt
2019-06-10 16:53:35 +01:00
David Baker a79ee4d048
Merge pull request #3086 from matrix-org/dbkr/fix_exception_on_logout
Fix exception on logout
2019-06-10 15:37:50 +01:00
David Baker 4597dcd221 Fix exception on logout
Don't try to unregister if we never registered
2019-06-10 15:27:59 +01:00
David Baker f620b712fb
Merge pull request #3083 from matrix-org/dbkr/remember_invited_room
Remember we were trying to accept an invite
2019-06-10 13:31:12 +01:00
J. Ryan Stinnett 73d2d78c33 Recheck message actions on decrypt
This changes the message action bar to force an update after an event decrypts,
since it's quite likely that changes the set of available actions.

Fixes https://github.com/vector-im/riot-web/issues/9991
2019-06-10 12:49:37 +01:00
David Baker 2c10557f26 Don't NPE if no third party invite 2019-06-10 12:32:53 +01:00
David Baker 80812db466 Remember we were trying to accept an invite
When the user was on an invite page and clicked the sign up/sign in
buttons, remember that invite so we can show it again after they're
done signing up/in.

https://github.com/vector-im/riot-web/issues/9816
2019-06-10 10:24:06 +01:00
J. Ryan Stinnett 2e556b7df4
Merge pull request #3079 from matrix-org/jryans/funding
Add funding details for GitHub sponsor button
2019-06-07 20:43:07 +01:00
J. Ryan Stinnett 7790eeb42f
Merge pull request #3081 from matrix-org/jryans/reactions-rm-highlight
Remove highlight from reactions
2019-06-07 20:41:26 +01:00
J. Ryan Stinnett a1d0b8c5f3
Merge pull request #3080 from matrix-org/jryans/lowercase-letters
Clarify that only lowercase letters are allowed
2019-06-07 20:40:55 +01:00
Travis Ralston 10c81b4208
Merge pull request #3082 from matrix-org/travis/fail-less-fast-on-is
Don't handle identity server liveliness errors as fatal
2019-06-07 13:26:28 -06:00
Travis Ralston f238bbb6af Merge branch 'develop' into jryans/reactions-rm-highlight 2019-06-07 13:20:45 -06:00
Travis Ralston 758b3394a4 Don't handle identity server liveliness errors as fatal
An invalid IS causes an invalid HS, so we switch the order of the checks. Additionally, we adjust the HS result so that it appears like a liveliness error for the IS, allowing the app to continue normally.
2019-06-07 13:14:43 -06:00
J. Ryan Stinnett 3320fd9929 Remove highlight from reactions
This explicitly sets `color` for the reactions row to ensure it's always the fg
colour, even if the event is highlighted.

Fixes https://github.com/vector-im/riot-web/issues/9697
2019-06-07 15:57:34 +01:00
Hubert Chathi 41cbfe0d27
Merge pull request #3078 from uhoreg/truncate_displayname
truncate long display names in timeline headings
2019-06-07 10:24:17 -04:00
Travis Ralston 795a273e26
Merge pull request #3067 from matrix-org/travis/fail-fast-but-not-too-fast
Fail more softly on homeserver liveliness errors
2019-06-07 07:43:45 -06:00
Travis Ralston 59ba5fe62a Don't block submit if the server is dead
But still check so we can clear any errors, maybe
2019-06-07 07:36:46 -06:00
Travis Ralston 120123bcb1 Allow submit on forgot password page 2019-06-07 07:27:15 -06:00
J. Ryan Stinnett b2a9402d3f Clarify that only lowercase letters are allowed
We only allow lowercase letters in localparts.

Fixes https://github.com/vector-im/riot-web/issues/9983
2019-06-07 13:57:30 +01:00
J. Ryan Stinnett 36ebe5ca48
Add funding details for GitHub sponsor button 2019-06-07 11:45:53 +01:00
Hubert Chathi 4ab491f823 truncate long display names in timeline headings
partial fix for vector-im/riot-web#5739
2019-06-06 22:41:10 -04:00
Travis Ralston 6daf5a1d9b
Merge pull request #3076 from matrix-org/t3chguy/fix_community_add_room
Fix AddressPickerDialog adding wrong entry to selected list case
2019-06-06 17:25:26 -06:00
Michael Telatynski 3f6b266256
Merge pull request #3077 from matrix-org/t3chguy/change_keybind
change profile keybind to backtick from i due to italics conflict
2019-06-07 00:16:54 +01:00
Michael Telatynski bea4f557a1 change profile keybind to backtick from i due to italics conflict
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-07 00:08:51 +01:00
Michael Telatynski b2c39ba842 Fix AddressPickerDialog adding wrong entry to selected list case
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-07 00:00:38 +01:00
David Baker a591a939fd
Merge pull request #3075 from matrix-org/dbkr/wait_for_token_request
Look busy whilst requesting the email token
2019-06-06 19:52:02 +01:00
David Baker aba329cab5 Look busy whilst requesting the email token
We need to wait for it to finish before letting the user start
completing the steps since if it fails, we can't complete the auth.
2019-06-06 19:41:57 +01:00
Travis Ralston d59ad605a6 Allow the login form to be submitted, and clarify other things 2019-06-06 12:18:41 -06:00
David Baker b365c9dfe6
Merge pull request #3074 from matrix-org/dbkr/fix_email_invite_address_match_check
Fix email invites address-match checking
2019-06-06 15:06:36 +01:00
David Baker 9816fe0ed7 Fix email invites address-match checking
Riot was always saying the email address that the invite was sent
to was not associated with your account.

Two fixes here:
 1. We mounted RoomPreviewBar with no invitedEmail prop and then
    changed the prop later, but RoomPreviewBar only checked for it
    on mount. Make sure we re-check when the props change.
 2. Pass oobData through RoomPreviewBar because we need to pass it
    to the RoomAvatar for 3pid invites.

https://github.com/vector-im/riot-web/issues/9816
2019-06-06 14:34:57 +01:00
J. Ryan Stinnett aec3950a71
Merge pull request #3073 from matrix-org/jryans/twemoji-license
Add license info for Twemoji
2019-06-06 14:27:50 +01:00
J. Ryan Stinnett 881842a737
Merge pull request #3072 from matrix-org/jryans/hover-read-avatars
Show read receipts on top of message
2019-06-06 14:22:22 +01:00
J. Ryan Stinnett 20b57b855b Add license info for Twemoji
Fixes https://github.com/vector-im/riot-web/issues/9930
2019-06-06 14:20:13 +01:00
J. Ryan Stinnett 4b18bb17fe Show read receipts on top of message
This allows you to view a long expanded set of read receipts even while hovering
a message.

Fixes https://github.com/vector-im/riot-web/issues/7608
2019-06-06 14:02:35 +01:00
Michael Telatynski db495e7162
Merge pull request #3070 from matrix-org/t3chguy/fuzzier-emojis
Be somewhat fuzzier when matching emojis to complete on space
2019-06-06 12:39:00 +01:00
J. Ryan Stinnett 8d79c73019
Merge pull request #3069 from matrix-org/jryans/single-emoji
Restrict reactions to a single emoji
2019-06-06 09:59:33 +01:00
Michael Telatynski 25a994e575 pull toLowerCase(...).replace(...) out of the loop
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-06 08:45:32 +01:00
Michael Telatynski 878f0a4753 Be somewhat fuzzier when matching emojis to complete on space
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-06 08:39:24 +01:00
J. Ryan Stinnett b5f85399a7 Rename may to might 2019-06-05 19:26:14 +01:00
Travis Ralston c15ee1a829 Appease the linter 2019-06-05 12:15:37 -06:00
J. Ryan Stinnett 5581b56cfe Restrict reactions to a single emoji
While the protocol supports more complex strings, in Riot we only want to
display single emoji.

Fixes https://github.com/vector-im/riot-web/issues/9916
2019-06-05 18:35:43 +01:00
Travis Ralston ace1bde238 Implement design and copy for errors 2019-06-05 11:32:02 -06:00
J. Ryan Stinnett 97019fbfb5
Merge pull request #3068 from matrix-org/jryans/reaction-row-button-live
Fix live updates to reaction row buttons
2019-06-05 17:20:30 +01:00
J. Ryan Stinnett c8cd1f30dd Fix live updates to reaction row buttons
This makes the reaction row buttons take the current count as prop as an easy
way of ensuring they always trigger an update when the count changes.

Fixes https://github.com/vector-im/riot-web/issues/9954
2019-06-05 14:54:26 +01:00
Travis Ralston 85858c731c
Merge pull request #3065 from matrix-org/travis/fix-logout
Don't refresh custom status on logout
2019-06-05 07:25:08 -06:00
Travis Ralston 38a4031299
Merge pull request #3066 from matrix-org/travis/no-button-guest
Add a logged in class to EmbeddedPage and react to MatrixClient changes
2019-06-05 07:23:45 -06:00
Bruno Windels 940b2a7ef2
Merge pull request #3058 from matrix-org/bwindels/redactions-local-echo
Don't show "can't redact" dialog on network error, with redaction having local echo & queuing now.
2019-06-05 07:49:51 +00:00
Travis Ralston 10f4d6b419 Appease the linter 2019-06-04 23:52:40 -06:00
Travis Ralston e2fdeec71a Fail more softly on homeserver liveliness errors
This performs liveliness checks on the auth pages to try and show a friendlier error. Earlier checks in the app startup are expected to not block the app from loading on such failures.

See https://github.com/vector-im/riot-web/issues/9828
2019-06-04 23:42:38 -06:00
Travis Ralston 4fc054e1c9 Add a logged in class to EmbeddedPage and react to MatrixClient changes
See https://github.com/vector-im/riot-web/pull/9957

The two hacks introduced here are for different reasons, mostly related to the welcome page. If you land directly on the welcome page, the app's lifecycle is highly unlikely to have a bootstrapped client. This results in the loggedIn class being false. When the client is later set up (loaded from session, new guest account registered, etc) the context fails to update for the EmbeddedPage, and we need to give it a kick to re-render. It's arguable if we should even keep using the context here.
2019-06-04 16:08:32 -06:00