Travis Ralston
							
						 
						
							 
							
							
							
								
							
								dad1d3f131 
								
							
								 
							
						 
						
							
							
								
								Fix runtime react errors for various parts of the app  
							
							 
							
							... 
							
							
							
							These are just the ones that were causing console flooding on reload in development.
* Elements in a list need a `key`
* `super()` needs to be supplied with the same props as the parent
* `<div>` (AccessibleButton) cannot be a descendant of `<p>` - this was a problem in the NewRoomIntro "Add topic" button
* `label` is a non-boolean property and cannot receive "false" 
							
						 
						
							2021-10-18 13:47:42 -06:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								98ba3fd6e6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6973  from matrix-org/dbkr/upgrade_highlightjs  
							
							 
							
							... 
							
							
							
							Upgrade highlight.js 
							
						 
						
							2021-10-18 19:52:34 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c2fb745188 
								
							
								 
							
						 
						
							
							
								
								Appease type checker  
							
							 
							
							
							
						 
						
							2021-10-18 19:44:05 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								e9f5fa7858 
								
							
								 
							
						 
						
							
							
								
								Update usage here too  
							
							 
							
							
							
						 
						
							2021-10-18 19:39:43 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2b7ea16c2d 
								
							
								 
							
						 
						
							
							
								
								Upgrade highlight.js  
							
							 
							
							... 
							
							
							
							Major version bump for highlight.js. Update usage of deprecated function & some cleanups. 
							
						 
						
							2021-10-18 19:32:20 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								df5f4409ad 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6965  from SimonBrandner/feature/end-of-line-emoji  
							
							 
							
							... 
							
							
							
							Convert emoticon to emoji at the end of a line on send even if the cursor isn't there 
							
						 
						
							2021-10-18 17:12:41 +01:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								77e6e1c0ab 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6960  from matrix-org/gsouquet/rename-replythread  
							
							 
							
							
							
						 
						
							2021-10-18 17:11:31 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								e0027895e7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6963  from SimonBrandner/task/colors-5  
							
							 
							
							... 
							
							
							
							Color clean-up numero cinco 
							
						 
						
							2021-10-18 17:09:39 +01:00  
						
					 
				
					
						
							
							
								 
								Dariusz Niemczyk
							
						 
						
							 
							
							
								
								
							
							
								
							
								a2bc090607 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix threads with bubbles rendering ( #6971 )  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/vector-im/element-web/issues/18958  
							
						 
						
							2021-10-18 15:41:05 +01:00  
						
					 
				
					
						
							
							
								 
								Ekaterina Gerasimova
							
						 
						
							 
							
							
							
								
							
								695e110794 
								
							
								 
							
						 
						
							
							
								
								Improve capitalisation in string  
							
							 
							
							... 
							
							
							
							Remove random mid-sentence capitalisation in Security Phrase dialog. The
dialog will change at some point but for now lets make it more human
readable.
Fixes  #19429  
							
						 
						
							2021-10-18 15:28:07 +01:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								4f3d761984 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6968  from andybalaam/cryptographypanel-table  
							
							 
							
							... 
							
							
							
							Convert CryptographyPanel to a table 
							
						 
						
							2021-10-18 13:26:16 +01:00  
						
					 
				
					
						
							
							
								 
								Dariusz Niemczyk
							
						 
						
							 
							
							
								
								
							
							
								
							
								1d6c9fa8da 
								
									
								
							
								 
							
						 
						
							
							
								
								Add threads ViewInRoom context button ( #18955 ) ( #6947 )  
							
							 
							
							
							
						 
						
							2021-10-18 12:09:01 +00:00  
						
					 
				
					
						
							
							
								 
								Dariusz Niemczyk
							
						 
						
							 
							
							
							
								
							
								2c66403b3c 
								
							
								 
							
						 
						
							
							
								
								Replace console.info with logger.info  
							
							 
							
							... 
							
							
							
							Related https://github.com/vector-im/element-web/issues/18425  
							
						 
						
							2021-10-18 14:08:23 +02:00  
						
					 
				
					
						
							
							
								 
								Dariusz Niemczyk
							
						 
						
							 
							
							
							
								
							
								5290afcc4c 
								
							
								 
							
						 
						
							
							
								
								Replace console.warn with logger.warn  
							
							 
							
							... 
							
							
							
							Related https://github.com/vector-im/element-web/issues/18425  
							
						 
						
							2021-10-18 14:08:23 +02:00  
						
					 
				
					
						
							
							
								 
								Dariusz Niemczyk
							
						 
						
							 
							
							
							
								
							
								5e73a212f4 
								
							
								 
							
						 
						
							
							
								
								Replace console.error with logger.error  
							
							 
							
							... 
							
							
							
							Related https://github.com/vector-im/element-web/issues/18425  
							
						 
						
							2021-10-18 14:08:23 +02:00  
						
					 
				
					
						
							
							
								 
								Dariusz Niemczyk
							
						 
						
							 
							
							
							
								
							
								9c594a8a96 
								
							
								 
							
						 
						
							
							
								
								Replace console.logs to logger.log  
							
							 
							
							... 
							
							
							
							Related https://github.com/vector-im/element-web/issues/18425  
							
						 
						
							2021-10-18 14:08:23 +02:00  
						
					 
				
					
						
							
							
								 
								Dariusz Niemczyk
							
						 
						
							 
							
							
							
								
							
								12632318ef 
								
							
								 
							
						 
						
							
							
								
								Add missing parenthesis for await calls  
							
							 
							
							
							
						 
						
							2021-10-18 14:08:23 +02:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
							
								
							
								61a5b495b7 
								
							
								 
							
						 
						
							
							
								
								Remove duplicate CSS selector  
							
							 
							
							
							
						 
						
							2021-10-18 12:23:09 +01:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
							
								
							
								13d6456200 
								
							
								 
							
						 
						
							
							
								
								Convert CryptographyPanel to a table  
							
							 
							
							
							
						 
						
							2021-10-18 09:36:16 +01:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								f05e35bd94 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6958  from andybalaam/separate-cryptography-setting-component  
							
							 
							
							... 
							
							
							
							Break 'Cryptography' settings into a separate component 
							
						 
						
							2021-10-18 09:34:55 +01:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
							
								
							
								78890ab3aa 
								
							
								 
							
						 
						
							
							
								
								Run i18n generation  
							
							 
							
							
							
						 
						
							2021-10-18 09:20:58 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								4d63e1239b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6962  from CicadaCinema/patch-3  
							
							 
							
							
							
						 
						
							2021-10-18 09:17:40 +01:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								d93c220aae 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6898  from oliver-pham/issue-19180  
							
							 
							
							
							
						 
						
							2021-10-18 08:47:28 +01:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								fd2a7fe0f4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6961  from RafaelGoncalves8/move-error-message  
							
							 
							
							
							
						 
						
							2021-10-18 08:43:17 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								1935620e43 
								
									
								
							
								 
							
						 
						
							
							
								
								Convert emoticon to emoji at the end of a line on send even if the cursor isn't there  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-10-17 09:40:42 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								459f3661cf 
								
									
								
							
								 
							
						 
						
							
							
								
								Add a few fallback colors  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-10-16 20:56:02 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								6693ec3401 
								
									
								
							
								 
							
						 
						
							
							
								
								Reorder things to make it work  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-10-16 20:54:23 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								a3cde0e5e6 
								
									
								
							
								 
							
						 
						
							
							
								
								$voice-record-waveform-incomplete-fg-color -> $quaternary-content  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-10-16 20:34:24 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								aad4e6f312 
								
									
								
							
								 
							
						 
						
							
							
								
								$voice-playback-button-bg-color -> $system  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-10-16 20:29:03 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								707f0c6bc9 
								
									
								
							
								 
							
						 
						
							
							
								
								$voice-playback-button-fg-color -> $secondary-content  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-10-16 20:28:01 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								ee7c126596 
								
									
								
							
								 
							
						 
						
							
							
								
								$groupFilterPanel-divider-color -> $tertiary-content  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-10-16 20:21:27 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								0794be1e98 
								
									
								
							
								 
							
						 
						
							
							
								
								$notice-secondary-color -> $tertiary-content  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-10-16 20:21:27 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								ca6ed64811 
								
									
								
							
								 
							
						 
						
							
							
								
								$roomlist-header-color -> $tertiary-content  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-10-16 20:21:26 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								79efd61b66 
								
									
								
							
								 
							
						 
						
							
							
								
								$roomsublist-divider-color -> $primary-content  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-10-16 20:21:26 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								36531be8ca 
								
									
								
							
								 
							
						 
						
							
							
								
								$roomtile-preview-color -> $secondary-content  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-10-16 20:21:26 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								1691127ad2 
								
									
								
							
								 
							
						 
						
							
							
								
								$field-focused-label-bg-color -> $background  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-10-16 20:21:20 +02:00  
						
					 
				
					
						
							
							
								 
								CicadaCinema
							
						 
						
							 
							
							
							
								
							
								a9c9e5b778 
								
							
								 
							
						 
						
							
							
								
								appease the linter  
							
							 
							
							
							
						 
						
							2021-10-16 14:58:10 +01:00  
						
					 
				
					
						
							
							
								 
								CicadaCinema
							
						 
						
							 
							
							
							
								
							
								7b893366f2 
								
							
								 
							
						 
						
							
							
								
								Add spacing to Room settings - Notifications subsection  
							
							 
							
							
							
						 
						
							2021-10-16 14:52:29 +01:00  
						
					 
				
					
						
							
							
								 
								Rafael Goncalves
							
						 
						
							 
							
							
							
								
							
								2fb802eb9e 
								
							
								 
							
						 
						
							
							
								
								Move error message closer to password field  
							
							 
							
							... 
							
							
							
							Signed-off-by: Rafael Goncalves <rafaelgoncalves@riseup.net> 
							
						 
						
							2021-10-15 16:01:35 -03:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								5a7c0d87b6 
								
							
								 
							
						 
						
							
							
								
								Rename ReplyThread to ReplyChain to avoid confusion with m.thread  
							
							 
							
							
							
						 
						
							2021-10-15 17:42:44 +01:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
							
								
							
								0941b38b5d 
								
							
								 
							
						 
						
							
							
								
								Name CryptographyPanel CSS classes consistent with style  
							
							 
							
							
							
						 
						
							2021-10-15 16:09:36 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								4fb0d021ae 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6897  from SimonBrandner/task/colors-4  
							
							 
							
							... 
							
							
							
							Color de-duplication #4  
							
						 
						
							2021-10-15 16:07:07 +01:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
							
								
							
								a547ee4654 
								
							
								 
							
						 
						
							
							
								
								Break 'Cryptography' settings into a separate component  
							
							 
							
							
							
						 
						
							2021-10-15 16:02:44 +01:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								495f824f0f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6957  from matrix-org/gsouquet/fix-appearance-settings  
							
							 
							
							
							
						 
						
							2021-10-15 15:45:05 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								ac23afe9f1 
								
							
								 
							
						 
						
							
							
								
								Allow EventTile to be rendered with mock events  
							
							 
							
							
							
						 
						
							2021-10-15 15:36:06 +01:00  
						
					 
				
					
						
							
							
								 
								Faye Duxovni
							
						 
						
							 
							
							
								
								
							
							
								
							
								1b7277b8f0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6943  from matrix-org/fayed/emoji-compare-buttons  
							
							 
							
							... 
							
							
							
							Update the button styling on the emoji comparison dialog during cross-signing 
							
						 
						
							2021-10-15 10:34:25 -04:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								0a6e78fd38 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into task/colors-4  
							
							 
							
							
							
						 
						
							2021-10-15 16:23:40 +02:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								cee0d6894f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6951  from matrix-org/gsouquet/fix-thread-root-hidden  
							
							 
							
							
							
						 
						
							2021-10-15 15:00:17 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								93fc24c875 
								
							
								 
							
						 
						
							
							
								
								Adding renderThreadInfo comment to explain data accessor  
							
							 
							
							
							
						 
						
							2021-10-15 14:47:02 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								904147b194 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into gsouquet/fix-thread-root-hidden  
							
							 
							
							
							
						 
						
							2021-10-15 14:45:11 +01:00