f86ca5bc97 
								
							
								 
							
						 
						
							
							
								
								Hide empty tips if collapsed  
							
							
							
						 
						
							2017-05-04 18:08:04 +01:00  
				
					
						
							
							
								 
						
							
							
								909cdb6e9a 
								
							
								 
							
						 
						
							
							
								
								Depend on prop-types module  
							
							... 
							
							
							
							So we can start writing code compatible with new React 
							
						 
						
							2017-05-04 16:22:06 +01:00  
				
					
						
							
							
								 
						
							
							
								72df43d22b 
								
							
								 
							
						 
						
							
							
								
								Year  
							
							
							
						 
						
							2017-05-04 15:46:24 +01:00  
				
					
						
							
							
								 
						
							
							
								306ea58578 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2  
							
							
							
						 
						
							2017-05-04 15:45:05 +01:00  
				
					
						
							
							
								 
						
							
							
								6a1d0fbab5 
								
							
								 
							
						 
						
							
							
								
								Make bottom left menu buttons use RoleButton too  
							
							
							
						 
						
							2017-05-04 15:38:09 +01:00  
				
					
						
							
							
								 
						
							
							
								0998adb366 
								
							
								 
							
						 
						
							
							
								
								What year is it? Who's the president?  
							
							
							
						 
						
							2017-05-04 15:02:21 +01:00  
				
					
						
							
							
								 
						
							
							
								d5b49a11d7 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #829  from matrix-org/luke/fix-people-section-disappearing  
							
							... 
							
							
							
							Remove DM-guessing code 
							
						 
						
							2017-05-04 14:15:28 +01:00  
				
					
						
							
							
								 
						
							
							
								e1c99430cb 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2  
							
							
							
						 
						
							2017-05-04 14:04:22 +01:00  
				
					
						
							
							
								 
						
							
							
								ce119a6364 
								
							
								 
							
						 
						
							
							
								
								Add buttons to room sub list headers  
							
							
							
						 
						
							2017-05-04 13:55:52 +01:00  
				
					
						
							
							
								 
						
							
							
								694fc26a55 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #855  from matrix-org/luke/fix-jump-to-rm-in-mels  
							
							... 
							
							
							
							Fix jumping to an unread event when in MELS 
							
						 
						
							2017-05-04 13:03:30 +01:00  
				
					
						
							
							
								 
						
							
							
								6d9a1f047d 
								
							
								 
							
						 
						
							
							
								
								Typo  
							
							
							
						 
						
							2017-05-04 13:03:04 +01:00  
				
					
						
							
							
								 
						
							
							
								bfa3123f9b 
								
							
								 
							
						 
						
							
							
								
								Combine data-scroll-token and -contained-scroll-tokens  
							
							... 
							
							
							
							- Instead of using one attribute, use one that might just contain one token
 - Use the first token when tracking a child
 - Mandate that no commas can be in individual tokens 
							
						 
						
							2017-05-04 10:00:13 +01:00  
				
					
						
							
							
								 
						
							
							
								f4bb76922d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #856  from matrix-org/luke/fix-phone-number-invalid-feedback  
							
							... 
							
							
							
							Validate phone number on login 
							
						 
						
							2017-05-02 19:45:27 +01:00  
				
					
						
							
							
								 
						
							
							
								af137f8867 
								
							
								 
							
						 
						
							
							
								
								Validate phone number on login  
							
							... 
							
							
							
							To prevent confusion when accidently inputting mxid or email. Fixes https://github.com/vector-im/riot-web/issues/3637  
							
						 
						
							2017-05-02 18:30:46 +01:00  
				
					
						
							
							
								 
						
							
							
								4febc63aee 
								
							
								 
							
						 
						
							
							
								
								Add comment to _scrollToToken  
							
							
							
						 
						
							2017-05-02 17:41:09 +01:00  
				
					
						
							
							
								 
						
							
							
								fe83a99ab7 
								
							
								 
							
						 
						
							
							
								
								Update ScrollPanel docs  
							
							
							
						 
						
							2017-05-02 17:36:59 +01:00  
				
					
						
							
							
								 
						
							
							
								3f25928380 
								
							
								 
							
						 
						
							
							
								
								Fix jumping to an unread event when in MELS  
							
							... 
							
							
							
							This adds the `data-contained-scroll-tokens` API to elements in `ScrollPanel` which allows arbitrary containers of elements with scroll tokens to declare their contained scroll tokens. When jumping to a scroll token inside a container, the `ScrollPanel` will act as if it is scrolling to the container itself, not the child.
