5c7e9812a1 
								
							
								 
							
						 
						
							
							
								
								also check content and content.users before proceeding  
							
							
							
						 
						
							2019-07-12 18:50:13 +02:00  
				
					
						
							
							
								 
						
							
							
								8d4356a5b9 
								
							
								 
							
						 
						
							
							
								
								Show anything other than ban/invite -> leave as a kick  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-07-10 08:57:00 +01:00  
				
					
						
							
							
								 
						
							
							
								46a8ec903e 
								
							
								 
							
						 
						
							
							
								
								Handle null-rejoins only if SettingsStore says so  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-06-26 20:22:01 +01:00  
				
					
						
							
							
								 
						
							
							
								f3641eaa32 
								
							
								 
							
						 
						
							
							
								
								Add ability to render null-rejoins in Timeline and MELS  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-06-23 21:41:28 +01:00  
				
					
						
							
							
								 
						
							
							
								07cc640089 
								
							
								 
							
						 
						
							
							
								
								Add common utility for checking 3pid invites  
							
							... 
							
							
							
							We just need to make sure they are structurally sound - actual validation is done by other parties. 
							
						 
						
							2019-03-29 11:45:07 -06:00  
				
					
						
							
							
								 
						
							
							
								99dc2c4738 
								
							
								 
							
						 
						
							
							
								
								Add MemberInfo for 3pid invites and support revoking those invites  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/625 
Fixes https://github.com/vector-im/riot-web/issues/6411 
Fixes https://github.com/vector-im/riot-web/issues/5490  
							
						 
						
							2019-03-28 21:02:24 -06:00  
				
					
						
							
							
								 
						
							
							
								003d0eb0bf 
								
							
								 
							
						 
						
							
							
								
								Show changes to related groups (flair) in the timeline  
							
							
							
						 
						
							2019-02-21 17:03:15 -07:00  
				
					
						
							
							
								 
						
							
							
								85cfd48744 
								
							
								 
							
						 
						
							
							
								
								join rules -> join rule  
							
							
							
						 
						
							2019-02-08 09:15:12 -07:00  
				
					
						
							
							
								 
						
							
							
								5d4406cbab 
								
							
								 
							
						 
						
							
							
								
								Render join rules and guest access changes in the timeline  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/8435  
							
						 
						
							2019-02-07 12:14:58 -07:00  
				
					
						
							
							
								 
						
							
							
								e24d3cd671 
								
							
								 
							
						 
						
							
							
								
								Render a tile for tombstone events  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/7997 
This isn't super elegant, but it also provides some amount of utility for people. As users might leave the old room, it might be useful to see when exactly a room was upgraded. We should fix the underlying cause for infinite back pagination though. 
							
						 
						
							2019-01-10 15:15:45 -07:00  
				
					
						
							
							
								 
						
							
							
								91e8ee98a1 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix brace style in TextForEvent.js  
							
							... 
							
							
							
							Signed-off-by: Aaron Raimist <aaron@raim.ist> 
							
						 
						
							2018-10-02 22:12:39 -05:00  
				
					
						
							
							
								 
						
							
							
								c0b89866de 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2184  from matrix-org/matthew/fudge-hangup-reason  
							
							... 
							
							
							
							fudge hangup reasons 
							
						 
						
							2018-09-28 01:09:55 +01:00  
				
					
						
							
							
								 
						
							
							
								d839629aea 
								
							
								 
							
						 
						
							
							
								
								fudge hangup reasons  
							
							
							
						 
						
							2018-09-27 23:51:33 +01:00  
				
					
						
							
							
								 
						
							
							
								fb262596b2 
								
							
								 
							
						 
						
							
							
								
								Provide more helpful errors when i18n generation fails  
							
							... 
							
							
							
							Also fix TextForEvent.js so it doesn't break the script. Using a variable here is not recognized, so the object has been moved inline instead. 
							
						 
						
							2018-09-27 11:55:57 -06:00  
				
					
						
							
							
								 
						
							
							
								1157320cba 
								
							
								 
							
						 
						
							
							
								
								s/canonical address/main address/g for consistency  
							
							
							
						 
						
							2018-09-20 11:41:59 +01:00  
				
					
						
							
							
								 
						
							
							
								c6fa8ea24c 
								
							
								 
							
						 
						
							
							
								
								show canonical aliases in timeline, and set/remove implicit ones  
							
							
							
						 
						
							2018-09-20 01:07:01 +01:00  
				
					
						
							
							
								 
						
							
							
								0e1a814d23 
								
							
								 
							
						 
						
							
							
								
								remove RoomAliasesEvent in favour of simpler textual event  
							
							
							
						 
						
							2018-09-17 18:27:17 +01:00  
				
					
						
							
							
								 
						
							
							
								dc7212ec2b 
								
							
								 
							
						 
						
							
							
								
								switch back to simple TextForEvent  
							
							... 
							
							
							
							I haven't found anyone who can justify to me why we need
