f0ee7f7905 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge matrix-react-sdk into element-web  
							
							... 
							
							
							
							Merge remote-tracking branch 'repomerge/t3chguy/repomerge' into t3chguy/repo-merge
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2024-10-15 15:32:09 +01:00  
				
					
						
							
							
								 
						
							
							
								b084ff2313 
								
									
								
							
								 
							
						 
						
							
							
								
								Prepare for repo merge  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2024-10-15 11:35:21 +01:00  
				
					
						
							
							
								 
						
							
							
								491f0cd08a 
								
									
								
							
								 
							
						 
						
							
							
								
								Change license ( #13 )  
							
							... 
							
							
							
							* Copyright headers 1
* Licence headers 2
* Copyright Headers 3
* Copyright Headers 4
* Copyright Headers 5
* Copyright Headers 6
* Copyright headers 7
* Add copyright headers for html and config file
* Replace license files and update package.json
* Update with CLA
* lint 
							
						 
						
							2024-09-09 13:57:16 +00:00  
				
					
						
							
							
								 
						
							
							
								8b7f49e74e 
								
									
								
							
								 
							
						 
						
							
							
								
								Rewrite doesRoomOrThreadHaveUnreadMessages to use the receipt rewrite from js-sdk ( #11903 )  
							
							... 
							
							
							
							* Rewrite doesRoomOrThreadHaveUnreadMessages to use the receipt rewrite from js-sdk
* Remove unit tests that rely on receipt timestamps
Previously, if we found a receipt for an unknown event, we would use the
receipt timestamp and declare all events before that time to be read.
Now, we ignore such "dangling" receipts until we find the event they
refer to.
This new behaviour is more correct, but does lead to more messages being
considered unread.
This commit deletes tests that checked for the old behaviour.
* Check for a missing thread in determineUnreadState
* Fix incorrect way to find room timeline
* More realistic test setup to support new receipt code
* Update snapshot to expect a room to be unread when there are no receipts
* Formatting fixes
* Update snapshot to show menu and notif button
* Disable some flaky tests
* Disable some flaky tests
* Fix test to make a threaded receipt for an event that is actually in the thread
---------
Co-authored-by: Florian Duros <florianduros@element.io>
Co-authored-by: Florian Duros <florian.duros@ormaz.fr> 
							
						 
						
							2023-11-29 13:36:52 +00:00  
				
					
						
							
							
								 
						
							
							
								d2c6577024 
								
									
								
							
								 
							
						 
						
							
							
								
								Switch to importing more things from the main js-sdk export ( #11394 )  
							
							
							
						 
						
							2023-08-14 08:58:55 +00:00  
				
					
						
							
							
								 
						
							
							
								e959eca354 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix corrupt thread timeline for sending events ( #11260 )  
							
							... 
							
							
							
							Events which are still in the process of being sent should *not* be included
in the `EventTimeline`. Doing so means that we will attempt to render them
twice, which makes react explode.
Fixes https://github.com/vector-im/element-web/issues/25770  
							
						 
						
							2023-07-14 10:59:55 +00:00  
				
					
						
							
							
								 
						
							
							
								b5727cb463 
								
									
								
							
								 
							
						 
						
							
							
								
								Include thread replies in message previews ( #10631 )  
							
							... 
							
							
							
							* Include thread replies to message previews
* Extend tests
* Fix type issue
* Use currentColor for thread icon
* Fix long room name overflow
* Update snapshots
* Fix preview
* Fix typing issue
* Fix type issues
* Tweak thread reply detection
* Extend tests
* Fix type issue
* Fix test 
							
						 
						
							2023-06-01 07:53:48 +00:00  
				
					
						
							
							
								 
						
							
							
								da7aa4055e 
								
									
								
							
								 
							
						 
						
							
							
								
								Conform more of the code base to strict null checking ( #10147 )  
							
							... 
							
							
							
							* Conform more of the code base to strict null checking
* More strict fixes
* More strict work
* Fix missing optional type
* Iterate 
							
						 
						
							2023-02-13 17:01:43 +00:00  
				
					
						
							
							
								 
						
							
							
								47cc8d6edf 
								
									
								
							
								 
							
						 
						
							
							
								
								Don't double-add events to threads in tests ( #9742 )  
							
							
							
						 
						
							2022-12-12 15:43:42 -07:00  
				
					
						
							
							
								 
						
							
							
								dae13ac852 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into weeman1337/prettier  
							
							
							
						 
						
							2022-12-12 15:58:30 +01:00  
				
					
						
							
							
								 
						
							
							
								9de5654353 
								
									
								
							
								 
							
						 
						
							
							
								
								Check each thread for unread messages. ( #9723 )  
							
							... 
							
							
							
							Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: Janne Mareike Koschinski <jannemk@element.io> 
							
						 
						
							2022-12-12 14:34:05 +00:00  
				
					
						
							
							
								 
						
							
							
								526645c791 
								
									
								
							
								 
							
						 
						
							
							
								
								Apply prettier formatting  
							
							
							
						 
						
							2022-12-12 12:24:14 +01:00  
				
					
						
							
							
								 
						
							
							
								d92fdc1f5b 
								
									
								
							
								 
							
						 
						
							
							
								
								Loading threads with server-side assistance ( #9356 )  
							
							... 
							
							
							
							* Fix bug with message context menu
* fix bug where ThreadSummary failed if no last reply is available
* Fix relations direction API
* Use same API for threads as for any other timeline
* Determine if event belongs to thread on jumping to event
* properly listen to thread deletion
* Add thread redaction tests
* Add fetchInitialEvent tests
* Paginate using default TimelinePanel behaviour
* Remove unused threads deleted code
Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: Germain <germains@element.io> 
							
						 
						
							2022-10-28 13:48:15 +02:00  
				
					
						
							
							
								 
						
							
							
								9eb4f8d723 
								
									
								
							
								 
							
						 
						
							
							
								
								Add thread notification with server assistance (MSC3773) ( #9400 )  
							
							... 
							
							
							
							Co-authored-by: Janne Mareike Koschinski <janne@kuschku.de> 
							
						 
						
							2022-10-24 07:50:21 +01:00  
				
					
						
							
							
								 
						
							
							
								be281fd735 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix threads fallback incorrectly targets root event ( #9229 )  
							
							... 
							
							
							
							* Use RelationType enum instead of hardcoded value
* Fix threads replies fallback to target last reply
* Only unsubscribe from threads events if needed
* fix strict null check
* fix strict null checks
* strict null checks
* fix typing
* Unsubscribe listeners if new thread is `null`
Co-authored-by: Faye Duxovni <fayed@element.io>
* Update strict null checks
* Type HTMLElement as nullable
* Add thread fallback integration test
* lint fix
* Update snapshots
* Add test after changing thread
* Remove test comment
* update snapshot
* fix room context test utility
* Add ThreadListContextMenu test
* lint fix
* fix thread rendering
Co-authored-by: Faye Duxovni <fayed@element.io>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2022-10-20 12:48:25 +01:00  
				
					
						
							
							
								 
						
							
							
								19e514d83c 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove dead code ( #9035 )  
							
							
							
						 
						
							2022-07-11 07:52:44 +02:00  
				
					
						
							
							
								 
						
							
							
								f29ef04751 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix race conditions around threads ( #8448 )  
							
							
							
						 
						
							2022-05-03 14:25:08 +01:00  
				
					
						
							
							
								 
						
							
							
								21d3cb08a9 
								
									
								
							
								 
							
						 
						
							
							
								
								Switch to using stable values for threads ( #8019 )  
							
							
							
						 
						
							2022-03-11 09:04:22 +00:00  
				
					
						
							
							
								 
						
							
							
								f25e6813bb 
								
									
								
							
								 
							
						 
						
							
							
								
								Mandate use of js-sdk/src/matrix import over js-sdk/src ( #7933 )  
							
							
							
						 
						
							2022-03-01 20:42:05 +00:00  
				
					
						
							
							
								 
						
							
							
								889b0cebb2 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix 'my threads' filtering to include participated threads ( #7882 )  
							
							... 
							
							
							
							* move js utils into directory
Signed-off-by: Kerry Archibald <kerrya@element.io>
* typescripterize js test-utils
Signed-off-by: Kerry Archibald <kerrya@element.io>
* move test utils to directory
Signed-off-by: Kerry Archibald <kerrya@element.io>
* move remaining mock functions to directory
Signed-off-by: Kerry Archibald <kerrya@element.io>
* update imports
Signed-off-by: Kerry Archibald <kerrya@element.io>
* missed copyright
Signed-off-by: Kerry Archibald <kerrya@element.io>
* threads test helpers
Signed-off-by: Kerry Archibald <kerrya@element.io>
* forgotten copyright
Signed-off-by: Kerry Archibald <kerrya@element.io>
* comments
Signed-off-by: Kerry Archibald <kerrya@element.io>
* fix threads helper unsigned
Signed-off-by: Kerry Archibald <kerrya@element.io>
* test filter creation when thread capabilities enabled
Signed-off-by: Kerry Archibald <kerrya@element.io> 
							
						 
						
							2022-02-24 09:44:34 +01:00  
				
					
						
							
							
								 
						
							
							
								1830de2733 
								
									
								
							
								 
							
						 
						
							
							
								
								Thread test utilities ( #7881 )  
							
							... 
							
							
							
							* move js utils into directory
Signed-off-by: Kerry Archibald <kerrya@element.io>
* typescripterize js test-utils
Signed-off-by: Kerry Archibald <kerrya@element.io>
* move test utils to directory
Signed-off-by: Kerry Archibald <kerrya@element.io>
* move remaining mock functions to directory
Signed-off-by: Kerry Archibald <kerrya@element.io>
* update imports
Signed-off-by: Kerry Archibald <kerrya@element.io>
* missed copyright
Signed-off-by: Kerry Archibald <kerrya@element.io>
* threads test helpers
Signed-off-by: Kerry Archibald <kerrya@element.io>
* forgotten copyright
Signed-off-by: Kerry Archibald <kerrya@element.io>
* comments
Signed-off-by: Kerry Archibald <kerrya@element.io>
* add unsigned to root event
Signed-off-by: Kerry Archibald <kerrya@element.io> 
							
						 
						
							2022-02-23 17:12:48 +01:00