9fb8d1d410 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'origin/develop' into Weblate.  
							
							
							
						 
						
							2019-06-19 12:29:23 +00:00  
				
					
						
							
							
								 
						
							
							
								057f2da327 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (French)  
							
							... 
							
							
							
							Currently translated at 100.0% (1661 of 1661 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/  
							
						 
						
							2019-06-19 12:29:23 +00:00  
				
					
						
							
							
								 
						
							
							
								a10675a400 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Finnish)  
							
							... 
							
							
							
							Currently translated at 97.5% (1620 of 1661 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/  
							
						 
						
							2019-06-19 12:29:23 +00:00  
				
					
						
							
							
								 
						
							
							
								399f59130e 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Albanian)  
							
							... 
							
							
							
							Currently translated at 99.6% (1655 of 1661 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/  
							
						 
						
							2019-06-19 12:29:22 +00:00  
				
					
						
							
							
								 
						
							
							
								97d8fe6db3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3121  from matrix-org/dbkr/count_rooms_with_notifs  
							
							... 
							
							
							
							Fix favicon/title badge count 
							
						 
						
							2019-06-19 13:29:17 +01:00  
				
					
						
							
							
								 
						
							
							
								6eddce8c32 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							2019-06-19 12:13:17 +01:00  
				
					
						
							
							
								 
						
							
							
								edd43a2706 
								
							
								 
							
						 
						
							
							
								
								Fix favicon/title badge count  
							
							... 
							
							
							
							This was using a separate function (in MatrixChat) that didn't
take into account whether we were supposed to be hiding the badge
for rooms so would include notifs that were hidden everywhere else.
Also make it a function & put it in RoomNotifs with all its friends.
Fixes https://github.com/vector-im/riot-web/issues/3060  
							
						 
						
							2019-06-19 12:06:32 +01:00  
				
					
						
							
							
								 
						
							
							
								b062bb6553 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'origin/develop' into Weblate.  
							
							
							
						 
						
							2019-06-19 08:31:16 +00:00  
				
					
						
							
							
								 
						
							
							
								9591e6b0d3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3071  from matrix-org/t3chguy/authentication_password_field  
							
							... 
							
							
							
							Switch ugly password boxes to Field or styled input 
							
						 
						
							2019-06-19 09:31:11 +01:00  
				
					
						
							
							
								 
						
							
							
								0c71aa2a57 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'origin/develop' into Weblate.  
							
							
							
						 
						
							2019-06-19 08:27:37 +00:00  
				
					
						
							
							
								 
						
							
							
								6970552a87 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Hungarian)  
							
							... 
							
							
							
							Currently translated at 100.0% (1660 of 1660 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/  
							
						 
						
							2019-06-19 08:27:37 +00:00  
				
					
						
							
							
								 
						
							
							
								e69e9dd705 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Chinese (Traditional))  
							
							... 
							
							
							
							Currently translated at 100.0% (1660 of 1660 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/  
							
						 
						
							2019-06-19 08:27:36 +00:00  
				
					
						
							
							
								 
						
							
							
								9641110315 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3118  from matrix-org/dbkr/already_registered  
							
							... 
							
							
							
							Restore warning for if you're already logged in 
							
						 
						
							2019-06-19 09:27:31 +01:00  
				
					
						
							
							
								 
						
							
							
								c8e121dc70 
								
							
								 
							
						 
						
							
							
								
								Restore warning for if you're already logged in  
							
							... 
							
							
							
							...when clicking an email link. Although now we can complete the
registration because we can do so without replacing your session. 
							
						 
						
							2019-06-18 18:43:14 +01:00  
				
					
						
							
							
								 
						
							
							
								456fa7a26b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'origin/develop' into Weblate.  
							
							
							
						 
						
							2019-06-18 16:44:47 +00:00  
				
					
						
							
							
								 
						
							
							
								bb97653455 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3113  from matrix-org/bwindels/mediadeviceslabels  
							
							... 
							
							
							
							Provide default name if device label is missing 
							
						 
						
							2019-06-18 16:44:43 +00:00  
				
					
						
							
							
								 
						
							
							
								1a23265742 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'origin/develop' into Weblate.  
							
							
							
						 
						
							2019-06-18 16:43:19 +00:00  
				
					
						
							
							
								 
						
							
							
								63fba611c0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3108  from matrix-org/bwindels/edit-room-notif-pill  
							
							... 
							
							
							
							Support @room pills while editing 
							
						 
						
							2019-06-18 16:43:14 +00:00  
				
					
						
							
							
								 
						
							
							
								d52b5ba85d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'origin/develop' into Weblate.  
							
							
							
						 
						
							2019-06-18 14:17:26 +00:00  
				
					
						
							
							
								 
						
							
							
								7b514b0573 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3115  from matrix-org/travis/reduce-scalar-calls  
							
							... 
							
							
							
							Defer scalar API calls until they are needed 
							
						 
						
							2019-06-18 08:17:21 -06:00  
				
					
						
							
							
								 
						
							
							
								b6ca0ea6bf 
								
							
								 
							
						 
						
							
							
								
								Appease the linter  
							
							
							
						 
						
							2019-06-18 08:01:38 -06:00  
				
					
						
							
							
								 
						
							
							
								be37332bb0 
								
							
								 
							
						 
						
							
							
								
								Further simplify usage of integrations  
							
							
							
						 
						
							2019-06-18 07:55:43 -06:00  
				
					
						
							
							
								 
						
							
							
								386de1970e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'origin/develop' into Weblate.  
							
							
							
						 
						
							2019-06-18 13:09:30 +00:00  
				
					
						
							
							
								 
						
							
							
								f7c03acb58 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3117  from matrix-org/bwindels/redactions-blended-echo  
							
							... 
							
							
							
							Blend pending redactions 
							
						 
						
							2019-06-18 13:09:25 +00:00  
				
					
						
							
							
								 
						
							
							
								c4fc2a8089 
								
							
								 
							
						 
						
							
							
								
								remove redundant localecho part from method name  
							
							
							
						 
						
							2019-06-18 14:57:58 +02:00  
				
					
						
							
							
								 
						
							
							
								f9188bca92 
								
							
								 
							
						 
						
							
							
								
								reduced opacity for pending redactions  
							
							
							
						 
						
							2019-06-18 13:48:51 +02:00  
				
					
						
							
							
								 
						
							
							
								02c9e29937 
								
							
								 
							
						 
						
							
							
								
								use renamed method that also takes local redactions into account now  
							
							
							
						 
						
							2019-06-18 13:47:33 +02:00  
				
					
						
							
							
								 
						
							
							
								6e072e300c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'origin/develop' into Weblate.  
							
							
							
						 
						
							2019-06-18 09:57:13 +00:00  
				
					
						
							
							
								 
						
							
							
								3cd91feb2a 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Italian)  
							
							... 
							
							
							
							Currently translated at 100.0% (1651 of 1651 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/  
							
						 
						
							2019-06-18 09:57:13 +00:00  
				
					
						
							
							
								 
						
							
							
								ea32d12c77 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Esperanto)  
							
							... 
							
							
							
							Currently translated at 83.9% (1385 of 1651 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/  
							
						 
						
							2019-06-18 09:57:13 +00:00  
				
					
						
							
							
								 
						
							
							
								cc155ac049 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3116  from matrix-org/bwindels/feature-guard-arrowup-to-edit  
							
							... 
							
							
							
							Keep old arrow-up behaviour when editing is not enabled 
							
						 
						
							2019-06-18 09:57:04 +00:00  
				
					
						
							
							
								 
						
							
							
								f95f194b6a 
								
							
								 
							
						 
						
							
							
								
								keep old arrow-up behaviour when editing is not enabled  
							
							... 
							
							
							
							also, move caret at end/start checks before choosing what to do
also, selectHistory shouldn't return a promise 
							
						 
						
							2019-06-18 11:49:36 +02:00  
				
					
						
							
							
								 
						
							
							
								592576bf42 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'origin/develop' into Weblate.  
							
							
							
						 
						
							2019-06-18 08:59:18 +00:00  
				
					
						
							
							
								 
						
							
							
								32840fc274 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3098  from matrix-org/t3chguy/restore_composer_history  
							
							... 
							
							
							
							Restore Composer History under shift-up & down 
							
						 
						
							2019-06-18 08:59:11 +00:00  
				
					
						
							
							
								 
						
							
							
								38d9f9ef8c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'origin/develop' into Weblate.  
							
							
							
						 
						
							2019-06-18 08:37:36 +00:00  
				
					
						
							
							
								 
						
							
							
								1729247340 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Chinese (Traditional))  
							
							... 
							
							
							
							Currently translated at 100.0% (1651 of 1651 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/  
							
						 
						
							2019-06-18 08:37:36 +00:00  
				
					
						
							
							
								 
						
							
							
								d8c0f12009 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Basque)  
							
							... 
							
							
							
							Currently translated at 100.0% (1651 of 1651 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/  
							
						 
						
							2019-06-18 08:37:36 +00:00  
				
					
						
							
							
								 
						
							
							
								5e7b4564cf 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3114  from matrix-org/dbkr/allow_server_change_if_dead  
							
							... 
							
							
							
							Allow changing server if validation has failed 
							
						 
						
							2019-06-18 09:37:31 +01:00  
				
					
						
							
							
								 
						
							
							
								1db505c667 
								
							
								 
							
						 
						
							
							
								
								comment typo  
							
							
							
						 
						
							2019-06-18 09:50:31 +02:00  
				
					
						
							
							
								 
						
							
							
								3119feaa17 
								
							
								 
							
						 
						
							
							
								
								whitespace  
							
							
							
						 
						
							2019-06-18 09:48:25 +02:00  
				
					
						
							
							
								 
						
							
							
								47579f37e8 
								
							
								 
							
						 
						
							
							
								
								clarify why its always safe to not append @room at end while parsing  
							
							
							
						 
						
							2019-06-18 08:40:58 +02:00  
				
					
						
							
							
								 
						
							
							
								6b7bcb239b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'origin/develop' into Weblate.  
							
							
							
						 
						
							2019-06-18 00:06:20 +00:00  
				
					
						
							
							
								 
						
							
							
								0692775f98 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Hungarian)  
							
							... 
							
							
							
							Currently translated at 100.0% (1650 of 1650 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/  
							
						 
						
							2019-06-18 00:06:20 +00:00  
				
					
						
							
							
								 
						
							
							
								b0d340f578 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3109  from matrix-org/t3chguy/upload_all_button  
							
							... 
							
							
							
							Add Upload All button to UploadConfirmDialog 
							
						 
						
							2019-06-17 18:06:15 -06:00  
				
					
						
							
							
								 
						
							
							
								d5db0077ed 
								
							
								 
							
						 
						
							
							
								
								Remove unused imports  
							
							
							
						 
						
							2019-06-17 15:53:11 -06:00  
				
					
						
							
							
								 
						
							
							
								8f6e8c1ec7 
								
							
								 
							
						 
						
							
							
								
								Appease the linter  
							
							
							
						 
						
							2019-06-17 15:51:14 -06:00  
				
					
						
							
							
								 
						
							
							
								d58ab8e6d0 
								
							
								 
							
						 
						
							
							
								
								Remove excessive scalar auth checks in manager util class  
							
							
							
						 
						
							2019-06-17 15:50:09 -06:00  
				
					
						
							
							
								 
						
							
							
								974a11ed20 
								
							
								 
							
						 
						
							
							
								
								Defer scalar auth in AppsDrawer to widgets/manager dialog  
							
							
							
						 
						
							2019-06-17 15:39:32 -06:00  
				
					
						
							
							
								 
						
							
							
								d2d0cb2e9e 
								
							
								 
							
						 
						
							
							
								
								Port AppTile (widgets) over to new integration manager dialog props  
							
							
							
						 
						
							2019-06-17 15:34:30 -06:00  
				
					
						
							
							
								 
						
							
							
								f699fed720 
								
							
								 
							
						 
						
							
							
								
								Defer sticker picker scalar auth to integration manager dialog  
							
							... 
							
							
							
							or when needed, instead of up front. 
							
						 
						
							2019-06-17 15:30:24 -06:00