14757cacd5 
								
							
								 
							
						 
						
							
							
								
								Introduce a concept of "non-urgent" toasts  
							
							... 
							
							
							
							This is somewhat expected to be temporary. 
							
						 
						
							2020-07-29 12:43:35 -06:00  
				
					
						
							
							
								 
						
							
							
								7f5c501b2b 
								
							
								 
							
						 
						
							
							
								
								CallView2 -> CallView  
							
							
							
						 
						
							2020-07-17 15:55:30 -06:00  
				
					
						
							
							
								 
						
							
							
								cbf967ea69 
								
							
								 
							
						 
						
							
							
								
								Remove legacy call components  
							
							
							
						 
						
							2020-07-17 15:53:13 -06:00  
				
					
						
							
							
								 
						
							
							
								c9b0b3b31d 
								
							
								 
							
						 
						
							
							
								
								RoomSublist2 -> RoomSublist  
							
							
							
						 
						
							2020-07-17 15:46:46 -06:00  
				
					
						
							
							
								 
						
							
							
								96065ae982 
								
							
								 
							
						 
						
							
							
								
								RoomTile2 -> RoomTile  
							
							
							
						 
						
							2020-07-17 15:43:29 -06:00  
				
					
						
							
							
								 
						
							
							
								8dfe7b6cc7 
								
							
								 
							
						 
						
							
							
								
								RoomBreadcrumbs2 -> RoomBreadcrumbs  
							
							
							
						 
						
							2020-07-17 15:32:06 -06:00  
				
					
						
							
							
								 
						
							
							
								a7c18bfbfa 
								
							
								 
							
						 
						
							
							
								
								RoomList2 -> RoomList  
							
							
							
						 
						
							2020-07-17 15:27:49 -06:00  
				
					
						
							
							
								 
						
							
							
								2441cbc9ac 
								
							
								 
							
						 
						
							
							
								
								LeftPanel2 -> LeftPanel  
							
							
							
						 
						
							2020-07-17 15:22:18 -06:00  
				
					
						
							
							
								 
						
							
							
								3c047cecfd 
								
							
								 
							
						 
						
							
							
								
								Remove core structures for the old room list  
							
							
							
						 
						
							2020-07-17 14:17:11 -06:00  
				
					
						
							
							
								 
						
							
							
								38dc3c8bd1 
								
							
								 
							
						 
						
							
							
								
								Replace non-functional Interactive Tooltip  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-07-17 18:43:42 +01:00  
				
					
						
							
							
								 
						
							
							
								d5f2d43429 
								
							
								 
							
						 
						
							
							
								
								Improve Tooltip font/layout consistency  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-07-16 15:15:00 +01:00  
				
					
						
							
							
								 
						
							
							
								503159c1c8 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dbkr/in-app-rebrand-prompt' into 'element'  
							
							... 
							
							
							
							Add in-app rebranding toasts & prompts
See merge request new-vector/element/element-web/matrix-react-sdk!1 
							
						 
						
							2020-07-10 17:09:17 +00:00  
				
					
						
							
							
								 
						
							
							
								8701e9293e 
								
							
								 
							
						 
						
							
							
								
								Add in-app rebranding toasts & prompts  
							
							... 
							
							
							
							Either shows an informational dialog telling you the name has changed,
or a more naggy one if the user needs to log in on a different URL.
The new URL (if any) is hardcoded based on the current URL, and also
with a bonus config param in case other deployments need to do similar. 
							
						 
						
							2020-07-10 15:32:34 +01:00  
				
					
						
							
							
								 
						
							
							
								0d6e7759d0 
								
							
								 
							
						 
						
							
							
								
								Fix review details  
							
							... 
							
							
							
							- spelling mistake
- unwatch watched setting
- lint (indentation)
- use more performant component 
							
						 
						
							2020-07-07 15:11:08 +01:00  
				
					
						
							
							
								 
						
							
							
								5176685d20 
								
							
								 
							
						 
						
							
							
								
								Implement incoming call box  
							
							
							
						 
						
							2020-07-06 23:05:00 +01:00  
				
					
						
							
							
								 
						
							
							
								dcd51b5be3 
								
							
								 
							
						 
						
							
							
								
								Implement breadcrumb notifications and scrolling  
							
							
							
						 
						
							2020-06-30 23:24:46 +01:00  
				
					
						
							
							
								 
						
							
							
								dafce40d1b 
								
							
								 
							
						 
						
							
							
								
								Rename UserMenuButton to UserMenu for new scope  
							
							
							
						 
						
							2020-06-25 19:29:12 -06:00  
				
					
						
							
							
								 
						
							
							
								e4a51a7c01 
								
							
								 
							
						 
						
							
							
								
								Add presence icons; Convert to generic icon component  
							
							... 
							
							
							
							For https://github.com/vector-im/riot-web/issues/14039  
							
						 
						
							2020-06-16 14:44:37 -06:00  
				
					
						
							
							
								 
						
							
							
								95b4abba3b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4735  from matrix-org/travis/room-list/breadcrumbs  
							
							... 
							
							
							
							Reimplement breadcrumbs for new room list 
							
						 
						
							2020-06-10 07:39:55 -06:00  
				
					
						
							
							
								 
						
							
							
								0fb6846c9d 
								
							
								 
							
						 
						
							
							
								
								Radio buttons  
							
							
							
						 
						
							2020-06-10 13:03:00 +01:00  
				
					
						
							
							
								 
						
							
							
								9377fa513f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/room-list/breadcrumbs  
							
							
							
						 
						
							2020-06-09 08:11:08 -06:00  
				
					
						
							
							
								 
						
							
							
								724f545b4a 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into travis/room-list/sublist-badges  
							
							
							
						 
						
							2020-06-09 08:06:10 -06:00  
				
					
						
							
							
								 
						
							
							
								5114c37b82 
								
							
								 
							
						 
						
							
							
								
								Add filtering and exploring to the new room list  
							
							... 
							
							
							
							This is per the designs. Animation doesn't feel required here.
Like the rest of this series, this rewrites a component to be more purpose-built to help match the designs and to solve the smallest possible problem. 
							
						 
						
							2020-06-08 20:33:21 -06:00  
				
					
						
							
							
								 
						
							
							
								9859891b4d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/room-list/sublist-badges  
							
							
							
						 
						
							2020-06-08 18:12:43 -06:00  
				
					
						
							
							
								 
						
							
							
								bcc455b248 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/room-list/breadcrumbs  
							
							
							
						 
						
							2020-06-08 18:11:42 -06:00  
				
					
						
							
							
								 
						
							
							
								0354bf9b6d 
								
							
								 
							
						 
						
							
							
								
								Reimplement breadcrumbs for new room list  
							
							... 
							
							
							
							This all-new component handles breadcrumbs a bit more smoothly for the app by always listening to changes even if the component isn't present. This allows the breadcrumbs to remain up to date for when the user re-enables breadcrumbs.
