ae79ce97f3 
								
							
								 
							
						 
						
							
							
								
								Dress up the soft logout page to look like the design  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/10262 
Also fixes showing the user ID twice. We might have a User object which helpfully sets the display name to the user ID, so check for that. 
							
						 
						
							2019-07-05 15:05:31 -06:00  
				
					
						
							
							
								 
						
							
							
								ca6563dce4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'travis/soft-logout-rehydrate' into t1  
							
							
							
						 
						
							2019-07-05 15:03:24 -06:00  
				
					
						
							
							
								 
						
							
							
								017fc84862 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3184  from matrix-org/jryans/reactions-send-marks-unread  
							
							... 
							
							
							
							Track live events in timeline and use for read receipts and read markers 
							
						 
						
							2019-07-05 17:55:59 +01:00  
				
					
						
							
							
								 
						
							
							
								480fe44d44 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3179  from matrix-org/jryans/upgrade-deps  
							
							... 
							
							
							
							Upgrade dependencies 
							
						 
						
							2019-07-05 17:50:13 +01:00  
				
					
						
							
							
								 
						
							
							
								74431fe8b1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3186  from matrix-org/jryans/reactions-allow-text  
							
							... 
							
							
							
							Allow diplayed reaction values to contain anything 
							
						 
						
							2019-07-05 16:35:06 +01:00  
				
					
						
							
							
								 
						
							
							
								87188e9229 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3185  from matrix-org/jryans/tooltip-target-null  
							
							... 
							
							
							
							Fix interactive tooltip null target error 
							
						 
						
							2019-07-05 16:28:12 +01:00  
				
					
						
							
							
								 
						
							
							
								9266c797da 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3181  from matrix-org/travis/soft-logout-force  
							
							... 
							
							
							
							Require that users go to the soft logout page if they're soft logged out 
							
						 
						
							2019-07-05 09:24:56 -06:00  
				
					
						
							
							
								 
						
							
							
								eb0e1eade4 
								
							
								 
							
						 
						
							
							
								
								Clamp reaction content width to at most 100px  
							
							... 
							
							
							
							Part of https://github.com/vector-im/riot-web/issues/10256  
							
						 
						
							2019-07-05 16:18:16 +01:00  
				
					
						
							
							
								 
						
							
							
								2a8f9a81f7 
								
							
								 
							
						 
						
							
							
								
								Allow diplayed reaction values to contain anything  
							
							... 
							
							
							
							Part of https://github.com/vector-im/riot-web/issues/10256  
							
						 
						
							2019-07-05 16:18:06 +01:00  
				
					
						
							
							
								 
						
							
							
								3c3426d97e 
								
							
								 
							
						 
						
							
							
								
								Update copyright header  
							
							
							
						 
						
							2019-07-05 15:08:55 +01:00  
				
					
						
							
							
								 
						
							
							
								5496a4dce6 
								
							
								 
							
						 
						
							
							
								
								Fix interactive tooltip null target error  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/10232  
							
						 
						
							2019-07-05 15:02:09 +01:00  
				
					
						
							
							
								 
						
							
							
								0ae98a5a4d 
								
							
								 
							
						 
						
							
							
								
								Track live events in timeline and use for read receipts and read markers  
							
							... 
							
							
							
							This changes the `TimelinePanel` to track live events (that have committed to
the server and been remote echoed) as well as the full list of events (which
includes pending events).
The code paths that advance read receipt and read markers are then changed to
only use the live events so that these cannot advance into pending events.
Fixes https://github.com/vector-im/riot-web/issues/9952  
							
						 
						
							2019-07-05 14:37:19 +01:00  
				
					
						
							
							
								 
						
							
							
								27c79b9504 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3163  from matrix-org/t3chguy/fix_emoji_shortname_tooltip  
							
							... 
							
							
							
							Emojibase data includes blank variations, accept these when searching 
							
						 
						
							2019-07-05 11:50:38 +01:00  
				
					
						
							
							
								 
						
							
							
								ecc672cccc 
								
							
								 
							
						 
						
							
							
								
								add comment  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-07-05 08:40:00 +01:00  
				
					
						
							
							
								 
						
							
							
								00973a1ee8 
								
							
								 
							
						 
						
							
							
								
								Appease the linter  
							
							
							
						 
						
							2019-07-04 17:00:09 -06:00  
				
					
						
							
							
								 
						
							
							
								03cbd7e8bb 
								
							
								 
							
						 
						
							
							
								
								Ensure links off the forgot password page land you at soft logout  
							
							
							
						 
						
							2019-07-04 16:51:55 -06:00  
				
					
						
							
							
								 
						
							
							
								93872e6fa5 
								
							
								 
							
						 
						
							
							
								
								Ask for the user's password to rehydrate their soft logged out session  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/10236 
