030652f289 
								
							
								 
							
						 
						
							
							
								
								Add removeLisatener for account data listener  
							
							
							
						 
						
							2016-07-21 13:49:31 +01:00  
				
					
						
							
							
								 
						
							
							
								46a2c74d71 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #358  from matrix-org/rav/device_id_for_register  
							
							... 
							
							
							
							Set the device_id on pre-login MatrixClient 
							
						 
						
							2016-07-21 13:15:39 +01:00  
				
					
						
							
							
								 
						
							
							
								e41df245c3 
								
							
								 
							
						 
						
							
							
								
								Set the device_id on pre-login MatrixClient  
							
							... 
							
							
							
							In order that device_id is set when we register a new user (or, for that
matter, when we register as a guest), we need to make sure that device_id is
set on the temporary MatrixClient which is created before the user is logged
in - ie, that created by replaceUsingUrls.
In order to achieve this, I've basically removed the distinction between
replaceUsingAccessToken and replaceUsingUrls. There is a side-effect in that
the temporary MatrixClient now gets an e2e sessionStore, but I don't think that
is a bad thing. 
							
						 
						
							2016-07-20 20:20:10 +01:00  
				
					
						
							
							
								 
						
							
							
								165b0810cc 
								
							
								 
							
						 
						
							
							
								
								remove debug  
							
							
							
						 
						
							2016-07-20 18:17:09 +01:00  
				
					
						
							
							
								 
						
							
							
								bc87fc575b 
								
							
								 
							
						 
						
							
							
								
								remove debug  
							
							
							
						 
						
							2016-07-20 18:16:54 +01:00  
				
					
						
							
							
								 
						
							
							
								d6415aceca 
								
							
								 
							
						 
						
							
							
								
								handle accountData changes, and errors on toggling URL previews  
							
							
							
						 
						
							2016-07-20 18:14:16 +01:00  
				
					
						
							
							
								 
						
							
							
								9babf3f92f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #357  from matrix-org/wmwragg/mention-state-indicator-round-2  
							
							... 
							
							
							
							Wmwragg/mention state indicator round 2 
							
						 
						
							2016-07-20 18:01:59 +01:00  
				
					
						
							
							
								 
						
							
							
								ffa43ebb96 
								
							
								 
							
						 
						
							
							
								
								badge content when hovered is now kerned via the CSS  
							
							
							
						 
						
							2016-07-20 17:12:41 +01:00  
				
					
						
							
							
								 
						
							
							
								fb964be072 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #356  from matrix-org/matthew/disable-url-previews  
							
							... 
							
							
							
							Support for disabling/enabling URL previews per-user, per-room and per-user-per-room 
							
						 
						
							2016-07-20 16:43:08 +01:00  
				
					
						
							
							
								 
						
							
							
								02e2ade7d9 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #336  from matrix-org/dbkr/add_email_fail_if_in_use  
							
							... 
							
							
							
							Use HS proxy API for requestToken on adding email 
							
						 
						
							2016-07-20 14:05:58 +01:00  
				
					
						
							
							
								 
						
							
							
								ae7e51ae17 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #337  from matrix-org/dbkr/password_reset_email_not_found  
							
							... 
							
							
							
							Error if email already in use when resetting pw 
							
						 
						
							2016-07-20 14:00:12 +01:00  
				
					
						
							
							
								 
						
							
							
								3efd805243 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #355  from matrix-org/dbkr/fix_massive_video  
							
							... 
							
							
							
							Fix enourmous video bug 
							
						 
						
							2016-07-20 13:42:03 +01:00  
				
					
						
							
							
								 
						
							
							
								33edb1dea9 
								
							
								 
							
						 
						
							
							
								
								Made the badge always exist, but if no unread mesasges available then has a different class  
							
							
							
						 
						
							2016-07-20 12:47:32 +01:00  
				
					
						
							
							
								 
						
							
							
								1365f18829 
								
							
								 
							
						 
						
							
							
								
								many stupid thinkos and bugfixes; make it work  
							
							
							
						 
						
							2016-07-20 12:03:13 +01:00  
				
					
						
							
							
								 
						
							
							
								d6df3682f2 
								
							
								 
							
						 
						
							
							
								
								Fix enourmous video bug  
							
							
							
						 
						
							2016-07-20 11:58:49 +01:00  
				
					
						
							
							
								 
						
							
							
								2190dcbe1e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #354  from Half-Shot/develop  
							
							... 
							
							
							
							Add support for sending uploaded content as m.video 
							
						 
						
							2016-07-20 11:15:38 +01:00  
				
					
						
							
							
								 
						
							
							
								514bc2cd51 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #341  from matrix-org/dbkr/tab_complete_most_recently_spoke  
							
							... 
							
							
							
							Order tab complete by most recently spoke 
							
						 
						
							2016-07-19 18:02:09 +01:00  
				
					
						
							
							
								 
						
							
							
								4bd2b93f59 
								
							
								 
							
						 
						
							
							
								
								Add support for sending uploaded content as m.video  
							
							
							
						 
						
							2016-07-19 16:05:15 +01:00  
				
					
						
							
							
								 
						
							
							
								1ba0ef7369 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #350  from matrix-org/wmwragg/spinner-fix  
							
							... 
							
							
							
							Wmwragg/spinner fix 
							
						 
						
							2016-07-19 12:10:31 +01:00  
				
					
						
							
							
								 
						
							
							
								c1fd2f888f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #352  from matrix-org/wmwragg/mention-state-indicator  
							
							... 
							
							
							
							Now showing three dots when hovering over the badge 
							
						 
						
							2016-07-19 11:12:42 +01:00  
				
					
						
							
							
								 
						
							
							
								1a2546c939 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #351  from matrix-org/dbkr/fix_directory_unpublish  
							
							... 
							
							
							
							Fix unpublishing room in room settings 
							
						 
						
							2016-07-18 16:28:39 +01:00  
				
					
						
							
							
								 
						
							
							
								9e4511b8eb 
								
							
								 
							
						 
						
							
							
								
								Now showing three dots when hovering over the badge  
							
							
							
						 
						
							2016-07-18 16:10:07 +01:00  
				
					
						
							
							
								 
						
							
							
								ffaf7f44f3 
								
							
								 
							
						 
						
							
							
								
								typos  
							
							
							
						 
						
							2016-07-18 15:36:19 +01:00  
				
					
						
							
							
								 
						
							
							
								743f79a9a7 
								
							
								 
							
						 
						
							
							
								
								Fix unpublishing room in room settings  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/vector-web/issues/1743  
							
						 
						
							2016-07-18 15:22:08 +01:00  
				
					
						
							
							
								 
						
							
							
								6bf5499289 
								
							
								 
							
						 
						
							
							
								
								typos  
							
							
							
						 
						
							2016-07-18 10:47:03 +01:00  
				
					
						
							
							
								 
						
							
							
								e92024f7a9 
								
							
								 
							
						 
						
							
							
								
								reskindex  
							
							
							
						 
						
							2016-07-18 10:42:18 +01:00  
				
					
						
							
							
								 
						
							
							
								2b7ade9ef5 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #347  from matrix-org/matthew/fix-race-on-new-room-invitelist  
							
							... 
							
							
							
							Fix race when creating rooms where invite list can be blank 
							
						 
						
							2016-07-18 10:37:05 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								f13bb5f656 
								
							
								 
							
						 
						
							
							
								
								typos  
							
							
							
						 
						
							2016-07-18 01:39:24 +01:00  
				
					
						
							
							
								 
						
							
							
								ebdac4ee50 
								
							
								 
							
						 
						
							
							
								
								first cut (untested)  
							
							
							
						 
						
							2016-07-18 01:35:42 +01:00  
				
					
						
							
							
								 
						
							
							
								bcd1c7e099 
								
							
								 
							
						 
						
							
							
								
								improve comment  
							
							
							
						 
						
							2016-07-18 01:34:26 +01:00  
				
					
						
							
							
								 
						
							
							
								a385955c6b 
								
							
								 
							
						 
						
							
							
								
								Fixed MatrixChat Dialog Spinner. Still needs testing, unsure what triggers it.  
							
							
							
						 
						
							2016-07-17 21:23:52 +01:00  
				
					
						
							
							
								 
						
							
							
								1559c69ddf 
								
							
								 
							
						 
						
							
							
								
								Create room Dialog Spinner fix.  
							
							
							
						 
						
							2016-07-17 21:21:27 +01:00  
				
					
						
							
							
								 
						
							
							
								8d749be51f 
								
							
								 
							
						 
						
							
							
								
								fix potential bug where canonical alias setting is broken (modulo autoheisting)  
							
							
							
						 
						
							2016-07-17 20:36:53 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								999c52b650 
								
							
								 
							
						 
						
							
							
								
								fix comment  
							
							
							
						 
						
							2016-07-17 19:00:22 +01:00  
				
					
						
							
							
								 
						
							
							
								0553d806d7 
								
							
								 
							
						 
						
							
							
								
								stop re-invites  
							
							
							
						 
						
							2016-07-17 18:40:54 +01:00  
				
					
						
							
							
								 
						
							
							
								2bc9dd4307 
								
							
								 
							
						 
						
							
							
								
								hopefully  fix   vector-im/vector-web#1813  
							
							
							
						 
						
							2016-07-17 18:32:48 +01:00  
				
					
						
							
							
								 
						
							
							
								bfe50c209c 
								
							
								 
							
						 
						
							
							
								
								fix typo in comment  
							
							
							
						 
						
							2016-07-16 22:49:42 +01:00  
				
					
						
							
							
								 
						
							
							
								5c566cae5c 
								
							
								 
							
						 
						
							
							
								
								typo  
							
							
							
						 
						
							2016-07-15 18:10:56 +01:00  
				
					
						
							
							
								 
						
							
							
								ccf8e269cd 
								
							
								 
							
						 
						
							
							
								
								Comments & required props  
							
							
							
						 
						
							2016-07-15 17:15:51 +01:00  
				
					
						
							
							
								 
						
							
							
								327015ba0f 
								
							
								 
							
						 
						
							
							
								
								Tidy up autocomplete updating  
							
							... 
							
							
							
							..into a function 
							
						 
						
							2016-07-15 17:03:53 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								a61168d943 
								
							
								 
							
						 
						
							
							
								
								Revert "Amends react template and removes opening image in lightbox"  
							
							
							
						 
						
							2016-07-15 16:54:56 +01:00  
				
					
						
							
							
								 
						
							
							
								7d712d06a1 
								
							
								 
							
						 
						
							
							
								
								Move code to make diff less confusing  
							
							
							
						 
						
							2016-07-15 16:14:05 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								41bff38713 
								
							
								 
							
						 
						
							
							
								
								fix classes used for body spans, and only apply markdown-body to markdown(!)  
							
							
							
						 
						
							2016-07-15 15:04:19 +01:00  
				
					
						
							
							
								 
						
							
							
								ca5987bf6c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #345  from matrix-org/wmwragg/modal-restyle  
							
							... 
							
							
							
							Wmwragg/modal restyle 
							
						 
						
							2016-07-15 14:05:22 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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