2d96f90181 
								
							
								 
							
						 
						
							
							
								
								Review comments  
							
							
							
						 
						
							2016-01-22 16:18:23 +00:00  
				
					
						
							
							
								 
						
							
							
								ec54c7cf6c 
								
							
								 
							
						 
						
							
							
								
								Match entities based on uid/displayname and include partials/stripping  
							
							... 
							
							
							
							"foo" would now match:
 - @foobar:matrix.org    - User ID matching
 - Foobar                - Display name matching
 - f (@foo2:matrix.org)  - user ID localpart matching
 - Bar Foo               - Word matching 
							
						 
						
							2016-01-22 15:21:41 +00:00  
				
					
						
							
							
								 
						
							
							
								4775f39e1d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #109  from matrix-org/kegan/room-swap-perf  
							
							... 
							
							
							
							Improve room swap performance 
							
						 
						
							2016-01-22 14:08:20 +00:00  
				
					
						
							
							
								 
						
							
							
								7ef1ba0b44 
								
							
								 
							
						 
						
							
							
								
								Unbreak RoomHeader  
							
							
							
						 
						
							2016-01-22 11:48:26 +00:00  
				
					
						
							
							
								 
						
							
							
								f213901e29 
								
							
								 
							
						 
						
							
							
								
								Return early when calculating one-to-one room avatars  
							
							... 
							
							
							
							Object.keys() is O(n) and is wasted because we only care if the keys are 1 or 2.
