3ae76c84f6 
								
							
								 
							
						 
						
							
							
								
								Add a simple TagComposer for the keywords entry  
							
							
							
						 
						
							2021-07-12 23:55:08 -06:00  
				
					
						
							
							
								 
						
							
							
								8a816bb096 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6331  from matrix-org/gsouquet/ghost-button-background  
							
							... 
							
							
							
							Make ghost button background transparent 
							
						 
						
							2021-07-12 09:07:52 +01:00  
				
					
						
							
							
								 
						
							
							
								829169ec87 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6342  from matrix-org/t3chguy/fix/vrlp  
							
							... 
							
							
							
							Fix small visual regression with the site name on url previews 
							
						 
						
							2021-07-09 18:05:48 +01:00  
				
					
						
							
							
								 
						
							
							
								8072007782 
								
							
								 
							
						 
						
							
							
								
								Fix small visual regression with the site name on url previews  
							
							
							
						 
						
							2021-07-09 14:50:55 +01:00  
				
					
						
							
							
								 
						
							
							
								91d208d514 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-07-09 08:26:19 +02:00  
				
					
						
							
							
								 
						
							
							
								1c2bdf3cf4 
								
							
								 
							
						 
						
							
							
								
								delint  
							
							
							
						 
						
							2021-07-08 13:35:26 +01:00  
				
					
						
							
							
								 
						
							
							
								00a3f5d469 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into revert-6135-t3chguy/fix/17494  
							
							
							
						 
						
							2021-07-08 13:29:10 +01:00  
				
					
						
							
							
								 
						
							
							
								1cdae54880 
								
							
								 
							
						 
						
							
							
								
								Fix text wrapping for Link Preview Widget  
							
							
							
						 
						
							2021-07-08 13:16:58 +01:00  
				
					
						
							
							
								 
						
							
							
								16dc3c47e1 
								
							
								 
							
						 
						
							
							
								
								Make ghost button background transparent  
							
							
							
						 
						
							2021-07-08 10:37:40 +02:00  
				
					
						
							
							
								 
						
							
							
								b9a539eaa2 
								
							
								 
							
						 
						
							
							
								
								Improve URL Previews  
							
							... 
							
							
							
							only show 2 by default with expand/collapse mechanism