MELS has been modified such that it exposes the scroll tokens of all events that exist within it.This means "Jump to unread message" will work if the unread event is within a MELS (which is any member event, because even individual member events surrounded by other events are put inside a MELS). 
							
						 
						
							2017-05-02 16:34:39 +01:00  
				
					
						
							
							
								 
						
							
							
								4f72450847 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #827  from t3chguy/develop  
							
							... 
							
							
							
							Failed to enable HTML5 Notifications Error Dialogs 
							
						 
						
							2017-04-30 13:40:27 +01:00  
				
					
						
							
							
								 
						
							
							
								e11dd23026 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #854  from t3chguy/patch-2  
							
							... 
							
							
							
							Pin filesize ver to fix break upstream 
							
						 
						
							2017-04-30 13:08:56 +01:00  
				
					
						
							
							
								 
						
							
							
								c8fb18dc93 
								
							
								 
							
						 
						
							
							
								
								Pin filesize ver to fix break upstream  
							
							... 
							
							
							
							https://travis-ci.org/vector-im/riot-web/builds/227340622 
https://github.com/avoidwork/filesize.js/issues/87 
3.5.7 and 3.5.8 ver released <24h ago and broke stuff for us 
						
							2017-04-30 13:00:47 +01:00  
				
					
						
							
							
								 
						
							
							
								083d5bf463 
								
							
								 
							
						 
						
							
							
								
								Other empty sections no longer need to be greyed  
							
							
							
						 
						
							2017-04-28 11:20:29 +01:00  
				
					
						
							
							
								 
						
							
							
								f5f35e3294 
								
							
								 
							
						 
						
							
							
								
								Make the left panel more friendly to new users  
							
							... 
							
							
							
							https://github.com/vector-im/riot-web/issues/3609  
						
							2017-04-28 11:10:21 +01:00  
				
					
						
							
							
								 
						
							
							
								47827e0b81 
								
							
								 
							
						 
						
							
							
								
								un-eat the space  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-04-28 01:00:50 +01:00  
				
					
						
							
							
								 
						
							
							
								c9c72036f3 
								
							
								 
							
						 
						
							
							
								
								Change wording  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-04-28 01:00:10 +01:00  
				
					
						
							
							
								 
						
							
							
								19482d751d 
								
							
								 
							
						 
						
							
							
								
								comment out spammy CTD logging  
							
							
							
						 
						
							2017-04-28 00:52:31 +01:00  
				
					
						
							
							
								 
						
							
							
								b91f53652d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #848  from matrix-org/luke/room-directory-improve  
							
							... 
							
							
							
							Improve RoomDirectory Look & Feel 
							
						 
						
							2017-04-27 18:28:28 +01:00  
				
					
						
							
							
								 
						
							
							
								88abe54ffe 
								
							
								 
							
						 
						
							
							
								
								Give the SRH its prop back  
							
							
							
						 
						
							2017-04-27 17:58:02 +01:00  
				
					
						
							
							
								 
						
							
							
								791f7f7f6b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'luke/room-directory-remove-rhs' into luke/room-directory-improve  
							
							
							
						 
						
							2017-04-27 17:57:19 +01:00  
				
					
						
							
							
								 
						
							
							
								0b06e979cb 
								
							
								 
							
						 
						
							
							
								
								Add optional tintable SVG icon for SimpleRoomHeader  
							
							
							
						 
						
							2017-04-27 17:57:13 +01:00  
				
					
						
							
							
								 
						
							
							
								9d57e8b959 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #845  from matrix-org/luke/rm-fix  
							
							... 
							
							
							
							Only show jumpToReadMarker bar when RM !== RR 
							
						 
						
							2017-04-27 17:01:39 +01:00  
				
					
						
							
							
								 
						
							
							
								6313193aa8 
								
							
								 
							
						 
						
							
							
								
								Null check readMarkerEventId, update comment  
							
							
							
						 
						
							2017-04-27 16:52:40 +01:00  
				
					
						
							
							
								 
						
							
							
								50831796bb 
								
							
								 
							
						 
						
							
							
								
								Remove RHS when viewing RoomDirectory  
							
							
							
						 
						
							2017-04-27 16:49:23 +01:00  
				
					
						
							
							
								 
						
							
							
								786fa6b6e7 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #846  from matrix-org/luke/fix-rm-stuck-in-mels  
							
							... 
							
							
							
							Allow MELS to have its own RM 
							
						 
						
							2017-04-27 15:22:24 +01:00  
				
					
						
							
							
								 
						
							
							
								2012513c0e 
								
							
								 
							
						 
						
							
							
								
								Allow MELS to have its own RM  
							
							... 
							
							
							
							This inserts a RM if any of the events in a MELS if the RM is tracking an event within it.