The new behaviour is that we turn breadcrumbs on once the user has a room, and we don't turn it back off for them.
This also introduces a new animation which is more stable and not laggy, though instead of sliding the breadcrumbs pop. This might be undesirable - to be reviewed. 
							
						 
						
							2020-06-08 17:11:58 -06:00  
				
					
						
							
							
								 
						
							
							
								086b9101fa 
								
							
								 
							
						 
						
							
							
								
								Add sublist badge counts to new room list  
							
							... 
							
							
							
							Also add IDLE state to rooms 
							
						 
						
							2020-06-08 13:42:18 -06:00  
				
					
						
							
							
								 
						
							
							
								8e0247afe5 
								
							
								 
							
						 
						
							
							
								
								Add most of the UI for the new room list's menu button  
							
							... 
							
							
							
							Incomplete implementation: buttons don't work, some text is missing, etc 
							
						 
						
							2020-06-07 22:06:41 -06:00  
				
					
						
							
							
								 
						
							
							
								4521e9feb1 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering  
							
							
							
						 
						
							2020-06-07 15:12:30 +03:00  
				
					
						
							
							
								 
						
							
							
								4c1bc50649 
								
							
								 
							
						 
						
							
							
								
								Initial styling for new room list  
							
							... 
							
							
							
							This is a work in progress, but covers the coarse areas. This uses all-new classes to better describe what everything is, and to reduce the number of selectors we keep track of.
This is primarily layout for the list and not actually the final structure. For example, some buttons are missing and other areas are not styled correctly - the idea in this commit was to get things roughly in the right place and work on it. 
							
						 
						
							2020-06-04 16:41:18 -06:00  
				
					
						
							
							
								 
						
							
							
								dbf996439b 
								
							
								 
							
						 
						
							
							
								
								Wedge t3chguy's resizer prototype into the sublist  
							
							
							
						 
						
							2020-06-03 21:17:51 -06:00  
				
					
						
							
							
								 
						
							
							
								936445ab2d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4660  from matrix-org/t3chguy/kill_UDE_and_UDD  
							
							... 
							
							
							
							Remove legacy codepaths for Unknown Device Error (UDE/UDD) handling 
							
						 
						
							2020-06-03 10:45:47 +01:00  
				
					
						
							
							
								 
						
							
							
								69747b6114 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/matrix-org/matrix-react-sdk  into joriks/appearance-tab  
							
							
							
						 
						
							2020-06-01 14:32:31 +01:00  
				
					
						
							
							
								 
						
							
							
								efd0da44a1 
								
							
								 
							
						 
						
							
							
								
								Give contextual feedback for manual update check instead of banner  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-05-29 18:24:45 +01:00  
				
					
						
							
							
								 
						
							
							
								66c0d53f3e 
								
							
								 
							
						 
						
							
							
								
								Create and use stylised checkboxes  
							
							
							
						 
						
							2020-05-28 22:33:00 +01:00  
				
					
						
							
							
								 
						
							
							
								8aaa7825ef 
								
							
								 
							
						 
						
							
							
								
								Also kill off things that these kept behind  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-05-28 17:12:19 +01:00  
				
					
						
							
							
								 
						
							
							
								f0cabd55c0 
								
							
								 
							
						 
						
							
							
								
								Remove legacy codepaths for Unknown Device Error (UDE/UDD) handling  
							
							... 
							
							
							
							as we now always `setGlobalErrorOnUnknownDevices(false)`
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-05-28 17:01:22 +01:00  
				
					
						
							
							
								 
						
							
							
								563a36e0a1 
								
							
								 
							
						 
						
							
							
								
								Remove unused CSS too  
							
							
							
						 
						
							2020-05-26 13:42:00 +01:00  
				
					
						
							
							
								 
						
							
							
								4e5680de85 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering  
							
							
							
						 
						
							2020-05-25 19:21:19 +03:00  
				
					
						
							
							
								 
						
							
							
								6d9d4ee547 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/matrix-org/matrix-react-sdk  into joriks/font-scaling-slider  
							
							
							
						 
						
							2020-05-20 13:46:17 +01:00  
				
					
						
							
							
								 
						
							
							
								323d0762fc 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/matrix-org/matrix-react-sdk  into joriks/irc-ui  
							
							
							
						 
						
							2020-05-19 18:03:44 +01:00  
				
					
						
							
							
								 
						
							
							
								2e325191bc 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'nv/develop' into joriks/irc-ui  
							
							
							
						 
						
							2020-05-19 17:18:36 +01:00  
				
					
						
							
							
								 
						
							
							
								1eea203db6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4599  from matrix-org/t3chguy/progress_colour  
							
							... 
							
							
							
							Consolidate password/passphrase fields into a component & add dynamic colour to progress 
							
						 
						
							2020-05-18 11:08:08 +01:00  
				
					
						
							
							
								 
						
							
							
								f2979f3fd8 
								
							
								 
							
						 
						
							
							
								
								replace zxcvbn field in CreateKeyBackupDialog with PassphraseField  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-05-14 20:59:46 +01:00  
				
					
						
							
							
								 
						
							
							
								cf3c4d9e5f 
								
							
								 
							
						 
						
							
							
								
								Extract Password field from Registration into a reusable component  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-05-14 20:20:36 +01:00  
				
					
						
							
							
								 
						
							
							
								09a4af49f3 
								
							
								 
							
						 
						
							
							
								
								Consolidate zxcvbn progress bars into a component and add dynamic colour  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-05-14 18:49:55 +01:00  
				
					
						
							
							
								 
						
							
							
								d1c6f3099c 
								
							
								 
							
						 
						
							
							
								
								move styling to QRCode scss  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-05-14 11:20:06 +01:00  
				
					
						
							
							
								 
						
							
							
								6ff093f5a3 
								
							
								 
							
						 
						
							
							
								
								Bring back UnknownBody for UISIs  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-05-08 19:15:59 +01:00  
				
					
						
							
							
								 
						
							
							
								54d211a847 
								
							
								 
							
						 
						
							
							
								
								Index file name changes  
							
							
							
						 
						
							2020-05-07 14:04:33 +01:00  
				
					
						
							
							
								 
						
							
							
								37e8dc0477 
								
							
								 
							
						 
						
							
							
								
								Include new css files  
							
							
							
						 
						
							2020-05-07 14:04:33 +01:00  
				
					
						
							
							
								 
						
							
							
								e16f511527 
								
							
								 
							
						 
						
							
							
								
								Redesign redactions  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-04-24 15:07:39 +01:00  
				
					
						
							
							
								 
						
							
							
								9a585fee0a 
								
							
								 
							
						 
						
							
							
								
								Move slider themes  
							
							
							
						 
						
							2020-04-23 10:45:48 +01:00  
				
					
						
							
							
								 
						
							
							
								abd94a65bd 
								
							
								 
							
						 
						
							
							
								
								Move compoenets/FontSlider to views/Slider  
							
							
							
						 
						
							2020-04-23 10:45:47 +01:00  
				
					
						
							
							
								 
						
							
							
								df73f12320 
								
							
								 
							
						 
						
							
							
								
								Make a font slider  
							
							
							
						 
						
							2020-04-23 10:45:47 +01:00  
				
					
						
							
							
								 
						
							
							
								80b8120bc3 
								
							
								 
							
						 
						
							
							
								
								Update login security copy and design to match Figma  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-04-22 22:32:02 +01:00  
				
					
						
							
							
								 
						
							
							
								aef6687931 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4406  from matrix-org/bwindels/completesecuritywithoutspinner  
							
							... 
							
							
							
							Fix: don't confuse user with spinner during complete security step 
							
						 
						
							2020-04-14 15:54:44 +00:00  
				
					
						
							
							
								 
						
							
							
								db09cadb66 
								
							
								 
							
						 
						
							
							
								
								remove spinner, change copy, add button placeholder  
							
							
							
						 
						
							2020-04-14 17:19:15 +02:00  
				
					
						
							
							
								 
						
							
							
								3e057070fd 
								
							
								 
							
						 
						
							
							
								
								Fix width of MVideoBody in FilePanel  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-04-12 00:56:21 +01:00  
				
					
						
							
							
								 
						
							
							
								25af26323c 
								
							
								 
							
						 
						
							
							
								
								Make image reply rendering even more compact  
							
							
							
						 
						
							2020-04-10 15:45:59 +03:00  
				
					
						
							
							
								 
						
							
							
								26a4a23a33 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering  
							
							
							
						 
						
							2020-04-10 13:56:01 +03:00  
				
					
						
							
							
								 
						
							
							
								202ad9f98a 
								
							
								 
							
						 
						
							
							
								
								Remove sort and include new scss file in components  
							
							
							
						 
						
							2020-04-02 13:42:59 +01:00  
				
					
						
							
							
								 
						
							
							
								25e7bde7bc 
								
							
								 
							
						 
						
							
							
								
								Add a flag to control whether cross-signing signatures are trusted  
							
							... 
							
							
							
							Fixes: https://github.com/vector-im/riot-web/issues/12616  
							
						 
						
							2020-03-25 18:38:12 +00:00  
				
					
						
							
							
								 
						
							
							
								d593a76f28 
								
							
								 
							
						 
						
							
							
								
								Merge branches 'develop' and 't3chguy/kbd' of github.com:matrix-org/matrix-react-sdk into t3chguy/kbd  
							
							
							
						 
						
							2020-03-18 20:41:13 +00:00  
				
					
						
							
							
								 
						
							
							
								cad28c81c0 
								
							
								 
							
						 
						
							
							
								
								Add Keyboard shortcuts dialog  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-03-18 16:40:21 +00:00  
				
					
						
							
							
								 
						
							
							
								a9f414dafe 
								
							
								 
							
						 
						
							
							
								
								Remove unused SearchableEntityList.js  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-03-13 23:23:23 +00:00  
				
					
						
							
							
								 
						
							
							
								a8c5574bc8 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering  
							
							
							
						 
						
							2020-03-05 13:19:15 +02:00  
				
					
						
							
							
								 
						
							
							
								39e9bffe1f 
								
							
								 
							
						 
						
							
							
								
								Make encryption events into bubble-style tiles  
							
							... 
							
							
							
							Factors out the verification tile stuff into encryption event
