b1010189be 
								
									
								
							
								 
							
						 
						
							
							
								
								Tabbed copyright link  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-01-05 20:41:33 +01:00  
				
					
						
							
							
								 
						
							
							
								640e6d68b3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into fix-screen-sharing  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-01-05 20:41:06 +01:00  
				
					
						
							
							
								 
						
							
							
								bb7e76f69e 
								
									
								
							
								 
							
						 
						
							
							
								
								Hopefully fixed copyrights  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-01-05 20:36:54 +01:00  
				
					
						
							
							
								 
						
							
							
								99dc829369 
								
									
								
							
								 
							
						 
						
							
							
								
								Fixed translation  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-01-05 20:27:11 +01:00  
				
					
						
							
							
								 
						
							
							
								d497594a6f 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove unnecessary line  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-01-05 19:55:08 +01:00  
				
					
						
							
							
								 
						
							
							
								8652c2e653 
								
									
								
							
								 
							
						 
						
							
							
								
								Fixed class names  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-01-05 19:49:09 +01:00  
				
					
						
							
							
								 
						
							
							
								efd889c09a 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove commented line  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-01-05 19:32:59 +01:00  
				
					
						
							
							
								 
						
							
							
								2d37151750 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5523  from matrix-org/dbkr/dial_pad  
							
							... 
							
							
							
							Add a dialpad UI for PSTN lookup 
							
						 
						
							2021-01-05 17:23:34 +00:00  
				
					
						
							
							
								 
						
							
							
								470756546c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5494  from matrix-org/dbkr/call_transfer  
							
							... 
							
							
							
							Basic call transfer initiation support 
							
						 
						
							2021-01-05 17:22:22 +00:00  
				
					
						
							
							
								 
						
							
							
								3fa2b7d55c 
								
							
								 
							
						 
						
							
							
								
								Document payload (or in this case, lack thereof)  
							
							
							
						 
						
							2021-01-04 11:54:10 +00:00  
				
					
						
							
							
								 
						
							
							
								a258a3874b 
								
							
								 
							
						 
						
							
							
								
								Use objectShallowClone  
							
							
							
						 
						
							2021-01-04 11:51:27 +00:00  
				
					
						
							
							
								 
						
							
							
								461b569278 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5524  from SimonBrandner/fix-15988  
							
							... 
							
							
							
							Fix  #15988  
						
							2020-12-29 13:09:11 +00:00  
				
					
						
							
							
								 
						
							
							
								95d93d143e 
								
									
								
							
								 
							
						 
						
							
							
								
								Clean up the SCSS  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2020-12-28 08:38:29 +01:00  
				
					
						
							
							
								 
						
							
							
								14a3b88497 
								
									
								
							
								 
							
						 
						
							
							
								
								Consistent formatting  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2020-12-28 08:15:54 +01:00  
				
					
						
							
							
								 
						
							
							
								eff26600e8 
								
									
								
							
								 
							
						 
						
							
							
								
								Linting  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2020-12-26 18:33:23 +01:00  
				
					
						
							
							
								 
						
							
							
								b24464269f 
								
									
								
							
								 
							
						 
						
							
							
								
								i18n  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2020-12-26 18:28:53 +01:00  
				
					
						
							
							
								 
						
							
							
								5779a543c9 
								
									
								
							
								 
							
						 
						
							
							
								
								Type cleanup  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2020-12-26 18:10:50 +01:00  
				
					
						
							
							
								 
						
							
							
								322afe6450 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove log  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2020-12-26 18:00:08 +01:00  
				
					
						
							
							
								 
						
							
							
								675ca58eef 
								
									
								
							
								 
							
						 
						
							
							
								
								Improve UI  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2020-12-26 16:56:25 +01:00  
				
					
						
							
							
								 
						
							
							
								1dc1bc68db 
								
									
								
							
								 
							
						 
						
							
							
								
								Clean up  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2020-12-26 08:40:58 +01:00  
				
					
						
							
							
								 
						
							
							
								eae3c1c496 
								
									
								
							
								 
							
						 
						
							
							
								
								Get screen-sharing working, somehow  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2020-12-26 08:32:51 +01:00  
				
					
						
							
							
								 
						
							
							
								65af77e546 
								
							
								 
							
						 
						
							
							
								
								i18n  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2020-12-24 08:01:35 +01:00  
				
					
						
							
							
								 
						
							
							
								65285fd55e 
								
							
								 
							
						 
						
							
							
								
								Fix 15988  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2020-12-24 08:00:23 +01:00  
				
					
						
							
							
								 
						
							
							
								452fbb076b 
								
							
								 
							
						 
						
							
							
								
								Add a dialpad UI for PSTN lookup  
							
							... 
							
							
							
							Queries the homeserver for PSTN protocol support, and if found,
