c0d2fe19ef 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #677  from matrix-org/rav/logging_for_send_fail  
							
							... 
							
							
							
							Logging to try to track down riot-web#3148 
							
						 
						
							2017-02-06 16:46:54 +00:00  
				
					
						
							
							
								 
						
							
							
								484d9d708e 
								
							
								 
							
						 
						
							
							
								
								Logging to try to track down riot-web#3148  
							
							... 
							
							
							
							Since I can't figure out how this is happening, add a shedload of logging to
try to pin it down. 
							
						 
						
							2017-02-06 16:01:25 +00:00  
				
					
						
							
							
								 
						
							
							
								77f76db68b 
								
							
								 
							
						 
						
							
							
								
								UserSettings: s/vector-web/riot-web/  
							
							... 
							
							
							
							vector is dead, long live riot 
							
						 
						
							2017-02-06 09:50:14 +00:00  
				
					
						
							
							
								 
						
							
							
								6d8dcd97af 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into develop  
							
							... 
							
							
							
							(Keep js-sdk on develop) 
							
						 
						
							2017-02-04 10:42:31 +00:00  
				
					
						
							
							
								 
						
							
							
								a9cd1bfd4b 
								
							
								 
							
						 
						
							
							
								
								v0.8.6  
							
							
							
						 
						
							2017-02-04 10:30:16 +00:00  
				
					
						
							
							
								 
						
							
							
								04bbf0a26b 
								
							
								 
							
						 
						
							
							
								
								Prepare changelog for v0.8.6  
							
							
							
						 
						
							2017-02-04 10:30:15 +00:00  
				
					
						
							
							
								 
						
							
							
								39488f294b 
								
							
								 
							
						 
						
							
							
								
								bump to js-sdk 0.7.5  
							
							
							
						 
						
							2017-02-04 10:23:56 +00:00  
				
					
						
							
							
								 
						
							
							
								19b0f956d2 
								
							
								 
							
						 
						
							
							
								
								v0.8.6-rc.3  
							
							
							
						 
						
							2017-02-03 15:32:37 +00:00  
				
					
						
							
							
								 
						
							
							
								aa164bf54c 
								
							
								 
							
						 
						
							
							
								
								Prepare changelog for v0.8.6-rc.3  
							
							
							
						 
						
							2017-02-03 15:32:37 +00:00  
				
					
						
							
							
								 
						
							
							
								c52ae8ff01 
								
							
								 
							
						 
						
							
							
								
								Bump to js-sdk 0.7.5-rc.3  
							
							
							
						 
						
							2017-02-03 15:28:03 +00:00  
				
					
						
							
							
								 
						
							
							
								1334e0ae0d 
								
							
								 
							
						 
						
							
							
								
								Prep changelog  
							
							
							
						 
						
							2017-02-03 15:27:51 +00:00  
				
					
						
							
							
								 
						
							
							
								fd0a66ab99 
								
							
								 
							
						 
						
							
							
								
								Unpin js-sdk  
							
							
							
						 
						
							2017-02-03 14:37:58 +00:00  
				
					
						
							
							
								 
						
							
							
								827b5a6811 
								
							
								 
							
						 
						
							
							
								
								Fix deviceverifybuttons  
							
							... 
							
							
							
							Use DeviceInfo from deviceVerificationChanged event rather than calling