styles so we can reuse them betwen all the encryption event tiles.
Also makes the event list summary stuff even more gnarly by
putting the encryption event tile above the group. We really need
to refactor that. :/
Fixes https://github.com/vector-im/riot-web/issues/12006  
							
						 
						
							2020-01-30 20:03:26 +00:00  
				
					
						
							
							
								 
						
							
							
								76e61b9948 
								
							
								 
							
						 
						
							
							
								
								Merge branches 'develop' and 't3chguy/cs_verification_decoration' of  https://github.com/matrix-org/matrix-react-sdk  into t3chguy/cs_verification_decoration  
							
							
							
						 
						
							2020-01-28 17:19:59 +00:00  
				
					
						
							
							
								 
						
							
							
								ff532dd684 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into hs/bridge-info-pretty  
							
							
							
						 
						
							2020-01-28 16:01:50 +00:00  
				
					
						
							
							
								 
						
							
							
								dea919f6ee 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3953  from matrix-org/jryans/verif-toast-details-2  
							
							... 
							
							
							
							Add new session verification details dialog 
							
						 
						
							2020-01-28 11:50:03 +00:00  
				
					
						
							
							
								 
						
							
							
								7c0a461cbb 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into hs/bridge-info-pretty  
							
							
							
						 
						
							2020-01-28 11:22:02 +00:00  
				
					
						
							
							
								 
						
							
							
								d014c5239b 
								
							
								 
							
						 
						
							
							
								
								Add new session verification details dialog  
							
							... 
							
							
							
							This gives more info on the session you're about to verify, including device
name and ID.
Fixes https://github.com/vector-im/riot-web/issues/11977  
							
						 
						
							2020-01-27 23:16:26 +00:00  
				
					
						
							
							
								 
						
							
							
								89f110f60a 
								
							
								 
							
						 
						
							
							
								
								Add separate component for post-auth security flows  
							
							... 
							
							
							
							Instead of twisting `AuthBody`, this adds a new component for the different
styling of post-auth security flows. This also makes them fixed width and
adjusts padding to match designs. 
							
						 
						
							2020-01-27 22:28:07 +00:00  
				
					
						
							
							
								 
						
							
							
								c0d1298c4f 
								
							
								 
							
						 
						
							
							
								
								Factor out into BridgeTile  
							
							
							
						 
						
							2020-01-27 14:05:22 +00:00  
				
					
						
							
							
								 
						
							
							
								342fcb09c4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/matrix-org/matrix-react-sdk  into t3chguy/cs_verification_decoration  
							
							... 
							
							
							
							 Conflicts:
	src/components/views/right_panel/VerificationPanel.js
	src/components/views/toasts/VerificationRequestToast.js 
							
						 
						
							2020-01-24 16:19:41 +00:00  
				
					
						
							
							
								 
						
							
							
								7a5e172b88 
								
							
								 
							
						 
						
							
							
								
								Apply a huge part of the decorations and copy  
							
							
							
						 
						
							2020-01-24 16:16:46 +00:00  
				
					
						
							
							
								 
						
							
							
								a6fcbcacf6 
								
							
								 
							
						 
						
							
							
								
								Seperates out the padlock icon, and adds a tooltip  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/11840  
							
						 
						
							2020-01-24 12:06:21 +00:00  
				
					
						
							
							
								 
						
							
							
								7da9e0582f 
								
							
								 
							
						 
						
							
							
								
								Rename DMInviteDialog to be a generic Invite Dialog  
							
							
							
						 
						
							2020-01-16 13:42:34 -07:00  
				
					
						
							
							
								 
						
							
							
								27ee90cad5 
								
							
								 
							
						 
						
							
							
								
								Add post-login complete security flow  
							
							... 
							
							
							
							This adds a step after login to complete security for your new session. At the
moment, the only verification method is entering your SSSS passphrase, but nicer
paths will be added soon.
This new step only appears when crypto is available and the account has
cross-signing enabled in SSSS.
Fixes https://github.com/vector-im/riot-web/issues/11214  
							
						 
						
							2020-01-15 21:53:36 +00:00  
				
					
						
							
							
								 
						
							
							
								4de0f7257a 
								
							
								 
							
						 
						
							
							
								
								Initial implementation of FTUE user lists design  
							
							... 
							
							
							
							This covers the "recents" section and rough design exclusively. It is known that the Field does nothing and that there's a bunch of missing functionality - this is to be iterated upon in future PRs. Labs flag is to aide development and should be removed in a very near future PR.
