nurjinn jafar
							
						 | 
						
							
							
							
							
								
							
								eef654e0e3
								
							
								
							
						 | 
						
							
							
								
								fix indentation and remove console.log
							
							
							
							
							
						 | 
						
							2020-08-25 11:09:10 +02:00 | 
						
					
				
					
						
							
							
								 
								nurjinn jafar
							
						 | 
						
							
							
							
							
								
							
								f1c7139711
								
							
								
							
						 | 
						
							
							
								
								remove not needed comma
							
							
							
							
							
						 | 
						
							2020-08-24 14:25:06 +02:00 | 
						
					
				
					
						
							
							
								 
								nurjinn jafar
							
						 | 
						
							
							
							
							
								
							
								5b7ccb5a78
								
							
								
							
						 | 
						
							
							
								
								fix indentation spaces and readability line spaces
							
							
							
							
							
						 | 
						
							2020-08-24 14:04:20 +02:00 | 
						
					
				
					
						
							
							
								 
								nurjinn jafar
							
						 | 
						
							
							
							
							
								
							
								b79cf1e7ad
								
							
								
							
						 | 
						
							
							
								
								updated translated string
							
							
							
							
							
						 | 
						
							2020-08-24 13:59:11 +02:00 | 
						
					
				
					
						
							
							
								 
								nurjinn jafar
							
						 | 
						
							
							
							
							
								
							
								2a8b1e0ccd
								
							
								
							
						 | 
						
							
							
								
								remove space before function parentheses and maximum allowed line
							
							
							
							
							
						 | 
						
							2020-08-24 11:55:23 +02:00 | 
						
					
				
					
						
							
							
								 
								nurjinn jafar
							
						 | 
						
							
							
							
							
								
							
								03b2a529ef
								
							
								
							
						 | 
						
							
							
								
								remove unused var
							
							
							
							
							
						 | 
						
							2020-08-24 11:29:46 +02:00 | 
						
					
				
					
						
							
							
								 
								nurjinn jafar
							
						 | 
						
							
							
							
							
								
							
								77de63bf4b
								
							
								
							
						 | 
						
							
							
								
								confetti file added
							
							
							
							
							
						 | 
						
							2020-08-24 10:44:49 +02:00 | 
						
					
				
					
						
							
							
								 
								nurjinn jafar
							
						 | 
						
							
							
							
							
								
							
								a7567b2e31
								
							
								
							
						 | 
						
							
							
								
								confetti animationsd handeled on roomViewTimeline
							
							
							
							
							
						 | 
						
							2020-08-24 10:44:32 +02:00 | 
						
					
				
					
						
							
							
								 
								nurjinn jafar
							
						 | 
						
							
							
							
							
								
							
								34cee20140
								
							
								
							
						 | 
						
							
							
								
								added confetti on command /confetti
							
							
							
							
							
						 | 
						
							2020-08-24 10:43:41 +02:00 | 
						
					
				
					
						
							
							
								 
								nurjinn jafar
							
						 | 
						
							
							
							
							
								
							
								69227dd456
								
							
								
							
						 | 
						
							
							
								
								translations added
							
							
							
							
							
						 | 
						
							2020-08-24 10:26:20 +02:00 | 
						
					
				
					
						
							
							
								 
								nurjinn jafar
							
						 | 
						
							
							
							
							
								
							
								ecd4d6e19e
								
							
								
							
						 | 
						
							
							
								
								test commit for confetti changes
							
							
							
							
							
						 | 
						
							2020-08-18 17:57:51 +02:00 | 
						
					
				
					
						
							
							
								 
								nurjinn jafar
							
						 | 
						
							
							
							
							
								
							
								4394a20f87
								
							
								
							
						 | 
						
							
							
								
								setting added to User Settings -> Preferences -> Timeline as an opt out for users with german translation
							
							
							
							
							
						 | 
						
							2020-08-18 09:56:38 +02:00 | 
						
					
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 | 
						
							
							
							
								
								
							
							
								
							
								d076d6351f
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #5093 from matrix-org/jryans/rebrand-rageshakes
							
							
							
							
							
							
							
							Update rageshake app name 
							
						 | 
						
							2020-08-10 11:11:37 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
								
								
							
							
								
							
								4799f0ee43
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #5085 from matrix-org/t3chguy/notifications11
							
							
							
							
							
							
							
							Factor out Iconized Context menu for reusability 
							
						 | 
						
							2020-08-08 11:41:28 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								fee808a75e
								
							
								
							
						 | 
						
							
							
								
								fix indentation
							
							
							
							
							
						 | 
						
							2020-08-08 11:16:28 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
								
								
							
							
								
							
								fe2f29d78e
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #5088 from matrix-org/t3chguy/notifications/14880
							
							
							
							
							
							
							
							Decouple Audible notifications from Desktop notifications 
							
						 | 
						
							2020-08-08 10:49:39 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
								
								
							
							
								
							
								a095f858b0
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #5087 from matrix-org/t3chguy/fix/14868
							
							
							
							
							
							
							
							Make the room sublist show more/less buttons treeitems 
							
						 | 
						
							2020-08-08 10:46:57 +01:00 | 
						
					
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 | 
						
							
							
							
								
								
							
							
								
							
								286624a89e
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #5092 from matrix-org/jryans/defer-cross-signing-setup
							
							
							
							
							
							
							
							Share and debug master cross-signing key 
							
						 | 
						
							2020-08-07 16:06:35 +01:00 | 
						
					
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 | 
						
							
							
							
							
								
							
								9e40e079ff
								
							
								
							
						 | 
						
							
							
								
								Use an explicit list of keys to share
							
							
							
							
							
						 | 
						
							2020-08-07 15:54:05 +01:00 | 
						
					
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 | 
						
							
							
							
							
								
							
								f03ed868bd
								
							
								
							
						 | 
						
							
							
								
								Update rageshake app name
							
							
							
							
							
							
							
							Fixes https://github.com/vector-im/element-web/issues/14892 
							
						 | 
						
							2020-08-06 17:54:54 +01:00 | 
						
					
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 | 
						
							
							
							
							
								
							
								810f07a846
								
							
								
							
						 | 
						
							
							
								
								Report master key cache status in rageshakes
							
							
							
							
							
						 | 
						
							2020-08-06 15:26:47 +01:00 | 
						
					
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 | 
						
							
							
							
							
								
							
								4c1956a3c2
								
							
								
							
						 | 
						
							
							
								
								Show master key cache status in Settings
							
							
							
							
							
						 | 
						
							2020-08-06 15:25:33 +01:00 | 
						
					
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 | 
						
							
							
							
							
								
							
								060f2cf54f
								
							
								
							
						 | 
						
							
							
								
								Enable sharing of master cross-signing key
							
							
							
							
							
							
							
							We've realised it's beneficial to support sharing the master cross-singing key