non-existent getStoredDevice 
							
						 
						
							2017-02-03 14:34:19 +00:00  
				
					
						
							
							
								 
						
							
							
								41936a957f 
								
							
								 
							
						 
						
							
							
								
								v0.8.6-rc.2  
							
							
							
						 
						
							2017-02-03 13:07:11 +00:00  
				
					
						
							
							
								 
						
							
							
								08276aefa7 
								
							
								 
							
						 
						
							
							
								
								Prepare changelog for v0.8.6-rc.2  
							
							
							
						 
						
							2017-02-03 13:07:10 +00:00  
				
					
						
							
							
								 
						
							
							
								66e22d1d26 
								
							
								 
							
						 
						
							
							
								
								Bump js-sdk  
							
							
							
						 
						
							2017-02-03 13:04:42 +00:00  
				
					
						
							
							
								 
						
							
							
								bded0a7e8e 
								
							
								 
							
						 
						
							
							
								
								v0.8.6-rc.1  
							
							
							
						 
						
							2017-02-03 12:13:42 +00:00  
				
					
						
							
							
								 
						
							
							
								aa1a3db7fe 
								
							
								 
							
						 
						
							
							
								
								Prepare changelog for v0.8.6-rc.1  
							
							
							
						 
						
							2017-02-03 12:13:42 +00:00  
				
					
						
							
							
								 
						
							
							
								25876837f5 
								
							
								 
							
						 
						
							
							
								
								released js-sdk  
							
							
							
						 
						
							2017-02-03 12:11:24 +00:00  
				
					
						
							
							
								 
						
							
							
								5df5fed6f5 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #675  from matrix-org/dbkr/fix_timeline_notifs_empty  
							
							... 
							
							
							
							Fix timeline & notifs panel spuriously being empty 
							
						 
						
							2017-02-03 11:35:28 +00:00  
				
					
						
							
							
								 
						
							
							
								2b67c1245f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #636  from matrix-org/matthew/blacklist-unverified  
							
							... 
							
							
							
							UI for blacklisting unverified devices per-room & globally 
							
						 
						
							2017-02-03 11:32:24 +00:00  
				
					
						
							
							
								 
						
							
							
								3ea746db1d 
								
							
								 
							
						 
						
							
							
								
								Fix RoomSettings  
							
							... 
							
							
							
							Don't enable encryption unless the box is checked! 
							
						 
						
							2017-02-03 11:20:36 +00:00  
				
					
						
							
							
								 
						
							
							
								470e760e42 
								
							
								 
							
						 
						
							
							
								
								Fix timeline & notifs panel spuriously being empty  
							
							... 
							
							
							
							Only claim there's nothing to display once we've failed to back
paginate, otherwise we'll show the empty message instead of the
MessagePanel and therefore never try to back-paginate. 
							
						 
						
							2017-02-03 11:11:37 +00:00  
				
					
						
							
							
								 
						
							
							
								e018eef9fa 
								
							
								 
							
						 
						
							
							
								
								UnknownDeviceDialog.js: tweak warning  
							
							
							
						 
						
							2017-02-03 10:50:03 +00:00  
				
					
						
							
							
								 
						
							
							
								917be72965 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #674  from matrix-org/matthew/better-unk-error  
							
							... 
							
							
							
							Show better error message in statusbar after UnkDevDialog 
							
						 
						
							2017-02-03 09:38:19 +00:00  
				
					
						
							
							
								 
						
							
							
								28d28b55d1 
								
							
								 
							
						 
						
							
							
								
								correctly reflect verify/blacklist state in UI  
							
							
							
						 
						
							2017-02-03 01:49:22 +00:00  
				
					
						
							
							
								 
						
							
							
								5de84f845a 
								
							
								 
							
						 
						
							
							
								
								tweak verbiage  
							
							
							
						 
						
							2017-02-03 01:49:05 +00:00  
				
					
						
							
							
								 
						
							
							
								e825a4af3c 
								
							
								 
							
						 
						
							
							
								
								show better error msg after UnkDevDialog  
							
							... 
							
							
							
							should fix https://github.com/vector-im/riot-web/issues/3122  
							
						 
						
							2017-02-03 00:45:33 +00:00  
				
					
						
							
							
								 
						
							
							
								be41462f3a 
								
							
								 
							
						 
						
							
							
								
								merge  
							
							
							
						 
						
							2017-02-02 22:05:44 +00:00  
				
					
						
							
							
								 
						
							
							
								cd5a1abfac 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #673  from matrix-org/dbkr/make_default_avatars_clickable  
							
							... 
							
							
							
							Make default avatars clickable 
							
						 
						
							2017-02-02 18:49:08 +00:00  
				
					
						
							
							
								 
						
							
							
								e7a32faf64 
								
							
								 
							
						 
						
							
							
								
								Wrap multiline JSX in parens  
							
							
							
						 
						
							2017-02-02 18:47:24 +00:00  
				
					
						
							
							
								 
						
							
							
								8799891e0e 
								
							
								 
							
						 
						
							
							
								
								hopefully fix key array warning  
							
							
							
						 
						
							2017-02-02 18:47:15 +00:00  
				
					
						
							
							
								 
						
							
							
								2bb275c071 
								
							
								 
							
						 
						
							
							
								
								missing (c)  
							
							
							
						 
						
							2017-02-02 18:45:49 +00:00  
				
					
						
							
							
								 
						
							
							
								1fc5c9ddcc 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #672  from matrix-org/dbkr/velociraptor_always_change_visibility  
							
							... 
							
							
							
							Fix one read receipt randomly not appearing 
							
						 
						
							2017-02-02 18:45:29 +00:00  
				
					
						
							
							
								 
						
							
							
								10edab06a6 
								
							
								 
							
						 
						
							
							
								
								Don't c+p the complex markup  
							
							
							
						 
						
							2017-02-02 18:41:50 +00:00  
				
					
						
							
							
								 
						
							
							
								7484cc3f70 
								
							
								 
							
						 
						
							
							
								
								Make default avatars clickable  
							
							... 
							
							
							
							BaseAvatar can be passed an onClick which is called when it's, er,
