6685cbcb25 
								
							
								 
							
						 
						
							
							
								
								make MessageComposerInput (new and old) warn on unload  
							
							... 
							
							
							
							new needs binding due to class this ref being softer
couldn't do this nicely in MessageComposer/Input as
isTyping wasn't propagated.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-04-29 06:26:59 +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  
				
					
						
							
							
								 
						
							
							
								4207bf31f2 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #833  from matrix-org/luke/improve-country-dd  
							
							... 
							
							
							
							Improve country dropdown UX and expose +prefix 
							
						 
						
							2017-04-26 10:25:10 +01:00  
				
					
						
							
							
								 
						
							
							
								78b452818c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #836  from t3chguy/fix_UserSettingsStore  
							
							... 
							
							
							
							Fix user settings store 
							
						 
						
							2017-04-26 10:11:32 +01:00  
				
					
						
							
							
								 
						
							
							
								6cbd04045d 
								
							
								 
							
						 
						
							
							
								
								change the now working defaults  
							
							... 
							
							
							
							to what they effectively were when defaultValue was broken
(hopefully tests now pass)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-04-25 22:17:25 +01:00  
				
					
						
							
							
								 
						
							
							
								cc53825b06 
								
							
								 
							
						 
						
							
							
								
								fix defaultValue on getLocalSetting and getSyncedSetting  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-04-25 22:01:35 +01:00  
				
					
						
							
							
								 
						
							
							
								de89c1f710 
								
							
								 
							
						 
						
							
							
								
								lets make eslint at least somewhat happy  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-04-25 22:00:50 +01:00  
				
					
						
							
							
								 
						
							
							
								fa9c2d1373 
								
							
								 
							
						 
						
							
							
								
								Fix specifying custom server for registration  
							
							... 
							
							
							
							Broken by 9cd7914ea5 
							
						 
						
							2017-04-25 19:21:09 +01:00  
				
					
						
							
							
								 
						
							
							
								c1336f09fe 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into luke/improve-country-dd  
							
							
							
						 
						
							2017-04-25 18:06:04 +01:00  
				
					
						
							
							
								 
						
							
							
								bc045698b9 
								
							
								 
							
						 
						
							
							
								
								Fix for fuse 2.7.2  
							
							... 
							
							
							
							As of v2.7.2, fuse.js introduces a regression where the second argument to the constructor `Fuse` is assumed to be an object. There was one instance where we were not passing any argument. This fixes that. 
							
						 
						
							2017-04-25 18:01:56 +01:00  
				
					
						
							
							
								 
						
							
							
								96e7479d8b 
								
							
								 
							
						 
						
							
							
								
								Show "jump to message" when message is not paginated  
							
							
							
						 
						
							2017-04-25 17:19:36 +01:00  
				
					
						
							
							
								 
						
							
							
								71a119376c 
								
							
								 
							
						 
						
							
							
								
								Guard against no children  
							
							
							
						 
						
							2017-04-25 17:05:54 +01:00  
				
					
						
							
							
								 
						
							
							
								1e9a2e80e9 
								
							
								 
							
						 
						
							
							
								
								Remove empty line  
							
							
							
						 
						
							2017-04-25 11:57:03 +01:00  
				
					
						
							
							
								 
						
							
							
								0d4ab07250 
								
							
								 
							
						 
						
							
							
								
								Fix not autoSelecting first item in dropdown  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/3686  
							
						 
						
							2017-04-25 11:53:14 +01:00  
				
					
						
							
							
								 
						
							
							
								aac0238882 
								
							
								 
							
						 
						
							
							
								
								Remove redundant API for getting country prefix  
							
							
							
						 
						
							2017-04-25 11:25:14 +01:00  
				
					
						
							
							
								 
						
							
							
								336462366e 
								
							
								 
							
						 
						
							
							
								
								Improve country dropdown UX and expose +prefix  
							
							... 
							
							
							
							A prefix is now exposed through a change to the API for onOptionChange. This now returns the entire country object which includes iso2, prefix etc.
This also shows the prefix in the Registration and Login screens as a prefix to the phone number field. 
							
						 
						
							2017-04-25 11:21:47 +01:00  
				
					
						
							
							
								 
						
							
							
								5c83d4d2ed 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #832  from t3chguy/ude_break_out_room  
							
							... 
							
							
							
							show the room name in the UDE Dialog 
							
						 
						
							2017-04-25 10:04:23 +01:00  
				
					
						
							
							
								 
						
							
							
								e64b647799 
								
							
								 
							
						 
						
							
							
								
								show the room name in the UDE Dialog  
							
							... 
							
							
							
							especially useful when it appears after you switch rooms
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-04-25 09:26:21 +01:00  
				
					
						
							
							
								 
						
							
							
								29e48d1801 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #826  from matrix-org/matthew/mels-profile-changes  
							
							... 
							
							
							
							summarise profile changes in MELS 
							
						 
						
							2017-04-25 00:18:19 +01:00  
				
					
						
							
							
								 
						
							
							
								63dac026a8 
								
							
								 
							
						 
						
							
							
								
								remove spammy log  
							
							
							
						 
						
							2017-04-25 00:17:46 +01:00  
				
					
						
							
							
								 
						
							
							
								c7e4b298b2 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #820  from turt2live/travis/h1-h2-to-h3  
							
							... 
							
							
							
							Transform h1 and h2 tags to h3 tags 
							
						 
						
							2017-04-25 00:08:35 +01:00  
				
					
						
							
							
								 
						
							
							
								3bd77d56db 
								
							
								 
							
						 
						
							
							
								
								Allow h1 and h2 tags again. CSS handled by riot-web  
							
							... 
							
							
							
							Signed-off-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2017-04-24 08:45:22 -06:00  
				
					
						
							
							
								 
						
							
							
								28923cdb93 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into travis/h1-h2-to-h3  
							
							
							
						 
						
							2017-04-24 08:29:10 -06:00  
				
					
						
							
							
								 
						
							
							
								1347d9fa65 
								
							
								 
							
						 
						
							
							
								
								fix scroll behaviour on macs with no gemini  
							
							
							
						 
						
							2017-04-24 12:53:53 +01:00  
				
					
						
							
							
								 
						
							
							
								6f461f0ebb 
								
							
								 
							
						 
						
							
							
								
								add in scrollto button  
							
							
							
						 
						
							2017-04-24 01:09:57 +01:00