David Baker 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2c1ba6f104 
							
						 
					 
					
						
						
							
							Merge pull request  #2124  from matrix-org/dbkr/tombstone  
						
						... 
						
						
						
						Support m.room.tombstone events 
						
						
					 
					
						2018-08-29 18:38:48 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							c40ac49b2a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into dbkr/roomcreate  
						
						
						
						
					 
					
						2018-08-29 18:18:08 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							42bb8e4ebd 
							
						 
					 
					
						
						
							
							Add image dimensions  
						
						
						
						
					 
					
						2018-08-21 17:57:15 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							cd4b520574 
							
						 
					 
					
						
						
							
							Add image dimensions  
						
						... 
						
						
						
						To avoid popping when the image loads & make sure the SVG appears
the right size 
						
						
					 
					
						2018-08-21 17:52:13 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							7f8cd203a8 
							
						 
					 
					
						
						
							
							Support m.room.tombstone events  
						
						... 
						
						
						
						For https://github.com/vector-im/riot-web/issues/7164  
						
						
					 
					
						2018-08-21 15:56:56 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							ab10b5493b 
							
						 
					 
					
						
						
							
							Support room creation events  
						
						... 
						
						
						
						For https://github.com/vector-im/riot-web/issues/7164  
						
						
					 
					
						2018-08-20 16:20:59 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							9f19896df0 
							
						 
					 
					
						
						
							
							Support for room upgrades  
						
						... 
						
						
						
						* Show when a room upgrade is needed
 * Dialog box to perform the upgrade 
						
						
					 
					
						2018-08-17 14:54:43 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							6593ee09d1 
							
						 
					 
					
						
						
							
							Warning bar for MAU limit hit  
						
						... 
						
						
						
						Somewhat untested, sorry 
						
						
					 
					
						2018-08-07 17:04:37 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							b5d2fa769c 
							
						 
					 
					
						
						
							
							Support MAU error on sync  
						
						... 
						
						
						
						For https://github.com/vector-im/riot-web/issues/7091  
						
						
					 
					
						2018-08-03 14:54:52 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Telatynski 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							afa19cd60d 
							
						 
					 
					
						
						
							
							make clicking autocomplete suggestions work again  
						
						... 
						
						
						
						Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
						
						
					 
					
						2018-07-24 13:48:05 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							4f8ece53b2 
							
						 
					 
					
						
						
							
							Fix CSS naming  
						
						
						
						
					 
					
						2018-07-23 15:58:07 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							5adcd673ab 
							
						 
					 
					
						
						
							
							Fix persisent apps being the wrong size  
						
						
						
						
					 
					
						2018-07-23 15:08:17 +01:00 
						 
				 
			
				
					
						
							
							
								Bruno Windels 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6f278ceab0 
							
						 
					 
					
						
						
							
							Merge pull request  #2071  from matrix-org/dbkr/persistedelement_border  
						
						... 
						
						
						
						Fix border around persisted widgets 
						
						
					 
					
						2018-07-20 12:23:02 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							f658753610 
							
						 
					 
					
						
						
							
							Fix e2e icons floating above jitsi  
						
						... 
						
						
						
						Remove another seemingly redundant z-index
Fixes https://github.com/vector-im/riot-web/issues/7056  
						
						
					 
					
						2018-07-18 14:14:38 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							f868cd6699 
							
						 
					 
					
						
						
							
							Fix border around persisted widgets  
						
						... 
						
						
						
						The PersistedElement had zero height so the border ended up in the
wrong place. Add a wrapper to fix the height back.
Fixes https://github.com/vector-im/riot-web/issues/7030 
Fixes https://github.com/vector-im/riot-web/issues/7029  
						
						
					 
					
						2018-07-18 11:52:57 +01:00 
						 
				 
			
				
					
						
							
							
								Bruno Windels 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							349615c5c1 
							
						 
					 
					
						
						
							
							Merge pull request  #2065  from matrix-org/dbkr/read_avatars_under_jitsi  
						
						... 
						
						
						
						Fix read receipts on top of Jitsi 
						
						
					 
					
						2018-07-17 17:37:13 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							a79caed0c9 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into dbkr/tiny_jitsi_follows_you_between_rooms  
						
						
						
						
					 
					
						2018-07-16 17:21:51 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							74ad795d4a 
							
						 
					 
					
						
						
							
							Fix read receipts on top of Jitsi  
						
						... 
						
						
						
						By removing z-index which, as far as I can see, does nothing.
