6ec7e5df28 
								
							
								 
							
						 
						
							
							
								
								Move scalar auth stuff to ScalarAuthClient from RoomSettings  
							
							
							
						 
						
							2016-09-02 16:03:24 +01:00  
				
					
						
							
							
								 
						
							
							
								d3bc2b7df7 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #436  from matrix-org/rav/handle_broken_olm  
							
							... 
							
							
							
							Handle broken OlmAccounts 
							
						 
						
							2016-09-02 11:58:40 +01:00  
				
					
						
							
							
								 
						
							
							
								f3a1c58fa9 
								
							
								 
							
						 
						
							
							
								
								Handle broken OlmAccounts  
							
							... 
							
							
							
							olm 1.0.0 made broken OlmAccounts, which we may be unable to restore with olm
1.1.0. Add some words to that effect, and make sure we clear the localstorage. 
							
						 
						
							2016-09-02 11:28:04 +01:00  
				
					
						
							
							
								 
						
							
							
								584c7ed56d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'rav/show_session_load_errors' into develop  
							
							
							
						 
						
							2016-09-02 11:03:39 +01:00  
				
					
						
							
							
								 
						
							
							
								b4521bc44c 
								
							
								 
							
						 
						
							
							
								
								review feedback  
							
							
							
						 
						
							2016-09-01 22:45:09 +01:00  
				
					
						
							
							
								 
						
							
							
								1a4e236a50 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into develop  
							
							
							
						 
						
							2016-09-01 22:18:32 +01:00  
				
					
						
							
							
								 
						
							
							
								b9d98f918e 
								
							
								 
							
						 
						
							
							
								
								0.6.5-r1  
							
							
							
						 
						
							2016-09-01 22:18:11 +01:00  
				
					
						
							
							
								 
						
							
							
								57ba49d896 
								
							
								 
							
						 
						
							
							
								
								Prepare changelog for v0.6.5-r1  
							
							
							
						 
						
							2016-09-01 22:18:10 +01:00  
				
					
						
							
							
								 
						
							
							
								1586e5bd6f 
								
							
								 
							
						 
						
							
							
								
								fix guest access; broken since Aug 18  
							
							
							
						 
						
							2016-09-01 22:16:55 +01:00  
				
					
						
							
							
								 
						
							
							
								1bc26cb6c5 
								
							
								 
							
						 
						
							
							
								
								fix guest access; broken since Aug 18  
							
							
							
						 
						
							2016-09-01 16:58:37 +01:00  
				
					
						
							
							
								 
						
							
							
								031daf7b3c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #434  from matrix-org/matthew/uninterrupted-audio  
							
							... 
							
							
							
							use a top-level audio tag for playing all VoIP audio. 
							
						 
						
							2016-09-01 16:12:37 +01:00  
				
					
						
							
							
								 
						
							
							
								f0d5f42921 
								
							
								 
							
						 
						
							
							
								
								whine loudly if remoteAudio element is missing  
							
							
							
						 
						
							2016-09-01 13:58:26 +01:00  
				
					
						
							
							
								 
						
							
							
								ba341c11fb 
								
							
								 
							
						 
						
							
							
								
								Show session restore errors on the login screen  
							
							... 
							
							
							
							If we are unable to load the matrix session on startup, don't just get stuck at