Fixes https://github.com/vector-im/riot-web/issues/3749  
							
						 
						
							2017-04-27 14:16:50 +01:00  
				
					
						
							
							
								 
						
							
							
								8f7359fce1 
								
							
								 
							
						 
						
							
							
								
								Only show jumpToReadMarker bar when RM !== RR  
							
							... 
							
							
							
							If RM !== RR, use the pos. of the RM to determine whether it is visible, as before. 
							
						 
						
							2017-04-27 14:03:54 +01:00  
				
					
						
							
							
								 
						
							
							
								021cdb8010 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #844  from matrix-org/luke/fire-activity-on-keydown  
							
							... 
							
							
							
							Use document.onkeydown instead of onkeypress 
							
						 
						
							2017-04-27 13:47:17 +01:00  
				
					
						
							
							
								 
						
							
							
								fc774e8508 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #808  from matrix-org/rob/shiny-avatars  
							
							... 
							
							
							
							(Room)?Avatar: Request 96x96 avatars on high DPI screens 
							
						 
						
							2017-04-27 12:02:52 +01:00  
				
					
						
							
							
								 
						
							
							
								39de37b547 
								
							
								 
							
						 
						
							
							
								
								*Avatar: Calculate thumbnail dimensions based on devicePixelRatio  
							
							... 
							
							
							
							Multiply the dimension by the device pixel ratio and then round it to
get the width/height of the thumbnail to use in the request. 
							
						 
						
							2017-04-27 12:38:03 +02:00  
				
					
						
							
							
								 
						
							
							
								8291b36b3e 
								
							
								 
							
						 
						
							
							
								
								Use document.onkeydown instead of onkeypress  
							
							
							
						 
						
							2017-04-27 10:16:24 +01:00  
				
					
						
							
							
								 
						
							
							
								0e880f7971 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #842  from matrix-org/luke/fix-emote-rrs  
							
							... 
							
							
							
							Add mx_EventTile_emote class 
							
						 
						
							2017-04-26 18:25:24 +01:00  
				
					
						
							
							
								 
						
							
							
								63224ff164 
								
							
								 
							
						 
						
							
							
								
								Add mx_EventTile_emote class  
							
							
							
						 
						
							2017-04-26 18:00:25 +01:00  
				
					
						
							
							
								 
						
							
							
								1913a32fbd 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #841  from matrix-org/luke/fix-double-dialogs  
							
							... 
							
							
							
							Fix dialog reappearing after hitting Enter 
							
						 
						
							2017-04-26 17:47:53 +01:00  
				
					
						
							
							
								 
						
							
							
								0c16298c45 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #840  from matrix-org/dbkr/spinner_until_sync_fixed  
							
							... 
							
							
							
							Fix spinner that shows until the first sync 
							
						 
						
							2017-04-26 17:39:29 +01:00  
				
					
						
							
							
								 
						
							
							
								5f0ecc588f 
								
							
								 
							
						 
						
							
							
								
								Fix dialog reappearing after hitting Enter  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/3714 
https://github.com/vector-im/riot-web/issues/3714#issuecomment-297460620  :
> It's as if there are two dialogs and as one closes, the other one appears. For some reason matrix-org/matrix-react-sdk#822  is causing this.
> I've realised it's because the `priorActiveElement` is probably the button that opened the dialog. If this is focused and the enter key is released, this triggers a keyPress which fires once the dialog has closed and the button has been focused 😬  the BaseDialog only calls stopPropagation _onKeyDown.
The soln. was to submit the dialog as finished `onKeyUp`. This means the `priorActiveElement` is focussed after any key events that should be associated with the dialog. 
							
						 
						
							2017-04-26 17:37:52 +01:00  
				
					
						
							
							
								 
						
							
							
								4910a225d1 
								
							
								 
							
						 
						
							
							
								
								Fix spinner that shows until the first sync  
							
							... 
							
							
							
							Listen for the sync event and update when it changes 
							
						 
						
							2017-04-26 17:26:53 +01:00  
				
					
						
							
							
								 
						
							
							
								9ac06d4c79 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #839  from matrix-org/dbkr/spinner_until_sync  
							
							... 
							
							
							
							Show spinner until first sync has completed 
							
						 
						
							2017-04-26 14:34:08 +01:00  
				
					
						
							
							
								 
						
							
							
								e37ab02706 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #838  from matrix-org/dbkr/loggedinview_style  
							
							... 
							
							
							
							Style fixes for LoggedInView 
							
						 
						
							2017-04-26 14:11:29 +01:00  
				
					
						
							
							
								 
						
							
							
								df283dae47 
								
							
								 
							
						 
						
							
							
								
								Show spinner until first sync has completed  
							
							... 
							
							
							
							Shows the 'forward paginating' spinner until the first sync has
completed.
Fixes https://github.com/vector-im/riot-web/issues/3318  
							
						 
						
							2017-04-26 14:05:09 +01:00  
				
					
						
							
							
								 
						
							
							
								04f44e9201 
								
							
								 
							
						 
						
							
							
								
								Style fixes for LoggedInView  
							
							... 
							
							
							
							PRing this becaise I was going to change LoggedInView, so did
some code style updates, but then decided the do the change
elsewhere. 
							
						 
						
							2017-04-26 13:48:03 +01:00  
				
					
						
							
							
								 
						
							
							
								5cbf77b53e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #834  from matrix-org/dbkr/fix_registration_custom_server  
							
							... 
							
							
							
							Fix specifying custom server for registration 
							
						 
						
							2017-04-26 10:41:29 +01:00