Fixes https://github.com/vector-im/riot-web/issues/7021  
						
						
					 
					
						2018-07-16 17:10:58 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d16ac4d80c 
							
						 
					 
					
						
						
							
							Merge pull request  #1890  from matrix-org/matthew/slate  
						
						... 
						
						
						
						Replace Draft with Slate 
						
						
					 
					
						2018-07-16 14:16:25 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							e56feea9ec 
							
						 
					 
					
						
						
							
							Put always-on-screen widgets in top left  
						
						... 
						
						
						
						always-on-screen widgets now appear in the top-left where the
call preview normally is if you're not in the room that they're in.
Fixes https://github.com/vector-im/riot-web/issues/7007 
Based off https://github.com/matrix-org/matrix-react-sdk/pull/2053  
						
						
					 
					
						2018-07-12 18:43:49 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							8f10ee01c6 
							
						 
					 
					
						
						
							
							Implement always-on-screen capability for widgets  
						
						... 
						
						
						
						As per https://github.com/matrix-org/matrix-doc/issues/1354 
This is whitelisted to only jitsi widgets for now as per comment,
mostly because any widget that we may make always-on-screen we need
to preemptively put in a PersistedElement container, which is
unnecessary for any other widget.
Apologies that this does a bunch of refactoring which could have
been split out separately: I only discovered what needed to be
refactored in the process of doing this.
Fixes https://github.com/vector-im/riot-web/issues/6984  
						
						
					 
					
						2018-07-11 18:07:32 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							efdc5430d7 
							
						 
					 
					
						
						
							
							merge develop  
						
						
						
						
					 
					
						2018-07-09 17:50:07 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Telatynski 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7225f7372c 
							
						 
					 
					
						
						
							
							Revert " make click to insert nick work on join/parts, /me's etc"  
						
						
						
						
					 
					
						2018-07-03 10:30:08 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Telatynski 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2c537a8dff 
							
						 
					 
					
						
						
							
							update styling  
						
						... 
						
						
						
						Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
						
						
					 
					
						2018-06-29 15:28:36 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Telatynski 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6021c3a634 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/click_username_state_ev  
						
						
						
						
					 
					
						2018-06-29 14:56:18 +01:00 
						 
				 
			
				
					
						
							
							
								Luke Barnard 
							
						 
					 
					
						
						
						
						
							
						
						
							66002a4c00 
							
						 
					 
					
						
						
							
							Fix status bar element positioning  
						
						
						
						
					 
					
						2018-06-27 15:19:27 +01:00 
						 
				 
			
				
					
						
							
							
								Luke Barnard 
							
						 
					 
					
						
						
						
						
							
						
						
							6345fcb8f2 
							
						 
					 
					
						
						
							
							Fix incorrectly positioned copy button on <pre> blocks  
						
						
						
						
					 
					
						2018-06-27 11:31:55 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Telatynski 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b3341e6664 
							
						 
					 
					
						
						
							
							on click roomsublist notif badge, goto first room with notif  
						
						... 
						
						
						
						Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
						
						
					 
					
						2018-06-27 09:49:25 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Telatynski 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f7dfba417c 
							
						 
					 
					
						
						
							
							Revert "affix copyButton so that it doesn't get scrolled horizontally"  
						
						
						
						
					 
					
						2018-06-25 16:31:43 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Telatynski 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e1ba6949d0 
							
						 
					 
					
						
						
							
							expand composer input focus region and apply cursor:text to it  
						
						... 
						
						
						
						Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
						
						
					 
					
						2018-06-23 16:40:53 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Telatynski 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							32ab997230 
							
						 
					 
					
						
						
							
							properly style Group Pill  
						
						... 
						
						
						
						Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
						
						
					 
					
						2018-06-22 14:38:06 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Telatynski 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c1e608f1a8 
							
						 
					 
					
						
						
							
							show permalinks to communities as Pills  
						
						... 
						
						
						
						Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
						
						
					 
					
						2018-06-19 11:53:17 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Telatynski 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							01a6b7f77f 
							
						 
					 
					
						
						
							
							affix copyButton so that it doesn't get scrolled horizontally  
						
						... 
						
						
						
						Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
						
						
					 
					
						2018-06-16 10:27:42 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6904c2bafe 
							
						 
					 
					
						
						
							
							Merge pull request  #1948  from matrix-org/export_Group  
						
						... 
						
						
						
						Share Dialog 
						
						
					 
					
						2018-06-15 10:52:27 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Telatynski 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7de7275c6d 
							
						 
					 
					
						
						
							
							remove subheadings in ShareDialog  
						
						... 
						
						
						
						Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
						
						
					 
					
						2018-06-14 18:56:46 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5523c1e50a 
							
						 
					 
					
						
						
							
							Merge pull request  #1964  from matrix-org/t3chguy/tag_panel_a11y  
						
						... 
						
						
						
						fix styling of clearButton when its not there 
						
						
					 
					
						2018-06-14 11:47:44 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Telatynski 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3b501137a5 
							
						 
					 
					
						
						
							
							change cursor:pointer iff clicking TagPanel background does something  
						
						... 
						
						
						
						Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
						
						
					 
					
						2018-06-14 11:42:21 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Telatynski 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c811c30c0d 
							
						 
					 
					
						
						
							
							fix styling of clearButton when its not there  
						
						... 
						
						
						
						Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
						
						
					 
					
						2018-06-14 11:36:04 +01:00 
						 
				 
			
				
					
						
							
							
								Luke Barnard 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7029e9ac74 
							
						 
					 
					
						
						
							
							Merge pull request  #1912  from matrix-org/luke/kill-mimage-fixupheight  
						
						... 
						
						
						
						Implement slightly magical CSS soln. to thumbnail sizing 
						
						
					 
					
						2018-06-14 11:17:15 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							742a2d0111 
							
						 
					 
					
						
						
							
							Merge pull request  #1962  from matrix-org/t3chguy/codeblock_notice  
						
						... 
						
						
						
						move css rule to be more generic; remove overriden rule 
						
						
					 
					
						2018-06-14 10:57:58 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Telatynski 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a257dc27c5 
							
						 
					 
					
						
						
							
							move css rule to be more generic; remove overriden rule  
						
						... 
						
						
						
						Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
						
						
					 
					
						2018-06-13 19:08:24 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Telatynski 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							22bec0d67d 
							
						 
					 
					
						
						
							
							allow CreateRoom to scale properly horizontally  
						
						... 
						
						
						
						Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
						
						
					 
					
						2018-06-13 09:13:32 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Telatynski 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e3c455e599 
							
						 
					 
					
						
						
							
							Style the ShareDialog  
						
						... 
						
						
						
						Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
						
						
					 
					
						2018-06-12 11:22:01 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Telatynski 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e7a4a0b2e0 
							
						 
					 
					
						
						
							
							allow context-menus/tooltips to work over modals  
						
						... 
						
						
						
						Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
						
						
					 
					
						2018-06-12 11:22:01 +01:00 
						 
				 
			
				
					
						
							
							
								Luke Barnard 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2120858e5f 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into luke/kill-mimage-fixupheight  
						
						
						
						
					 
					
						2018-06-11 14:24:40 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Telatynski 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c91e6cb530 
							
						 
					 
					
						
						
							
							make click to insert nick work on join/parts, /me's etc  
						
						... 
						
						
						
						Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
						
						
					 
					
						2018-06-07 01:02:34 +01:00 
						 
				 
			
				
					
						
							
							
								Travis Ralston 
							
						 
					 
					
						
						
						
						
							
						
						
							53396ff38d 
							
						 
					 
					
						
						
							
							Show timestamp of pinned messages on hover  
						
						... 
						
						
						
						Addresses part of https://github.com/vector-im/riot-web/issues/5405 
