f06de1f129 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #654  from matrix-org/rav/fix_e2e_dialog_cancel  
							
							... 
							
							
							
							Fix cancel button on e2e import/export dialogs 
							
						 
						
							2017-01-26 11:41:30 +00:00  
				
					
						
							
							
								 
						
							
							
								e2edecc55b 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #653  from matrix-org/dbkr/invite_look_up_emails  
							
							... 
							
							
							
							Look up email addresses in ChatInviteDialog 
							
						 
						
							2017-01-26 11:35:06 +00:00  
				
					
						
							
							
								 
						
							
							
								c42b705497 
								
							
								 
							
						 
						
							
							
								
								Use a cancel function  
							
							... 
							
							
							
							rather than checking queryList each time 
							
						 
						
							2017-01-26 10:54:07 +00:00  
				
					
						
							
							
								 
						
							
							
								23a25e550d 
								
							
								 
							
						 
						
							
							
								
								Missed a `function`  
							
							
							
						 
						
							2017-01-26 10:09:33 +00:00  
				
					
						
							
							
								 
						
							
							
								bf66f77acb 
								
							
								 
							
						 
						
							
							
								
								Set state in _lookupThreepid  
							
							
							
						 
						
							2017-01-26 10:08:44 +00:00  
				
					
						
							
							
								 
						
							
							
								81d95ecea0 
								
							
								 
							
						 
						
							
							
								
								Fix cancel button on e2e import/export dialogs  
							
							... 
							
							
							
							Make sure that we preventDefault on the cancel button.
Fixes https://github.com/vector-im/riot-web/issues/3066  
							
						 
						
							2017-01-25 22:15:09 +00:00  
				
					
						
							
							
								 
						
							
							
								e1e87807b5 
								
							
								 
							
						 
						
							
							
								
								Look up email addresses in ChatInviteDialog  
							
							... 
							
							
							
							So email addresses known to the IS get a display name & avatar 
							
						 
						
							2017-01-25 18:51:28 +00:00  
				
					
						
							
							
								 
						
							
							
								c3616fd208 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #652  from matrix-org/kegan/rageshake-glue  
							
							... 
							
							
							
							Move BugReportDialog to riot-web 
							
						 
						
							2017-01-25 17:20:43 +00:00  
				
					
						
							
							
								 
						
							
							
								12642bdf2b 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #651  from matrix-org/rav/roomheader_theming_fix  
							
							... 
							
							
							
							Fix dark theme styling of roomheader cancel button 
							
						 
						
							2017-01-25 17:02:07 +00:00  
				
					
						
							
							
								 
						
							
							
								8a5e19f64f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #649  from matrix-org/rav/stack_dialogs  
							
							... 
							
							
							
							Allow modals to stack up 
							
						 
						
							2017-01-25 16:45:50 +00:00  
				
					
						
							
							
								 
						
							
							
								e9de34ec40 
								
							
								 
							
						 
						
							
							
								
								We no longer supply a BugReportDialog  
							
							
							
						 
						
							2017-01-25 16:35:16 +00:00  
				
					
						
							
							
								 
						
							
							
								5099f07562 
								
							
								 
							
						 
						
							
							
								
								Fix dark theme styling of roomheader cancel button  
							
							
							
						 
						
							2017-01-25 16:33:29 +00:00  
				
					
						
							
							
								 
						
							
							
								bea6df88e0 
								
							
								 
							
						 
						
							
							
								
								Move BugReportDialog to riot-web  
							
							
							
						 
						
							2017-01-25 16:33:00 +00:00  
				
					
						
							
							
								 
						
							
							
								55dc2e0161 
								
							
								 
							
						 
						
							
							
								
								Factor out common CancelButton  
							
							
							
						 
						
							2017-01-25 16:32:06 +00:00  
				
					
						
							
							
								 
						
							
							
								e5fde759e6 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #642  from matrix-org/kegan/rageshake-ui  
							
							... 
							
							
							
							Add bug report UI 
							
						 
						
							2017-01-25 16:03:22 +00:00  
				
					
						
							
							
								 
						
							
							
								a3b938427d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #625  from matrix-org/dbkr/user_search_feedback  
							
							... 
							
							
							
							Better feedback in invite dialog 
							
						 
						
							2017-01-25 15:59:47 +00:00  
				
					
						
							
							
								 
						
							
							
								602ce37ba7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into kegan/rageshake-ui  
							
							
							
						 
						
							2017-01-25 15:52:00 +00:00  
				
					
						
							
							
								 
						
							
							
								dc7a169779 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #647  from matrix-org/rav/megolm_backup_ui  
							
							... 
							
							
							
							Import and export for Megolm session data 
							
						 
						
							2017-01-25 15:43:15 +00:00  
				
					
						
							
							
								 
						
							
							
								ced1c45a34 
								
							
								 
							
						 
						
							
							
								
								Doc state in getinitialstate  
							
							
							
						 
						
							2017-01-25 15:23:50 +00:00  
				
					
						
							
							
								 
						
							
							
								9cadc2f55f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #613  from matrix-org/luke/fix-join-part-collapsing-causality  
							
							... 
							
							
							
							Overhaul MELS to deal with causality, kicks, etc. 
							
						 
						
							2017-01-25 15:20:30 +00:00  
				
					
						
							
							
								 
						
							
							
								ebe6cddd21 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into rav/megolm_backup_ui  
							
							
							
						 
						
							2017-01-25 15:13:14 +00:00  
				
					
						
							
							
								 
						
							
							
								69b55fd9d1 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #650  from matrix-org/dbkr/fix_alt_up_down  
							
							... 
							
							
							
							Re-add dispatcher as alt-up/down uses it 
							
						 
						
							2017-01-25 15:10:56 +00:00  
				
					
						
							
							
								 
						
							
							
								7343ef968e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #645  from matrix-org/rav/base_dialog  
							
							... 
							
							
							
							Create a common BaseDialog 
							
						 
						
							2017-01-25 15:09:34 +00:00  
				
					
						
							
							
								 
						
							
							
								e9804086ca 
								
							
								 
							
						 
						
							
							
								
								Point to InviteAddressType  
							
							
							
						 
						
							2017-01-25 15:03:01 +00:00  
				
					
						
							
							
								 
						
							
							
								adf8f50f6e 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into rav/base_dialog  
							
							
							
						 
						
							2017-01-25 15:01:11 +00:00  
				
					
						
							
							
								 
						
							
							
								b34f63d3e7 
								
							
								 
							
						 
						
							
							
								
								Re-add dispatcher as alt-up/down uses it  
							
							... 
							
							
							
							Alt-up/down still doesn't go through rooms in the right order,
