efd5405267 
								
							
								 
							
						 
						
							
							
								
								Add a form field component for the redesign  
							
							... 
							
							
							
							The label moves into the border on focus and after being filled. A valid color
is applied to the label and input border. Other states like invalid can be added
later as needed.
Adapted from @ara4n's experiment into a React component with a CSS only
approach. 
							
						 
						
							2019-01-19 22:13:53 -06:00  
				
					
						
							
							
								 
						
							
							
								8c30d05eb8 
								
							
								 
							
						 
						
							
							
								
								Revert "Merge pull request  #2348  from matrix-org/bwindels/roomgridview-experimental"  
							
							... 
							
							
							
							This reverts commit ece5cb1fcc64a3d2521c 
							
						 
						
							2019-01-17 10:29:37 +01:00  
				
					
						
							
							
								 
						
							
							
								35af3fc6f7 
								
							
								 
							
						 
						
							
							
								
								Add separate dialog for recovery method removed  
							
							... 
							
							
							
							The "New Recovery Method" dialog would show if either the recovery method had
been changed or removed, but the dialog text didn't make much sense for the
removed case.
This adds a separate dialog customized for the removed case.
Fixes https://github.com/vector-im/riot-web/issues/8046 . 
							
						 
						
							2019-01-10 15:18:57 -06:00  
				
					
						
							
							
								 
						
							
							
								cbf9ff6aee 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'experimental' of github.com:matrix-org/matrix-react-sdk into erikj/state_counters  
							
							
							
						 
						
							2019-01-10 16:56:47 +00:00  
				
					
						
							
							
								 
						
							
							
								712241d710 
								
							
								 
							
						 
						
							
							
								
								Add simple state counters to room heading  
							
							
							
						 
						
							2019-01-07 13:52:13 +00:00  
				
					
						
							
							
								 
						
							
							
								290dc9d8fb 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'experimental' into bwindels/roomgridview-experimental  
							
							
							
						 
						
							2019-01-07 14:17:57 +01:00  
				
					
						
							
							
								 
						
							
							
								8017f0a4a1 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/experimental' into travis/develop-for-real  
							
							
							
						 
						
							2019-01-03 16:00:23 -07:00  
				
					
						
							
							
								 
						
							
							
								f928be6f59 
								
							
								 
							
						 
						
							
							
								
								Revert "Merge pull request  #2395  from matrix-org/dbkr/merge_develop_experimental"  
							
							... 
							
							
							
							This reverts commit ad47144355 
							
						 
						
							2019-01-03 15:37:03 -07:00  
				
					
						
							
							
								 
						
							
							
								7d161de35b 
								
							
								 
							
						 
						
							
							
								
								Partial merge of develop to experimental  
							
							... 
							
							
							
							Does not include #2336  as the file has been moved out from underneath it:
will do this separately 
							
						 
						
							2019-01-03 15:02:58 +00:00  
				
					
						
							
							
								 
						
							
							
								2e1e536d5c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2347  from matrix-org/travis/custom-status  
							
							... 
							
							
							
							Custom status messages 
							
						 
						
							2018-12-19 11:11:15 -07:00  
				
					
						
							
							
								 
						
							
							
								a22a9492a0 
								
							
								 
							
						 
						
							
							
								
								Remove duplicate CSS file for CreateKeyBackupDialog  
							
							... 
							
							
							
							Signed-off-by: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2018-12-19 17:46:37 +00:00  
				
					
						
							
							
								 
						
							
							
								a1347add95 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/custom-status  
							
							
							
						 
						
							2018-12-19 10:33:34 -07:00  
				
					
						
							
							
								 
						
							
							
								acc2e98355 
								
							
								 
							
						 
						
							
							
								
								Add New Recovery Method dialog  
							
							... 
							
							
							
							Adds a New Recovery Method dialog which is shown when key backup fails because
of a version mismatch / version not found error.
The set up button in the dialog currently only marks a device as verified (via a
verification prompt) instead of the eventual restore and cross-sign flow, since
those pieces don't exist yet.
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2018-12-18 10:20:12 +00:00  
				
					
						
							
							
								 
						
							
							
								d4748c91df 
								
							
								 
							
						 
						
							
							
								
								add first draft of RoomGridView  
							
							
							
						 
						
							2018-12-13 13:01:59 +01:00  
				
					
						
							
							
								 
						
							
							
								b0b7932f5f 
								
							
								 
							
						 
						
							
							
								
								Move status context menu to its own component  
							
							... 
							
							
							
							This fixes a lot of the state bugs such as buttons not updating, etc. 
