ff18a04da1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3529  from matrix-org/t3chguy/react16_cleanup2  
							
							... 
							
							
							
							React error/warning cleanup 
							
						 
						
							2019-10-09 16:26:24 +01:00  
				
					
						
							
							
								 
						
							
							
								93ff43f7e1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3535  from matrix-org/jryans/tag-react-soft-crashes  
							
							... 
							
							
							
							Add label to rageshakes for React soft crashes 
							
						 
						
							2019-10-09 12:38:42 +01:00  
				
					
						
							
							
								 
						
							
							
								aa6ce97b2f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3534  from matrix-org/dbkr/add_threepid_ui_auth  
							
							... 
							
							
							
							Support UI Auth on adding email addresses & phone numbers 
							
						 
						
							2019-10-09 12:02:05 +01:00  
				
					
						
							
							
								 
						
							
							
								e905abe5ce 
								
							
								 
							
						 
						
							
							
								
								Add label to rageshakes for React soft crashes  
							
							... 
							
							
							
							This adds a label all rageshakes submitted via the React error boundary marking
them as soft crashes for triage.
Fixes https://github.com/vector-im/riot-web/issues/11072  
							
						 
						
							2019-10-09 11:59:10 +01:00  
				
					
						
							
							
								 
						
							
							
								93aebf9e68 
								
							
								 
							
						 
						
							
							
								
								Return promises a better way  
							
							
							
						 
						
							2019-10-09 11:30:44 +01:00  
				
					
						
							
							
								 
						
							
							
								1c207f3b55 
								
							
								 
							
						 
						
							
							
								
								Revert  2040587826 
							
							
							
						 
						
							2019-10-09 11:28:16 +01:00  
				
					
						
							
							
								 
						
							
							
								2040587826 
								
							
								 
							
						 
						
							
							
								
								Return promises  
							
							
							
						 
						
							2019-10-09 10:47:34 +01:00  
				
					
						
							
							
								 
						
							
							
								a653fea020 
								
							
								 
							
						 
						
							
							
								
								Removed unused lines  
							
							... 
							
							
							
							Moved these around to avpid NPEs but they went away and I didn't
notice when merging. 
							
						 
						
							2019-10-09 10:33:29 +01:00  
				
					
						
							
							
								 
						
							
							
								4635b1319a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3533  from matrix-org/jryans/null-client-soft-crash  
							
							... 
							
							
							
							Unmount React components before stopping the client 
							
						 
						
							2019-10-08 23:23:40 +01:00  
				
					
						
							
							
								 
						
							
							
								e81df88ec2 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3532  from matrix-org/jryans/join-soft-crash  
							
							... 
							
							
							
							Fix soft crash on room join 
							
						 
						
							2019-10-08 23:22:57 +01:00  
				
					
						
							
							
								 
						
							
							
								4a56aa16b8 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/add_threepid_ui_auth  
							
							
							
						 
						
							2019-10-08 19:11:00 +01:00  
				
					
						
							
							
								 
						
							
							
								f4a2d216c3 
								
							
								 
							
						 
						
							
							
								
								Support UI auth on adding phone numbers  
							
							
							
						 
						
							2019-10-08 19:07:39 +01:00  
				
					
						
							
							
								 
						
							
							
								0b334c0bbc 
								
							
								 
							
						 
						
							
							
								
								Support UI Auth on adding email address  
							
							
							
						 
						
							2019-10-08 18:56:13 +01:00  
				
					
						
							
							
								 
						
							
							
								051fd0fd92 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3528  from matrix-org/bwindels/addemailerror  
							
							... 
							
							
							
							Fix:  Unable to verify email address error 
							
						 
						
							2019-10-08 16:49:51 +00:00  
				
					
						
							
							
								 
						
							
							
								8c8b1430e4 
								
							
								 
							
						 
						
							
							
								
								fix spelling  
							
							
							
						 
						
							2019-10-08 18:39:35 +02:00  
				
					
						
							
							
								 
						
							
							
								14bbaae585 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3509  from matrix-org/bwindels/createroomenter  
							
							... 
							
							
							
							Fix: submit create room dialog when pressing enter 
							
						 
						
							2019-10-08 16:36:05 +00:00  
				
					
						
							
							
								 
						
							
							
								2880ade45c 
								
							
								 
							
						 
						
							
							
								
								Unmount React components before stopping the client  
							
							... 
							
							
							
							This fixes an entire class of React soft crashes that can happen when you:
1. Log out, causing the client peg to become `null`
2. Some async process (event handler, timeout, request, etc.) tries to use the
   client in a component before it unmounts, triggering a soft crash