The changes to the MatrixClientPeg (assign/start) are to permit the SoftLogout page to access the MatrixClientPeg reliably. This is why assign() is called by Lifecycle as an alternative to start().
Minimal design work has been done here. The majority is deferred to https://github.com/vector-im/riot-web/issues/10262  
							
						 
						
							2019-07-04 16:51:16 -06:00  
				
					
						
							
							
								 
						
							
							
								89131be438 
								
							
								 
							
						 
						
							
							
								
								Require that users go to the soft logout page if they're soft logged out  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/10234  
							
						 
						
							2019-07-04 15:14:00 -06:00  
				
					
						
							
							
								 
						
							
							
								f3c6c73329 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3177  from matrix-org/travis/soft-logout-base  
							
							... 
							
							
							
							Implement basic soft logout handling 
							
						 
						
							2019-07-04 10:22:18 -06:00  
				
					
						
							
							
								 
						
							
							
								8ea46a8c4d 
								
							
								 
							
						 
						
							
							
								
								Remove unneeded page types  
							
							
							
						 
						
							2019-07-04 09:59:20 -06:00  
				
					
						
							
							
								 
						
							
							
								5e5bf21281 
								
							
								 
							
						 
						
							
							
								
								Remove irrelevant debugging  
							
							
							
						 
						
							2019-07-04 09:59:07 -06:00  
				
					
						
							
							
								 
						
							
							
								b095042084 
								
							
								 
							
						 
						
							
							
								
								Upgrade dependencies  
							
							
							
						 
						
							2019-07-04 15:08:20 +01:00  
				
					
						
							
							
								 
						
							
							
								2b5d9961c0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3178  from matrix-org/dbkr/delint_scalar_auth_client  
							
							... 
							
							
							
							De-lint ScalarAuthClient 
							
						 
						
							2019-07-04 13:07:13 +01:00  
				
					
						
							
							
								 
						
							
							
								7d40ccfdbe 
								
							
								 
							
						 
						
							
							
								
								De-lint ScalarAuthClient  
							
							
							
						 
						
							2019-07-04 12:59:20 +01:00  
				
					
						
							
							
								 
						
							
							
								3f28f2e4a6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3174  from matrix-org/bwindels/edit-history-error  
							
							... 
							
							
							
							show /relations error in edit history dialog 
							
						 
						
							2019-07-04 09:05:29 +00:00  
				
					
						
							
							
								 
						
							
							
								521bc90b5f 
								
							
								 
							
						 
						
							
							
								
								Appease the linter  
							
							
							
						 
						
							2019-07-03 16:51:09 -06:00  
				
					
						
							
							
								 
						
							
							
								42e6287bdb 
								
							
								 
							
						 
						
							
							
								
								Implement basic soft logout handling  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/10235 
