David Baker
							
						 
						
							 
							
							
							
								
							
								37402c0071 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #348  from matrix-org/matthew/improve-start-chat-wording  
							
							 
							
							... 
							
							
							
							improve wording of MemberInfo's start chat button. 
							
						 
						
							2016-07-18 10:34:37 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								f13bb5f656 
								
							
								 
							
						 
						
							
							
								
								typos  
							
							 
							
							
							
						 
						
							2016-07-18 01:39:24 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								ebdac4ee50 
								
							
								 
							
						 
						
							
							
								
								first cut (untested)  
							
							 
							
							
							
						 
						
							2016-07-18 01:35:42 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								bcd1c7e099 
								
							
								 
							
						 
						
							
							
								
								improve comment  
							
							 
							
							
							
						 
						
							2016-07-18 01:34:26 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								a385955c6b 
								
							
								 
							
						 
						
							
							
								
								Fixed MatrixChat Dialog Spinner. Still needs testing, unsure what triggers it.  
							
							 
							
							
							
						 
						
							2016-07-17 21:23:52 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								1559c69ddf 
								
							
								 
							
						 
						
							
							
								
								Create room Dialog Spinner fix.  
							
							 
							
							
							
						 
						
							2016-07-17 21:21:27 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								8d749be51f 
								
							
								 
							
						 
						
							
							
								
								fix potential bug where canonical alias setting is broken (modulo autoheisting)  
							
							 
							
							
							
						 
						
							2016-07-17 20:36:53 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								554a6ff035 
								
							
								 
							
						 
						
							
							
								
								improve wording of MemberInfo's start chat button. Fixes  https://github.com/vector-im/vector-web/issues/689  and clarifies  https://github.com/matrix-org/matrix-react-sdk/issues/328  
							
							 
							
							
							
						 
						
							2016-07-17 19:41:53 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								999c52b650 
								
							
								 
							
						 
						
							
							
								
								fix comment  
							
							 
							
							
							
						 
						
							2016-07-17 19:00:22 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								0553d806d7 
								
							
								 
							
						 
						
							
							
								
								stop re-invites  
							
							 
							
							
							
						 
						
							2016-07-17 18:40:54 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								2bc9dd4307 
								
							
								 
							
						 
						
							
							
								
								hopefully  fix   vector-im/vector-web#1813  
							
							 
							
							
							
						 
						
							2016-07-17 18:32:48 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								bfe50c209c 
								
							
								 
							
						 
						
							
							
								
								fix typo in comment  
							
							 
							
							
							
						 
						
							2016-07-16 22:49:42 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								5c566cae5c 
								
							
								 
							
						 
						
							
							
								
								typo  
							
							 
							
							
							
						 
						
							2016-07-15 18:10:56 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								ccf8e269cd 
								
							
								 
							
						 
						
							
							
								
								Comments & required props  
							
							 
							
							
							
						 
						
							2016-07-15 17:15:51 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								327015ba0f 
								
							
								 
							
						 
						
							
							
								
								Tidy up autocomplete updating  
							
							 
							
							... 
							
							
							
							..into a function 
							
						 
						
							2016-07-15 17:03:53 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								16665b9ca3 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #346  from matrix-org/revert-343-feature-inline-link-preview  
							
							 
							
							... 
							
							
							
							Revert "Amends react template and removes opening image in lightbox" 
							
						 
						
							2016-07-15 16:55:05 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								a61168d943 
								
							
								 
							
						 
						
							
							
								
								Revert "Amends react template and removes opening image in lightbox"  
							
							 
							
							
							
						 
						
							2016-07-15 16:54:56 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								7d712d06a1 
								
							
								 
							
						 
						
							
							
								
								Move code to make diff less confusing  
							
							 
							
							
							
						 
						
							2016-07-15 16:14:05 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								d5bed78a54 
								
							
								 
							
						 
						
							
							
								
								Rejig tab complete to make it faster  
							
							 
							
							... 
							
							
							
							Now do a lot less when people speak. Also move more of the tab completion logic into TabComplete.js and out of RoomView. 
							
						 
						
							2016-07-15 16:10:27 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								41bff38713 
								
							
								 
							
						 
						
							
							
								
								fix classes used for body spans, and only apply markdown-body to markdown(!)  
							
							 
							
							
							
						 
						
							2016-07-15 15:04:19 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								ca5987bf6c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #345  from matrix-org/wmwragg/modal-restyle  
							
							 
							
							... 
							
							
							
							Wmwragg/modal restyle 
							
						 
						
							2016-07-15 14:05:22 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								78b7d04710 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #343  from ribot/feature-inline-link-preview  
							
							 
							
							... 
							
							
							
							Amends react template and removes opening image in lightbox 
							
						 
						
							2016-07-15 13:55:07 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								febd2110c5 
								
							
								 
							
						 
						
							
							
								
								Updated all dialogs to define their primary button, I've selected the one that had been specified for focus, but the primary button isn't dependent on focus, it's a UX feature  
							
							 
							
							
							
						 
						
							2016-07-15 11:23:58 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								8144b894f7 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #344  from matrix-org/dbkr/remove_initial_memberlist_load_hack  
							
							 
							
							... 
							
							
							
							Remove the member list loading hack 
							
						 
						
							2016-07-14 18:50:52 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								3abdb83d16 
								
							
								 
							
						 
						
							
							
								
								Remove now-unused limit param to roomMembers()  
							
							 
							
							
							
						 
						
							2016-07-14 18:40:43 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								743cb4b777 
								
							
								 
							
						 
						
							
							
								
								Remove the member list loading hack  
							
							 
							
							... 
							
							
							
							Now the memberlist os a truncated list it at-best makes no difference and may be marginally slowing us down. 
							
						 
						
							2016-07-14 18:37:57 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2e776f540e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #342  from matrix-org/dbkr/offline_user_colour  
							
							 
							
							... 
							
							
							
							CSS classes to colour offline users differently 
							
						 
						
							2016-07-14 18:29:24 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								9fd0ea1e32 
								
							
								 
							
						 
						
							
							
								
								More variable case  
							
							 
							
							
							
						 
						
							2016-07-14 18:18:44 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2fd690ea2b 
								
							
								 
							
						 
						
							
							
								
								Oops, removed the pure offline class  
							
							 
							
							
							
						 
						
							2016-07-14 18:13:54 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								7c1b4f4fc9 
								
							
								 
							
						 
						
							
							
								
								Obey my own code style  
							
							 
							
							
							
						 
						
							2016-07-14 18:13:15 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a49a545161 
								
							
								 
							
						 
						
							
							
								
								CSS classes to colour offline users differently  
							
							 
							
							... 
							
							
							
							So we can use the same 66% opacity as idle tiles for offline-with-last-active-time to reduce the visual jarring 
							
						 
						
							2016-07-14 17:41:07 +01:00  
						
					 
				
					
						
							
							
								 
								Stefan Pearson
							
						 
						
							 
							
							
							
								
							
								cad057ef34 
								
							
								 
							
						 
						
							
							
								
								amends react template and removes opening image in lightbox  
							
							 
							
							
							
						 
						
							2016-07-14 17:12:17 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								f1d72296b7 
								
							
								 
							
						 
						
							
							
								
								Fix last-spoke order  
							
							 
							
							... 
							
							
							
							Turns out this timeline is the other way around, so loop through the other way 
							
						 
						
							2016-07-14 14:06:31 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								fd5d28768a 
								
							
								 
							
						 
						
							
							
								
								Simplification of the css  
							
							 
							
							
							
						 
						
							2016-07-14 12:05:00 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								f6302fc990 
								
							
								 
							
						 
						
							
							
								
								Updated the search button, and simplified the leave css  
							
							 
							
							
							
						 
						
							2016-07-14 11:43:33 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2ce521fe38 
								
							
								 
							
						 
						
							
							
								
								Fix null error in TabComplete  
							
							 
							
							... 
							
							
							
							.sende ris sometimes null: use getSender() which isn't and returns the userId which is what we actually want 
							
						 
						
							2016-07-14 11:40:17 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								0dde891d4c 
								
							
								 
							
						 
						
							
							
								
								Order tab complete by most recently spoke  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/vector-im/vector-web/issues/1741  
							
						 
						
							2016-07-14 11:25:45 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a5272542ef 
								
							
								 
							
						 
						
							
							
								
								Lengthen timelinepanel test timeout again  
							
							 
							
							... 
							
							
							
							It's now hitting this timeout on the jenkins box instead of the browser disconnect timeout 
							
						 
						
							2016-07-14 10:40:12 +01:00  
						
					 
				
					
						
							
							
								 
								Kegsay
							
						 
						
							 
							
							
							
								
							
								20210e7104 
								
							
								 
							
						 
						
							
							
								
								Log scrollTop and scrollHeight to try to debug flakey test  
							
							 
							
							... 
							
							
							
							Sometimes it fails because awaitScroll() on :277 isn't resolving because onScroll isn't firing. We need to know if this is because we aren't changing scrollTop 
							
						 
						
							2016-07-14 10:38:24 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								ec70a08b93 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #340  from matrix-org/dbkr/memberlist_listen_all_presence  
							
							 
							
							... 
							
							
							
							Listen for the new lastPreseceTs event 
							
						 
						
							2016-07-14 10:36:08 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2d6d734571 
								
							
								 
							
						 
						
							
							
								
								Listen for the new lastPreseceTs event  
							
							 
							
							... 
							
							
							
							This will catch all presence events as previously we were only listening for the actual presence string changing 
							
						 
						
							2016-07-14 10:05:40 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								7f00053f84 
								
							
								 
							
						 
						
							
							
								
								Footer upload icon updated to new vesrion  
							
							 
							
							
							
						 
						
							2016-07-13 17:46:56 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								936a38a9f4 
								
							
								 
							
						 
						
							
							
								
								Updated and moved the room header settings icon  
							
							 
							
							
							
						 
						
							2016-07-13 16:02:18 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								95529df7a3 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #339  from matrix-org/dbkr/search_by_user_id  
							
							 
							
							... 
							
							
							
							Fix filtering user list by ID 
							
						 
						
							2016-07-13 13:17:22 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								6b03f72474 
								
							
								 
							
						 
						
							
							
								
								Fix filtering user list by ID  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/vector-im/vector-web/issues/1739  
							
						 
						
							2016-07-13 11:56:01 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								da8f7df262 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #338  from matrix-org/dbkr/fix_tab_complete_on_load  
							
							 
							
							... 
							
							
							
							Update tab completion list when we have a room 
							
						 
						
							2016-07-12 18:58:39 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								ac58520b3b 
								
							
								 
							
						 
						
							
							
								
								Update tab completion list when we have a room  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/vector-im/vector-web/issues/1737  
							
						 
						
							2016-07-12 18:30:37 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								a8677b52ad 
								
							
								 
							
						 
						
							
							
								
								major update to dev guidelines  
							
							 
							
							
							
						 
						
							2016-07-11 18:26:16 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								e00f3d9334 
								
							
								 
							
						 
						
							
							
								
								Mark code blocks as javascript  
							
							 
							
							
							
						 
						
							2016-07-11 16:28:41 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								513492e1bf 
								
							
								 
							
						 
						
							
							
								
								Change line length as per PR discussion  
							
							 
							
							
							
						 
						
							2016-07-11 16:27:17 +01:00