more complicated plurals for i18n (even in Polish) for
%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room. 
							
						 
						
							2018-09-17 18:20:12 +01:00  
				
					
						
							
							
								 
						
							
							
								3b868064c7 
								
							
								 
							
						 
						
							
							
								
								merge in develop  
							
							
							
						 
						
							2018-09-16 19:06:52 +01:00  
				
					
						
							
							
								 
						
							
							
								6e1f62d16a 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix stuff  
							
							
							
						 
						
							2018-07-06 20:22:37 +01:00  
				
					
						
							
							
								 
						
							
							
								4044185cdd 
								
									
								
							
								 
							
						 
						
							
							
								
								add space after commas  
							
							
							
						 
						
							2018-07-06 19:17:01 +01:00  
				
					
						
							
							
								 
						
							
							
								83221da7d7 
								
							
								 
							
						 
						
							
							
								
								Delint  
							
							
							
						 
						
							2018-07-06 16:54:28 +01:00  
				
					
						
							
							
								 
						
							
							
								9a4075c637 
								
							
								 
							
						 
						
							
							
								
								Semicolons  
							
							
							
						 
						
							2018-07-06 16:38:04 +01:00  
				
					
						
							
							
								 
						
							
							
								52b1d946be 
								
							
								 
							
						 
						
							
							
								
								Remove unused console.log  
							
							
							
						 
						
							2018-07-06 16:37:52 +01:00  
				
					
						
							
							
								 
						
							
							
								1db803ccfc 
								
							
								 
							
						 
						
							
							
								
								"/n" -> " "  
							
							
							
						 
						
							2018-07-06 16:37:40 +01:00  
				
					
						
							
							
								 
						
							
							
								1ca164f1a9 
								
							
								 
							
						 
						
							
							
								
								Change all ban message and move further up  
							
							
							
						 
						
							2018-07-06 16:36:44 +01:00  
				
					
						
							
							
								 
						
							
							
								12ce7839f3 
								
							
								 
							
						 
						
							
							
								
								Const things  
							
							
							
						 
						
							2018-07-06 16:36:26 +01:00  
				
					
						
							
							
								 
						
							
							
								8b9fd7ddcb 
								
							
								 
							
						 
						
							
							
								
								Clean up rules.  
							
							
							
						 
						
							2018-07-06 15:31:21 +01:00  
				
					
						
							
							
								 
						
							
							
								526459a9e0 
								
							
								 
							
						 
						
							
							
								
								Capitalise  
							
							
							
						 
						
							2018-07-06 11:06:31 +01:00  
				
					
						
							
							
								 
						
							
							
								a6cff4a969 
								
							
								 
							
						 
						
							
							
								
								Show server bans in the timeline  
							
							
							
						 
						
							2018-07-06 11:06:31 +01:00  
				
					
						
							
							
								 
						
							
							
								7225f7372c 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert " make click to insert nick work on join/parts, /me's etc"  
							
							
							
						 
						
							2018-07-03 10:30:08 +01:00  
				
					
						
							
							
								 
						
							
							
								1d91469104 
								
									
								
							
								 
							
						 
						
							
							
								
								switch to <ClickableUsername> and use `<a>` over `<span>`  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-06-29 14:52:25 +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  
				
					
						
							
							
								 
						
							
							
								3b85920424 
								
							
								 
							
						 
						
							
							
								
								Use mxid as sender name on set display name  
							
							... 
							
							
							
							As it was, "<New name> set their display name to <New name>" which