CSS and copy are left as an exercise for a later iteration.
Login page handling is left for https://github.com/vector-im/riot-web/issues/10236 
This implementation reuses as much of the Lifecycle flow as it can without causing problems. Most importantly, it requires https://github.com/matrix-org/matrix-js-sdk/pull/975  to be able to detect a soft logout and react to it. When it comes time to starting/stopping the Lifecycle, additional parameters are provided so that the auxiliary services can (re)start themselves without the client starting to sync. 
							
						 
						
							2019-07-03 16:46:37 -06:00  
				
					
						
							
							
								 
						
							
							
								4dc8de0e71 
								
							
								 
							
						 
						
							
							
								
								log server errors in edit history dialog  
							
							
							
						 
						
							2019-07-03 17:53:32 +02:00  
				
					
						
							
							
								 
						
							
							
								e7e6af2592 
								
							
								 
							
						 
						
							
							
								
								use existing strings  
							
							
							
						 
						
							2019-07-03 17:51:16 +02:00  
				
					
						
							
							
								 
						
							
							
								668d24111c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3173  from matrix-org/t3chguy/MELS_3pid  
							
							... 
							
							
							
							MELS handle m.room.third_party_invite 
							
						 
						
							2019-07-03 16:02:10 +01:00  
				
					
						
							
							
								 
						
							
							
								b43a04634a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3172  from matrix-org/t3chguy/invites_list  
							
							... 
							
							
							
							Fix logic around MemberList invites section, specifically regarding 3pid 
							
						 
						
							2019-07-03 16:01:01 +01:00  
				
					
						
							
							
								 
						
							
							
								d7cc3159b2 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3176  from RiotTranslateBot/weblate-riot-web-matrix-react-sdk  
							
							... 
							
							
							
							Update from Weblate 
							
						 
						
							2019-07-03 15:40:23 +01:00  
				
					
						
							
							
								 
						
							
							
								d22b0e5934 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'origin/develop' into Weblate.  
							
							
							
						 
						
							2019-07-03 14:33:48 +00:00  
				
					
						
							
							
								 
						
							
							
								0d809d66af 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Italian)  
							
							... 
							
							
							
							Currently translated at 100.0% (1670 of 1670 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/  
							
						 
						
							2019-07-03 14:33:48 +00:00  
				
					
						
							
							
								 
						
							
							
								b658053f33 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (French)  
							
							... 
							
							
							
							Currently translated at 100.0% (1670 of 1670 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/  
							
						 
						
							2019-07-03 14:33:47 +00:00  
				
					
						
							
							
								 
						
							
							
								baefc6f232 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Chinese (Traditional))  
							
							... 
							
							
							
							Currently translated at 100.0% (1670 of 1670 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/  
							
						 
						
							2019-07-03 14:33:47 +00:00  
				
					
						
							
							
								 
						
							
							
								1d22f901a0 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Albanian)  
							
							... 
							
							
							
							Currently translated at 99.6% (1663 of 1670 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/  
							
						 
						
							2019-07-03 14:33:47 +00:00  
				
					
						
							
							
								 
						
							
							
								7dbd17c137 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3150  from matrix-org/travis/less-typing  
							
							... 
							
							
							
							Track the user's own typing state external to the composer 
							
						 
						
							2019-07-03 08:33:42 -06:00  
				
					
						
							
							
								 
						
							
							
								344cc079c5 
								
							
								 
							
						 
						
							
							
								
								show /relations error in edit history dialog  
							
							
							
						 
						
							2019-07-03 12:16:58 +02:00  
				
					
						
							
							
								 
						
							
							
								b70f3bf48e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'origin/develop' into Weblate.  
							
							
							
						 
						
							2019-07-03 09:03:04 +00:00  
				
					
						
							
							
								 
						
							
							
								21bf7e51e1 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (German)  
							
							... 
							
							
							
							Currently translated at 88.3% (1472 of 1667 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/  
							
						 
						
							2019-07-03 09:03:04 +00:00  
				
					
						
							
							
								 
						
							
							
								3c0698ea0e 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Finnish)  
							
							... 
							
							
							
							Currently translated at 99.3% (1655 of 1667 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/  
							
						 
						
							2019-07-03 09:03:04 +00:00  
				
					
						
							
							
								 
						
							
							
								dcc3bb58be 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Bulgarian)  
							
							... 
							
							
							
							Currently translated at 100.0% (1667 of 1667 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/  
							
						 
						
							2019-07-03 09:03:04 +00:00  
				
					
						
							
							
								 
						
							
							
								7f2c6b46ca 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Albanian)  
							
							... 
							
							
							
							Currently translated at 99.6% (1660 of 1667 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/  
							
						 
						
							2019-07-03 09:03:03 +00:00  
				
					
						
							
							
								 
						
							
							
								353f5a205c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3170  from matrix-org/bwindels/handle-associated-failures  
							
							... 
							
							
							
							Handle associated event send failures 
							
						 
						
							2019-07-03 09:02:58 +00:00  
				
					
						
							
							
								 
						
							
							
								cca82635f3 
								
							
								 
							
						 
						
							
							
								
								whitespace  
							
							
							
						 
						
							2019-07-03 10:32:37 +02:00  
				
					
						
							
							
								 
						
							
							
								429b8e94df 
								
							
								 
							
						 
						
							
							
								
								MELS handle m.room.third_party_invite  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-07-03 08:58:34 +01:00  
				
					
						
							
							
								 
						
							
							
								430dd40b8d 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Finnish)  
							
							... 
							
							
							
							Currently translated at 99.3% (1655 of 1667 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/  
							
						 
						
							2019-07-03 07:57:16 +00:00  
				
					
						
							
							
								 
						
							
							
								906b46940a 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Finnish)  
							
							... 
							
							
							
							Currently translated at 99.3% (1655 of 1667 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/  
							
						 
						
							2019-07-03 07:57:16 +00:00  
				
					
						
							
							
								 
						
							
							
								bc4bff64f6 
								
							
								 
							
						 
						
							
							
								
								Fix logic around MemberList invites section, specifically regarding 3pid  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-07-03 08:38:08 +01:00