Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								8bd4fdbd5a 
								
							
								 
							
						 
						
							
							
								
								Don't set presence  
							
							 
							
							
							
						 
						
							2016-01-05 13:24:05 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								ae7b2d54bb 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into kegan/guest-access  
							
							 
							
							
							
						 
						
							2016-01-05 11:39:36 +00:00  
						
					 
				
					
						
							
							
								 
								Kegsay
							
						 
						
							 
							
							
							
								
							
								a6e735dbde 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #76  from matrix-org/kegan/bugfix-read-receipt  
							
							 
							
							... 
							
							
							
							Null guard getMember
Fixes https://github.com/vector-im/vector-web/issues/566  
							
						 
						
							2016-01-05 11:26:04 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								7640dd52e3 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #78  from matrix-org/rav/fix_unread_messages  
							
							 
							
							... 
							
							
							
							Make ScrollPanel.isAtBottom more reliable 
							
						 
						
							2016-01-05 11:18:40 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								2b169b06f5 
								
							
								 
							
						 
						
							
							
								
								Make ScrollPanel.isAtBottom more reliable  
							
							 
							
							... 
							
							
							
							Given we want to use isAtBottom to figure out whether to show 'unread messages'
counts, we ought to return the current scroll state, rather than the saved one.
This fixes  vector-im/vector-web#576  
							
						 
						
							2016-01-05 11:02:18 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								aa1012b127 
								
							
								 
							
						 
						
							
							
								
								oops  
							
							 
							
							
							
						 
						
							2016-01-05 03:59:04 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								9cf49eb62d 
								
							
								 
							
						 
						
							
							
								
								oops, forgot this  
							
							 
							
							
							
						 
						
							2016-01-05 03:54:44 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								0e98764d82 
								
							
								 
							
						 
						
							
							
								
								oops, no double classNames  
							
							 
							
							
							
						 
						
							2016-01-05 03:51:00 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								001dc8612b 
								
							
								 
							
						 
						
							
							
								
								support fixing up dynamically loaded SVGs  
							
							 
							
							
							
						 
						
							2016-01-05 03:34:52 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								555abdae30 
								
							
								 
							
						 
						
							
							
								
								wire up Tinter.js  
							
							 
							
							
							
						 
						
							2016-01-05 00:46:52 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								e177263d9f 
								
							
								 
							
						 
						
							
							
								
								Address review comments  
							
							 
							
							... 
							
							
							
							Minor fixes post-review 
							
						 
						
							2016-01-04 16:54:27 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								b5eae891b4 
								
							
								 
							
						 
						
							
							
								
								Address review comments  
							
							 
							
							... 
							
							
							
							Make onFillRequest always return a promise 
							
						 
						
							2016-01-04 16:28:32 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								722c7033bc 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #73  from matrix-org/rav/on_highlight_click  
							
							 
							
							... 
							
							
							
							Expose onHighlightClick on the event tiles 
							
						 
						
							2016-01-04 15:23:45 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								89fcf019e1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into rav/scrollpanel_promises  
							
							 
							
							... 
							
							
							
							Conflicts:
	src/components/structures/RoomView.js 
							
						 
						
							2016-01-04 12:56:39 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								75ad96c8ba 
								
							
								 
							
						 
						
							
							
								
								Null guard getMember  
							
							 
							
							
							
						 
						
							2016-01-04 10:11:42 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								3009da0b39 
								
							
								 
							
						 
						
							
							
								
								move title attributes to the div  
							
							 
							
							
							
						 
						
							2016-01-03 22:34:56 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								4f915d622e 
								
							
								 
							
						 
						
							
							
								
								switch SVGs from imgs to objects  
							
							 
							
							
							
						 
						
							2016-01-03 22:30:52 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								640aa45956 
								
							
								 
							
						 
						
							
							
								
								fix comedy bug where dates in timestamps were spectacularly wrong  
							
							 
							
							
							
						 
						
							2016-01-03 00:40:05 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								3fd5a3a19f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #75  from matrix-org/matthew/css-refactor  
							
							 
							
							... 
							
							
							
							sync CSS classnames with current react component names 
							
						 
						
							2016-01-03 00:15:07 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								441a9540ca 
								
							
								 
							
						 
						
							
							
								
								sync CSS classnames with current react component names  
							
							 
							
							
							
						 
						
							2016-01-03 00:11:11 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								15f19be408 
								
							
								 
							
						 
						
							
							
								
								highlight case insensitively  
							
							 
							
							
							
						 
						
							2015-12-28 03:14:50 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								970bc84bb6 
								
							
								 
							
						 
						
							
							
								
								explicitly rejoin parted rooms  
							
							 
							
							
							
						 
						
							2015-12-28 02:58:40 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								424540e57a 
								
							
								 
							
						 
						
							
							
								
								fix NPE if messagePanel isn't yet defined  
							
							 
							
							
							
						 
						
							2015-12-28 02:40:17 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								50ac0ab4cf 
								
							
								 
							
						 
						
							
							
								
								wire up RoomAlias's homeserver as intended  
							
							 
							
							
							
						 
						
							2015-12-28 02:36:28 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								bd498b47b3 
								
							
								 
							
						 
						
							
							
								
								fix 'this' scoping bug that could never have worked...  
							
							 
							
							
							
						 
						
							2015-12-28 02:36:18 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								93e7f90ae4 
								
							
								 
							
						 
						
							
							
								
								ScrollPanel: implement forward-fill  
							
							 
							
							
							
						 
						
							2015-12-24 14:30:49 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								f2a24521dc 
								
							
								 
							
						 
						
							
							
								
								Make ScrollPanel keep track of when fill requests are happening  
							
							 
							
							... 
							
							
							
							The dance to avoid doing repeated fill requests on every update is common, so