but it should probably not error. 
							
						 
						
							2017-01-25 14:59:18 +00:00  
				
					
						
							
							
								 
						
							
							
								fd8d5af63a 
								
							
								 
							
						 
						
							
							
								
								Fix import of InviteAddressType  
							
							... 
							
							
							
							and rewrite to import while we're at it 
							
						 
						
							2017-01-25 14:54:21 +00:00  
				
					
						
							
							
								 
						
							
							
								9020a7515c 
								
							
								 
							
						 
						
							
							
								
								Correctly bail out on unknown address  
							
							
							
						 
						
							2017-01-25 14:50:00 +00:00  
				
					
						
							
							
								 
						
							
							
								b00e090600 
								
							
								 
							
						 
						
							
							
								
								Do not show the bug report section if there is no bug_report_endpoint_url  
							
							
							
						 
						
							2017-01-25 14:43:47 +00:00  
				
					
						
							
							
								 
						
							
							
								e567162d28 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #648  from matrix-org/rav/fix_set_displayname  
							
							... 
							
							
							
							Fix SetDisplayNameDialog 
							
						 
						
							2017-01-25 14:32:52 +00:00  
				
					
						
							
							
								 
						
							
							
								f9ca2a8e59 
								
							
								 
							
						 
						
							
							
								
								Fix _renderCommaSeparatedList  
							
							
							
						 
						
							2017-01-25 11:28:12 +00:00  
				
					
						
							
							
								 
						
							
							
								f66e412d3a 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #643  from matrix-org/luke/fix-typing-indication  
							
							... 
							
							
							
							Sync typing indication with avatar typing indication 
							
						 
						
							2017-01-25 11:13:55 +00:00  
				
					
						
							
							
								 
						
							
							
								b887d5b823 
								
							
								 
							
						 
						
							
							
								
								Much linting  
							
							
							
						 
						
							2017-01-25 11:05:45 +00:00  
				
					
						
							
							
								 
						
							
							
								fc9987a827 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #646  from matrix-org/matthew/password-reset-warning  
							
							... 
							
							
							
							Warn users of E2E key loss when changing/resetting passwords or logging out 
							
						 
						
							2017-01-25 11:04:35 +00:00  
				
					
						
							
							
								 
						
							
							
								24e94787dd 
								
							
								 
							
						 
						
							
							
								
								A lot of linting  
							
							
							
						 
						
							2017-01-25 10:52:55 +00:00  
				
					
						
							
							
								 
						
							
							
								d5edf26371 
								
							
								 
							
						 
						
							
							
								
								Improve comment  
							
							
							
						 
						
							2017-01-25 10:39:39 +00:00  
				
					
						
							
							
								 
						
							
							
								8091cf7df8 
								
							
								 
							
						 
						
							
							
								
								Enumerate->label  
							
							
							
						 
						
							2017-01-25 09:32:28 +00:00  
				
					
						
							
							
								 
						
							
							
								f8e46819c5 
								
							
								 
							
						 
						
							
							
								
								Rename truncated->coalesced  
							
							
							
						 
						
							2017-01-25 09:28:26 +00:00  
				
					
						
							
							
								 
						
							
							
								3b8b2cf500 
								
							
								 
							
						 
						
							
							
								
								Document _getCanonicalTransitions  
							
							
							
						 
						
							2017-01-25 09:18:47 +00:00  
				
					
						
							
							
								 
						
							
							
								e9719b1766 
								
							
								 
							
						 
						
							
							
								
								Get rid of .only  
							
							
							
						 
						
							2017-01-25 09:12:29 +00:00  
				
					
						
							
							
								 
						
							
							
								29b4dde878 
								
							
								 
							
						 
						
							
							
								
								Fix SetDisplayNameDialog  
							
							... 
							
							
							
							SetDisplayNameDialog got broken by the changes to support asynchronous loading