Use `for .. in` instead and return early if there are >2 keys.
Profiling indicates this cuts wasted time from ~74ms to ~32ms for me (who has
a large number of rooms with large numbers of people in them). 
							
						 
						
							2016-01-22 11:11:56 +00:00  
				
					
						
							
							
								 
						
							
							
								e72323c405 
								
							
								 
							
						 
						
							
							
								
								Removed unexpected commit on .gitignore  
							
							
							
						 
						
							2016-01-22 08:57:06 +01:00  
				
					
						
							
							
								 
						
							
							
								a627ee7ef6 
								
							
								 
							
						 
						
							
							
								
								Fixed ternary operation  
							
							
							
						 
						
							2016-01-22 08:54:40 +01:00  
				
					
						
							
							
								 
						
							
							
								8ccc3f04c3 
								
							
								 
							
						 
						
							
							
								
								correct layout for truncated lists  
							
							
							
						 
						
							2016-01-21 17:39:12 +00:00  
				
					
						
							
							
								 
						
							
							
								b45e5e6eb5 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #108  from matrix-org/kegan/member-list-perf  
							
							... 
							
							
							
							Add "and X more" overflow tile to joined member list 
							
						 
						
							2016-01-21 16:15:12 +00:00  
				
					
						
							
							
								 
						
							
							
								dfab32394d 
								
							
								 
							
						 
						
							
							
								
								Set truncation to 10 for now.  
							
							
							
						 
						
							2016-01-21 16:03:32 +00:00  
				
					
						
							
							
								 
						
							
							
								d72ab641d0 
								
							
								 
							
						 
						
							
							
								
								Expand the list when the overflow element is clicked  
							
							... 
							
							
							
							Negative truncateAt values means "do not truncate". 
							
						 
						
							2016-01-21 15:57:59 +00:00  
				
					
						
							
							
								 
						
							
							
								c5099a837b 
								
							
								 
							
						 
						
							
							
								
								doh - anyone can set their own tags...  
							
							
							
						 
						
							2016-01-21 15:08:14 +00:00  
				
					
						
							
							
								 
						
							
							
								97d42b3ad7 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #107  from matrix-org/unread_sync  
							
							... 
							
							
							
							Use read receipts to calculate unread room status 
							
						 
						
							2016-01-21 13:29:45 +00:00  
				
					
						
							
							
								 
						
							
							
								876646ac54 
								
							
								 
							
						 
						
							
							
								
								Hopefully make unread loop a bit more digrestable.  
							
							
							
						 
						
							2016-01-21 13:22:13 +00:00  
				
					
						
							
							
								 
						
							
							
								eed83f982e 
								
							
								 
							
						 
						
							
							
								
								Add a suitable overflow tile for the member list  
							
							
							
						 
						
							2016-01-21 11:41:28 +00:00  
				
					
						
							
							
								 
						
							
							
								9f362e488c 
								
							
								 
							
						 
						
							
							
								
								Add a TruncatedList component, which truncates children passed to it.  
							
							
							
						 
						
							2016-01-21 11:30:37 +00:00  
				
					
						
							
							
								 
						
							
							
								13e70e6956 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into unread_sync  
							
							
							
						 
						
							2016-01-21 10:36:29 +00:00  
				
					
						
							
							
								 
						
							
							
								99a491bb0e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #68  from matrix-org/notif_sync  
							
							... 
							
							
							
							Set room highlight from unread_notification_count 
							
						 
						
							2016-01-21 10:31:42 +00:00  
				
					
						
							
							
								 
						
							
							
								acce08194d 
								
							
								 
							
						 
						
							
							
								
								Apply patch to the right branch: update for new count format  
							
							
							
						 
						
							2016-01-21 10:23:18 +00:00  
				
					
						
							
							
								 
						
							
							
								1c54c64850 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #99  from matrix-org/user_settings_on_register  
							
							... 
							
							
							
							Show user settings screen on registration 
							
						 
						
							2016-01-21 10:11:28 +00:00  
				
					
						
							
							
								 
						
							
							
								a0cc3720a9 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #106  from matrix-org/dbkr/dont_spam_read_receipts  
							
							... 
							
							
							
							Don't spam the same RR at the server until it acks it. 
							
						 
						
							2016-01-21 10:01:30 +00:00  
				
					
						
							
							
								 
						
							
							
								9bbb9f7b29 
								
							
								 
							
						 
						
							
							
								
								pretty invites!  
							
							
							
						 
						
							2016-01-21 00:45:22 +00:00  
				
					
						
							
							
								 
						
							
							
								eab0ca8716 
								
							
								 
							
						 
						
							
							
								
								fix bottom margin on FF  
							
							
							
						 
						
							2016-01-21 00:39:10 +00:00  
				
					
						
							
							
								 
						
							
							
								4d549304b6 
								
							
								 
							
						 
						
							
							
								
								Fix autoshow  
							
							
							
						 
						
							2016-01-21 00:26:44 +00:00  
				
					
						
							
							
								 
						
							
							
								9ce4148925 
								
							
								 
							
						 
						
							
							
								
								go splitscreen at the first sign of an invite search  
							
							
							
						 
						
							2016-01-21 00:25:47 +00:00  
				
					
						
							
							
								 
						
							
							
								deca90d0a7 
								
							
								 
							
						 
						
							
							
								
								fix up Start Chat behaviour as per Amandine's feedback  
							
							
							
						 
						
							2016-01-21 00:16:10 +00:00  
				
					
						
							
							
								 
						
							
							
								35c141cda9 
								
							
								 
							
						 
						
							
							
								
								reduce size of auxpanel when editing roomsettings  
							
							
							
						 
						
							2016-01-20 23:09:36 +00:00  
				
					
						
							
							
								 
						
							
							
								6f6db75ea1 
								
							
								 
							
						 
						
							
							
								
								improve banned users layout  
							
							
							
						 
						
							2016-01-20 22:47:42 +00:00  
				
					
						
							
							
								 
						
							
							
								41da05f36a 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #102  from matrix-org/matthew/roompreview  
							
							... 
							
							
							
							Try to support non-guest room peek. 
							
						 
						
							2016-01-20 22:30:10 +00:00  
				
					
						
							
							
								 
						
							
							
								c0aa15aa09 
								
							
								 
							
						 
						
							
							
								
								now with gemini  
							
							
							
						 
						
							2016-01-20 22:11:58 +00:00  
				
					
						
							
							
								 
						
							
							
								3aaf934c97 
								
							
								 
							
						 
						
							
							
								
								implement the correct design for memberlist, modulo gemini  
							
							
							
						 
						
							2016-01-20 22:04:49 +00:00  
				
					
						
							
							
								 
						
							
							
								161cdef36e 
								
							
								 
							
						 
						
							
							
								
								tint bottom borders  
							
							
							
						 
						
							2016-01-20 17:24:09 +00:00  
				
					
						
							
							
								 
						
							
							
								548dac2ad9 
								
							
								 
							
						 
						
							
							
								
								Use new unread count methods  
							
							
							
						 
						
							2016-01-20 17:19:52 +00:00  
				
					
						
							
							
								 
						
							
							
								964e7c3739 
								
							
								 
							
						 
						
							
							
								
								fix user_levels some more  
							
							
							
						 
						
							2016-01-20 17:15:01 +00:00  
				
					
						
							
							
								 
						
							
							
								705730d450 
								
							
								 
							
						 
						
							
							
								
								fix user_levels  
							
							
							
						 
						
							2016-01-20 17:12:55 +00:00  
				
					
						
							
							
								 
						
							
							
								442e090f37 
								
							
								 
							
						 
						
							
							
								
								button layout  
							
							
							
						 
						
							2016-01-20 17:09:46 +00:00  
				
					
						
							
							
								 
						
							
							
								76b7788ba6 
								
							
								 
							
						 
						
							
							
								
								usersettings rhs button  
							
							
							
						 
						
							2016-01-20 17:07:00 +00:00  
				
					
						
							
							
								 
						
							
							
								c64f08dcc3 
								
							
								 
							
						 
						
							
							
								
								fix missing aliases  
							
							
							
						 
						
							2016-01-20 16:53:46 +00:00  
				
					
						
							
							
								 
						
							
							
								76279e2940 
								
							
								 
							
						 
						
							
							
								
								fix roomsettings a bit  
							
							
							
						 
						
							2016-01-20 16:39:26 +00:00  
				
					
						
							
							
								 
						
							
							
								0052fbd6cb 
								
							
								 
							
						 
						
							
							
								
								Don't spam the same RR at the server until it acks it.  
							
							
							
						 
						
							2016-01-20 16:39:25 +00:00  
				
					
						
							
							
								 
						
							
							
								14c2d945d6 
								
							
								 
							
						 
						
							
							
								
								oops, use right class  
							
							
							
						 
						
							2016-01-20 15:58:17 +00:00  
				
					
						
							
							
								 
						
							
							
								83634bf930 
								
							
								 
							
						 
						
							
							
								
								Update for new unread count format  
							
							
							
						 
						
							2016-01-20 15:56:11 +00:00  
				
					
						
							
							
								 
						
							
							
								dbcbd2aad8 
								
							
								 
							
						 
						
							
							
								
								fix badge layout  
							
							
							
						 
						
							2016-01-20 15:52:34 +00:00  
				
					
						
							
							
								 
						
							
							
								5c105a50e2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'matthew/roompreview' of  https://github.com/matrix-org/matrix-react-sdk  into matthew/roompreview  
							
							
							
						 
						
							2016-01-20 15:49:02 +00:00  
				
					
						
							
							
								 
						
							
							
								4d2608017b 
								
							
								 
							
						 
						
							
							
								
								fix CSS for ChangeAvatar placeholder  
							
							
							
						 
						
							2016-01-20 15:39:56 +00:00  
				
					
						
							
							
								 
						
							
							
								b296d05b35 
								
							
								 
							
						 
						
							
							
								
								Fix finally NPE  
							
							
							
						 
						
							2016-01-20 15:38:34 +00:00  
				
					
						
							
							
								 
						
							
							
								8dc21ec837 
								
							
								 
							
						 
						
							
							
								
								Fix race condition when joining rooms  
							
							... 
							
							
							
							Problem: Hitting join on a room invite would show spinner, then join room screen
then the messages.
Cause: The UI to show a spinner is set via the "joining" flag. This flag was
only set for the duration of the /join HTTP request. This is insufficient
because it races with actual room info arriving from /sync. If this info does
not arrive before the /join HTTP request returns, "joining" is false but the
current membership state of the user is still invite.
Fix: The "joining" flag is still set when the /join HTTP request is made, but
it is only turned off when the join event arrives from /sync.
Extras: This fix should also work when joining a room not from an invite. 
							
						 
						
							2016-01-20 15:25:40 +00:00  
				
					
						
							
							
								 
						
							
							
								edb67b778d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into matthew/roompreview  
							
							
							
						 
						
							2016-01-20 14:42:04 +00:00  
				
					
						
							
							
								 
						
							
							
								fee7ee5dcc 
								
							
								 
							
						 
						
							
							
								
								Load the user list eventually if we have no Room object  
							
							
							
						 
						
							2016-01-20 14:41:48 +00:00  
				
					
						
							
							
								 
						
							
							
								a0aaae49dd 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into matthew/roompreview  
							
							
							
						 
						
							2016-01-20 14:27:25 +00:00