so that new devices can fully manage cross-signing on your account.
Part of https://github.com/vector-im/element-web/issues/13896 
							
						 | 
						
							2020-08-06 15:17:39 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
								
								
							
							
								
							
								0da31de5ad
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #5086 from matrix-org/t3chguy/notifications12
							
							
							
							
							
							
							
							Create Map comparison utilities and convert Hooks to Typescript 
							
						 | 
						
							2020-08-05 16:28:52 +01:00 | 
						
					
				
					
						
							
							
								 
								RiotRobot
							
						 | 
						
							
							
							
							
								
							
								45b79a0b7c
								
							
								
							
						 | 
						
							
							
								
								Reset matrix-js-sdk back to develop branch
							
							
							
							
							
						 | 
						
							2020-08-05 16:11:28 +01:00 | 
						
					
				
					
						
							
							
								 
								RiotRobot
							
						 | 
						
							
							
							
							
								
							
								f8cdd51fe3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into develop
							
							
							
							
							
						 | 
						
							2020-08-05 16:10:29 +01:00 | 
						
					
				
					
						
							
							
								 
								RiotRobot
							
						 | 
						
							
							
							
							
								
							
								f8ed635fbf
								
							
								
							
						 | 
						
							
							
								
								v3.1.0
							
							
							
							
							
						 | 
						
							2020-08-05 16:05:30 +01:00 | 
						
					
				
					
						
							
							
								 
								RiotRobot
							
						 | 
						
							
							
							
							
								
							
								299aa3ed98
								
							
								
							
						 | 
						
							
							
								
								Prepare changelog for v3.1.0
							
							
							
							
							
						 | 
						
							2020-08-05 16:05:29 +01:00 | 
						
					
				
					
						
							
							
								 
								RiotRobot
							
						 | 
						
							
							
							
							
								
							
								57814a40c1
								
							
								
							
						 | 
						
							
							
								
								Upgrade matrix-js-sdk to 8.0.1
							
							
							
							
							
						 | 
						
							2020-08-05 15:50:03 +01:00 | 
						
					
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 | 
						
							
							
							
								
								
							
							
								
							
								dd3e6292ac
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #5091 from matrix-org/jryans/safari-roomlist-scroll-release
							
							
							
							
							
							
							
							Fix room list scrolling in Safari 
							
						 | 
						
							2020-08-05 14:51:47 +01:00 | 
						
					
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 | 
						
							
							
							
								
								
							
							
								
							
								2f3eff4301
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #5090 from matrix-org/jryans/safari-roomlist-scroll
							
							
							
							
							
							
							
							Fix room list scrolling in Safari 
							
						 | 
						
							2020-08-05 14:45:27 +01:00 | 
						
					
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 | 
						
							
							
							
							
								
							
								1e868a256d
								
							
								
							
						 | 
						
							
							
								
								Fix room list scrolling in Safari
							
							
							
							
							
							
							
							This sets `flex-basis` properly in Safari so the room list is scrollable.