of dialogs.
Rather than poking into its internals via a ref, make it return its result via
onFinished.
Fixes https://github.com/vector-im/riot-web/issues/3047  
							
						 
						
							2017-01-25 08:01:45 +00:00  
				
					
						
							
							
								 
						
							
							
								10018374f8 
								
							
								 
							
						 
						
							
							
								
								Allow modals to stack up  
							
							... 
							
							
							
							Show the most recent modal; if we end up with more than one, just show the most
recent. 
							
						 
						
							2017-01-25 07:44:33 +00:00  
				
					
						
							
							
								 
						
							
							
								770820e6fa 
								
							
								 
							
						 
						
							
							
								
								Fix a bunch of lint complaints  
							
							
							
						 
						
							2017-01-24 22:41:52 +00:00  
				
					
						
							
							
								 
						
							
							
								6a40abbbf0 
								
							
								 
							
						 
						
							
							
								
								actually, move signout warning to UserSettings.js  
							
							... 
							
							
							
							also, kill off the inexplicably useless LogoutPrompt in favour of a normal QuestionDialog.
This in turn fixes https://github.com/vector-im/riot-web/issues/2152  
							
						 
						
							2017-01-24 23:18:25 +01:00  
				
					
						
							
							
								 
						
							
							
								6e55bb4956 
								
							
								 
							
						 
						
							
							
								
								actually, move signout warning to UserSettings.js  
							
							... 
							
							
							
							also, kill off the inexplicably useless LogoutPrompt in favour of a normal QuestionDialog.
This in turn fixes https://github.com/vector-im/riot-web/issues/2152  
							
						 
						
							2017-01-24 23:15:00 +01:00  
				
					
						
							
							
								 
						
							
							
								b85f53cadd 
								
							
								 
							
						 
						
							
							
								
								Implement Megolm key importing  
							
							
							
						 
						
							2017-01-24 21:50:24 +00:00  
				
					
						
							
							
								 
						
							
							
								e23deac1bb 
								
							
								 
							
						 
						
							
							
								
								Implement e2e export  
							
							
							
						 
						
							2017-01-24 21:50:24 +00:00  
				
					
						
							
							
								 
						
							
							
								b148619c52 
								
							
								 
							
						 
						
							
							
								
								warn on logout too  
							
							
							
						 
						
							2017-01-24 22:47:03 +01:00  
				
					
						
							
							
								 
						
							
							
								5b61d00533 
								
							
								 
							
						 
						
							
							
								
								warn users that changing/resetting password will nuke E2E keys  
							
							
							
						 
						
							2017-01-24 22:36:55 +01:00  
				
					
						
							
							
								 
						
							
							
								86276450f6 
								
							
								 
							
						 
						
							
							
								
								Add AccessibleButton to component-index  
							
							
							
						 
						
							2017-01-24 21:27:57 +00:00