show all hashes again, but dedup requests
clean up hide mechanism, instead of one `x` per preview have one per group 
							
						 
						
							2021-07-07 18:04:30 +01:00  
				
					
						
							
							
								 
						
							
							
								9d12439ee7 
								
									
								
							
								 
							
						 
						
							
							
								
								Give codeblocks a background color  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-07-07 09:22:56 +02:00  
				
					
						
							
							
								 
						
							
							
								8c1721fc35 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove the old codeblock code  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-07-07 09:22:50 +02:00  
				
					
						
							
							
								 
						
							
							
								1b95762910 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6310  from matrix-org/gsouquet/faster-animations  
							
							
							
						 
						
							2021-07-05 12:21:49 +01:00  
				
					
						
							
							
								 
						
							
							
								0cee0db9df 
								
							
								 
							
						 
						
							
							
								
								Fix icon size in passphrase prompt  
							
							
							
						 
						
							2021-07-02 20:38:07 +01:00  
				
					
						
							
							
								 
						
							
							
								df64a076d9 
								
							
								 
							
						 
						
							
							
								
								Deprecate unused PulsedAvatar  
							
							
							
						 
						
							2021-07-02 15:24:30 +01:00  
				
					
						
							
							
								 
						
							
							
								a22baa1b2b 
								
							
								 
							
						 
						
							
							
								
								move file drop image animation to compositor  
							
							
							
						 
						
							2021-07-02 15:23:27 +01:00  
				
					
						
							
							
								 
						
							
							
								a093ea6357 
								
							
								 
							
						 
						
							
							
								
								Move RightPanel animation to compositor  
							
							
							
						 
						
							2021-07-02 15:23:03 +01:00  
				
					
						
							
							
								 
						
							
							
								aac0989005 
								
							
								 
							
						 
						
							
							
								
								Make beta dot animation run on the compositor  
							
							
							
						 
						
							2021-07-02 14:58:59 +01:00  
				
					
						
							
							
								 
						
							
							
								1f337b28ac 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash  
							
							... 
							
							
							
							 Conflicts:
	src/ContentMessages.tsx
	src/components/structures/UploadBar.tsx
	src/components/views/messages/MImageBody.js
	src/components/views/messages/MStickerBody.js
	src/components/views/messages/MVideoBody.tsx 
							
						 
						
							2021-07-01 20:48:34 +01:00  
				
					
						
							
							
								 
						
							
							
								5e3c8fae5c 
								
							
								 
							
						 
						
							
							
								
								put this just on the buttons  
							
							
							
						 
						
							2021-07-01 15:22:44 +01:00  
				
					
						
							
							
								 
						
							
							
								66d95ed7b2 
								
							
								 
							
						 
						
							
							
								
								Fix button styling in verification bubbles  
							
							
							
						 
						
							2021-07-01 14:51:20 +01:00  
				
					
						
							
							
								 
						
							
							
								da8a783ca0 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							2021-06-30 14:51:18 -06:00  
				
					
						
							
							
								 
						
							
							
								12d7be2b6a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/new-audio  
							
							
							
						 
						
							2021-06-30 13:25:41 -06:00  
				
					
						
							
							
								 
						
							
							
								fdced3da1b 
								
							
								 
							
						 
						
							
							
								
								Remove reminescent references to the tinter  
							
							
							
						 
						
							2021-06-30 08:09:55 +01:00  
				
					
						
							
							
								 
						
							
							
								4cfdad8aa2 
								
							
								 
							
						 
						
							
							
								
								Add spacing between toast buttons with cross browser support in mind  
							
							
							
						 
						
							2021-06-29 11:59:13 +01:00  
				
					
						
							
							
								 
						
							
							
								26592da09f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5671  from weeman1337/msg-context-menu  
							
							
							
						 
						
							2021-06-29 08:18:07 +01:00  
				
					
						
							
							
								 
						
							
							
								d6cf2346fe 
								
							
								 
							
						 
						
							
							
								
								Manually conflict resolve  https://github.com/matrix-org/matrix-react-sdk/pull/6240  
							
							
							
						 
						
							2021-06-28 21:00:36 -06:00  
				
					
						
							
							
								 
						
							
							
								964a97d59e 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into travis/new-audio  
							
							
							
						 
						
							2021-06-28 20:52:44 -06:00  
				
					
						
							
							
								 
						
							
							
								b6d9ecde8b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6240  from matrix-org/gsouquet/voice-messages-waveform-perf  
							
							... 
							
							
							
							Improve audio recording performance 
							
						 
						
							2021-06-28 20:49:21 -06:00  
				
					
						
							
							
								 
						
							
							
								52b578fb3f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6193  from SimonBrandner/fix/irc-layout-mxid/17648  
							
							... 
							
							
							
							Fix IRC layout regressions 
							
						 
						
							2021-06-28 16:10:02 +01:00  
				
					
						
							
							
								 
						
							
							
								494f4d3ab4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6248  from matrix-org/t3chguy/fix/17731  
							
							
							
						 
						
							2021-06-28 16:08:12 +01:00  
				
					
						
							
							
								 
						
							
							
								56514d51a6 
								
							
								 
							
						 
						
							
							
								
								Fix tiny scrollbar dot on chrome/electron in Forward Dialog  
							
							
							
						 
						
							2021-06-28 15:37:28 +01:00  
				
					
						
							
							
								 
						
							
							
								6cb86057c5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into gsouquet/voice-messages-waveform-perf  
							
							
							
						 
						
							2021-06-28 09:29:11 +01:00  
				
					
						
							
							
								 
						
							
							
								1d374f6cbb 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17731  
							
							
							
						 
						
							2021-06-25 14:50:24 +01:00  
				
					
						
							
							
								 
						
							
							
								2e940b7763 
								
									
								
							
								 
							
						 
						
							
							
								
								Update res/css/structures/_RoomStatusBar.scss  
							
							... 
							
							
							
							Co-authored-by: Germain <germain@souquet.com> 
							
						 
						
							2021-06-25 14:47:17 +01:00  
				
					
						
							
							
								 
						
							
							
								1f27049a5d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6257  from SimonBrandner/feature/pinned-click  
							
							
							
						 
						
							2021-06-25 14:42:18 +01:00  
				
					
						
							
							
								 
						
							
							
								b371abe556 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6266  from matrix-org/t3chguy/fix/17768  
							
							... 
							
							
							
							Fix space avatar management layout being broken 
							
						 
						
							2021-06-25 11:58:41 +01:00  
				
					
						
							
							
								 
						
							
							
								a8e2c1bc2a 
								
									
								
							
								 
							
						 
						
							
							
								
								Move the dial pad button next to Explore button from Create Room context menu  ( #6237 )  
							
							... 
							
							
							
							This commit moves the dial pad from a context menu to sit right by the explore button, in line with the designs in the linked issue. The dial pad button is only shown when PSTN support is detected. 
							
						 
						
							2021-06-25 11:45:15 +01:00  
				
					
						
							
							
								 
						
							
							
								620e14eb4b 
								
							
								 
							
						 
						
							
							
								
								Fix space avatar management layout being broken  
							
							
							
						 
						
							2021-06-25 11:10:37 +01:00  
				
					
						
							
							
								 
						
							
							
								7a6ee7d918 
								
							
								 
							
						 
						
							
							
								
								I know how CSS works.  
							
							
							
						 
						
							2021-06-25 00:22:05 -06:00  
				
					
						
							
							
								 
						
							
							
								e0a73a583e 
								
							
								 
							
						 
						
							
							
								
								Increase clickable area of seek bar  
							
							
							
						 
						
							2021-06-25 00:19:57 -06:00  
				
					
						
							
							
								 
						
							
							
								dd53c25706 
								
							
								 
							
						 
						
							
							
								
								Fix right panel sizing  
							
							
							
						 
						
							2021-06-24 20:37:34 -06:00  
				
					
						
							
							
								 
						
							
							
								ebb6f1b602 
								
							
								 
							
						 
						
							
							
								
								Add seeking and notes about clock desync  
							
							
							
						 
						
							2021-06-24 20:18:50 -06:00  
				
					
						
							
							
								 
						
							
							
								086042f078 
								
									
								
							
								 
							
						 
						
							
							
								
								update message context texts and icons  
							
							... 
							
							
							
							Signed-off-by: Michael Weimann <mail@michael-weimann.eu> 
							
						 
						
							2021-06-24 22:20:53 +02:00  
				
					
						
							
							
								 
						
							
							
								6ea79b297f 
								
									
								
							
								 
							
						 
						
							
							
								
								tweak message context icons  
							
							... 
							
							
							
							Signed-off-by: Michael Weimann <mail@michael-weimann.eu> 
							
						 
						
							2021-06-24 22:20:51 +02:00  
				
					
						
							
							
								 
						
							
							
								8f6904ec1b 
								
									
								
							
								 
							
						 
						
							
							
								
								tweak the message menu cancel icon size  
							
							... 
							
							
							
							Signed-off-by: Michael Weimann <mail@michael-weimann.eu> 
							
						 
						
							2021-06-24 22:20:50 +02:00  
				
					
						
							
							
								 
						
							
							
								74f61795eb 
								
									
								
							
								 
							
						 
						
							
							
								
								add _MessageContextMenu.scss license header  
							
							... 
							
							
							
							Signed-off-by: Michael Weimann <mail@michael-weimann.eu> 
							
						 
						
							2021-06-24 22:20:50 +02:00  
				
					
						
							
							
								 
						
							
							
								62efea7e19 
								
									
								
							
								 
							
						 
						
							
							
								
								add message context menu icons  
							
							... 
							
							
							
							Signed-off-by: Michael Weimann <mail@michael-weimann.eu> 
							
						 
						
							2021-06-24 22:20:50 +02:00  
				
					
						
							
							
								 
						
							
							
								e4eeafd485 
								
									
								
							
								 
							
						 
						
							
							
								
								migrate the message context menu to IconizedContextMenu  
							
							... 
							
							
							
							Signed-off-by: Michael Weimann <mail@michael-weimann.eu> 
							
						 
						
							2021-06-24 22:20:49 +02:00  
				
					
						
							
							
								 
						
							
							
								9c752680ba 
								
							
								 
							
						 
						
							
							
								
								Tile styling and early behaviour  
							
							
							
						 
						
							2021-06-24 13:56:11 -06:00