add it to ScrollPanel. Let onFillRequest return a promise, which prevents any
updates until it completes. 
							
						 
						
							2015-12-24 14:15:50 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								b0adb1945f 
								
							
								 
							
						 
						
							
							
								
								Expose onHighlightClick on the event tiles  
							
							 
							
							
							
						 
						
							2015-12-24 13:51:14 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								cc72f7ec24 
								
							
								 
							
						 
						
							
							
								
								Use new searchRoomEvents and backPaginateRoomEventsSearch methods  
							
							 
							
							... 
							
							
							
							MatrixClient now exposes higher-level search APIs, so use them. 
							
						 
						
							2015-12-24 13:33:58 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								103b0a03b1 
								
							
								 
							
						 
						
							
							
								
								Hotfix for tab press bug  
							
							 
							
							... 
							
							
							
							The bug was that *sometimes* typing in some letters then
pressing tab would flash red and not auto-complete. This was
happening because nextMatchedEntry was being called with 0
because the state of inPassiveMode was wrong. 
							
						 
						
							2015-12-24 11:56:50 +00:00  
						
					 
				
					
						
							
							
								 
								Kegsay
							
						 
						
							 
							
							
							
								
							
								b941904078 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #33  from matrix-org/matthew/settings  
							
							 
							
							... 
							
							
							
							WIP experiment of turning UserSettings controller into UserSettingsStore 
							
						 
						
							2015-12-24 10:54:26 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								5d490841bc 
								
							
								 
							
						 
						
							
							
								
								Review comments  
							
							 
							
							
							
						 
						
							2015-12-24 10:50:47 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								5286ec170f 
								
							
								 
							
						 
						
							
							
								
								Wrangle CSS to get avatar in right place  
							
							 
							
							
							
						 
						
							2015-12-24 09:20:16 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								32c1af54d8 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #69  from matrix-org/rav/refactor_body_to_html  
							
							 
							
							... 
							
							
							
							Refactor bodyToHtml, and allow onHighlightClicked
