David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							fcf6afbe06 
							
						 
					 
					
						
						
							
							Merge pull request  #113  from matrix-org/dbkr/unread_only_if_have_tile  
						
						... 
						
						
						
						Don't count as an unread message if we don't have a tile for it. 
						
						
					 
					
						2016-01-26 14:19:45 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							f8cc6bdad6 
							
						 
					 
					
						
						
							
							Don't count as an unread message if we don't have a tile for it.  
						
						
						
						
					 
					
						2016-01-25 17:13:07 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							c1f28bb6b9 
							
						 
					 
					
						
						
							
							hide 'unknown screen' warning  
						
						
						
						
					 
					
						2016-01-24 19:14:14 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							6eea1f7f83 
							
						 
					 
					
						
						
							
							try for a simpler invite placeholder look & feel  
						
						
						
						
					 
					
						2016-01-24 19:02:18 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							872b9be17a 
							
						 
					 
					
						
						
							
							increase truncatelist size to match INITIAL_LOAD_NUM_MEMBERS  
						
						
						
						
					 
					
						2016-01-24 18:24:26 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							bc60435750 
							
						 
					 
					
						
						
							
							improve settings layout and fix FF bugs  
						
						
						
						
					 
					
						2016-01-24 18:15:08 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							bb0051f24f 
							
						 
					 
					
						
						
							
							fix another NPE; apparently some stylesheets don't have href attributes (wtf?)  
						
						
						
						
					 
					
						2016-01-24 11:46:25 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							3da76192a1 
							
						 
					 
					
						
						
							
							title attr  
						
						
						
						
					 
					
						2016-01-24 02:01:45 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							f15564074c 
							
						 
					 
					
						
						
							
							track whether we're scrolled to bottom or not and display UI for warning & jumping there if needed.  
						
						
						
						
					 
					
						2016-01-24 01:51:01 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							28fddef5f9 
							
						 
					 
					
						
						
							
							only try to tint our CSS, otherwise random extensions which have inserted CSS may cause untrappable XSS SecurityErrors to throw  
						
						
						
						
					 
					
						2016-01-23 19:46:00 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							001b9ad7cc 
							
						 
					 
					
						
						
							
							try to trap SecurityError exceptions for linux FFs who don't like you calling .contentDocument on an SVG (assuming that's where the error comes from)  
						
						
						
						
					 
					
						2016-01-23 18:59:37 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							add8ef3c59 
							
						 
					 
					
						
						
							
							trap for ss.cssRules mysteriously returning null  
						
						
						
						
					 
					
						2016-01-22 19:59:41 +00:00 
						 
				 
			
				
					
						
							
							
								Kegsay 
							
						 
					 
					
						
						
						
						
							
						
						
							9a6f33861f 
							
						 
					 
					
						
						
							
							Merge pull request  #112  from matrix-org/kegan/email-invite-tile  
						
						... 
						
						
						
						Add a tile to the invitee list which represents an email tile 
						
						
					 
					
						2016-01-22 17:35:17 +00:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							437280020c 
							
						 
					 
					
						
						
							
							Turn off autocomplete for search list  
						
						
						
						
					 
					
						2016-01-22 17:32:43 +00:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							e78c1fba87 
							
						 
					 
					
						
						
							
							Hide 'Email: ' is the first char is @  
						
						
						
						
					 
					
						2016-01-22 17:28:23 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							b19a318b2d 
							
						 
					 
					
						
						
							
							put a black badge on unread notifications, and a red one for unread highlights  
						
						
						
						
					 
					
						2016-01-22 17:22:49 +00:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							c3f786cc5e 
							
						 
					 
					
						
						
							
							Add a tile to the invitee list which represents an email tile  
						
						
						
						
					 
					
						2016-01-22 17:20:52 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							4631648f26 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/matrix-org/matrix-react-sdk  into develop  
						
						
						
						
					 
					
						2016-01-22 17:01:28 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							24225af416 
							
						 
					 
					
						
						
							
							work around history visibility roomsetting UI some more  
						
						
						
						
					 
					
						2016-01-22 17:01:15 +00:00 
						 
				 
			
				
					
						
							
							
								Kegsay 
							
						 
					 
					
						
						
						
						
							
						
						
							ed3a112e5c 
							
						 
					 
					
						
						
							
							Merge pull request  #111  from matrix-org/kegan/search-on-mxid-and-displayname  
						
						... 
						
						
						
						Match entities based on uid/displayname and include partials/stripping 
						
						
					 
					
						2016-01-22 16:19:59 +00:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							2d96f90181 
							
						 
					 
					
						
						
							
							Review comments  
						
						
						
						
					 
					
						2016-01-22 16:18:23 +00:00 
						 
				 
			
				
					
						
							
							
								Kegsay 
							
						 
					 
					
						
						
						
						
							
						
						
							2e154c7478 
							
						 
					 
					
						
						
							
							Merge pull request  #110  from matrix-org/kegan/3pid-invite-refresh-mlist  
						
						... 
						
						
						
						Refresh the membership list on 3PID invites 
						
						
					 
					
						2016-01-22 16:13:42 +00:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							99da0ef656 
							
						 
					 
					
						
						
							
							Fix   vector-im/vector-web#694  - Empty invitee list  
						
						... 
						
						
						
						The invitee list is lazy-loaded 50ms after the first render. We were relying