3. Several moments later, the app actually unmounts
With this change, we change the app's view and unmount components first and then
after that we stop the client.
Fixes https://github.com/vector-im/riot-web/issues/11078  
							
						 
						
							2019-10-08 17:10:19 +01:00  
				
					
						
							
							
								 
						
							
							
								1dc2ae007f 
								
							
								 
							
						 
						
							
							
								
								Fix soft crash on room join  
							
							... 
							
							
							
							This fixes a soft crash that can happen on room join if you keep the right panel
open (which is the default). The `MainSplit` component was not properly testing
for the edge cases of when the resize container would be mounted.
Fixes https://github.com/vector-im/riot-web/issues/10997  
							
						 
						
							2019-10-08 15:43:57 +01:00  
				
					
						
							
							
								 
						
							
							
								f384d4e5c1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3531  from matrix-org/jryans/cyclic-rageshake  
							
							... 
							
							
							
							Allow cyclic objects in console logs 
							
						 
						
							2019-10-08 14:41:00 +01:00  
				
					
						
							
							
								 
						
							
							
								538c3795d8 
								
							
								 
							
						 
						
							
							
								
								Allow cyclic objects in console logs  
							
							... 
							
							
							
							This fixes a bug in rageshake handling that would throw an error if you log a
cyclic object, which can be convenient during development. 
							
						 
						
							2019-10-08 14:29:03 +01:00  
				
					
						
							
							
								 
						
							
							
								5bcb4b0fb6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3530  from matrix-org/bwindels/watchemoticonsetting  
							
							... 
							
							
							
							Fix: watch emoticon autoreplace setting 
							
						 
						
							2019-10-08 12:53:54 +00:00  
				
					
						
							
							
								 
						
							
							
								91d593cb71 
								
							
								 
							
						 
						
							
							
								
								watch emoticon autoreplace setting  
							
							
							
						 
						
							2019-10-08 14:40:10 +02:00  
				
					
						
							
							
								 
						
							
							
								4c82496bca 
								
							
								 
							
						 
						
							
							
								
								export ToggleSwitch  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-10-08 12:22:22 +01:00  
				
					
						
							
							
								 
						
							
							
								a03e9e7a4f 
								
							
								 
							
						 
						
							
							
								
								tidy ToggleSwitch  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-10-08 12:18:44 +01:00  
				
					
						
							
							
								 
						
							
							
								a782baf510 
								
							
								 
							
						 
						
							
							
								
								React error/warning cleanup  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-10-08 12:10:37 +01:00  
				
					
						
							
							
								 
						
							
							
								15e7559d5b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3508  from matrix-org/bwindels/redact-all-more-robust  
							
							... 
							
							
							
							Make "remove recent messages" more robust 
							
						 
						
							2019-10-08 06:58:21 +00:00  
				
					
						
							
							
								 
						
							
							
								cbeb45abd3 
								
							
								 
							
						 
						
							
							
								
								update i18n  
							
							
							
						 
						
							2019-10-08 08:56:34 +02:00  
				
					
						
							
							
								 
						
							
							
								1ab19be46c 
								
							
								 
							
						 
						
							
							
								
								also show dialog here  
							
							... 
							
							
							
							unsure why this code seems duplicated? 
							
						 
						
							2019-10-08 08:54:23 +02:00  
				
					
						
							
							
								 
						
							
							
								978866ea96 
								
							
								 
							
						 
						
							
							
								
								dont assume id server when verifying phone numbers either  
							
							
							
						 
						
							2019-10-08 08:54:23 +02:00  
				
					
						
							
							
								 
						
							
							
								040bc5e157 
								
							
								 
							
						 
						
							
							
								
								show dialog when server says e-mail hasn't been verified yet  
							
							... 
							
							
							
							as it's confusing to have nothing happen at all when clicking