Factor out a Highlighter class to avoid passing round the static state
everywhere.
Add an optional 'opts' argument which can take an 'onHighlightClick' member. 
							
						 
						
							2015-12-23 23:50:38 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								b4436df5e4 
								
							
								 
							
						 
						
							
							
								
								Refactor bodyToHtml, and allow onHighlightClicked  
							
							 
							
							... 
							
							
							
							Factor out a Highlighter class to avoid passing round the static state
everywhere.
Add an optional 'opts' argument which can take an 'onHighlightClick' member. 
							
						 
						
							2015-12-23 23:50:35 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								05d1d7c82d 
								
							
								 
							
						 
						
							
							
								
								Better error message for failing to set avatars with no connection  
							
							 
							
							
							
						 
						
							2015-12-23 17:30:25 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								abb170ebde 
								
							
								 
							
						 
						
							
							
								
								Keep one source of truth (the Notifier) when toggling notification state. Fixes notifications.  
							
							 
							
							
							
						 
						
							2015-12-23 17:06:30 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								a279dce027 
								
							
								 
							
						 
						
							
							
								
								Get avatar display and uploads working  
							
							 
							
							
							
						 
						
							2015-12-23 16:52:59 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								19bd39b066 
								
							
								 
							
						 
						
							
							
								
								More random tweaks  
							
							 
							
							... 
							
							
							
							- Make onBlur reset the EditText to show that it hasn't submitted it.
- Add the user ID of the logged in user to Advanced.
- Remove remnants of the Save/Cancel buttons. 
							
						 
						
							2015-12-23 16:02:18 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								72b8cf1be2 
								
							
								 
							
						 
						
							
							
								
								Refactor ChangePassword to get it working. Add 'Account' section because trying to make ChangePassword divs part of the same table as the display name is nigh impossible. Feels okay though  
							
							 
							
							
							
						 
						
							2015-12-23 15:38:28 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								6295cf2ec9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into matthew/settings  
							
							 
							
							
							
						 
						
							2015-12-23 14:19:42 +00:00  
						
					 
				
					
						
							
							
								 
								Kegsay
							
						 
						
							 
							
							
							
								
							
								2a0faea838 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #67  from matrix-org/kegan/tab-complete  
							
							 
							
							... 
							
							
							
							Implement tab complete UX 
							
						 
						
							2015-12-23 14:18:48 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								fb151b35c8 
								
							
								 
							
						 
						
							
							
								
								Remove debug logging  
							
							 
							
							
							
						 
						
							2015-12-23 14:17:56 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								e657b40a7e 
								
							
								 
							
						 
						
							
							
								
								Use ChangeDisplayName for implict display name saving on enter  
							
							 
							
							
							
						 
						
							2015-12-23 14:14:25 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								82ff5c5e52 
								
							
								 
							
						 
						
							
							
								
								Factor out handleTabPress and remove passive flag onKeyDown  
							
							 
							
							
							
						 
						
							2015-12-23 13:48:44 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								b80015c69c 
								
							
								 
							
						 
						
							
							
								
								More comments; remove redundant if statement  
							
							 
							
							
							
						 
						
							2015-12-23 13:33:44 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								1af5018597 
								
							
								 
							
						 
						
							
							
								
								General code cleanup / tweaks / fixes  
							
							 
							
							... 
							
							
							
							- Swap Phases enum to be using string literals
- Swap roomId prop on UserSettings for a more sane onUserSettingsClose and
  make MatrixChat responsible for swapping the room.
- s/then/done/ when terminating Promise chains to avoid subtle errors.
- Rejig render() of UserSettings so we don't need to indent quite so much. 
							
						 
						
							2015-12-23 11:47:56 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								095f82feee 
								
							
								 
							
						 
						
							
							
								
								Remove boolean returns  
							
							 
							
							
							
						 
						
							2015-12-23 10:35:54 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								7e1b107f4c 
								
							
								 
							
						 
						
							
							
								
								Review comments  
							
							 
							
							
							
						 
						
							2015-12-23 09:34:34 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								810e8993d6 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into kegan/tab-complete  
							
							 
							
							
							
						 
						
							2015-12-22 17:44:04 +00:00