91ec96c8d3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into bwindels/redesign  
							
							
							
						 
						
							2018-09-21 12:44:44 +02:00  
				
					
						
							
							
								 
						
							
							
								f507aac3d5 
								
							
								 
							
						 
						
							
							
								
								Show if recovery key is valid  
							
							
							
						 
						
							2018-09-17 17:05:29 +01:00  
				
					
						
							
							
								 
						
							
							
								d94553bafc 
								
							
								 
							
						 
						
							
							
								
								UI for whether the key backup is enabled or not  
							
							
							
						 
						
							2018-09-14 17:08:02 +01:00  
				
					
						
							
							
								 
						
							
							
								292b1f09af 
								
							
								 
							
						 
						
							
							
								
								WIP e2e key backups  
							
							... 
							
							
							
							Continues from Matthew's work: adds a feature flag & panel in
user settings to create a backup.
Can't restore a backup yet, nor even continue backing up to the same
backup after a refresh. 
							
						 
						
							2018-09-13 17:11:46 +01:00  
				
					
						
							
							
								 
						
							
							
								c40ac49b2a 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/roomcreate  
							
							
							
						 
						
							2018-08-29 18:18:08 +01:00  
				
					
						
							
							
								 
						
							
							
								ab10b5493b 
								
							
								 
							
						 
						
							
							
								
								Support room creation events  
							
							... 
							
							
							
							For https://github.com/vector-im/riot-web/issues/7164  
							
						 
						
							2018-08-20 16:20:59 +01:00  
				
					
						
							
							
								 
						
							
							
								9f19896df0 
								
							
								 
							
						 
						
							
							
								
								Support for room upgrades  
							
							... 
							
							
							
							* Show when a room upgrade is needed
 * Dialog box to perform the upgrade 
							
						 
						
							2018-08-17 14:54:43 +01:00  
				
					
						
							
							
								 
						
							
							
								9783b6100d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into matthew/dharma  
							
							
							
						 
						
							2018-07-29 17:03:23 +01:00  
				
					
						
							
							
								 
						
							
							
								7225f7372c 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert " make click to insert nick work on join/parts, /me's etc"  
							
							
							
						 
						
							2018-07-03 10:30:08 +01:00  
				
					
						
							
							
								 
						
							
							
								6021c3a634 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/click_username_state_ev  
							
							
							
						 
						
							2018-06-29 14:56:18 +01:00  
				
					
						
							
							
								 
						
							
							
								e3c455e599 
								
									
								
							
								 
							
						 
						
							
							
								
								Style the ShareDialog  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-06-12 11:22:01 +01:00  
				
					
						
							
							
								 
						
							
							
								c91e6cb530 
								
									
								
							
								 
							
						 
						
							
							
								
								make click to insert nick work on join/parts, /me's etc  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-06-07 01:02:34 +01:00  
				
					
						
							
							
								 
						
							
							
								3bf28a08ec 
								
							
								 
							
						 
						
							
							
								
								experiments in dharma  
							
							
							
						 
						
							2018-05-25 03:17:29 +01:00  
				
					
						
							
							
								 
						
							
							
								dca1217a45 
								
							
								 
							
						 
						
							
							
								
								Change wording and appearance of Deactivate Account dialog  
							
							
							
						 
						
							2018-05-24 11:50:45 +01:00  
				
					
						
							
							
								 
						
							
							
								06408f843b 
								
									
								
							
								 
							
						 
						
							
							
								
								post BigMerge fixup - merge in stuff from riot-web PR  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-04-20 09:23:27 +01:00  
				
					
						
							
							
								 
						
							
							
								46f5c0d205 
								
							
								 
							
						 
						
							
							
								
								finish merging  vector-im/riot-web#5881  into matrix-react-sdk  
							
							
							
						 
						
							2018-04-16 01:13:03 +01:00  
				
					
						
							
							
								 
						
							
							
								5d03eabb15 
								
							
								 
							
						 
						
							
							
								
								rethemedex  
							
							
							
						 
						
							2018-04-13 00:54:41 +01:00  
				
					
						
							
							
								 
						
							
							
								79d3cca6e9 
								
							
								 
							
						 
						
							
							
								
								move components' CSS to be in the same repo as their JS  
							
							
							
						 
						
							2018-04-12 00:23:58 +01:00