continue straight away. 
							
						 
						
							2019-10-08 08:54:21 +02:00  
				
					
						
							
							
								 
						
							
							
								48b8044937 
								
							
								 
							
						 
						
							
							
								
								don't try to get id server domain when not asked to bind  
							
							
							
						 
						
							2019-10-08 08:52:35 +02:00  
				
					
						
							
							
								 
						
							
							
								6bb303c381 
								
							
								 
							
						 
						
							
							
								
								add singular translation string  
							
							
							
						 
						
							2019-10-08 08:46:13 +02:00  
				
					
						
							
							
								 
						
							
							
								80ec77a144 
								
							
								 
							
						 
						
							
							
								
								dont rely on timeline linkage to find events to redact  
							
							
							
						 
						
							2019-10-08 08:46:13 +02:00  
				
					
						
							
							
								 
						
							
							
								c97d1d5b05 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3527  from matrix-org/dbkr/label_submit_button  
							
							... 
							
							
							
							Label submit button in UI auth password prompt 
							
						 
						
							2019-10-07 17:48:51 +01:00  
				
					
						
							
							
								 
						
							
							
								1dec534493 
								
							
								 
							
						 
						
							
							
								
								Label submit button in UI auth password prompt  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/10739  
							
						 
						
							2019-10-07 13:13:30 +01:00  
				
					
						
							
							
								 
						
							
							
								9200c55ce0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3526  from matrix-org/travis/recaptcha-fix  
							
							... 
							
							
							
							Null-guard the recaptcha setup 
							
						 
						
							2019-10-07 13:05:52 +01:00  
				
					
						
							
							
								 
						
							
							
								495513028c 
								
							
								 
							
						 
						
							
							
								
								Appease the linter  
							
							
							
						 
						
							2019-10-07 12:46:14 +01:00  
				
					
						
							
							
								 
						
							
							
								c547367b62 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3513  from matrix-org/travis/mask-eye  
							
							... 
							
							
							
							Use a mask instead of an img for "Show image" eye 
							
						 
						
							2019-10-07 12:45:22 +01:00  
				
					
						
							
							
								 
						
							
							
								afaaa6774e 
								
							
								 
							
						 
						
							
							
								
								Update i18n  
							
							
							
						 
						
							2019-10-07 12:43:30 +01:00  
				
					
						
							
							
								 
						
							
							
								e841bd5442 
								
									
								
							
								 
							
						 
						
							
							
								
								Update src/components/views/auth/InteractiveAuthEntryComponents.js  
							
							... 
							
							
							
							Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2019-10-07 12:43:07 +01:00  
				
					
						
							
							
								 
						
							
							
								082ebe636e 
								
							
								 
							
						 
						
							
							
								
								Null-guard the recaptcha setup  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/11069  
							
						 
						
							2019-10-07 12:36:20 +01:00  
				
					
						
							
							
								 
						
							
							
								7d96517139 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3523  from matrix-org/dbkr/rageshake_limit_once  
							
							... 
							
							
							
							Only limit the rageshake log size in one place 
							
						 
						
							2019-10-07 12:06:30 +01:00  
				
					
						
							
							
								 
						
							
							
								b091cf1f6d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3525  from MichaelKohler/fix-constant-name  
							
							... 
							
							
							
							Rename UPPER_CAMEL_CASE to UPPER_SNAKE_CASE in Coding Style 
							
						 
						
							2019-10-06 09:44:16 -06:00  
				
					
						
							
							
								 
						
							
							
								8eb07197cc 
								
							
								 
							
						 
						
							
							
								
								Rename UPPER_CAMEL_CASE to UPPER_SNAKE_CASE in Coding Style  
							
							
							
						 
						
							2019-10-06 13:08:46 +02:00  
				
					
						
							
							
								 
						
							
							
								1e8a338e66 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3524  from matrix-org/revert-3521-dbkr/yarn_upgrade_20191004  
							
							... 
							
							
							
							Revert "Run yarn upgrade" 
							
						 
						
							2019-10-04 16:28:41 +01:00  
				
					
						
							
							
								 
						
							
							
								40969c60a9 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Run yarn upgrade"  
							
							
							
						 
						
							2019-10-04 16:28:13 +01:00  
				
					
						
							
							
								 
						
							
							
								07bf5e6f56 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3521  from matrix-org/dbkr/yarn_upgrade_20191004  
							
							... 
							
							
							
							Run yarn upgrade 
							
						 
						
							2019-10-04 15:08:14 +01:00  
				
					
						
							
							
								 
						
							
							
								a15c8fd476 
								
							
								 
							
						 
						
							
							
								
								Only limit the rageshake log size in one place  
							
							... 
							
							
							
							We had two different places in the code that were both trying to
limit to the MAX_LOG_SIZE and doing different things with it.
fetchLogs was keeping each individual file to MAX_LOG_SIZE but then
the outer loop was also discarding the whole file if it would make
the total exceed MAX_LOG_SIZE. This meant that if you ran your client
for a while then refreshed and sent a rageshake, the logic would
omit everything from before the refresh but make sure it included the
tiny amount of useless logging from after the refresh.
This will truncate large files if they would take the whole thing
over the size limit and still include part of them. 
							
						 
						
							2019-10-04 14:56:46 +01:00  
				
					
						
							
							
								 
						
							
							
								b1b4139163 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3522  from matrix-org/t3chguy/backspace_cider_focus  
							
							... 
							
							
							
							Limit Backspace-consuming workaround to just Slate, tidy Keyboard :) 
							
						 
						
							2019-10-04 11:57:06 +01:00  
				
					
						
							
							
								 
						
							
							
								1ec0bb284a 
								
							
								 
							
						 
						
							
							
								
								Limit Backspace-consuming workaround to just Slate, tidy Keyboard :)  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-10-04 11:47:33 +01:00