Signed-off-by: Travis Ralston <travpc@gmail.com> 
						
						
					 
					
						2018-05-26 19:46:11 -06:00 
						 
				 
			
				
					
						
							
							
								Travis Ralston 
							
						 
					 
					
						
						
						
						
							
						
						
							033c41a2a8 
							
						 
					 
					
						
						
							
							Align pinned message contents and reduce image size  
						
						... 
						
						
						
						Fixes https://github.com/vector-im/riot-web/issues/5421 
Signed-off-by: Travis Ralston <travpc@gmail.com> 
						
						
					 
					
						2018-05-26 18:40:48 -06:00 
						 
				 
			
				
					
						
							
							
								Travis Ralston 
							
						 
					 
					
						
						
						
						
							
						
						
							62f4cfe734 
							
						 
					 
					
						
						
							
							Don't affect avatars in pinned message contents  
						
						... 
						
						
						
						This uses more direct classes to avoid affecting pills. Fixes https://github.com/vector-im/riot-web/issues/5438 
Signed-off-by: Travis Ralston <travpc@gmail.com> 
						
						
					 
					
						2018-05-26 18:21:24 -06:00 
						 
				 
			
				
					
						
							
							
								Travis Ralston 
							
						 
					 
					
						
						
						
						
							
						
						
							ed9e4d82c9 
							
						 
					 
					
						
						
							
							Reduce the text size on the 'Jump to pinned message' button  
						
						... 
						
						
						
						Fixes https://github.com/vector-im/riot-web/issues/6329 
Signed-off-by: Travis Ralston <travpc@gmail.com> 
						
						
					 
					
						2018-05-26 18:16:19 -06:00