is unhelpful because you never knew them as "<New name>" before.
They would previously have been displayed with their matrix ID, so
that's what should be here. 
							
						 
						
							2018-04-20 14:28:20 +01:00  
				
					
						
							
							
								 
						
							
							
								8458023bbc 
								
							
								 
							
						 
						
							
							
								
								Fix display name change message  
							
							... 
							
							
							
							(i18n file fixes coming separately for ease of review)
Fixes https://github.com/vector-im/riot-web/issues/5171  
							
						 
						
							2018-02-06 10:24:38 +00:00  
				
					
						
							
							
								 
						
							
							
								dad797d4a2 
								
							
								 
							
						 
						
							
							
								
								Run linting --fix  
							
							
							
						 
						
							2017-11-16 13:19:36 +00:00  
				
					
						
							
							
								 
						
							
							
								c34b55c6c7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/pinned_messages  
							
							
							
						 
						
							2017-10-14 16:10:32 -06:00  
				
					
						
							
							
								 
						
							
							
								152499a17d 
								
									
								
							
								 
							
						 
						
							
							
								
								DRY map lookup  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-10-06 12:16:54 +01:00  
				
					
						
							
							
								 
						
							
							
								91ba939e23 
								
									
								
							
								 
							
						 
						
							
							
								
								tiny bit of de-lint for consistency  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-10-06 12:10:07 +01:00  
				
					
						
							
							
								 
						
							
							
								6a4e3792d4 
								
									
								
							
								 
							
						 
						
							
							
								
								split handlers into state and non-states  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-10-06 12:07:38 +01:00  
				
					
						
							
							
								 
						
							
							
								3a58e1c066 
								
							
								 
							
						 
						
							
							
								
								Show pinned message changes in the timeline  
							
							... 
							
							
							
							Signed-off-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2017-09-29 08:56:21 -06:00  
				
					
						
							
							
								 
						
							
							
								796924ef35 
								
							
								 
							
						 
						
							
							
								
								Fix typo as found by Luke  
							
							
							
						 
						
							2017-09-25 15:49:48 +01:00  
				
					
						
							
							
								 
						
							
							
								c8922ba7f5 
								
									
								
							
								 
							
						 
						
							
							
								
								This file was hurting my eyes. Delint and DRY  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-09-25 09:48:00 +01:00  
				
					
						
							
							
								 
						
							
							
								bc4bb6cc48 
								
									
								
							
								 
							
						 
						
							
							
								
								remove redundant new line  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-09-17 13:29:05 +01:00  
				
					
						
							
							
								 
						
							
							
								ce2cdf3fa1 
								
									
								
							
								 
							
						 
						
							
							
								
								sanitize the i18n for fn:textForHistoryVisibilityEvent  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-09-17 13:28:17 +01:00  
				
					
						
							
							
								 
						
							
							
								755f22a7fa 
								
									
								
							
								 
							
						 
						
							
							
								
								shelving.  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-09-14 17:39:18 +01:00  
				
					
						
							
							
								 
						
							
							
								8ab96ae2ff 
								
									
								
							
								 
							
						 
						
							
							
								
								render m.room.aliases events  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-09-14 13:43:46 +01:00  
				
					
						
							
							
								 
						
							
							
								6127727267 
								
									
								
							
								 
							
						 
						
							
							
								
								text4event widget modified, used to show widget added each time.  
							
							
							
						 
						
							2017-08-28 08:19:39 +01:00  
				
					
						
							
							
								 
						
							
							
								7395f96b77 
								
							
								 
							
						 
						
							
							
								
								Rearrange timeline update wording for better internationalisation. Fix widget name values.  
							
							
							
						 
						
							2017-08-18 18:02:50 +01:00  
				
					
						
							
							
								 
						
							
							
								7a277bff3a 
								
							
								 
							
						 
						
							
							
								
								Add a space between widget name and "widget" in widget event tiles  
							
							
							
						 
						
							2017-08-18 15:45:02 +01:00