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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								120123bcb1 
								
							
								 
							
						 
						
							
							
								
								Allow submit on forgot password page  
							
							
							
						 
						
							2019-06-07 07:27:15 -06:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								d59ad605a6 
								
							
								 
							
						 
						
							
							
								
								Allow the login form to be submitted, and clarify other things  
							
							
							
						 
						
							2019-06-06 12:18:41 -06:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								aec3950a71 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3073  from matrix-org/jryans/twemoji-license  
							
							... 
							
							
							
							Add license info for Twemoji 
							
						 
						
							2019-06-06 14:27:50 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								20b57b855b 
								
							
								 
							
						 
						
							
							
								
								Add license info for Twemoji  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/9930  
							
						 
						
							2019-06-06 14:20:13 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								25a994e575 
								
							
								 
							
						 
						
							
							
								
								pull toLowerCase(...).replace(...) out of the loop  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-06-06 08:45:32 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								b5f85399a7 
								
							
								 
							
						 
						
							
							
								
								Rename may to might  
							
							
							
						 
						
							2019-06-05 19:26:14 +01:00  
				
					
						
							
							
								 
						
							
							
								c15ee1a829 
								
							
								 
							
						 
						
							
							
								
								Appease the linter  
							
							
							
						 
						
							2019-06-05 12:15:37 -06:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								ace1bde238 
								
							
								 
							
						 
						
							
							
								
								Implement design and copy for errors  
							
							
							
						 
						
							2019-06-05 11:32:02 -06:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								10f4d6b419 
								
							
								 
							
						 
						
							
							
								
								Appease the linter  
							
							
							
						 
						
							2019-06-04 23:52:40 -06:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								6b2dbdf7ba 
								
							
								 
							
						 
						
							
							
								
								Don't refresh custom status on logout  
							
							... 
							
							
							
							The RoomTile gets remounted during logout due to the room stores being obliterated, however this causes the render() function to check if it should be showing custom status. If you have custom status enabled, and the person has a status set, the function errors due to no MatrixClient being available.
Fixes https://github.com/vector-im/riot-web/issues/9940  
							
						 
						
							2019-06-04 15:34:11 -06:00  
				
					
						
							
							
								 
						
							
							
								ef7b7628ac 
								
							
								 
							
						 
						
							
							
								
								use Room.redactionCancelled event  
							
							
							
						 
						
							2019-06-04 21:37:57 +02:00  
				
					
						
							
							
								 
						
							
							
								b412103f21 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3062  from matrix-org/dbkr/dont_break_on_wrong_password  
							
							... 
							
							
							
							Fix login page breaking on wrong password 
							
						 
						
							2019-06-04 18:02:22 +01:00  
				
					
						
							
							
								 
						
							
							
								bf52bfae15 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3064  from RiotTranslateBot/weblate-riot-web-matrix-react-sdk  
							
							... 
							
							
							
							Update from Weblate 
							
						 
						
							2019-06-04 17:30:33 +01:00  
				
					
						
							
							
								 
						
							
							
								ace94843ef 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (West Flemish)  
							
							... 
							
							
							
							Currently translated at 99.6% (1634 of 1641 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/vls/  
							
						 
						
							2019-06-04 16:20:10 +00:00  
				
					
						
							
							
								 
						
							
							
								5b5c0222e6 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Dutch)  
							
							... 
							
							
							
							Currently translated at 100.0% (1641 of 1641 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/  
							
						 
						
							2019-06-04 16:20:09 +00:00  
				
					
						
							
							
								 
						
							
							
								104d3a8b05 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'origin/develop' into Weblate.  
							
							
							
						 
						
							2019-06-04 15:54:08 +00:00  
				
					
						
							
							
								 
						
							
							
								ba5fd8a49d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3063  from matrix-org/jryans/js-sdk-for-lint  
							
							... 
							
							
							
							Install latest JS SDK when linting 
							
						 
						
							2019-06-04 16:54:03 +01:00  
				
					
						
							
							
								 
						
							
							
								ba37a55a6c 
								
							
								 
							
						 
						
							
							
								
								Install latest JS SDK when linting  
							
							... 
							
							
							
							Since React SDK's linting rules depend on JS SDK, we should use the latest
changes when linting as well in case there's been a recent rule change. 
							
						 
						
							2019-06-04 16:40:45 +01:00  
				
					
						
							
							
								 
						
							
							
								29935f1dfa 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'origin/develop' into Weblate.  
							
							
							
						 
						
							2019-06-04 15:24:15 +00:00  
				
					
						
							
							
								 
						
							
							
								2c11ca20ab 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (West Flemish)  
							
							... 
							
							
							
							Currently translated at 99.6% (1634 of 1641 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/vls/  
							
						 
						
							2019-06-04 15:24:15 +00:00  
				
					
						
							
							
								 
						
							
							
								a9b9b8d0f9 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Russian)  
							
							... 
							
							
							
							Currently translated at 99.6% (1634 of 1641 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/  
							
						 
						
							2019-06-04 15:24:12 +00:00  
				
					
						
							
							
								 
						
							
							
								9f540e35bf 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Dutch)  
							
							... 
							
							
							
							Currently translated at 100.0% (1641 of 1641 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/  
							
						 
						
							2019-06-04 15:24:10 +00:00  
				
					
						
							
							
								 
						
							
							
								4956dcf45e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3056  from matrix-org/jryans/read-receipts-relations-review  
							
							... 
							
							
							
							Ensure we always show read receipts even with hidden events 
							
						 
						
							2019-06-04 16:24:05 +01:00  
				
					
						
							
							
								 
						
							
							
								8e811fc78e 
								
							
								 
							
						 
						
							
							
								
								Use the existing room object  
							
							... 
							
							
							
							For some reason, we were getting the room object for every event during read
receipt processing, even though it has been passed in as a prop already. 
							
						 
						
							2019-06-04 16:01:02 +01:00  
				
					
						
							
							
								 
						
							
							
								06547ef5b3 
								
							
								 
							
						 
						
							
							
								
								Cache hidden events setting  
							
							... 
							
							
							
							Settings is too expensive to query in a hot code path, so this caches the value
on the MessagePanel component instead. 
							
						 
						
							2019-06-04 16:01:02 +01:00  
				
					
						
							
							
								 
						
							
							
								62ad40d1d9 
								
									
								
							
								 
							
						 
						
							
							
								
								spelling  
							
							... 
							
							
							
							Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2019-06-04 14:53:01 +00:00  
				
					
						
							
							
								 
						
							
							
								629b776820 
								
							
								 
							
						 
						
							
							
								
								clarify why we dont need dialog on network error  
							
							
							
						 
						
							2019-06-04 16:11:49 +02:00