80ee68a42f 
								
							
								 
							
						 
						
							
							
								
								Use a settings watcher to set the theme  
							
							... 
							
							
							
							Rather than listening for account data updates manually 
							
						 
						
							2019-11-19 22:36:55 +00:00  
				
					
						
							
							
								 
						
							
							
								a0dbd5f62c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3632  from matrix-org/bwindels/merge-userinfo-flag  
							
							... 
							
							
							
							Merge the `feature_user_info_panel` flag into `feature_dm_verification` 
							
						 
						
							2019-11-19 13:34:23 +00:00  
				
					
						
							
							
								 
						
							
							
								f9b5678b06 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3631  from matrix-org/bwindels/userinfo-css-fixes  
							
							... 
							
							
							
							Fix some styling regressions in member panel 
							
						 
						
							2019-11-19 13:24:06 +00:00  
				
					
						
							
							
								 
						
							
							
								43884923e8 
								
							
								 
							
						 
						
							
							
								
								merge the feature_user_info_panel flag into feature_dm_verification  
							
							
							
						 
						
							2019-11-19 14:18:12 +01:00  
				
					
						
							
							
								 
						
							
							
								5f7b0fef33 
								
							
								 
							
						 
						
							
							
								
								scale (new) icons to fit available size  
							
							... 
							
							
							
							fixes https://github.com/vector-im/riot-web/issues/11399  
							
						 
						
							2019-11-19 12:55:28 +01:00  
				
					
						
							
							
								 
						
							
							
								39939de04f 
								
							
								 
							
						 
						
							
							
								
								remove white background on ! and  ✅  so it looks better on dark theme  
							
							
							
						 
						
							2019-11-19 12:51:46 +01:00  
				
					
						
							
							
								 
						
							
							
								de15965c4a 
								
							
								 
							
						 
						
							
							
								
								improve device list layout  
							
							
							
						 
						
							2019-11-19 12:51:37 +01:00  
				
					
						
							
							
								 
						
							
							
								92292003c8 
								
							
								 
							
						 
						
							
							
								
								make shield on verification request scale correctly  
							
							... 
							
							
							
							by not overriding `mask-size` using `mask` for `mask-image` 
							
						 
						
							2019-11-19 12:51:02 +01:00  
				
					
						
							
							
								 
						
							
							
								fea8737632 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3629  from matrix-org/travis/breadcrumbs-fix  
							
							... 
							
							
							
							Add a bit more safety around breadcrumbs 
							
						 
						
							2019-11-18 14:35:46 -07:00  
				
					
						
							
							
								 
						
							
							
								2f89f28496 
								
							
								 
							
						 
						
							
							
								
								Remove extraneous paranoia  
							
							... 
							
							
							
							The value is nullchecked later on. 
							
						 
						
							2019-11-18 14:25:04 -07:00  
				
					
						
							
							
								 
						
							
							
								8d25952dbb 
								
							
								 
							
						 
						
							
							
								
								Add a bit more safety around breadcrumbs  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/11420  
							
						 
						
							2019-11-18 14:17:31 -07:00  
				
					
						
							
							
								 
						
							
							
								2f410c060f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3628  from matrix-org/travis/widget-sender  
							
							... 
							
							
							
							Ensure widgets always have a sender associated with them 
							
						 
						
							2019-11-18 13:29:56 -07:00  
				
					
						
							
							
								 
						
							
							
								f5ec9eb8f4 
								
							
								 
							
						 
						
							
							
								
								Ensure widgets always have a sender associated with them  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/11419  
							
						 
						
							2019-11-18 13:16:36 -07:00  
				
					
						
							
							
								 
						
							
							
								f543a113cf 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3627  from matrix-org/t3chguy/bluebird_sync  
							
							... 
							
							
							
							re-add missing case of codepath 
							
						 
						
							2019-11-18 19:53:41 +00:00  
				
					
						
							
							
								 
						
							
							
								f9d1fed74a 
								
							
								 
							
						 
						
							
							
								
								re-add missing case of codepath  
							
							
							
						 
						
							2019-11-18 19:00:22 +00:00  
				
					
						
							
							
								 
						
							
							
								ef1c575bff 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3622  from matrix-org/travis/new-widget-prompt  
							
							... 
							
							
							
							Implement the bulk of the new widget permission prompt design 
							
						 
						
							2019-11-18 10:45:18 -07:00  
				
					
						
							
							
								 
						
							
							
								d5d2f7f936 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3588  from matrix-org/jryans/identity-disco-opt  
							
							... 
							
							
							
							Relax identity server discovery error handling 
							
						 
						
							2019-11-18 17:09:08 +00:00  
				
					
						
							
							
								 
						
							
							
								31b2d263f2 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3626  from matrix-org/jryans/cross-signing-flag  
							
							... 
							
							
							
							Add cross-signing feature flag 
							
						 
						
							2019-11-18 16:51:58 +00:00  
				
					
						
							
							
								 
						
							
							
								050761d339 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3624  from matrix-org/t3chguy/remove_bluebird_2  
							
							... 
							
							
							
							Attempt number two at ripping out Bluebird from rageshake.js 
							
						 
						
							2019-11-18 16:39:23 +00:00  
				
					
						
							
							
								 
						
							
							
								b8c0a0fe72 
								
							
								 
							
						 
						
							
							
								
								Reload automatically when changing cross-signing flag  
							
							
							
						 
						
							2019-11-18 16:06:00 +00:00  
				
					
						
							
							
								 
						
							
							
								50cccd3212 
								
							
								 
							
						 
						
							
							
								
								Add cross-signing feature flag  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/11407  
							
						 
						
							2019-11-18 16:06:00 +00:00  
				
					
						
							
							
								 
						
							
							
								759b497899 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3625  from RiotTranslateBot/weblate-riot-web-matrix-react-sdk  
							
							... 
							
							
							
							Update from Weblate 
							
						 
						
							2019-11-18 10:33:51 +00:00  
				
					
						
							
							
								 
						
							
							
								2fe764a3e9 
								
							
								 
							
						 
						
							
							
								
								Merge branches 'develop' and 't3chguy/remove_bluebird_2' of  https://github.com/matrix-org/matrix-react-sdk  into t3chguy/remove_bluebird_2  
							
							
							
						 
						
							2019-11-18 10:24:14 +00:00  
				
					
						
							
							
								 
						
							
							
								47948812b0 
								
							
								 
							
						 
						
							
							
								
								Attempt number two at ripping out Bluebird from rageshake.js  
							
							
							
						 
						
							2019-11-18 09:47:37 +00:00  
				
					
						
							
							
								 
						
							
							
								32fc1458d1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'origin/develop' into Weblate.  
							
							
							
						 
						
							2019-11-18 09:29:24 +00:00  
				
					
						
							
							
								 
						
							
							
								5d3a84db85 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Swedish)  
							
							... 
							
							
							
							Currently translated at 76.4% (1457 of 1908 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/  
							
						 
						
							2019-11-18 09:29:23 +00:00  
				
					
						
							
							
								 
						
							
							
								20dd731ed0 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Korean)  
							
							... 
							
							
							
							Currently translated at 100.0% (1908 of 1908 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/  
							
						 
						
							2019-11-18 09:29:22 +00:00  
				
					
						
							
							
								 
						
							
							
								16a107a163 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Hungarian)  
							
							... 
							
							
							
							Currently translated at 100.0% (1908 of 1908 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/  
							
						 
						
							2019-11-18 09:29:18 +00:00  
				
					
						
							
							
								 
						
							
							
								78c36e5936 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (French)  
							
							... 
							
							
							
							Currently translated at 100.0% (1908 of 1908 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/  
							
						 
						
							2019-11-18 09:29:17 +00:00  
				
					
						
							
							
								 
						
							
							
								a9ef6bde63 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Chinese (Traditional))  
							
							... 
							
							
							
							Currently translated at 100.0% (1908 of 1908 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/  
							
						 
						
							2019-11-18 09:29:15 +00:00  
				
					
						
							
							
								 
						
							
							
								d56ae70287 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Albanian)  
							
							... 
							
							
							
							Currently translated at 99.8% (1904 of 1908 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/  
							
						 
						
							2019-11-18 09:29:14 +00:00  
				
					
						
							
							
								 
						
							
							
								1ab9b82c25 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3618  from matrix-org/t3chguy/remove_bluebird_2  
							
							... 
							
							
							
							Remove Bluebird: phase 2.1 
							
						 
						
							2019-11-18 09:29:04 +00:00  
				
					
						
							
							
								 
						
							
							
								6b726a8e13 
								
							
								 
							
						 
						
							
							
								
								Implement the bulk of the new widget permission prompt design  
							
							... 
							
							
							
							Part 1 of https://github.com/vector-im/riot-web/issues/11262 
This is all the visual changes - the actual wiring of the UI to the right places is for another PR (though this PR still works independently).
The help icon is known to be weird here - it's a bug in the svg we have. The tooltip also goes right instead of up because making the tooltip go up is not easy work for this PR - maybe a future one if we *really* want it to go up. 
							
						 
						
							2019-11-15 14:26:16 -07:00  
				
					
						
							
							
								 
						
							
							
								e46a8c92d0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'origin/develop' into Weblate.  
							
							
							
						 
						
							2019-11-15 17:54:24 +00:00  
				
					
						
							
							
								 
						
							
							
								d15722d4c9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3619  from matrix-org/travis/deactivate-2  
							
							... 
							
							
							
							Add better error handling to Synapse user deactivation 
							
						 
						
							2019-11-15 10:54:17 -07:00  
				
					
						
							
							
								 
						
							
							
								61454bcf32 
								
							
								 
							
						 
						
							
							
								
								Fix i18n after merge  
							
							
							
						 
						
							2019-11-15 10:25:58 -07:00  
				
					
						
							
							
								 
						
							
							
								616a5ab55d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/deactivate-2  
							
							
							
						 
						
							2019-11-15 10:24:20 -07:00  
				
					
						
							
							
								 
						
							
							
								e6ffec948e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'origin/develop' into Weblate.  
							
							
							
						 
						
							2019-11-15 16:38:02 +00:00  
				
					
						
							
							
								 
						
							
							
								9a92f3d38e 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Ukrainian)  
							
							... 
							
							
							
							Currently translated at 29.0% (551 of 1898 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/  
							
						 
						
							2019-11-15 16:38:01 +00:00  
				
					
						
							
							
								 
						
							
							
								21dc9b9f25 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Finnish)  
							
							... 
							
							
							
							Currently translated at 96.4% (1830 of 1898 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/  
							
						 
						
							2019-11-15 16:37:53 +00:00  
				
					
						
							
							
								 
						
							
							
								5f31efadb6 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Esperanto)  
							
							... 
							
							
							
							Currently translated at 98.1% (1862 of 1898 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/  
							
						 
						
							2019-11-15 16:37:49 +00:00  
				
					
						
							
							
								 
						
							
							
								41f832a549 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3620  from matrix-org/bwindels/userinfomakeover  
							
							... 
							
							
							
							New design for member panel 
							
						 
						
							2019-11-15 16:37:42 +00:00  
				
					
						
							
							
								 
						
							
							
								0f39a9f72d 
								
							
								 
							
						 
						
							
							
								
								fix pr feedback  
							
							
							
						 
						
							2019-11-15 17:29:38 +01:00  
				
					
						
							
							
								 
						
							
							
								d416ba2c0c 
								
							
								 
							
						 
						
							
							
								
								add verify button while we don't have the verification in right panel  
							
							
							
						 
						
							2019-11-15 16:14:18 +01:00  
				
					
						
							
							
								 
						
							
							
								ecc842629a 
								
							
								 
							
						 
						
							
							
								
								fix css lint errors  
							
							
							
						 
						
							2019-11-15 16:14:18 +01:00  
				
					
						
							
							
								 
						
							
							
								edd5d3c915 
								
							
								 
							
						 
						
							
							
								
								make custom power level not grow too wide  
							
							
							
						 
						
							2019-11-15 16:14:18 +01:00  
				
					
						
							
							
								 
						
							
							
								1162d1ee43 
								
							
								 
							
						 
						
							
							
								
								Fix user info scroll container growing larger than available height  
							
							... 
							
							
							
							making whole room view grow taller than viewport 
							
						 
						
							2019-11-15 16:14:18 +01:00  
				
					
						
							
							
								 
						
							
							
								3a399e18fc 
								
							
								 
							
						 
						
							
							
								
								prevent  https://github.com/vector-im/riot-web/issues/11338  
							
							
							
						 
						
							2019-11-15 16:14:18 +01:00  
				
					
						
							
							
								 
						
							
							
								53019c5e91 
								
							
								 
							
						 
						
							
							
								
								don't show devices section when not encrypted, as it just shows spinner  
							
							
							
						 
						
							2019-11-15 16:14:18 +01:00  
				
					
						
							
							
								 
						
							
							
								92237f1045 
								
							
								 
							
						 
						
							
							
								
								cleanup  
							
							
							
						 
						
							2019-11-15 16:14:18 +01:00