This commit also adds the border around the avatar to indicate a status is set. 
							
						 
						
							2018-12-12 22:26:39 -07:00  
				
					
						
							
							
								 
						
							
							
								a91963e5ee 
								
							
								 
							
						 
						
							
							
								
								Replace the avatar next to the composer with a status entry menu  
							
							... 
							
							
							
							The checkmark might change, and there appears to be some state tracking mishaps that need to be worked out.
Part of https://github.com/vector-im/riot-web/issues/1528  
							
						 
						
							2018-12-12 18:03:30 -07:00  
				
					
						
							
							
								 
						
							
							
								a92d2902c4 
								
							
								 
							
						 
						
							
							
								
								Add an in-room reminder to set up key recovery  
							
							... 
							
							
							
							This adds an in-room reminder above the message timeline to set up Secure
Message Recovery so that your keys will be backed up. If you try to ignore it,
an additional dialog is shown to confirm.
Fixes  vector-im/riot-web#7783 .
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2018-12-07 14:13:02 -06:00  
				
					
						
							
							
								 
						
							
							
								67e0030ccd 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into experimental  
							
							
							
						 
						
							2018-11-26 13:10:29 +01:00  
				
					
						
							
							
								 
						
							
							
								132408cf02 
								
							
								 
							
						 
						
							
							
								
								Add e2e backup recovery with passphrase  
							
							
							
						 
						
							2018-11-20 16:16:24 +00:00  
				
					
						
							
							
								 
						
							
							
								fbab8ceeef 
								
							
								 
							
						 
						
							
							
								
								Passphrase based key backups  
							
							... 
							
							
							
							Add passphrase support to backup creation stage 
							
						 
						
							2018-11-20 13:11:58 +00:00  
				
					
						
							
							
								 
						
							
							
								7df47cbc87 
								
							
								 
							
						 
						
							
							
								
								move typing notifications to WhoIsTypingTile, shown in ScrollPanel  
							
							
							
						 
						
							2018-11-12 16:09:51 +01:00  
				
					
						
							
							
								 
						
							
							
								3e02f247c8 
								
							
								 
							
						 
						
							
							
								
								use AutoHideScrollbar in RoomSubList  
							
							
							
						 
						
							2018-11-01 17:33:21 +01:00  
				
					
						
							
							
								 
						
							
							
								2c039483c6 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into experimental  
							
							
							
						 
						
							2018-10-26 15:33:39 +02:00  
				
					
						
							
							
								 
						
							
							
								b59b8b7fca 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups  
							
							
							
						 
						
							2018-10-25 17:42:46 +01:00  
				
					
						
							
							
								 
						
							
							
								4b90fd5c11 
								
							
								 
							
						 
						
							
							
								
								move TopLeftMenu to context_menus folder  
							
							
							
						 
						
							2018-10-23 15:42:28 +02:00  
				
					
						
							
							
								 
						
							
							
								863d89f6fd 
								
							
								 
							
						 
						
							
							
								
								show profile in topleftmenu button for now (will be current community)  
							
							
							
						 
						
							2018-10-23 15:25:10 +02:00  
				
					
						
							
							
								 
						
							
							
								9582c1e65a 
								
							
								 
							
						 
						
							
							
								
								Move all dialog buttons to the right and fix their order  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/5689 
Some dialogs had their own CSS that prevented the buttons from being placed in the right spot. This has been fixed by using a generic standard for the buttons. The only strange dialog that needed more CSS was the devtools dialog due to the header.
Not all dialogs have been checked - I spot-checked about half of them and verified the CSS manually on an established account. It's hard to get at all the dialogs without convoluted testing. 
							
						 
						
							2018-10-19 15:33:23 -06:00  
				
					
						
							
							
								 
						
							
							
								928b6d47c8 
								
							
								 
							
						 
						
							
							
								
								add resize handles between 3 main app columns  
							
							
							
						 
						
							2018-09-24 16:07:42 +01:00  
				
					
						
							
							
								 
						
							
							
								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