on setState from the member lazy-load to also kick the invitee list. However,
setState is synchronous and we were loading the invitee list afterwards, which
meant that the SearchableEntityList wouldn't have any invitees until the next
render(). 
						
						
					 
					
						2016-01-22 16:11:09 +00:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							38d5c7d5c5 
							
						 
					 
					
						
						
							
							Filter out undefined/null children which won't render  
						
						
						
						
					 
					
						2016-01-22 15:57:42 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							1dd2cbed63 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/matrix-org/matrix-react-sdk  into develop  
						
						
						
						
					 
					
						2016-01-22 15:51:34 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							0bef94a6ce 
							
						 
					 
					
						
						
							
							fudge around  https://github.com/vector-im/vector-web/issues/731  
						
						
						
						
					 
					
						2016-01-22 15:51:27 +00:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							675e0f176f 
							
						 
					 
					
						
						
							
							Add onShowMoreRooms prop for kicking gemini  
						
						
						
						
					 
					
						2016-01-22 15:46:38 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							0bdd674f7f 
							
						 
					 
					
						
						
							
							fix invalid powerlevel setting  
						
						
						
						
					 
					
						2016-01-22 15:29:57 +00:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							366a24bbe4 
							
						 
					 
					
						
						
							
							Refresh the membership list on 3PID invites  
						
						
						
						
					 
					
						2016-01-22 15:11:36 +00:00 
						 
				 
			
				
					
						
							
							
								Kegsay 
							
						 
					 
					
						
						
						
						
							
						
						
							4775f39e1d 
							
						 
					 
					
						
						
							
							Merge pull request  #109  from matrix-org/kegan/room-swap-perf  
						
						... 
						
						
						
						Improve room swap performance 
						
						
					 
					
						2016-01-22 14:08:20 +00:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							7ef1ba0b44 
							
						 
					 
					
						
						
							
							Unbreak RoomHeader  
						
						
						
						
					 
					
						2016-01-22 11:48:26 +00:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								manuroe 
							
						 
					 
					
						
						
						
						
							
						
						
							e72323c405 
							
						 
					 
					
						
						
							
							Removed unexpected commit on .gitignore  
						
						
						
						
					 
					
						2016-01-22 08:57:06 +01:00 
						 
				 
			
				
					
						
							
							
								manuroe 
							
						 
					 
					
						
						
						
						
							
						
						
							a627ee7ef6 
							
						 
					 
					
						
						
							
							Fixed ternary operation  
						
						
						
						
					 
					
						2016-01-22 08:54:40 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							8ccc3f04c3 
							
						 
					 
					
						
						
							
							correct layout for truncated lists  
						
						
						
						
					 
					
						2016-01-21 17:39:12 +00:00 
						 
				 
			
				
					
						
							
							
								Kegsay 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							dfab32394d 
							
						 
					 
					
						
						
							
							Set truncation to 10 for now.  
						
						
						
						
					 
					
						2016-01-21 16:03:32 +00:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							c5099a837b 
							
						 
					 
					
						
						
							
							doh - anyone can set their own tags...  
						
						
						
						
					 
					
						2016-01-21 15:08:14 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							876646ac54 
							
						 
					 
					
						
						
							
							Hopefully make unread loop a bit more digrestable.  
						
						
						
						
					 
					
						2016-01-21 13:22:13 +00:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							eed83f982e 
							
						 
					 
					
						
						
							
							Add a suitable overflow tile for the member list  
						
						
						
						
					 
					
						2016-01-21 11:41:28 +00:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							9f362e488c 
							
						 
					 
					
						
						
							
							Add a TruncatedList component, which truncates children passed to it.  
						
						
						
						
					 
					
						2016-01-21 11:30:37 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							13e70e6956 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into unread_sync  
						
						
						
						
					 
					
						2016-01-21 10:36:29 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							acce08194d 
							
						 
					 
					
						
						
							
							Apply patch to the right branch: update for new count format  
						
						
						
						
					 
					
						2016-01-21 10:23:18 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							9bbb9f7b29 
							
						 
					 
					
						
						
							
							pretty invites!  
						
						
						
						
					 
					
						2016-01-21 00:45:22 +00:00