Michael Telatynski
							
						 | 
						
							
							
							
								
								
							
							
								
							
								c77589c9f7
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #4439 from matrix-org/t3chguy/network_dropdown
							
							
							
							
							
							
							
							Network Dropdown fix things not scrolling properly 
							
						 | 
						
							2020-04-20 13:57:42 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								4494c6cf2b
								
							
								
							
						 | 
						
							
							
								
								ImageView make clicking off it easier
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2020-04-20 11:21:51 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								a0f704f419
								
							
								
							
						 | 
						
							
							
								
								Network Dropdown fix things not scrolling properly
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2020-04-18 15:08:15 +01:00 | 
						
					
				
					
						
							
							
								 
								Zoe
							
						 | 
						
							
							
							
							
								
							
								e3d784816d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into foldleft/better-errors
							
							
							
							
							
						 | 
						
							2020-04-17 14:11:05 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								cd65bdc799
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'develop' and 't3chguy/user_online_dot' of github.com:matrix-org/matrix-react-sdk into t3chguy/user_online_dot
							
							
							
							
							
							
							
							 Conflicts:
	src/components/views/rooms/RoomBreadcrumbs.js
	src/components/views/rooms/RoomTile.js 
							
						 | 
						
							2020-04-17 12:58:54 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								4d91dc5bba
								
							
								
							
						 | 
						
							
							
								
								iterate pills in rich text styling
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2020-04-17 12:30:09 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								c3ff75d18f
								
							
								
							
						 | 
						
							
							
								
								Don't break spills over multiple lines, ellipsis them at max-1-line
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2020-04-17 11:04:52 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								bedffdb8e2
								
							
								
							
						 | 
						
							
							
								
								Fix Message Context Menu options not displaying: block
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2020-04-16 01:46:32 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
								
								
							
							
								
							
								f4c4fe7d12
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #4413 from matrix-org/t3chguy/wait4initialsync
							
							
							
							
							
							
							
							Login block on initialSync with spinners 
							
						 | 
						
							2020-04-15 16:17:13 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								81f501e844
								
							
								
							
						 | 
						
							
							
								
								disable language dropdown too
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2020-04-15 14:19:47 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								ac26719b69
								
							
								
							
						 | 
						
							
							
								
								disable password reset button when spinning
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2020-04-15 14:07:37 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								346b2e8588
								
							
								
							
						 | 
						
							
							
								
								Login block on initialSync with spinners
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2020-04-15 12:21:49 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								769cf1c987
								
							
								
							
						 | 
						
							
							
								
								Allow network dropdown to be scrollable and fix context menu window padding calc
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2020-04-14 17:34:39 +01:00 | 
						
					
				
					
						
							
							
								 
								Bruno Windels
							
						 | 
						
							
							
							
								
								
							
							
								
							
								aef6687931
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #4406 from matrix-org/bwindels/completesecuritywithoutspinner
							
							
							
							
							
							
							
							Fix: don't confuse user with spinner during complete security step 
							
						 | 
						
							2020-04-14 15:54:44 +00:00 | 
						
					
				
					
						
							
							
								 
								Bruno Windels
							
						 | 
						
							
							
							
							
								
							
								368737cfd9
								
							
								
							
						 | 
						
							
							
								
								fix copyright
							
							
							
							
							
						 | 
						
							2020-04-14 17:41:06 +02:00 | 
						
					
				
					
						
							
							
								 
								Bruno Windels
							
						 | 
						
							
							
							
							
								
							
								db09cadb66
								
							
								
							
						 | 
						
							
							
								
								remove spinner, change copy, add button placeholder
							
							
							
							
							
						 | 
						
							2020-04-14 17:19:15 +02:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
								
								
							
							
								
							
								8d3119ddb4
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #4396 from matrix-org/t3chguy/fix_MVideoBody_FilePanel
							
							
							
							
							
							
							
							Fix width of MVideoBody in FilePanel 
							
						 | 
						
							2020-04-14 15:02:28 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								a7d95d396e
								
							
								
							
						 | 
						
							
							
								
								fix copyright
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2020-04-14 14:46:04 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								3e057070fd
								
							
								
							
						 | 
						
							
							
								
								Fix width of MVideoBody in FilePanel
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2020-04-12 00:56:21 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								71b4aab5dc
								
							
								
							
						 | 
						
							
							
								
								Fix emoji tooltip flickering because onMouseOut&onMouseOver fired when moving between children
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2020-04-12 00:12:58 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								740b6f6cac
								
							
								
							
						 | 
						
							
							
								
								Composer pills respect showPillAvatar setting
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2020-04-10 09:34:38 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
								
								
							
							
								
							
								74291e8c2d
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #4370 from matrix-org/t3chguy/clear_event_line
							
							
							
							
							
							
							
							Fix image thumbnail width when read receipts are hidden 
							
						 | 
						
							2020-04-09 20:57:12 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
								
								
							
							
								
							
								a9a253f27f
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #4362 from matrix-org/t3chguy/private_room_e2ee
							
							
							
							
							
							
							
							Add toggle for e2ee when creating private room 
							
						 | 
						
							2020-04-09 17:22:58 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								60808ef6d2
								
							
								
							
						 | 
						
							
							
								
								apply clear:both to fix automatic margins for continuation events
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2020-04-09 13:36:53 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								ffecf03b2a
								
							
								
							
						 | 
						
							
							
								
								Update margins to improve grouping
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2020-04-08 14:48:50 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								4041c030a5
								
							
								
							
						 | 
						
							
							
								
								Apply changes from Figma
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2020-04-08 14:44:34 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								eec28ce38a
								
							
								
							
						 | 
						
							
							
								
								Update styling and copy to match Figma
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2020-04-08 13:47:15 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								ada860f163
								
							
								
							
						 | 
						
							
							
								
								Add toggle for e2ee when creating private room in x-signing world
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2020-04-08 10:50:22 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								712e6e8c49
								
							
								
							
						 | 
						
							
							
								
								Fix sas verification buttons to match figma and remove useless inDialog prop from EncryptionPanel.js
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2020-04-07 19:03:12 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								3e4e7953ed
								
							
								
							
						 | 
						
							
							
								
								word-break: break-word;
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2020-04-07 13:40:25 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								b5e6f8b8c1
								
							
								
							
						 | 
						
							
							
								
								Iterate PR
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2020-04-07 13:34:10 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								faab35738f
								
							
								
							
						 | 
						
							
							
								
								Add new default home page fallback
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2020-04-07 10:48:56 +01:00 | 
						
					
				
					
						
							
							
								 
								Zoe
							
						 | 
						
							
							
							
							
								
							
								1395cb02ed
								
							
								
							
						 | 
						
							
							
								
								Fixup alignment
							
							
							
							
							
						 | 
						
							2020-04-06 11:44:46 +01:00 | 
						
					
				
					
						
							
							
								 
								Zoe
							
						 | 
						
							
							
							
							
								
							
								5ef06357f6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into foldleft/better-errors
							
							
							
							
							
						 | 
						
							2020-04-06 11:36:46 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
								
								
							
							
								
							
								fe401ce4da
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into t3chguy/xsigning/fix_userinfo_e2eicon
							
							
							
							
							
						 | 
						
							2020-04-03 18:38:30 +01:00 | 
						
					
				
					
						
							
							
								 
								Bruno Windels
							
						 | 
						
							
							
							
							
								
							
								adead76882
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into bwindels/selfverifux
							
							
							
							
							
						 | 
						
							2020-04-03 17:53:07 +02:00 | 
						
					
				
					
						
							
							
								 
								Bruno Windels
							
						 | 
						
							
							
							
							
								
							
								2cf55fb2a0
								
							
								
							
						 | 
						
							
							
								
								adjust start options styling
							
							
							
							
							
						 | 
						
							2020-04-03 17:32:09 +02:00 | 
						
					
				
					
						
							
							
								 
								Bruno Windels
							
						 | 
						
							
							
							
								
								
							
							
								
							
								c15fa2ba0c
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #4334 from matrix-org/bwindels/qr-reciprocate
							
							
							
							
							
							
							
							QR code reciprocation 
							
						 | 
						
							2020-04-03 12:28:41 +00:00 | 
						
					
				
					
						
							
							
								 
								Jorik Schellekens
							
						 | 
						
							
							
							
								
								
							
							
								
							
								3ed457ea7d
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #4305 from JorikSchellekens/joriks/font-scaling
							
							
							
							
							
							
							
							Make all 'font-size's and 'line-height's rem 
							
						 | 
						
							2020-04-02 17:40:39 +01:00 | 
						
					
				
					
						
							
							
								 
								Bruno Windels
							
						 | 
						
							
							
							
							
								
							
								fffd5a4a5e
								
							
								
							
						 | 
						
							
							
								
								fix stylelint
							
							
							
							
							
						 | 
						
							2020-04-02 16:46:29 +02:00 | 
						
					
				
					
						
							
							
								 
								Bruno Windels
							
						 | 
						
							
							
							
							
								
							
								0307361fa2
								
							
								
							
						 | 
						
							
							
								
								more polish for self-verification
							
							
							
							
							
						 | 
						
							2020-04-02 16:42:39 +02:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								a28aa4c0b4
								
							
								
							
						 | 
						
							
							
								
								Tweak user online dot in room tile, make it occupy same space and inverse behaviour of the context menu button
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2020-04-02 15:13:19 +01:00 | 
						
					
				
					
						
							
							
								 
								Jorik Schellekens
							
						 | 
						
							
							
							
							
								
							
								202ad9f98a
								
							
								
							
						 | 
						
							
							
								
								Remove sort and include new scss file in components
							
							
							
							
							
						 | 
						
							2020-04-02 13:42:59 +01:00 | 
						
					
				
					
						
							
							
								 
								Jorik Schellekens
							
						 | 
						
							
							
							
							
								
							
								df1a8b288b
								
							
								
							
						 | 
						
							
							
								
								Change copyright
							
							
							
							
							
						 | 
						
							2020-04-02 13:35:12 +01:00 | 
						
					
				
					
						
							
							
								 
								Bruno Windels
							
						 | 
						
							
							
							
							
								
							
								31ca52dede
								
							
								
							
						 | 
						
							
							
								
								fix stylelint
							
							
							
							
							
						 | 
						
							2020-04-02 13:44:19 +02:00 | 
						
					
				
					
						
							
							
								 
								Bruno Windels
							
						 | 
						
							
							
							
							
								
							
								1f65cfb7f6
								
							
								
							
						 | 
						
							
							
								
								polish design and disable buttons after click
							
							
							
							
							
						 | 
						
							2020-04-02 13:44:19 +02:00 | 
						
					
				
					
						
							
							
								 
								Bruno Windels
							
						 | 
						
							
							
							
							
								
							
								ccf6c9efdc
								
							
								
							
						 | 
						
							
							
								
								fixup: more i18n
							
							
							
							
							
						 | 
						
							2020-04-02 13:44:19 +02:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
								
								
							
							
								
							
								6db51cf9aa
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #4321 from matrix-org/t3chguy/room_settings_notif_icon
							
							
							
							
							
							
							
							Fix Room Settings Dialog Notifications tab icon 
							
						 | 
						
							2020-04-02 09:50:57 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								faa4f54c97
								
							
								
							
						 | 
						
							
							
								
								Only apply padding to standard textual buttons (kind buttons)
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2020-04-02 00:12:48 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
								
								
							
							
								
							
								544bd09667
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #4320 from matrix-org/t3chguy/user_info_buttons
							
							
							
							
							
							
							
							Fix UserInfo e2e buttons to match Figma 
							
						 | 
						
							2020-04-01 17:47:05 +01:00 |