Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								1c6703356d 
								
									
								
							
								 
							
						 
						
							
							
								
								Highlight my vote even if it was made on another device ( #7202 )  
							
							 
							
							
							
						 
						
							2021-11-26 09:24:34 +00:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								ea97c416f5 
								
									
								
							
								 
							
						 
						
							
							
								
								Test for showing a spinner after submitting a new poll ( #7194 )  
							
							 
							
							
							
						 
						
							2021-11-24 16:24:19 +00:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								d7f3d2791a 
								
									
								
							
								 
							
						 
						
							
							
								
								Basic tests for PollCreateDialog ( #7193 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2021-11-24 13:48:07 +00:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								359962af6c 
								
									
								
							
								 
							
						 
						
							
							
								
								Prevent text overlapping on poll options ( #7187 )  
							
							 
							
							
							
						 
						
							2021-11-23 11:16:31 +00:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								d705fdd6e4 
								
									
								
							
								 
							
						 
						
							
							
								
								Display and send votes in polls ( #7158 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2021-11-23 10:27:44 +00:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								3c06e7f7a0 
								
									
								
							
								 
							
						 
						
							
							
								
								Add option to change the size of images/videos in the timeline ( #7017 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
Co-authored-by: Timo K <toger5@hotmail.de> 
							
						 
						
							2021-11-17 15:19:30 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								27c3153947 
								
									
								
							
								 
							
						 
						
							
							
								
								Unified room context menus ( #7072 )  
							
							 
							
							
							
						 
						
							2021-11-15 11:39:25 +00:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								9c8e1d32e2 
								
									
								
							
								 
							
						 
						
							
							
								
								Rename mx_RadioButton to mx_StyledRadioButton to match class name ( #7083 )  
							
							 
							
							
							
						 
						
							2021-11-04 12:57:38 +00:00  
						
					 
				
					
						
							
							
								 
								Faye Duxovni
							
						 
						
							 
							
							
								
								
							
							
								
							
								71244f3b3c 
								
									
								
							
								 
							
						 
						
							
							
								
								Add more checkbox styles ( #7058 )  
							
							 
							
							... 
							
							
							
							Add a "kind" param for StyledCheckbox, allowing designers to choose different styles of checkbox as needed.  In addition to the preexisting default kind (now called Solid), there's an Outline kind with a green checkmark and a transparent fill.  This is used in the device trust view, since the default checkbox style looks too much like the green "verified" shield and it's awkward to have those next to each other. 
							
						 
						
							2021-10-29 21:57:32 -04:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								4b903b9fbd 
								
									
								
							
								 
							
						 
						
							
							
								
								Break ThemeChoicePanel into a separate component ( #6998 )  
							
							 
							
							... 
							
							
							
							* Break ThemeChoicePanel into a separate component
* Tests for ThemeChoicePanel
* i18n fixes
* Fix copyright for ThemeChoicePanel 
							
						 
						
							2021-10-20 14:58:27 +00:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								96bd052ecf 
								
									
								
							
								 
							
						 
						
							
							
								
								Improve visibility of font size chooser ( #6988 )  
							
							 
							
							... 
							
							
							
							* Improve visibility of font size chooser
* Move slider dot sizes into variables
* Use a standard font size instead of percentage in Slider
* Use shorthand for padding in FontScalingPanel
* Change Slider text pos to px to be consistent when font changes
* Cleaner dot size for Slider selection 
							
						 
						
							2021-10-20 13:41:27 +01:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								694ec946e2 
								
									
								
							
								 
							
						 
						
							
							
								
								Allow quote-reply in thread view element-web ( #6959 )  
							
							 
							
							
							
						 
						
							2021-10-19 16:05:34 +01:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
							
								
							
								2582f6df23 
								
							
								 
							
						 
						
							
							
								
								Replace manual mock with jest.mock  
							
							 
							
							
							
						 
						
							2021-10-19 15:45:11 +01:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
							
								
							
								4ad32b16ea 
								
							
								 
							
						 
						
							
							
								
								Break out font size settings to a separate component  
							
							 
							
							
							
						 
						
							2021-10-19 14:50:09 +01:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								77e6e1c0ab 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6960  from matrix-org/gsouquet/rename-replythread  
							
							 
							
							
							
						 
						
							2021-10-18 17:11:31 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								5a7c0d87b6 
								
							
								 
							
						 
						
							
							
								
								Rename ReplyThread to ReplyChain to avoid confusion with m.thread  
							
							 
							
							
							
						 
						
							2021-10-15 17:42:44 +01:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
							
								
							
								a547ee4654 
								
							
								 
							
						 
						
							
							
								
								Break 'Cryptography' settings into a separate component  
							
							 
							
							
							
						 
						
							2021-10-15 16:02:44 +01:00  
						
					 
				
					
						
							
							
								 
								Dariusz Niemczyk
							
						 
						
							 
							
							
								
								
							
							
								
							
								bc336abf47 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix missing snapshot serializer&enzyme init ( #6932 )  
							
							 
							
							
							
						 
						
							2021-10-13 11:09:43 +01:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
							
								
							
								e8dba59b42 
								
							
								 
							
						 
						
							
							
								
								Fix review comments from Šimon Brandner.  
							
							 
							
							... 
							
							
							
							Rename test->it; Rename users->userIds; Un-break a line.
Signed-off-by: Andy Balaam <andyb@element.io> 
							
						 
						
							2021-10-04 11:41:09 +01:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
							
								
							
								226131409f 
								
							
								 
							
						 
						
							
							
								
								Unit tests for room avatars in DM and non-DM rooms  
							
							 
							
							... 
							
							
							
							Signed-off-by: Andy Balaam <andyb@element.io> 
							
						 
						
							2021-10-01 15:08:19 +01:00  
						
					 
				
					
						
							
							
								 
								Dariusz Niemczyk
							
						 
						
							 
							
							
								
								
							
							
								
							
								1331e960fa 
								
									
								
							
								 
							
						 
						
							
							
								
								Add ability to properly edit messages in Threads. ( #6877 )  
							
							 
							
							... 
							
							
							
							* Fix infinite rerender loop when editing message
* Refactor "edit_event" to Action.EditEvent
* Make up-arrow edit working in Threads
* Properly handle timeline events edit state
* Properly traverse messages to be edited
* Add MatrixClientContextHOC
* Refactor RoomContext to use AppRenderingContext
* Typescriptify test
Co-authored-by: Germain <germains@element.io> 
							
						 
						
							2021-10-01 15:35:54 +02:00  
						
					 
				
					
						
							
							
								 
								Eric Eastwood
							
						 
						
							 
							
							
								
								
							
							
								
							
								9c3439a1aa 
								
									
								
							
								 
							
						 
						
							
							
								
								Show updated relation reply from edited message - v2 ( #6817 )  
							
							 
							
							... 
							
							
							
							Part of https://github.com/vector-im/element-web/issues/10391 
When `m.relates_to` -> `m.in_reply_to` is provided in `m.new_content`
for an edited message, use the updated reply.
ex.
```json
{
  "type": "m.room.message",
  "content": {
    "body": " * foo bar",
    "msgtype": "m.text",
    "m.new_content": {
      "body": "foo bar",
      "msgtype": "m.text",
      "m.relates_to": {
        "m.in_reply_to": {
          "event_id": "$qkjmFBTEc0VvfVyzq1CJuh1QZi_xDIgNEFjZ4Pq34og"
        }
      }
    },
    "m.relates_to": {
      "rel_type": "m.replace",
      "event_id": "$lX9MRe9ZTFOOvnU8PRVbvr1wqGtYvNQ1rSot-iUTN5k"
    }
  }
}
``` 
							
						 
						
							2021-09-17 15:18:52 -05:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								a688e5b8b3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088  
							
							 
							
							... 
							
							
							
							 Conflicts:
	src/components/structures/LoggedInView.tsx
	src/stores/SpaceStore.tsx 
							
						 
						
							2021-09-06 11:41:09 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								95d1b06abb 
								
							
								 
							
						 
						
							
							
								
								Make composer able to reply in thread or in room timeline  
							
							 
							
							
							
						 
						
							2021-09-01 12:12:40 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								6b9dc40ad6 
								
							
								 
							
						 
						
							
							
								
								delint test  
							
							 
							
							
							
						 
						
							2021-08-11 16:12:08 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								da110855f0 
								
							
								 
							
						 
						
							
							
								
								delint and remove groups-specific tests and setups  
							
							 
							
							
							
						 
						
							2021-08-11 15:36:35 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								28f5dc483b 
								
							
								 
							
						 
						
							
							
								
								Update eslint plugin & fix silly indenting  
							
							 
							
							... 
							
							
							
							As per https://github.com/matrix-org/eslint-plugin-matrix-org/pull/15 
this caused a bunch of silly indenting to creep in, so this fixes it
back to the previous style. 
							
						 
						
							2021-08-03 17:07:37 +01:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								eefadf6a46 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-07-16 15:30:26 -04:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								f5f4be88f0 
								
							
								 
							
						 
						
							
							
								
								Update tests to expect LinkPreviewGroup behaviour  
							
							 
							
							
							
						 
						
							2021-07-12 08:34:26 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								00a3f5d469 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into revert-6135-t3chguy/fix/17494  
							
							 
							
							
							
						 
						
							2021-07-08 13:29:10 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								4a6af5a4d7 
								
							
								 
							
						 
						
							
							
								
								fix test missing required prop  
							
							 
							
							
							
						 
						
							2021-07-07 18:12:31 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								b36a727a09 
								
									
								
							
								 
							
						 
						
							
							
								
								Fourth batch of burning  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-07-02 18:15:05 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								b17d72c399 
								
							
								 
							
						 
						
							
							
								
								fix duplicate import  
							
							 
							
							
							
						 
						
							2021-07-02 14:54:10 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								82119a08f7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into t3chguy/ts/11  
							
							 
							
							
							
						 
						
							2021-07-02 11:03:54 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								88f691776f 
								
							
								 
							
						 
						
							
							
								
								Use sleep from js-sdk as no point duplicating it  
							
							 
							
							
							
						 
						
							2021-07-01 22:55:27 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								543fe6382d 
								
							
								 
							
						 
						
							
							
								
								Fix linting in tests  
							
							 
							
							... 
							
							
							
							Or in the case of one test, disbale just the one rule it breaks 
							
						 
						
							2021-07-01 20:54:04 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								ee9be5438e 
								
							
								 
							
						 
						
							
							
								
								eslint --fix  
							
							 
							
							
							
						 
						
							2021-07-01 20:43:05 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								e768ecb3d0 
								
							
								 
							
						 
						
							
							
								
								Typescript conversion of Composer components and more  
							
							 
							
							
							
						 
						
							2021-06-30 13:01:26 +01:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								ae0a8b8da4 
								
							
								 
							
						 
						
							
							
								
								Auto-fix lint errors  
							
							 
							
							
							
						 
						
							2021-06-29 13:11:58 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								0df6200dd0 
								
									
								
							
								 
							
						 
						
							
							
								
								Convert MemberList-test to TS  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-23 16:00:13 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								a52dd57eb2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17529  
							
							 
							
							... 
							
							
							
							 Conflicts:
	package.json
	yarn.lock 
							
						 
						
							2021-06-15 13:59:54 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								6e0a908c59 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into gsouquet/react-17  
							
							 
							
							
							
						 
						
							2021-06-09 12:01:35 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								d492ee4d8a 
								
							
								 
							
						 
						
							
							
								
								Update Enzyme adapter name  
							
							 
							
							
							
						 
						
							2021-06-09 11:57:29 +01:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								e891d18fa2 
								
							
								 
							
						 
						
							
							
								
								Add my email to my copyright notices  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-06-05 21:41:28 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								a06306d560 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into improved-forwarding-ui  
							
							 
							
							
							
						 
						
							2021-06-05 11:04:17 -04:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								d7a5547d80 
								
							
								 
							
						 
						
							
							
								
								use Intl.Collator over String.prototype.localeCompare for better performance  
							
							 
							
							
							
						 
						
							2021-06-02 10:42:17 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								0b7d3f007a 
								
							
								 
							
						 
						
							
							
								
								Remove react-beautiful-dnd  
							
							 
							
							
							
						 
						
							2021-06-01 17:35:31 +01:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								121ed5eba9 
								
							
								 
							
						 
						
							
							
								
								Pass Matrix client around as matrixClient  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-24 08:51:04 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								400917623c 
								
							
								 
							
						 
						
							
							
								
								Make myself the copyright holder for forward dialog code  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-24 08:33:28 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								7a04502151 
								
							
								 
							
						 
						
							
							
								
								Iterate on forward dialog design feedback  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-21 12:41:29 -04:00