bf62960e1a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5413  from matrix-org/t3chguy/fix/11415  
							
							... 
							
							
							
							Change how we expose Role in User Info and hide in DMs 
							
						 
						
							2020-11-11 18:15:46 +00:00  
				
					
						
							
							
								 
						
							
							
								0766519467 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5398  from matrix-org/t3chguy/fix/8141  
							
							... 
							
							
							
							Improvements around new room empty space interactions 
							
						 
						
							2020-11-10 13:09:59 +00:00  
				
					
						
							
							
								 
						
							
							
								5fb86f74d7 
								
							
								 
							
						 
						
							
							
								
								Remove unused IconButton  
							
							
							
						 
						
							2020-11-10 12:06:56 +00:00  
				
					
						
							
							
								 
						
							
							
								80bb091cc5 
								
							
								 
							
						 
						
							
							
								
								Iterate PR  
							
							
							
						 
						
							2020-11-10 10:00:55 +00:00  
				
					
						
							
							
								 
						
							
							
								50bce642d5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5366  from matrix-org/dbkr/call_hold  
							
							... 
							
							
							
							Implement call hold 
							
						 
						
							2020-11-10 08:41:34 +00:00  
				
					
						
							
							
								 
						
							
							
								602232a524 
								
									
								
							
								 
							
						 
						
							
							
								
								Update res/css/views/messages/_CreateEvent.scss  
							
							... 
							
							
							
							Co-authored-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2020-11-05 16:08:36 +00:00  
				
					
						
							
							
								 
						
							
							
								81f1e1d8d7 
								
							
								 
							
						 
						
							
							
								
								delint  
							
							
							
						 
						
							2020-11-05 15:54:21 +00:00  
				
					
						
							
							
								 
						
							
							
								664079a127 
								
							
								 
							
						 
						
							
							
								
								Use MiniAvatarUploader for the new NewRoomIntro component  
							
							
							
						 
						
							2020-11-05 15:50:42 +00:00  
				
					
						
							
							
								 
						
							
							
								6aeea3e38e 
								
							
								 
							
						 
						
							
							
								
								Extract MiniAvatarUploader into a reusable component  
							
							
							
						 
						
							2020-11-05 15:42:45 +00:00  
				
					
						
							
							
								 
						
							
							
								0a42853a25 
								
							
								 
							
						 
						
							
							
								
								Fix centering of bubble event tile  
							
							
							
						 
						
							2020-11-05 15:39:37 +00:00  
				
					
						
							
							
								 
						
							
							
								2594ff8e80 
								
							
								 
							
						 
						
							
							
								
								Remove old isAlone checker  
							
							
							
						 
						
							2020-11-05 15:39:22 +00:00  
				
					
						
							
							
								 
						
							
							
								90bbc082dc 
								
									
								
							
								 
							
						 
						
							
							
								
								Copyright  
							
							... 
							
							
							
							Co-authored-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2020-11-05 09:25:52 +00:00  
				
					
						
							
							
								 
						
							
							
								af71b0735d 
								
							
								 
							
						 
						
							
							
								
								Change icon for the Create Event bubble tile  
							
							
							
						 
						
							2020-11-04 17:24:03 +00:00  
				
					
						
							
							
								 
						
							
							
								ff25a9b45d 
								
							
								 
							
						 
						
							
							
								
								Consolidate all EventTile bubble stuff into its own component and use it for the room continuation plinth  
							
							
							
						 
						
							2020-11-04 17:06:38 +00:00  
				
					
						
							
							
								 
						
							
							
								5a8525dd93 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5387  from matrix-org/t3chguy/fix/13066  
							
							... 
							
							
							
							Invite / Create DM UX tweaks 
							
						 
						
							2020-11-04 14:01:21 +00:00  
				
					
						
							
							
								 
						
							
							
								3b7b66c856 
								
							
								 
							
						 
						
							
							
								
								Change out caption for email invite suggestions and stack vertically  
							
							
							
						 
						
							2020-11-03 14:56:06 +00:00  
				
					
						
							
							
								 
						
							
							
								2064cf80f5 
								
							
								 
							
						 
						
							
							
								
								Use semi-bold for Modal titles  
							
							
							
						 
						
							2020-11-03 13:21:33 +00:00  
				
					
						
							
							
								 
						
							
							
								a2885dcfe8 
								
							
								 
							
						 
						
							
							
								
								fix alignment of Modal X icon  
							
							
							
						 
						
							2020-11-03 13:18:18 +00:00  
				
					
						
							
							
								 
						
							
							
								66377eb731 
								
							
								 
							
						 
						
							
							
								
								Invite UX tweaks:  
							
							... 
							
							
							
							+ re-focus input field after all interactions