the add-room button on the DM rooms list section opens a context
menu instead with a 'dial pad' option as well as the current 'start chat'
dialog. Entering a number into this and pressing dial performs
a thirdparty user query for the given string and starts a DM with that
user. 
							
						 
						
							2020-12-23 19:02:01 +00:00  
				
					
						
							
							
								 
						
							
							
								777c0ca1ef 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5520  from matrix-org/dependabot/npm_and_yarn/node-notifier-8.0.1  
							
							... 
							
							
							
							Bump node-notifier from 8.0.0 to 8.0.1 
							
						 
						
							2020-12-22 08:45:36 -07:00  
				
					
						
							
							
								 
						
							
							
								7c7ed7a2e4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5503  from matrix-org/jryans/prepublish-only  
							
							... 
							
							
							
							Use TypeScript source for development, swap to build during release 
							
						 
						
							2020-12-22 13:48:22 +00:00  
				
					
						
							
							
								 
						
							
							
								c4f7269321 
								
							
								 
							
						 
						
							
							
								
								Reset matrix-js-sdk back to develop branch  
							
							
							
						 
						
							2020-12-21 17:52:30 +00:00  
				
					
						
							
							
								 
						
							
							
								8e6f8b11df 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into develop  
							
							
							
						 
						
							2020-12-21 17:51:09 +00:00  
				
					
						
							
							
								 
						
							
							
								5fd39954a1 
								
							
								 
							
						 
						
							
							
								
								v3.11.1  
							
							
							
						 
						
							2020-12-21 17:37:29 +00:00  
				
					
						
							
							
								 
						
							
							
								cc0bef7f8d 
								
							
								 
							
						 
						
							
							
								
								Upgrade matrix-js-sdk to 9.4.1  
							
							
							
						 
						
							2020-12-21 17:36:46 +00:00  
				
					
						
							
							
								 
						
							
							
								ec274196c4 
								
							
								 
							
						 
						
							
							
								
								Prepare changlog for v3.11.1  
							
							
							
						 
						
							2020-12-21 17:32:49 +00:00  
				
					
						
							
							
								 
						
							
							
								9af2138171 
								
									
								
							
								 
							
						 
						
							
							
								
								Bump node-notifier from 8.0.0 to 8.0.1  
							
							... 
							
							
							
							Bumps [node-notifier](https://github.com/mikaelbr/node-notifier ) from 8.0.0 to 8.0.1.
- [Release notes](https://github.com/mikaelbr/node-notifier/releases )
- [Changelog](https://github.com/mikaelbr/node-notifier/blob/v8.0.1/CHANGELOG.md )
- [Commits](https://github.com/mikaelbr/node-notifier/compare/v8.0.0...v8.0.1 )
Signed-off-by: dependabot[bot] <support@github.com> 
							
						 
						
							2020-12-21 17:19:21 +00:00  
				
					
						
							
							
								 
						
							
							
								e551e7ac40 
								
							
								 
							
						 
						
							
							
								
								Reset matrix-js-sdk back to develop branch  
							
							
							
						 
						
							2020-12-21 17:08:51 +00:00  
				
					
						
							
							
								 
						
							
							
								55fd463a9d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into develop  
							
							
							
						 
						
							2020-12-21 17:07:52 +00:00  
				
					
						
							
							
								 
						
							
							
								d23d0b2b42 
								
							
								 
							
						 
						
							
							
								
								v3.11.0  
							
							
							
						 
						
							2020-12-21 17:06:40 +00:00  
				
					
						
							
							
								 
						
							
							
								74c33cabca 
								
							
								 
							
						 
						
							
							
								
								Prepare changelog for v3.11.0  
							
							
							
						 
						
							2020-12-21 17:06:40 +00:00  
				
					
						
							
							
								 
						
							
							
								78e6fb9121 
								
							
								 
							
						 
						
							
							
								
								Upgrade matrix-js-sdk to 9.4.0  
							
							
							
						 
						
							2020-12-21 17:00:39 +00:00  
				
					
						
							
							
								 
						
							
							
								f806443b7d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5519  from matrix-org/jryans/big-emoji-html-release  
							
							... 
							
							
							
							[Release] Look for emoji in the body that will be displayed 
							
						 
						
							2020-12-21 16:26:45 +00:00  
				
					
						
							
							
								 
						
							
							
								ee56560e33 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5517  from matrix-org/jryans/big-emoji-html  
							
							... 
							
							
							
							Look for emoji in the body that will be displayed 
							
						 
						
							2020-12-21 16:07:58 +00:00  
				
					
						
							
							
								 
						
							
							
								3e7803d723 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5516  from matrix-org/jryans/element-url-patterns-release  
							
							... 
							
							
							
							[Release] Recognise `*.element.io` links as Element permalinks 
							
						 
						
							2020-12-21 16:07:39 +00:00  
				
					
						
							
							
								 
						
							
							
								3907826cd6 
								
							
								 
							
						 
						
							
							
								
								Look for emoji in the body that will be displayed  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/element-web/issues/16013  
							
						 
						
							2020-12-21 16:02:38 +00:00  
				
					
						
							
							
								 
						
							
							
								44c705e41c 
								
							
								 
							
						 
						
							
							
								
								Look for emoji in the body that will be displayed  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/element-web/issues/16013  
							
						 
						
							2020-12-21 15:24:59 +00:00  
				
					
						
							
							
								 
						
							
							
								b510399f31 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5486  from matrix-org/dependabot/npm_and_yarn/ini-1.3.7  
							
							... 
							
							
							
							Bump ini from 1.3.5 to 1.3.7 
							
						 
						
							2020-12-21 14:54:49 +00:00  
				
					
						
							
							
								 
						
							
							
								93e24fae7a 
								
							
								 
							
						 
						
							
							
								
								Recognise *.element.io links as Element permalinks  
							
							... 
							
							
							
							This ensures all Elements detect permalinks to official deployments as Element
and handle them internally.
Fixes https://github.com/vector-im/element-web/issues/16005  
							
						 
						
							2020-12-21 14:54:04 +00:00  
				
					
						
							
							
								 
						
							
							
								71cbc8bf29 
								
							
								 
							
						 
						
							
							
								
								Rename and reformat Element URL pattern  
							
							... 
							
							
							
							This is just a code style cleanup. There are no behaviour changes in this
commit. 
							
						 
						
							2020-12-21 14:54:04 +00:00  
				
					
						
							
							
								 
						
							
							
								62d1345790 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5514  from matrix-org/jryans/element-url-patterns  
							
							... 
							
							
							
							Recognise `*.element.io` links as Element permalinks 
							
						 
						
							2020-12-21 14:49:58 +00:00  
				
					
						
							
							
								 
						
							
							
								5d78418530 
								
							
								 
							
						 
						
							
							
								
								Recognise *.element.io links as Element permalinks  
							
							... 
							
							
							
							This ensures all Elements detect permalinks to official deployments as Element
and handle them internally.
Fixes https://github.com/vector-im/element-web/issues/16005  
							
						 
						
							2020-12-21 13:15:00 +00:00  
				
					
						
							
							
								 
						
							
							
								162a5de82e 
								
							
								 
							
						 
						
							
							
								
								Rename and reformat Element URL pattern  
							
							... 
							
							
							
							This is just a code style cleanup. There are no behaviour changes in this
commit. 
							
						 
						
							2020-12-21 13:05:45 +00:00  
				
					
						
							
							
								 
						
							
							
								e14050a19f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5513  from matrix-org/dbkr/call_ui_fixups_rel  
							
							... 
							
							
							
							[Release] Fixes for call UI 
							
						 
						
							2020-12-21 11:37:30 +00:00  
				
					
						
							
							
								 
						
							
							
								a126c2eadc 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5509  from matrix-org/dbkr/call_ui_fixups  
							
							... 
							
							
							
							Fixes for call UI 
							
						 
						
							2020-12-21 11:36:17 +00:00