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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								5e0a7212d9 
								
							
								 
							
						 
						
							
							
								
								Don't apply case logic to app names  
							
							... 
							
							
							
							As they should have the Correct Case in integrations land now 
							
						 
						
							2017-08-18 14:57:28 +01:00  
				
					
						
							
							
								 
						
							
							
								1bba1f0fa6 
								
							
								 
							
						 
						
							
							
								
								Add comment  
							
							
							
						 
						
							2017-08-18 12:04:34 +01:00  
				
					
						
							
							
								 
						
							
							
								6c37a9a3af 
								
							
								 
							
						 
						
							
							
								
								Simplify getting of content, prev content for widget event  
							
							
							
						 
						
							2017-08-18 12:03:29 +01:00  
				
					
						
							
							
								 
						
							
							
								20a0ec35af 
								
							
								 
							
						 
						
							
							
								
								Use short form to get event URL  
							
							
							
						 
						
							2017-08-18 10:45:43 +01:00  
				
					
						
							
							
								 
						
							
							
								acc54b97f1 
								
							
								 
							
						 
						
							
							
								
								Implement TextualEvent tiles for im.vector.modular.widgets  
							
							... 
							
							
							
							E.g. "Bob added a Acme widget", "Susan removed a Giraffe widget"
The name is calculated by taking the `name` in the event content, falling back on the `type`, falling back on the previous content `type`. This is then capitalised. 
							
						 
						
							2017-08-18 10:35:33 +01:00  
				
					
						
							
							
								 
						
							
							
								cbcca78c40 
								
							
								 
							
						 
						
							
							
								
								Add text for invite_timeout and fix message for ice_failed.  
							
							
							
						 
						
							2017-06-11 07:19:19 +01:00  
				
					
						
							
							
								 
						
							
							
								2bfad52b40 
								
							
								 
							
						 
						
							
							
								
								Make unknown failures more helpful.  
							
							
							
						 
						
							2017-06-10 14:35:11 +01:00  
				
					
						
							
							
								 
						
							
							
								18490377f8 
								
							
								 
							
						 
						
							
							
								
								Show reason for a call hanging up unexpectedly.  
							
							
							
						 
						
							2017-06-10 14:27:18 +01:00  
				
					
						
							
							
								 
						
							
							
								d9d25e26d2 
								
							
								 
							
						 
						
							
							
								
								Say "X removed the room name" instead of showing nothing  
							
							... 
							
							
							
							Addresses vector-im/riot-web#4072 
Signed-off-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2017-05-29 23:21:14 -06:00  
				
					
						
							
							
								 
						
							
							
								f442a665c8 
								
							
								 
							
						 
						
							
							
								
								fix more i18n punctuation fails  
							
							
							
						 
						
							2017-05-27 17:36:02 +01:00  
				
					
						
							
							
								 
						
							
							
								6d6b14a26c 
								
							
								 
							
						 
						
							
							
								
								fix spurious missing translation ('Default')  
							
							
							
						 
						
							2017-05-27 15:52:24 +01:00  
				
					
						
							
							
								 
						
							
							
								398ad4798e 
								
							
								 
							
						 
						
							
							
								
								fix string typo  
							
							
							
						 
						
							2017-05-27 15:02:20 +01:00  
				
					
						
							
							
								 
						
							
							
								355f4974af 
								
							
								 
							
						 
						
							
							
								
								standardise i18n TextForEvent to include punctuation.  
							
							... 
							
							
							
							fixes lots of missing & inconsistent strings, as somehow some of the i18n files had ended up with the raw strings being inconsistent in terms of punctuation, causing problems as per https://github.com/vector-im/riot-web/issues/4045  
							
						 
						
							2017-05-27 15:02:20 +01:00  
				
					
						
							
							
								 
						
							
							
								be4944a4b6 
								
							
								 
							
						 
						
							
							
								
								Hopefully get translations with '.'s sorted  
							
							... 
							
							
							
							attempt 2 
							
						 
						
							2017-05-25 19:43:34 +01:00  
				
					
						
							
							
								 
						
							
							
								dac6a3360b 
								
							
								 
							
						 
						
							
							
								
								Oops, don't change these reason strings.  
							
							
							
						 
						
							2017-05-25 19:25:06 +01:00  
				
					
						
							
							
								 
						
							
							
								43d8ccf128 
								
							
								 
							
						 
						
							
							
								
								Hopefully sort out strings with appended '.'s  
							
							
							
						 
						
							2017-05-25 19:21:18 +01:00  
				
					
						
							
							
								 
						
							
							
								5c359e63ab 
								
							
								 
							
						 
						
							
							
								
								Bulk change counterpart imports  
							
							... 
							
							
							
							to use languageHandler wrapper func 
							
						 
						
							2017-05-25 11:39:08 +01:00  
				
					
						
							
							
								 
						
							
							
								9bce417400 
								
							
								 
							
						 
						
							
							
								
								fix algorithm ReferenceError  
							
							
							
						 
						
							2017-05-23 18:01:30 +01:00  
				
					
						
							
							
								 
						
							
							
								d419c42a4f 
								
							
								 
							
						 
						
							
							
								
								Squash merge  https://github.com/matrix-org/matrix-react-sdk/pull/801  
							
							
							
						 
						
							2017-05-23 15:16:31 +01:00  
				
					
						
							
							
								 
						
							
							
								2b71123ddc 
								
							
								 
							
						 
						
							
							
								
								suppress null member rejoins again  
							
							... 
							
							
							
							reverts f5fe4b2433https://github.com/vector-im/riot-web/issues/3788  
							
						 
						
							2017-05-06 01:45:37 +01:00  
				
					
						
							
							
								 
						
							
							
								8b4836b60e 
								
							
								 
							
						 
						
							
							
								
								Refactor roles into Roles.js  
							
							... 
							
							
							
							So that the mapping between a numerical power level and a "role" are done in one place. PowerSelector.js has been modified to use the same mapping. 
							
						 
						
							2017-04-10 10:09:26 +01:00  
				
					
						
							
							
								 
						
							
							
								6010350ce5 
								
							
								 
							
						 
						
							
							
								
								Implement power-level changes in timeline  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/266  
							
						 
						
							2017-04-06 17:02:35 +01:00  
				
					
						
							
							
								 
						
							
							
								2bd9885288 
								
							
								 
							
						 
						
							
							
								
								Start to show redacted events  
							
							
							
						 
						
							2017-03-03 15:42:24 +00:00  
				
					
						
							
							
								 
						
							
							
								18d4d3392a 
								
							
								 
							
						 
						
							
							
								
								Fix a bunch of linting errors  
							
							... 
							
							
							
							eslint --fix and a few manual ones 
							
						 
						
							2017-01-20 14:22:27 +00:00  
				
					
						
							
							
								 
						
							
							
								1899d61893 
								
							
								 
							
						 
						
							
							
								
								textual event for m.room.encryption  
							
							
							
						 
						
							2016-09-15 17:01:02 +01:00  
				
					
						
							
							
								 
						
							
							
								f5fe4b2433 
								
							
								 
							
						 
						
							
							
								
								Show something when we see a no-op join event  
							
							... 
							
							
							
							As a very quick hack to work around