Also, this is focusing on DMs and not user lists in general because I misinterpreted the scope. I'll fix this in a future PR and instead make this the best DM invite dialog it can be.
Closes https://github.com/vector-im/riot-web/issues/11197  
							
						 
						
							2020-01-02 17:40:18 -07:00  
				
					
						
							
							
								 
						
							
							
								9bdadd2103 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3751  from matrix-org/t3chguy/react16_contexts_online_dot  
							
							... 
							
							
							
							Room Tile DMs online/active green dot 
							
						 
						
							2019-12-27 16:50:21 +00:00  
				
					
						
							
							
								 
						
							
							
								22fe0add3c 
								
							
								 
							
						 
						
							
							
								
								Make UserOnlineDot more generic  
							
							
							
						 
						
							2019-12-26 18:14:46 +00:00  
				
					
						
							
							
								 
						
							
							
								b2249d0561 
								
							
								 
							
						 
						
							
							
								
								Initial rejig  
							
							
							
						 
						
							2019-12-19 20:09:05 +00:00  
				
					
						
							
							
								 
						
							
							
								9fa2680dc6 
								
							
								 
							
						 
						
							
							
								
								Implement new design for uploading/removing avatars  
							
							
							
						 
						
							2019-12-16 14:58:12 +00:00  
				
					
						
							
							
								 
						
							
							
								fae819dfe5 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into jryans/4s-new-key-backup  
							
							
							
						 
						
							2019-12-11 10:05:20 +00:00  
				
					
						
							
							
								 
						
							
							
								9f1c2cd3e1 
								
							
								 
							
						 
						
							
							
								
								Add dialogs for creating and accessing secret storage  
							
							... 
							
							
							
							This adds dialogs for creating and accessing secret storage via a passphrase or
recovery key. These flows are adapted from the ones used for key backup. 
							
						 
						
							2019-12-05 15:34:07 +00:00  
				
					
						
							
							
								 
						
							
							
								2a8853dd82 
								
							
								 
							
						 
						
							
							
								
								Remove duplicate dialog CSS  
							
							
							
						 
						
							2019-12-04 17:24:49 +00:00  
				
					
						
							
							
								 
						
							
							
								c6e56d98b3 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into jryans/4s-new-key-backup  
							
							
							
						 
						
							2019-11-29 11:31:23 +00:00  
				
					
						
							
							
								 
						
							
							
								c103fe4273 
								
							
								 
							
						 
						
							
							
								
								Add cross-signing diagnostic panel  
							
							... 
							
							
							
							This is not part of any designs, so it may be short-lived, but it's quite handy
for diagnosing issues with cross-signing at least while the feature is in
development. 
							
						 
						
							2019-11-29 11:29:08 +00:00  
				
					
						
							
							
								 
						
							
							
								f020929345 
								
							
								 
							
						 
						
							
							
								
								Add an option to invite users to upgraded private rooms  
							
							... 
							
							
							
							The option doesn't show up on public room upgrades. 
							
						 
						
							2019-11-27 20:29:11 -07:00  
				
					
						
							
							
								 
						
							
							
								4a684d01a4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3661  from matrix-org/bwindels/verif-toasts  
							
							... 
							
							
							
							Show incoming verification requests in in-app notifications 
							
						 
						
							2019-11-22 16:39:18 +00:00  
				
					
						
							
							
								 
						
							
							
								66cc68bae4 
								
							
								 
							
						 
						
							
							
								
								add new-styled button  
							
							... 
							
							
							
							might merge it later on with accessible button 
							
						 
						
							2019-11-22 16:04:51 +01:00  
				
					
						
							
							
								 
						
							
							
								e86d2b616e 
								
							
								 
							
						 
						
							
							
								
								add ToastContainer  
							
							
							
						 
						
							2019-11-22 16:04:51 +01:00  
				
					
						
							
							
								 
						
							
							
								6597e0bd42 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3646  from matrix-org/travis/integration-manager-opt  
							
							... 
							
							
							
							Add an option to disable the use of integration managers for provisioning 
							
						 
						
							2019-11-21 08:10:56 -07:00  
				
					
						
							
							
								 
						
							
							
								81c9bdd9f3 
								
							
								 
							
						 
						
							
							
								
								It's called an "Integration Manager" (singular)  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/11256 
This was finally annoying me enough to fix it. 
							
						 
						
							2019-11-20 20:14:25 -07:00  
				
					
						
							
							
								 
						
							
							
								fd12eb28e7 
								
							
								 
							
						 
						
							
							
								
								Move many widget options to a context menu  
							
							... 
							
							
							
							Part of https://github.com/vector-im/riot-web/issues/11262  
							
						 
						
							2019-11-20 19:17:42 -07:00  
				
					
						
							
							
								 
						
							
							
								b278531f2f 
								
							
								 
							
						 
						
							
							
								
								add IconButton as in design  
							
							
							
						 
						
							2019-11-15 16:14:18 +01:00  
				
					
						
							
							
								 
						
							
							
								6d0b388fa2 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/mjolnir  
							
							
							
						 
						
							2019-11-12 10:00:01 -07:00  
				
					
						
							
							
								 
						
							
							
								0d2f9c4215 
								
							
								 
							
						 
						
							
							
								
								add verification request tile + styling  
							
							
							
						 
						
							2019-11-07 19:54:56 +01:00  
				
					
						
							
							
								 
						
							
							
								11068d189c 
								
							
								 
							
						 
						
							
							
								
								Hide messages blocked by ban lists  
							
							
							
						 
						
							2019-10-31 16:19:42 -06:00  
				
					
						
							
							
								 
						
							
							
								b93508728a 
								
							
								 
							
						 
						
							
							
								
								Add personal list management to Mjolnir section  
							
							
							
						 
						
							2019-10-31 14:24:51 -06:00  
				
					
						
							
							
								 
						
							
							
								c5d5cd72bc 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3465  from matrix-org/t3chguy/nvl/userinfo  
							
							... 
							
							
							
							UserInfo consolidation of GroupMemberInfo and MemberInfo panels 
							
						 
						
							2019-10-21 15:50:08 +01:00  
				
					
						
							
							
								 
						
							
							
								497b779334 
								
							
								 
							
						 
						
							
							
								
								Add full emoji picker for reactions  
							
							... 
							
							
							
							Signed-off-by: Tulir Asokan <tulir@maunium.net> 
							
						 
						
							2019-10-14 00:32:11 +03:00  
				
					
						
							
							
								 
						
							
							
								d282675bc6 
								
							
								 
							
						 
						
							
							
								
								Improve reply rendering  
							
							... 
							
							
							
							Signed-off-by: Tulir Asokan <tulir@maunium.net> 
							
						 
						
							2019-10-13 15:08:50 +03:00  
				
					
						
							
							
								 
						
							
							
								37b8b52d0d 
								
							
								 
							
						 
						
							
							
								
								regenerate components  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-10-09 12:50:19 +02:00  
				
					
						
							
							
								 
						
							
							
								34530843f4 
								
							
								 
							
						 
						
							
							
								
								Factor out generic EventListSummary from MELS  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-10-09 12:50:03 +02:00  
				
					
						
							
							
								 
						
							
							
								df02eb8e92 
								
							
								 
							
						 
						
							
							
								
								Add UserInfo panel (consolidation of MemberInfo & GroupMemberInfo) Labs  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-10-07 16:52:50 +01:00  
				
					
						
							
							
								 
						
							
							
								0e8dc24c3f 
								
							
								 
							
						 
						
							
							
								
								Add a basic error boundary for the entire app  
							
							... 
							
							
							
							This adds a basic error boundary around the entire app to catch errors during