+ change textarea to text input
+ fix margins between things
+ improve keyboard usage with enter/space autofilling 
							
						 
						
							2020-11-03 13:14:35 +00:00  
				
					
						
							
							
								 
						
							
							
								4afa610ee1 
								
							
								 
							
						 
						
							
							
								
								Add variant of default home page for justRegistered  
							
							
							
						 
						
							2020-11-02 17:24:47 +00:00  
				
					
						
							
							
								 
						
							
							
								fa9490b02b 
								
							
								 
							
						 
						
							
							
								
								Add skeleton UI for Room List when no rooms  
							
							
							
						 
						
							2020-11-02 17:22:45 +00:00  
				
					
						
							
							
								 
						
							
							
								7796621e8d 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/call_hold  
							
							
							
						 
						
							2020-10-30 16:49:42 +00:00  
				
					
						
							
							
								 
						
							
							
								90cdc2f341 
								
							
								 
							
						 
						
							
							
								
								Add the new css file  
							
							
							
						 
						
							2020-10-30 13:47:43 +00:00  
				
					
						
							
							
								 
						
							
							
								444425b9ab 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5365  from matrix-org/t3chguy/countly  
							
							... 
							
							
							
							Initial Countly work 
							
						 
						
							2020-10-30 13:07:58 +00:00  
				
					
						
							
							
								 
						
							
							
								c636dc0ed3 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix custom tag layout which regressed in  #5309  
							
							... 
							
							
							
							Signed-off-by: Aaron Raimist <aaron@raim.ist> 
							
						 
						
							2020-10-29 16:54:55 -05:00  
				
					
						
							
							
								 
						
							
							
								f828c6d494 
								
							
								 
							
						 
						
							
							
								
								Implement call hold  
							
							... 
							
							
							
							Currently just by adding /holdcall and /unholdcall slash commands