a spinner; instead, show the error on the login screen. 
							
						 
						
							2016-09-01 11:08:40 +01:00  
				
					
						
							
							
								 
						
							
							
								4829ac0c4d 
								
							
								 
							
						 
						
							
							
								
								comment  
							
							
							
						 
						
							2016-09-01 11:07:46 +01:00  
				
					
						
							
							
								 
						
							
							
								a23d8e313d 
								
							
								 
							
						 
						
							
							
								
								show ongoing audio call in LeftPanel  
							
							
							
						 
						
							2016-09-01 00:13:32 +01:00  
				
					
						
							
							
								 
						
							
							
								6c4ad49b78 
								
							
								 
							
						 
						
							
							
								
								use a top-level audio tag for playing all VoIP audio.\n\nfixes  https://github.com/vector-im/vector-web/issues/1271  and  https://github.com/vector-im/vector-web/issues/621  
							
							
							
						 
						
							2016-08-31 21:50:46 +01:00  
				
					
						
							
							
								 
						
							
							
								dae250b3a3 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #433  from matrix-org/matthew/audio-promises  
							
							... 
							
							
							
							use promises to mediate access to HTMLAudioElements 
							
						 
						
							2016-08-31 21:00:36 +01:00  
				
					
						
							
							
								 
						
							
							
								35fff74477 
								
							
								 
							
						 
						
							
							
								
								oops, typo  
							
							
							
						 
						
							2016-08-31 17:25:41 +01:00  
				
					
						
							
							
								 
						
							
							
								516369fb07 
								
							
								 
							
						 
						
							
							
								
								use promises to mediate access to HTMLAudioElements  
							
							
							
						 
						
							2016-08-31 16:38:37 +01:00  
				
					
						
							
							
								 
						
							
							
								5543c126e6 
								
							
								 
							
						 
						
							
							
								
								fix tests  
							
							
							
						 
						
							2016-08-30 15:22:52 +01:00  
				
					
						
							
							
								 
						
							
							
								3b2faa4cf9 
								
							
								 
							
						 
						
							
							
								
								pin to dev  
							
							
							
						 
						
							2016-08-30 13:54:35 +01:00  
				
					
						
							
							
								 
						
							
							
								7a2b7b5b66 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #432  from matrix-org/wmwragg/direct-chat-sublist  
							
							... 
							
							
							
							Wmwragg/direct chat sublist 
							
						 
						
							2016-08-30 12:56:31 +01:00  
				
					
						
							
							
								 
						
							
							
								c30ff57c62 
								
							
								 
							
						 
						
							
							
								
								Better comments  
							
							
							
						 
						
							2016-08-30 12:29:25 +01:00  
				
					
						
							
							
								 
						
							
							
								8061a2f279 
								
							
								 
							
						 
						
							
							
								
								Fixed historical scetion not scrolling up when clicked if not hidden and stuck  
							
							
							
						 
						
							2016-08-30 11:55:51 +01:00  
				
					
						
							
							
								 
						
							
							
								769e7d3b2e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into wmwragg/direct-chat-sublist  
							
							
							
						 
						
							2016-08-30 11:19:54 +01:00  
				
					
						
							
							
								 
						
							
							
								83c4fd4b2f 
								
							
								 
							
						 
						
							
							
								
								Code clean up, and better comments  
							
							
							
						 
						
							2016-08-30 10:45:17 +01:00  
				
					
						
							
							
								 
						
							
							
								2b1ed707c4 
								
							
								 
							
						 
						
							
							
								
								Better comments, and correct bottom header sticky calc to allow clicking  
							
							
							
						 
						
							2016-08-28 19:18:41 +01:00  
				
					
						
							
							
								 
						
							
							
								90cfb06ba3 
								
							
								 
							
						 
						
							
							
								
								0.6.5  
							
							
							
						 
						
							2016-08-28 16:55:04 +01:00  
				
					
						
							
							
								 
						
							
							
								4e169f8e00 
								
							
								 
							
						 
						
							
							
								
								Prepare changelog for v0.6.5  
							
							
							
						 
						
							2016-08-28 16:55:04 +01:00  
				
					
						
							
							
								 
						
							
							
								3dd337b553 
								
							
								 
							
						 
						
							
							
								
								dep on 0.5.6 of matrix-js-sdk  
							
							
							
						 
						
							2016-08-28 16:51:51 +01:00  
				
					
						
							
							
								 
						
							
							
								123d9b56c8 
								
							
								 
							
						 
						
							
							
								
								calculating the scrollAreaHeight correctly taking into account the different scroll methods available on macOSX, i.e. System Preferences>General>Show Scroll Bars  
							
							
							
						 
						
							2016-08-28 16:25:20 +01:00  
				
					
						
							
							
								 
						
							
							
								5e105e1be6 
								
							
								 
							
						 
						
							
							
								
								make /user URLs work  
							
							
							
						 
						
							2016-08-28 14:04:11 +01:00  
				
					
						
							
							
								 
						
							
							
								8f7d3394e6 
								
							
								 
							
						 
						
							
							
								
								Always setup stickies, even if we aren't going to use them so that the following map can fire  
							
							
							
						 
						
							2016-08-28 12:02:20 +01:00  
				
					
						
							
							
								 
						
							
							
								cd07907392 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #431  from aviraldg/fix-emojione-sizing  
							
							... 
							
							
							
							fix emojione sizing 
							
						 
						
							2016-08-28 11:55:14 +01:00  
				
					
						
							
							
								 
						
							
							
								7631539584 
								
							
								 
							
						 
						
							
							
								
								Fixed incorrect init calculation of originalPosition attribute  
							
							
							
						 
						
							2016-08-28 11:39:47 +01:00  
				
					
						
							
							
								 
						
							
							
								7c6b1703f3 
								
							
								 
							
						 
						
							
							
								
								fix emojione sizing  
							
							
							
						 
						
							2016-08-28 14:54:07 +05:30  
				
					
						
							
							
								 
						
							
							
								18436e1257 
								
							
								 
							
						 
						
							
							
								
								pick up ! matrix.to URLs  
							
							
							
						 
						
							2016-08-28 02:12:18 +01:00  
				
					
						
							
							
								 
						
							
							
								de82ac3bc0 
								
							
								 
							
						 
						
							
							
								
								don't change URL bar when clicking on linkified rooms or users.  
							
							... 
							
							
							
							be aware of /user paths. 
							
						 
						
							2016-08-28 02:05:31 +01:00  
				
					
						
							
							
								 
						
							
							
								ad873c2b60 
								
							
								 
							
						 
						
							
							
								
								handle matrix.to links correctly. add partial support for #/user URLs  
							
							
							
						 
						
							2016-08-28 01:55:42 +01:00  
				
					
						
							
							
								 
						
							
							
								50d09f73f5 
								
							
								 
							
						 
						
							
							
								
								add leave/forget button to RoomSettings  
							
							
							
						 
						
							2016-08-28 00:00:22 +01:00  
				
					
						
							
							
								 
						
							
							
								fb5f8294c8 
								
							
								 
							
						 
						
							
							
								
								switch to namespaced CSS  
							
							
							
						 
						
							2016-08-28 00:00:10 +01:00  
				
					
						
							
							
								 
						
							
							
								5b0d13c1fc 
								
							
								 
							
						 
						
							
							
								
								switch to namespaced CSS  
							
							
							
						 
						
							2016-08-27 23:59:55 +01:00  
				
					
						
							
							
								 
						
							
							
								5df98d70f4 
								
							
								 
							
						 
						
							
							
								
								add debugging to MemberAvatar to try to kick jenkins...  
							
							
							
						 
						
							2016-08-27 01:18:48 +01:00  
				
					
						
							
							
								 
						
							
							
								73dd05b01d 
								
							
								 
							
						 
						
							
							
								
								Corrected incorrect offset from top of window for the scrollArea  
							
							
							
						 
						
							2016-08-26 18:31:02 +01:00  
				
					
						
							
							
								 
						
							
							
								8ccb1d482a 
								
							
								 
							
						 
						
							
							
								
								Better comments, and adjusted the top sticky logic, so that the very top header isn't allways stuck  
							
							
							
						 
						
							2016-08-26 15:52:57 +01:00  
				
					
						
							
							
								 
						
							
							
								5f9c794f0c 
								
							
								 
							
						 
						
							
							
								
								Tweaking autoscroll to only adjust if header stuck at top and not at bottom  
							
							
							
						 
						
							2016-08-26 15:36:16 +01:00  
				
					
						
							
							
								 
						
							
							
								b9e95865af 
								
							
								 
							
						 
						
							
							
								
								Click on stuck header scrolls to that header, collapses expands for none stuck header  
							
							
							
						 
						
							2016-08-26 15:09:13 +01:00  
				
					
						
							
							
								 
						
							
							
								71e829fd32 
								
							
								 
							
						 
						
							
							
								
								Getting click to not collapse expand when header is stuck  
							
							
							
						 
						
							2016-08-26 14:36:39 +01:00  
				
					
						
							
							
								 
						
							
							
								774e24a3b4 
								
							
								 
							
						 
						
							
							
								
								Added some logic to turn off sticky headers when the scroll area isn't large enough to support them  
							
							
							
						 
						
							2016-08-26 11:01:04 +01:00  
				
					
						
							
							
								 
						
							
							
								c8c2f733e2 
								
							
								 
							
						 
						
							
							
								
								Re-calculate sticky header positions when sublist header is clicked  
							
							
							
						 
						
							2016-08-26 09:56:07 +01:00