Fixes https://github.com/vector-im/element-web/issues/14877 
							
						 | 
						
							2020-08-05 14:37:09 +01:00 | 
						
					
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 | 
						
							
							
							
							
								
							
								af825b4559
								
							
								
							
						 | 
						
							
							
								
								Fix room list scrolling in Safari
							
							
							
							
							
							
							
							This sets `flex-basis` properly in Safari so the room list is scrollable.
Fixes https://github.com/vector-im/element-web/issues/14877 
							
						 | 
						
							2020-08-05 14:32:02 +01:00 | 
						
					
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 | 
						
							
							
							
								
								
							
							
								
							
								7748e3ae1a
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #5083 from matrix-org/jryans/riot-to-element
							
							
							
							
							
							
							
							Replace Riot with Element in docs and comments 
							
						 | 
						
							2020-08-05 12:25:45 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								fca48c0426
								
							
								
							
						 | 
						
							
							
								
								improve types
							
							
							
							
							
						 | 
						
							2020-08-05 11:22:43 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								764b94c7ae
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/notifications/14880
							
							
							
							
							
							
							
							 Conflicts:
	src/@types/global.d.ts 
							
						 | 
						
							2020-08-05 11:11:14 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								c1e152dba2
								
							
								
							
						 | 
						
							
							
								
								Decouple Audible notifications from Desktop notifications
							
							
							
							
							
						 | 
						
							2020-08-05 11:10:12 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								d7229064c4
								
							
								
							
						 | 
						
							
							
								
								Convert Notifier to typescript
							
							
							
							
							
						 | 
						
							2020-08-05 11:07:10 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								f1505833b7
								
							
								
							
						 | 
						
							
							
								
								Make the room sublist show more/less buttons treeitems
							
							
							
							
							
						 | 
						
							2020-08-05 09:56:31 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
								
								
							
							
								
							
								3675128061
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #5027 from matrix-org/t3chguy/room-list/13981
							
							
							
							
							
							
							
							When the room view isn't active don't highlight it in room list 
							
						 | 
						
							2020-08-05 09:29:25 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								6220f50360
								
							
								
							
						 | 
						
							
							
								
								delint
							
							
							
							
							
						 | 
						
							2020-08-05 09:28:02 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								cd29edb442
								
							
								
							
						 | 
						
							
							
								
								Write more typescript defs
							
							
							
							
							
						 | 
						
							2020-08-05 09:13:01 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								f5d75bc078
								
							
								
							
						 | 
						
							
							
								
								fix comments
							
							
							
							
							
						 | 
						
							2020-08-04 22:03:30 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								ed4a427287
								
							
								
							
						 | 
						
							
							
								
								Convert hooks to Typescript
							
							
							
							
							
						 | 
						
							2020-08-04 22:00:05 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								93b4ea5be4
								
							
								
							
						 | 
						
							
							
								
								Create Maps utility comparison functions
							
							
							
							
							
						 | 
						
							2020-08-04 21:57:37 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								ab0b688bf2
								
							
								
							
						 | 
						
							
							
								
								i18n
							
							
							
							
							
						 | 
						
							2020-08-04 21:46:07 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								d126f5c1e6
								
							
								
							
						 | 
						
							
							
								
								tidy up IconizedContextMenu CSS
							
							
							
							
							
						 | 
						
							2020-08-04 21:42:45 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								b30ce0355e
								
							
								
							
						 | 
						
							
							
								
								Factor out Iconized Context Menu for reusabilit
							
							
							
							
							
						 | 
						
							2020-08-04 21:42:39 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								9ce96bc28d
								
							
								
							
						 | 
						
							
							
								
								delint
							
							
							
							
							
						 | 
						
							2020-08-04 21:35:42 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								80dff8706c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/13981
							
							
							
							
							
							
							
							 Conflicts:
	src/@types/global.d.ts
	src/stores/RoomViewStore.tsx 
							
						 | 
						
							2020-08-04 21:33:27 +01:00 |