The only place the hold status of the call is currently represented
is when the call is a voice call and you're viewing a different room:
it's not wired up when you're viewing the room because that currently
uses the room status bar which it won't do with the new UI.
Also convert VideoFeed to typescript, and remove videoview because
it essentially just managed the fullscreen functionality, but we'll
want and 'on hold' representation (and probably chrome for hagnup etc)
in the fullscreen UI too, so let's just make CallView the thing that
gets fullscreened. 
							
						 
						
							2020-10-29 17:56:24 +00:00  
				
					
						
							
							
								 
						
							
							
								c3a355097d 
								
							
								 
							
						 
						
							
							
								
								Initial Countly work  
							
							
							
						 
						
							2020-10-29 15:57:16 +00:00  
				
					
						
							
							
								 
						
							
							
								0004dd4475 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets  
							
							
							
						 
						
							2020-10-22 21:40:05 +01:00  
				
					
						
							
							
								 
						
							
							
								4e12aeca9e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets  
							
							... 
							
							
							
							 Conflicts:
	src/components/views/elements/AppTile.js 
							
						 
						
							2020-10-21 12:48:51 +01:00  
				
					
						
							
							
								 
						
							
							
								a5468c918e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets  
							
							... 
							
							
							
							 Conflicts:
	src/resizer/distributors/collapse.ts
	src/resizer/distributors/fixed.ts
	src/resizer/index.ts
	src/resizer/item.ts
	src/resizer/resizer.ts
	src/resizer/sizer.ts 
							
						 
						
							2020-10-21 09:56:22 +01:00  
				
					
						
							
							
								 
						
							
							
								5a9bac68c6 
								
							
								 
							
						 
						
							
							
								
								iterate PR based on feedback  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-10-21 09:48:02 +01:00  
				
					
						
							
							
								 
						
							
							
								334ab12c47 
								
							
								 
							
						 
						
							
							
								
								Tidy up widget colouring  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-10-20 16:06:35 +01:00  
				
					
						
							
							
								 
						
							
							
								24c4a3876c 
								
							
								 
							
						 
						
							
							
								
								Increase Border Radius of Accessible Buttons to 8px  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-10-20 15:05:38 +01:00  
				
					
						
							
							
								 
						
							
							
								b6fd2a0691 
								
							
								 
							
						 
						
							
							
								
								Iterate the Modal Widget Dialog paddings and phishing warning  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-10-20 15:05:22 +01:00  
				
					
						
							
							
								 
						
							
							
								bec1d718e0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets  
							
							... 
							
							
							
							 Conflicts:
	src/components/views/elements/AppTile.js
	src/utils/WidgetUtils.ts 
							
						 
						
							2020-10-19 20:50:16 +01:00  
				
					
						
							
							
								 
						
							
							
								00b1a03a3e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets  
							
							... 
							
							
							
							 Conflicts:
	src/@types/global.d.ts
	src/FromWidgetPostMessageApi.js
	src/WidgetMessaging.js
	src/widgets/WidgetApi.ts 
							
						 
						
							2020-10-19 19:46:07 +01:00  
				
					
						
							
							
								 
						
							
							
								06009df05b 
								
							
								 
							
						 
						
							
							
								
								Update Widget paddings and background colours  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-10-19 18:47:15 +01:00  
				
					
						
							
							
								 
						
							
							
								744a4abd1c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets  
							
							
							
						 
						
							2020-10-19 13:08:17 +01:00  
				
					
						
							
							
								 
						
							
							
								30adc98a15 
								
							
								 
							
						 
						
							
							
								
								Fix excessive hosting link padding  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-10-19 12:34:25 +01:00  
				
					
						
							
							
								 
						
							
							
								84111a2eaf 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5326  from matrix-org/t3chguy/fix/11195  
							
							... 
							
							
							
							Discard all mx_fadable legacy cruft which is totally useless 
							
						 
						
							2020-10-15 18:34:03 +01:00  
				
					
						
							
							
								 
						
							
							
								9234a58bdf 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5318  from matrix-org/t3chguy/fix/9232  
							
							... 
							
							
							
							Fix aspect ratio of avatar before clicking Save 
							
						 
						
							2020-10-15 16:48:07 +01:00  
				
					
						
							
							
								 
						
							
							
								6b01b6ac6c 
								
							
								 
							
						 
						
							
							
								
								Discard all mx_fadable legacy cruft which is totally useless  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-10-15 16:13:16 +01:00  
				
					
						
							
							
								 
						
							
							
								efbce309d0 
								
							
								 
							
						 
						
							
							
								
								improve paddings  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-10-15 15:42:08 +01:00  
				
					
						
							
							
								 
						
							
							
								f198b95579 
								
							
								 
							
						 
						
							
							
								
								Iterate PR; tidy and improve widget context menu  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-10-15 15:24:42 +01:00  
				
					
						
							
							
								 
						
							
							
								a6c81a903c 
								
							
								 
							
						 
						
							
							
								
								Iterate with new buttons and resize locking  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-10-15 11:14:48 +01:00  
				
					
						
							
							
								 
						
							
							
								43208c01a1 
								
							
								 
							
						 
						
							
							
								
								Fix variable naming  
							
							
							
						 
						
							2020-10-14 16:30:38 -06:00  
				
					
						
							
							
								 
						
							
							
								a5d01f2f4d 
								
							
								 
							
						 
						
							
							
								
								missed a replacement  
							
							
							
						 
						
							2020-10-14 17:18:50 +05:30  
				
					
						
							
							
								 
						
							
							
								49d99c6dc7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/matrix-org/matrix-react-sdk  into fix-final-10  
							
							
							
						 
						
							2020-10-14 16:58:05 +05:30  
				
					
						
							
							
								 
						
							
							
								00e35dafb3 
								
							
								 
							
						 
						
							
							
								
								Fix aspect ratio of avatar before clicking Save  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-10-14 10:57:34 +01:00  
				
					
						
							
							
								 
						
							
							
								bb52bad099 
								
							
								 
							
						 
						
							
							
								
								Remove stale props and CSS classes  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-10-13 16:23:49 +01:00