rendering and present the user with the options on how to proceed. This is not
implemented as a modal so that it could be used selectively in portions of the
app as well, such as just the `RoomView`.
Fixes https://github.com/vector-im/riot-web/issues/11009  
							
						 
						
							2019-10-02 17:31:22 +01:00  
				
					
						
							
							
								 
						
							
							
								8a1c1bbec4 
								
							
								 
							
						 
						
							
							
								
								implement RoomAliasField component  
							
							... 
							
							
							
							adding a postfix to Field to show the domain name 
							
						 
						
							2019-09-23 11:22:30 +02:00  
				
					
						
							
							
								 
						
							
							
								da29057fd8 
								
							
								 
							
						 
						
							
							
								
								move format bar to own component  
							
							
							
						 
						
							2019-09-06 10:39:19 +02:00  
				
					
						
							
							
								 
						
							
							
								b3cda4b19a 
								
							
								 
							
						 
						
							
							
								
								Support multiple integration managers behind a labs flag  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/10622 
Implements [MSC1957](https://github.com/matrix-org/matrix-doc/pull/1957 )
Design is not final. 
							
						 
						
							2019-08-23 09:12:40 -06:00  
				
					
						
							
							
								 
						
							
							
								cfbd2e9cc8 
								
							
								 
							
						 
						
							
							
								
								support basic sending with new main composer  
							
							... 
							
							
							
							this removes all formatting options, as the new editor doesn't
have any. 
							
						 
						
							2019-08-22 13:33:20 +01:00  
				
					
						
							
							
								 
						
							
							
								505846ce53 
								
							
								 
							
						 
						
							
							
								
								split up css, update class names  
							
							
							
						 
						
							2019-08-22 13:33:20 +01:00  
				
					
						
							
							
								 
						
							
							
								417de0cac7 
								
							
								 
							
						 
						
							
							
								
								Add an inline terms agreement component  
							
							... 
							
							
							
							Handles agreement of terms in an inline way. 
							
						 
						
							2019-08-19 22:59:33 -06:00  
				
					
						
							
							
								 
						
							
							
								03d735f4ed 
								
							
								 
							
						 
						
							
							
								
								Support changing your integration manager in the UI  
							
							... 
							
							
							
							Part of https://github.com/vector-im/riot-web/issues/10161  
							
						 
						
							2019-08-12 15:40:50 -06:00  
				
					
						
							
							
								 
						
							
							
								c76514fceb 
								
							
								 
							
						 
						
							
							
								
								Add UI in settings to change ID Server  
							
							... 
							
							
							
							Just changes the current ID server being used
To come in subsequent PRs:
 * Store this in account data
 * Check for terms or support the proper UI for accepting terms when setting
 * Support disconnecting
Part 1 of https://github.com/vector-im/riot-web/issues/10094 
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1013  
							
						 
						
							2019-08-09 18:07:58 +01:00  
				
					
						
							
							
								 
						
							
							
								ae834f8d05 
								
							
								 
							
						 
						
							
							
								
								Split out SlashCommandHelpDialog, group by category and style it  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-08-06 18:03:38 +01:00  
				
					
						
							
							
								 
						
							
							
								54aaabac74 
								
							
								 
							
						 
						
							
							
								
								Initial support for ToS dialogs for IS/IM  
							
							... 
							
							
							
							as per MSC2140 
							
						 
						
							2019-07-09 18:51:56 +01:00  
				
					
						
							
							
								 
						
							
							
								ef71e6fd4f 
								
							
								 
							
						 
						
							
							
								
								very basic & hackish edit history dialog  
							
							
							
						 
						
							2019-06-26 11:59:56 +02:00  
				
					
						
							
							
								 
						
							
							
								c1821fabd3 
								
							
								 
							
						 
						
							
							
								
								Remove toggling reaction dimensions  
							
							... 
							
							
							
							This removes the v1 Reactions UX which only allowed you to choose only one emoji
out of each pair. It is replaced by a different UX inside a tooltip and without
these constraints.
Part of https://github.com/vector-im/riot-web/issues/9753  
							
						 
						
							2019-06-25 16:23:31 +01:00  
				
					
						
							
							
								 
						
							
							
								c6f2bb4ba7 
								
							
								 
							
						 
						
							
							
								
								Arrange buttons in a grid  
							
							
							
						 
						
							2019-06-25 16:23:30 +01:00  
				
					
						
							
							
								 
						
							
							
								fd2723585f 
								
							
								 
							
						 
						
							
							
								
								Add quick reaction buttons in tooltip  
							
							... 
							
							
							
							This adds the set of quick reactions as buttons in a new tooltip accessed via
the react action in the message action bar.
Part of https://github.com/vector-im/riot-web/issues/9753  
							
						 
						
							2019-06-25 16:23:13 +01:00  
				
					
						
							
							
								 
						
							
							
								6dcdad028e 
								
							
								 
							
						 
						
							
							
								
								Clone ContextualMenu to InteractiveTooltip  
							
							... 
							
							
							
							As part of reactions and editing work, we're adding a new style of tooltip that
allows interacting with the content of the tooltip.  `ContextualMenu` is closest
out of the things we have today, but it doesn't position in quite the way we
want and it's already quite complex.
To get started, let's first clone that to a new `InteractiveTooltip`.
Part of https://github.com/vector-im/riot-web/issues/9753 
Part of https://github.com/vector-im/riot-web/issues/9716  
							
						 
						
							2019-06-21 15:04:19 +01:00  
				
					
						
							
							
								 
						
							
							
								4ec7a8ddff 
								
							
								 
							
						 
						
							
							
								
								Fix casing of TooltipButton  
							
							... 
							
							
							
							My brain can't deal with two different ways to write "Tooltip", so this
converges the naming to match the rest of the code base. Separate commits will
fix up the file names for case-insensitive file systems. 
							
						 
						
							2019-06-19 11:26:13 +01:00  
				
					
						
							
							
								 
						
							
							
								1090b7d912 
								
							
								 
							
						 
						
							
							
								
								Use flex: 1 for mx_Field to replace all the calc(100% - 20px) and more  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-06-13 23:48:47 +01:00  
				
					
						
							
							
								 
						
							
							
								3476be3327 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/feature/wellknown2  
							
							
							
						 
						
							2019-05-20 19:50:02 -06:00  
				
					
						
							
							
								 
						
							
							
								3a405701a3 
								
							
								 
							
						 
						
							
							
								
								Debug: Show all events  
							
							
							
						 
						
							2019-05-17 16:34:01 +01:00  
				
					
						
							
							
								 
						
							
							
								3da1f73ea4 
								
							
								 
							
						 
						
							
							
								
								Add a basic tooltip showing who reacted  
							
							... 
							
							
							
							This adds a first attempt at tooltip showing who reacted to a message. It
doesn't limit senders or position the tooltip nicely, but the info is there at
least.
Part of https://github.com/vector-im/riot-web/issues/9722  
							
						 
						
							2019-05-17 12:11:01 +01:00  
				
					
						
							
							
								 
						
							
							
								0c7aa39273 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/feature/wellknown2  
							
							
							
						 
						
							2019-05-16 12:59:50 -06:00  
				
					
						
							
							
								 
						
							
							
								6599d605cd 
								
							
								 
							
						 
						
							
							
								
								wire up editor component (somewhat hacky)  
							
							
							
						 
						
							2019-05-14 15:38:16 +01:00  
				
					
						
							
							
								 
						
							
							
								e4576dac28 
								
							
								 
							
						 
						
							
							
								
								Render underlines and tooltips on custom server names in auth pages  
							
							... 
							
							
							
							See https://github.com/vector-im/riot-web/issues/9290  
							
						 
						
							2019-05-13 17:16:40 -06:00  
				
					
						
							
							
								 
						
							
							
								576241236c 
								
							
								 
							
						 
						
							
							
								
								Extract `ReactionDimension` out of `MessageActionBar`  
							
							... 
							
							
							
							The reactions bits were cluttering up `MessageActionBar` so they have now been
extracted to a separate component. 
							
						 
						
							2019-05-08 13:53:41 +01:00  
				
					
						
							
							
								 
						
							
							
								15c5893278 
								
							
								 
							
						 
						
							
							
								
								Display existing reactions below the message  
							
							... 
							
							
							
							This displays the existing reactions a message has from all users below the
message.
Since we don't currently have an API to actually get these events yet,
adds a temporary hook that looks for a specific message to inject some sample
data. This helps build out the UI for now and can be removed once it exists.
Fixes https://github.com/vector-im/riot-web/issues/9573  
							
						 
						
							2019-05-02 12:05:17 +01:00  
				
					
						
							
							
								 
						
							
							
								ed8bbc7082 
								
							
								 
							
						 
						
							
							
								
								Extract message options button to action bar  
							
							... 
							
							
							
							This adds a new action bar component to hold multiple per-message actions. This
existing options button has moved to this new component, and is currently the
only action. 
							
						 
						
							2019-04-29 15:20:50 +01:00  
				
					
						
							
							
								 
						
							
							
								338d83ab55 
								
							
								 
							
						 
						
							
							
								
								Add validation feedback helper  
							
							... 
							
							
							
							This adds a general validation feedback mechanism for checking input values. An
initial example is wired up for the username input on registration. 
							
						 
						
							2019-04-25 14:29:09 +01:00  
				
					
						
							
							
								 
						
							
							
								aadc1a8d75 
								
							
								 
							
						 
						
							
							
								
								Add a generic error page element for startup errors  
							
							... 
							
							
							
							Used by Riot to communicate configuration problems. 
							
						 
						
							2019-04-11 15:52:37 -06:00  
				
					
						
							
							
								 
						
							
							
								7925e7169a 
								
							
								 
							
						 
						
							
							
								
								Design tweaks to dialogs  
							
							... 
							
							
							
							Little bit of a mix of things in this one:
 * Support variable-width dialogs. Default is fixed-width as before,
   only UploadConformDialog is variable-width. Controlled by a prop
   to BaseDialog.
 * Fixes to the cancel 'x' - scale the mask image, tweak size & colour
 * Colour & boldness of dialog titles
 * Align the dialog title & cancel 'x'
 * Remove gap between dialog buttons & right hand side of dialog(!)
 * Round corners on dialogs
 * Add grey border on image preview in upload confirm dialog
 * and, squeezing in slightly randomly, finish the partially renamed
   ChatInviteDialog to AddressPickerDialog. 
							
						 
						
							2019-04-03 16:27:45 +01:00  
				
					
						
							
							
								 
						
							
							
								5b2cee2fc1 
								
							
								 
							
						 
						
							
							
								
								Implement redesigned upload confirmation screens  
							
							... 
							
							
							
							Also fairly significant refactor of the uploading code: there are
a number of different ways of triggerring a file upload and each
went through a different code path (the media config size limit
worked on one of those paths). Basically take a lot of code out
of the views and put it into ContentMessages.
Sorry about the size of this patch.
https://github.com/vector-im/riot-web/issues/7565  
							
						 
						
							2019-04-01 16:42:41 +01:00  
				
					
						
							
							
								 
						
							
							
								adf263c4af 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into bwindels/bacat-scrolling-merged-develop  
							
							
							
						 
						
							2019-03-27 11:46:28 +01:00  
				
					
						
							
							
								 
						
							
							
								71f6b08b26 
								
							
								 
							
						 
						
							
							
								
								first impl of new scrolling, still a bit broken  
							
							
							
						 
						
							2019-03-19 13:42:22 +01:00  
				
					
						
							
							
								 
						
							
							
								f045beafc3 
								
							
								 
							
						 
						
							
							
								
								Support whitelisting/blacklisting widgets for OpenID  
							
							
							
						 
						
							2019-03-15 21:33:31 -06:00  
				
					
						
							
							
								 
						
							
							
								40f16fa310 
								
							
								 
							
						 
						
							
							
								
								adds validation for fields.  
							
							... 
							
							
							
							* renames RoomTooltip to be a generic Tooltip (which it is)
 * hooks it into Field to show validation results
 * adds onValidate to Field to let Field instances call an arbitrary validation function
Rebased from @ara4n's https://github.com/matrix-org/matrix-react-sdk/pull/2550 
by @jryans. Subsequent commits revise and adapt this work. 
							
						 
						
							2019-03-12 14:02:54 +00:00  
				
					
						
							
							
								 
						
							
							
								a41df7ab68 
								
							
								 
							
						 
						
							
							
								
								Convert PowerSelector to use mxField instead  
							
							
							
						 
						
							2019-02-28 19:00:57 -07:00  
				
					
						
							
							
								 
						
							
							
								bd54a401bc 
								
							
								 
							
						 
						
							
							
								
								Sort settings tabs into a logical structure  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/8864  
							
						 
						
							2019-02-22 11:33:03 -07:00  
				
					
						
							
							
								 
						
							
							
								f11505a9de 
								
							
								 
							
						 
						
							
							
								
								bring back user page  
							
							... 
							
							
							
							Adds a UserView that contains a MainSplit with an empty div
and a RightPanel, preset to the given member.
UserView fetches the profile and creates a fake member, which
it passed on to the RightPanel.
this doesn't use the view_user action on purpose, to avoid any
interference of the UserView when trying to view a room member. 
							
						 
						
							2019-02-20 12:45:55 +01:00  
				
					
						
							
							
								 
						
							
							
								de8cd88418 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2621  from matrix-org/bwindels/tabsdivider  
							
							... 
							
							
							
							Add divider between tabs and regular buttons in room header 
							
						 
						
							2019-02-13 11:00:52 +01:00  
				
					
						
							
							
								 
						
							
							
								5047d15a3b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2615  from matrix-org/bwindels/breadcrumbs  
							
							... 
							
							
							
							Labs feature: recent room breadcrumbs 
							
						 
						
							2019-02-13 09:16:40 +01:00  
				
					
						
							
							
								 
						
							
							
								ccaa017980 
								
							
								 
							
						 
						
							
							
								
								add divider between tabs and regular buttons in room header  
							
							
							
						 
						
							2019-02-12 20:05:01 +01:00  
				
					
						
							
							
								 
						
							
							
								aaea40a93d 
								
							
								 
							
						 
						
							
							
								
								add breadcrumbs component  
							
							
							
						 
						
							2019-02-12 11:04:25 +01:00  
				
					
						
							
							
								 
						
							
							
								99ae63c021 
								
							
								 
							
						 
						
							
							
								
								Add display name / avatar to incoming sas dialog  
							
							... 
							
							
							
							Fetch the other user's profile & display it on an incoming verification
request 
							
						 
						
							2019-02-11 15:57:34 +00:00  
				
					
						
							
							
								 
						
							
							
								f99c56fedb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2597  from matrix-org/jryans/add-welcome-page  
							
							... 
							
							
							
							SDK support for welcome page 
							
						 
						
							2019-02-08 17:17:22 +00:00  
				
					
						
							
							
								 
						
							
							
								7238c713d7 
								
							
								 
							
						 
						
							
							
								
								Add language selector to bottom of welcome  
							
							
							
						 
						
							2019-02-08 11:39:30 +00:00  
				
					
						
							
							
								 
						
							
							
								3a924d05b5 
								
							
								 
							
						 
						
							
							
								
								Remove click-to-verify from SAS  
							
							... 
							
							
							
							The click-each-pair to verify was hard to discover, so remove it 
							
						 
						
							2019-02-07 17:01:55 +00:00  
				
					
						
							
							
								 
						
							
							
								87ddb8a453 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2575  from matrix-org/bwindels/customtags  
							
							... 
							
							
							
							Bring back custom tags, also badges on communities 
							
						 
						
							2019-02-07 11:37:17 +00:00  
				
					
						
							
							
								 
						
							
							
								604020dd59 
								
							
								 
							
						 
						
							
							
								
								add selectable custom tags below tag panel  
							
							
							
						 
						
							2019-02-05 17:39:02 +00:00  
				
					
						
							
							
								 
						
							
							
								bdc7936130 
								
							
								 
							
						 
						
							
							
								
								move help & communities button out of tag panel  
							
							... 
							
							
							
							so we can shove the custom tag buttons between them
in the next commit 
							
						 
						
							2019-02-05 17:36:33 +00:00  
				
					
						
							
							
								 
						
							
							
								eac50aa800 
								
							
								 
							
						 
						
							
							
								
								Remove old user and room settings  
							
							... 
							
							
							
							This takes out the old user and room settings, replacing the paths with the new dialog editions. The labs setting has been removed in order to support this change.
In addition to removing the old components outright, some older components which were only used by the settings pages have been removed. The exception is the ColorSettings component as it has a high chance of sticking around in the future.
Styles that were shared by the settings components have been broken out to dedicated sections, making it easier to remove the old styles entirely.
Some stability testing of the app has been performed to ensure the app still works, however given the scope of this change there is a possibility of some broken functionality. 
							
						 
						
							2019-02-04 13:40:21 -07:00  
				
					
						
							
							
								 
						
							
							
								f2928c184d 
								
							
								 
							
						 
						
							
							
								
								create warning/verified icon to use in header/composer/member info  
							
							
							
						 
						
							2019-02-01 13:39:56 +01:00  
				
					
						
							
							
								 
						
							
							
								4d2a93eaaf 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2527  from jryans/auth-registration  
							
							... 
							
							
							
							Style registration flow 
							
						 
						
							2019-01-30 11:27:45 +00:00  
				
					
						
							
							
								 
						
							
							
								bdf2bb5601 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2526  from matrix-org/travis/settings/fixes-1  
							
							... 
							
							
							
							Round 1 of misc fixes for settings 
							
						 
						
							2019-01-29 22:59:07 -07:00  
				
					
						
							
							
								 
						
							
							
								f86e224db6 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'experimental' into travis/rsettings/tab/security  
							
							
							
						 
						
							2019-01-29 22:15:55 -07:00  
				
					
						
							
							
								 
						
							
							
								4d0a246629 
								
							
								 
							
						 
						
							
							
								
								Put a little padding between section headings  
							
							
							
						 
						
							2019-01-29 19:28:30 -07:00  
				
					
						
							
							
								 
						
							
							
								92394ba601 
								
							
								 
							
						 
						
							
							
								
								Change country dropdown to be smaller with arrow on right  
							
							
							
						 
						
							2019-01-29 17:38:28 -06:00  
				
					
						
							
							
								 
						
							
							
								0af419633f 
								
							
								 
							
						 
						
							
							
								
								Implement the Roles & Permissions tab of new room settings  
							
							... 
							
							
							
							This is largely copy/paste from the current room settings 
							
						 
						
							2019-01-29 15:54:51 -07:00  
				
					
						
							
							
								 
						
							
							
								a2f516c461 
								
							
								 
							
						 
						
							
							
								
								Implement the Security & Privacy tab of new room settings  
							
							
							
						 
						
							2019-01-29 14:31:07 -07:00  
				
					
						
							
							
								 
						
							
							
								ad276c1fda 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'experimental' into travis/rsettings/tab/general  
							
							
							
						 
						
							2019-01-29 09:11:21 -07:00  
				
					
						
							
							
								 
						
							
							
								243feb9b13 
								
							
								 
							
						 
						
							
							
								
								Early tab structure and profile changes (name/avatar/topic)  
							
							
							
						 
						
							2019-01-28 13:54:56 -07:00  
				
					
						
							
							
								 
						
							
							
								b7d0dd4408 
								
							
								 
							
						 
						
							
							
								
								Rename GeneralSettingsTab to GeneralUserSettingsTab  
							
							
							
						 
						
							2019-01-28 13:54:56 -07:00  
				
					
						
							
							
								 
						
							
							
								0bee324e48 
								
							
								 
							
						 
						
							
							
								
								Add server type selector component  
							
							
							
						 
						
							2019-01-28 08:52:20 -06:00  
				
					
						
							
							
								 
						
							
							
								b4f02844a8 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/experimental' into dbkr/sas  
							
							
							
						 
						
							2019-01-28 09:36:39 +00:00  
				
					
						
							
							
								 
						
							
							
								535d42684f 
								
							
								 
							
						 
						
							
							
								
								Initial structure for new room settings  
							
							
							
						 
						
							2019-01-25 13:09:44 -07:00  
				
					
						
							
							
								 
						
							
							
								f7f23e4dea 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'experimental' into travis/usettings/tab/security  
							
							
							
						 
						
							2019-01-25 09:12:07 -07:00  
				
					
						
							
							
								 
						
							
							
								3301c35f7d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2501  from matrix-org/travis/settings/dialog-size  
							
							... 
							
							
							
							Have the settings dialog be fixed in size 
							
						 
						
							2019-01-25 07:46:36 -07:00  
				
					
						
							
							
								 
						
							
							
								5dc75e2d3c 
								
							
								 
							
						 
						
							
							
								
								Have the settings dialog be fixed in size  
							
							... 
							
							
							
							This also brings out some classes that aren't solely applicable to the user settings and will be applicable to the room settings as well. 
							
						 
						
							2019-01-24 19:12:09 -07:00  
				
					
						
							
							
								 
						
							
							
								1f10cda5e4 
								
							
								 
							
						 
						
							
							
								
								Implement the "Help & About" tab of new user settings  
							
							
							
						 
						
							2019-01-24 17:10:35 -07:00  
				
					
						
							
							
								 
						
							
							
								b0a8cbf75f 
								
							
								 
							
						 
						
							
							
								
								Implement the "Security & Privacy" tab of new user settings  
							
							
							
						 
						
							2019-01-24 15:47:04 -07:00  
				
					
						
							
							
								 
						
							
							
								27ee6625ee 
								
							
								 
							
						 
						
							
							
								
								Implement the "Voice & Video" tab of new user settings  
							
							
							
						 
						
							2019-01-24 13:33:22 -07:00  
				
					
						
							
							
								 
						
							
							
								5479a4dac5 
								
							
								 
							
						 
						
							
							
								
								Implement the "Preferences" tab on new user settings  
							
							
							
						 
						
							2019-01-24 10:32:29 -07:00  
				
					
						
							
							
								 
						
							
							
								2a9f6186d7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2491  from matrix-org/travis/usettings/tab/general  
							
							... 
							
							
							
							Implement the "General" tab of new user settings 
							
						 
						
							2019-01-24 08:51:11 -07:00  
				
					
						
							
							
								 
						
							
							
								3f897468a6 
								
							
								 
							
						 
						
							
							
								
								Add a ToggleSwitch and use it for SettingsFlag  
							
							... 
							
							
							
							Also bring in the compact timeline option.
Without minor CSS changes, the old user settings are completely unusable with this change. As such, minimal effort has been put in to have it be useful. Similarly, the changes drop the use of radio groups and the old theme selector was the only one that used it. See the comments for more details on how/why this was mitigated the way it was. 
							
						 
						
							2019-01-23 15:50:41 -07:00  
				
					
						
							
							
								 
						
							
							
								9f5f552be1 
								
							
								 
							
						 
						
							
							
								
								Move LanguageSelector to views  
							
							... 
							
							
							
							It's too simple to be called a structure. 
							
						 
						
							2019-01-23 16:14:03 -06:00  
				
					
						
							
							
								 
						
							
							
								d55d145223 
								
							
								 
							
						 
						
							
							
								
								Bring over phone number management  
							
							
							
						 
						
							2019-01-23 14:16:18 -07:00  
				
					
						
							
							
								 
						
							
							
								6a90625d36 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/experimental' into dbkr/sas  
							
							
							
						 
						
							2019-01-23 17:32:18 +00:00  
				
					
						
							
							
								 
						
							
							
								aa7afe819f 
								
							
								 
							
						 
						
							
							
								
								Bring over email address management  
							
							
							
						 
						
							2019-01-23 09:28:53 -07:00  
				
					
						
							
							
								 
						
							
							
								fa1ce61a06 
								
							
								 
							
						 
						
							
							
								
								Move profile settings to a dedicated component  
							
							... 
							
							
							
							The tab component is getting a bit hard to navigate 
							
						 
						
							2019-01-23 09:28:53 -07:00  
				
					
						
							
							
								 
						
							
							
								05254f0e82 
								
							
								 
							
						 
						
							
							
								
								Tweak language selector to match design  
							
							
							
						 
						
							2019-01-23 10:18:06 -06:00  
				
					
						
							
							
								 
						
							
							
								94b1d739fb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2476  from matrix-org/travis/modal-tab-settings  
							
							... 
							
							
							
							Basic structure for tabbed user settings 
							
						 
						
							2019-01-23 07:52:44 -07:00  
				
					
						
							
							
								 
						
							
							
								0f3ee9c786 
								
							
								 
							
						 
						
							
							
								
								Extract auth header logo to new component  
							
							... 
							
							
							
							This will allow `riot-web` to replace only the logo, rather than the whole
header. 
							
						 
						
							2019-01-22 22:41:10 -06:00  
				
					
						
							
							
								 
						
							
							
								575cd1e37b 
								
							
								 
							
						 
						
							
							
								
								Add modal look to authentication flows  
							
							... 
							
							
							
							This changes the auth screens to use the modal-like style of the redesign.
This does not attempt to style the actual body content of each screen.  Instead,
it covers the header area with logo, footer links, and overall modal container
only. 
							
						 
						
							2019-01-22 20:44:49 -06:00  
				
					
						
							
							
								 
						
							
							
								5dd5f4f1dc 
								
							
								 
							
						 
						
							
							
								
								add JumpToBottomButtom component  
							
							
							
						 
						
							2019-01-22 14:49:04 +01:00  
				
					
						
							
							
								 
						
							
							
								3bd765f63f 
								
							
								 
							
						 
						
							
							
								
								Rename LoginPage, Header, Footer views to Auth*  
							
							
							
						 
						
							2019-01-21 19:11:43 -06:00  
				
					
						
							
							
								 
						
							
							
								c7354f483b 
								
							
								 
							
						 
						
							
							
								
								Rename LoginBox to AuthButtons  
							
							... 
							
							
							
							This component displays login and register buttons. It's currently used in the
composer when viewing a room as a guest.
The name is confusing because the login flow uses are very similarly named
`mx_Login_box` as a wrapping around forms, which is totally different than these
buttons.
Additionally, the components is moved to `views/auth` since it is very simple
and auth related. 
							
						 
						
							2019-01-21 19:11:43 -06:00  
				
					
						
							
							
								 
						
							
							
								f1e44757f0 
								
							
								 
							
						 
						
							
							
								
								Very early work on the "General" tab  
							
							
							
						 
						
							2019-01-21 16:51:43 -07:00  
				
					
						
							
							
								 
						
							
							
								a7e3d7df28 
								
							
								 
							
						 
						
							
							
								
								Make the tabs look like the design  
							
							
							
						 
						
							2019-01-21 16:51:43 -07:00  
				
					
						
							
							
								 
						
							
							
								5adfc09237 
								
							
								 
							
						 
						
							
							
								
								Bring in TabbedView nearly verbatim from prior work  
							
							... 
							
							
							
							Sourced from https://github.com/matrix-org/matrix-react-sdk/pull/1644  and related PRs. 
							
						 
						
							2019-01-21 16:51:43 -07:00  
				
					
						
							
							
								 
						
							
							
								29be3ee4b5 
								
							
								 
							
						 
						
							
							
								
								Rename login directory to auth  
							
							
							
						 
						
							2019-01-21 17:45:55 -06:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								970880737e 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/experimental' into dbkr/sas  
							
							
							
						 
						
							2019-01-18 18:33:11 +00:00  
				
					
						
							
							
								 
						
							
							
								ec2d51cbbb 
								
							
								 
							
						 
						
							
							
								
								SAS verification screen matching design  
							
							
							
						 
						
							2019-01-18 16:56:49 +00: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