clicked, except when it was the default avatar in which case it
merrily ignored it. Make it not ignore it. 
							
						 
						
							2017-02-02 18:29:33 +00:00  
				
					
						
							
							
								 
						
							
							
								2cf24c17e2 
								
							
								 
							
						 
						
							
							
								
								double scrollback window on roomview  
							
							
							
						 
						
							2017-02-02 18:27:21 +00:00  
				
					
						
							
							
								 
						
							
							
								d567b3bb6a 
								
							
								 
							
						 
						
							
							
								
								fix 'show rightpanel' button alt text & icon  
							
							
							
						 
						
							2017-02-02 18:27:21 +00:00  
				
					
						
							
							
								 
						
							
							
								42f75e1740 
								
							
								 
							
						 
						
							
							
								
								Fix one read receipt randomly not appearing  
							
							... 
							
							
							
							The velociraptor was only actioning hidden -> visible transitions
if the position had changed, so the one RR that stayed in position
but became visible... didn't become visible. 
							
						 
						
							2017-02-02 18:21:53 +00:00  
				
					
						
							
							
								 
						
							
							
								e45ac36a3b 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #635  from matrix-org/matthew/warn-unknown-devices  
							
							... 
							
							
							
							very barebones support for warning users when rooms contain unknown devices 
							
						 
						
							2017-02-02 18:08:18 +00:00  
				
					
						
							
							
								 
						
							
							
								5d5125df15 
								
							
								 
							
						 
						
							
							
								
								fix copyright & always show gemini  
							
							
							
						 
						
							2017-02-02 18:02:07 +00:00  
				
					
						
							
							
								 
						
							
							
								4ab479594b 
								
							
								 
							
						 
						
							
							
								
								temporarily stop hiding the statusbar  
							
							... 
							
							
							
							as per https://github.com/vector-im/riot-web/issues/1991#issuecomment-276953915  
							
						 
						
							2017-02-02 17:48:54 +00:00  
				
					
						
							
							
								 
						
							
							
								e9a53a8957 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #671  from matrix-org/dbkr/fix_read_receipt_unhide  
							
							... 
							
							
							
							Fix expanding/unexapnding read receipts 
							
						 
						
							2017-02-02 17:45:04 +00:00  
				
					
						
							
							
								 
						
							
							
								b561b711df 
								
							
								 
							
						 
						
							
							
								
								Fix expanding/unexapnding read receipts  
							
							... 
							
							
							
							Make the AccessibleButton element be the img directly rather than
wrapping it in a div which is unnecessary and breaks the rendering.
Fixes https://github.com/vector-im/riot-web/issues/3052  
							
						 
						
							2017-02-02 17:36:26 +00:00  
				
					
						
							
							
								 
						
							
							
								eebc7539f9 
								
							
								 
							
						 
						
							
							
								
								Megolm export: Increase to 500000 PBKDF rounds  
							
							... 
							
							
							
							This takes 370ms on my machine (100000 only took 100ms). 
							
						 
						
							2017-02-02 16:38:19 +00:00  
				
					
						
							
							
								 
						
							
							
								a0e4afc231 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #670  from matrix-org/matthew/empty-timelines  
							
							... 
							
							
							
							show placeholder when timeline empty 
							
						 
						
							2017-02-02 16:35:13 +00:00  
				
					
						
							
							
								 
						
							
							
								08ad69847c 
								
							
								 
							
						 
						
							
							
								
								show placeholder of timeline empty  
							
							
							
						 
						
							2017-02-02 16:32:10 +00:00  
				
					
						
							
							
								 
						
							
							
								68f644c824 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #669  from matrix-org/dbkr/read_receipt_title  
							
							... 
							
							
							
							Make read receipt's titles more explanatory 
							
						 
						
							2017-02-02 15:25:45 +00:00  
				
					
						
							
							
								 
						
							
							
								7ae54b34f3 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #667  from matrix-org/dbkr/fix_markdown_spurious_html  
							
							... 
							
							
							
							Fix spurious HTML tags being passed through literally 
							
						 
						
							2017-02-02 15:18:42 +00:00  
				
					
						
							
							
								 
						
							
							
								c5b752cac1 
								
							
								 
							
						 
						
							
							
								
								Make read receipt's titles more explanatory  
							
							... 
							
							
							
							Throwing this one in a suggestion while I'm in the area: I think
this would help people understand what the read receipt avatars
are. 
							
						 
						
							2017-02-02 15:08:18 +00:00