https://github.com/vector-im/vector-web/issues/2020 , don't supress no-op joins 
							
						 
						
							2016-09-02 16:54:27 +01:00  
				
					
						
							
							
								 
						
							
							
								cb4bbc04e0 
								
							
								 
							
						 
						
							
							
								
								fix leaked user_id on various textual events  
							
							
							
						 
						
							2016-03-17 19:05:39 +00:00  
				
					
						
							
							
								 
						
							
							
								f589bf6b2e 
								
							
								 
							
						 
						
							
							
								
								reject invites explicitly - fixes  https://github.com/vector-im/vector-web/issues/1133  
							
							
							
						 
						
							2016-03-16 01:16:15 +00:00  
				
					
						
							
							
								 
						
							
							
								0e1186c4f9 
								
							
								 
							
						 
						
							
							
								
								display m.room.history_visibility updates in the timeline  
							
							
							
						 
						
							2016-03-15 23:47:40 +00:00  
				
					
						
							
							
								 
						
							
							
								22bd0f9aa0 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #198  from matrix-org/matthew/confjoinparts  
							
							... 
							
							
							
							prettyprint conference joins and parts properly 
							
						 
						
							2016-03-13 23:30:31 +00:00  
				
					
						
							
							
								 
						
							
							
								0d841551a0 
								
							
								 
							
						 
						
							
							
								
								prettyprint conference joins and parts properly  
							
							
							
						 
						
							2016-03-05 02:30:57 +00:00  
				
					
						
							
							
								 
						
							
							
								82cdc15faf 
								
							
								 
							
						 
						
							
							
								
								unneccessary '+'  
							
							
							
						 
						
							2016-03-04 11:37:37 +00:00  
				
					
						
							
							
								 
						
							
							
								acaacae697 
								
							
								 
							
						 
						
							
							
								
								Fix 3pid invite acceptance with desired wording.  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/vector-web/issues/1070  
							
						 
						
							2016-03-02 16:04:24 +00:00  
				
					
						
							
							
								 
						
							
							
								82a159d651 
								
							
								 
							
						 
						
							
							
								
								make roomsettings actually work, including alias editing. (using staged UX rather than direct manipulation). loads of tweaks and fixes across the board  
							
							
							
						 
						
							2016-01-17 02:48:55 +00:00  
				
					
						
							
							
								 
						
							
							
								12943b11fc 
								
							
								 
							
						 
						
							
							
								
								Full Stop.  
							
							
							
						 
						
							2015-12-17 16:40:46 +00:00  
				
					
						
							
							
								 
						
							
							
								17a8eb0109 
								
							
								 
							
						 
						
							
							
								
								Display m.room.third_party_invite events. Display sensible text transitions.  
							
							
							
						 
						
							2015-12-17 15:48:14 +00:00  
				
					
						
							
							
								 
						
							
							
								3485a74036 
								
							
								 
							
						 
						
							
							
								
								Gracefully handle browsers which don't do VoIP  
							
							... 
							
							
							
							Specifically:
 - Don't show inbound call ringing
 - Don't let users place calls/conf calls
 - Show call records with "not supported by this browser". 
							
						 
						
							2015-11-02 17:39:00 +00:00  
				
					
						
							
							
								 
						
							
							
								40da7f500e 
								
							
								 
							
						 
						
							
							
								
								show m.room.name changes  
							
							
							
						 
						
							2015-10-30 02:07:04 +00:00