8c3e5ebbad 
								
							
								 
							
						 
						
							
							
								
								Create GranularSettingStore  
							
							... 
							
							
							
							GranularSettingStore is a class to manage settings of varying granularity, such as URL previews at the device, room, and account levels.
Signed-off-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2017-10-28 11:26:40 -06:00  
				
					
						
							
							
								 
						
							
							
								580d8dce19 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1549  from matrix-org/luke/groups-fix-mygroups-avatar-scale-method  
							
							... 
							
							
							
							Use "crop" method to scale group avatars in MyGroups 
							
						 
						
							2017-10-27 18:40:19 +01:00  
				
					
						
							
							
								 
						
							
							
								5209f29a5c 
								
							
								 
							
						 
						
							
							
								
								Use "crop" method to scale group avatars in MyGroups  
							
							
							
						 
						
							2017-10-27 18:27:54 +01:00  
				
					
						
							
							
								 
						
							
							
								27083df0f9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1547  from matrix-org/dbkr/username_to_lower  
							
							... 
							
							
							
							Lowercase all usernames 
							
						 
						
							2017-10-27 18:01:32 +01:00  
				
					
						
							
							
								 
						
							
							
								4eb8fe3e6a 
								
							
								 
							
						 
						
							
							
								
								Lowercase all usernames  
							
							... 
							
							
							
							As synapse doesn't accept usernames with capitals in them now
Fixes https://github.com/vector-im/riot-web/issues/5445  
							
						 
						
							2017-10-27 17:49:44 +01:00  
				
					
						
							
							
								 
						
							
							
								47c395ec06 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1546  from matrix-org/luke/fix-MELS-plural-strings-in-tests  
							
							... 
							
							
							
							Add sensible missing entry generator for MELS tests 
							
						 
						
							2017-10-27 17:26:08 +01:00  
				
					
						
							
							
								 
						
							
							
								8a64123ab8 
								
							
								 
							
						 
						
							
							
								
								Add sensible missing entry generator for MELS tests  
							
							... 
							
							
							
							Fixes  vector-im/riot-web#5426  (because we don't test plurals anywhere else) 
						
							2017-10-27 16:55:13 +01:00  
				
					
						
							
							
								 
						
							
							
								55e8f16ee3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1545  from matrix-org/dbkr/fix_chat_reuse_prompt  
							
							... 
							
							
							
							Fix prompt to re-use chat room 
							
						 
						
							2017-10-27 16:42:48 +01:00  
				
					
						
							
							
								 
						
							
							
								2f3e0fb049 
								
							
								 
							
						 
						
							
							
								
								Lint  
							
							
							
						 
						
							2017-10-27 16:29:56 +01:00  
				
					
						
							
							
								 
						
							
							
								5d0b9d73b4 
								
							
								 
							
						 
						
							
							
								
								Fix prompt to re-use chat room  
							
							... 
							
							
							
							I managed to lose this when refactoring ChatInviteDialog in
https://github.com/matrix-org/matrix-react-sdk/pull/1300 
Fixes https://github.com/vector-im/riot-web/issues/5119  
							
						 
						
							2017-10-27 16:20:17 +01:00  
				
					
						
							
							
								 
						
							
							
								b421fd05ef 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1544  from matrix-org/luke/groups-store-add-unregister-api  
							
							... 
							
							
							
							Add unregiseterListener to GroupStore 
							
						 
						
							2017-10-27 16:10:27 +01:00  
				
					
						
							
							
								 
						
							
							
								175fadbb57 
								
							
								 
							
						 
						
							
							
								
								Add unregiseterListener to GroupStore  
							
							
							
						 
						
							2017-10-27 15:08:38 +01:00  
				
					
						
							
							
								 
						
							
							
								a7379db1c2 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1543  from matrix-org/luke/fix-groups-invited-users-err-for-non-members  
							
							... 
							
							
							
							Fix groups invited users err for non members 
							
						 
						
							2017-10-27 11:48:26 +01:00  
				
					
						
							
							
								 
						
							
							
								5d0aa8d7f7 
								
							
								 
							
						 
						
							
							
								
								Handle 403 when inspecting invited users as non-member  
							
							
							
						 
						
							2017-10-27 11:38:10 +01:00  
				
					
						
							
							
								 
						
							
							
								e094c32c62 
								
							
								 
							
						 
						
							
							
								
								Simplify GroupStore listener registration  
							
							
							
						 
						
							2017-10-27 11:38:10 +01:00  
				
					
						
							
							
								 
						
							
							
								1715206f62 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1532  from matrix-org/t3chguy/mention_user  
							
							... 
							
							
							
							Add Mention button to MemberInfo 
							
						 
						
							2017-10-26 18:38:28 +01:00  
				
					
						
							
							
								 
						
							
							
								1d5b4a9d50 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into t3chguy/mention_user  
							
							
							
						 
						
							2017-10-26 18:10:10 +01:00  
				
					
						
							
							
								 
						
							
							
								c8a489ca77 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1541  from matrix-org/luke/groups-only-show-settings-icon-to-members  
							
							... 
							
							
							
							Only show group settings cog to members 
							
						 
						
							2017-10-26 14:52:16 +01:00  
				
					
						
							
							
								 
						
							
							
								9643784f85 
								
							
								 
							
						 
						
							
							
								
								Only show group settings cog to members  
							
							... 
							
							
							
							Non-members have no settings to change. 
							
						 
						
							2017-10-26 14:31:27 +01:00  
				
					
						
							
							
								 
						
							
							
								1012d118fe 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1540  from matrix-org/luke/fix-dark-theme-cancel-icon  
							
							... 
							
							
							
							Use correct icon for group room deletion and make themeable 
							
						 
						
							2017-10-26 14:23:06 +01:00  
				
					
						
							
							
								 
						
							
							
								eec6ed36cd 
								
							
								 
							
						 
						
							
							
								
								Use correct icon for group room deletion and make themeable  
							
							... 
							
							
							
							Also fix cancel icons to have class mx_filterFlipColor 
							
						 
						
							2017-10-26 14:05:58 +01:00  
				
					
						
							
							
								 
						
							
							
								5871a74228 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1534  from matrix-org/t3chguy/invite_in_memberinfo  
							
							... 
							
							
							
							Add invite button to MemberInfo if user has left or wasn't in room 
							
						 
						
							2017-10-26 11:35:45 +01:00  
				
					
						
							
							
								 
						
							
							
								bf4289632b 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1539  from matrix-org/luke/feature-optionally-mirror-local-video  
							
							... 
							
							
							
							Add option to mirror local video feed 
							
						 
						
							2017-10-26 10:36:03 +01:00  
				
					
						
							
							
								 
						
							
							
								591a7f4b86 
								
							
								 
							
						 
						
							
							
								
								Default to false  
							
							
							
						 
						
							2017-10-26 10:06:04 +01:00  
				
					
						
							
							
								 
						
							
							
								97b9cf6402 
								
							
								 
							
						 
						
							
							
								
								Actually use the synced setting  
							
							
							
						 
						
							2017-10-26 09:58:46 +01:00  
				
					
						
							
							
								 
						
							
							
								3ae97348f8 
								
							
								 
							
						 
						
							
							
								
								Add option to mirror local video feed  
							
							
							
						 
						
							2017-10-25 18:17:33 +01:00  
				
					
						
							
							
								 
						
							
							
								4cfbd66729 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1538  from matrix-org/luke/fix-redaction-sender-tooltip  
							
							... 
							
							
							
							Use the correct userId when displaying who redacted a message 
							
						 
						
							2017-10-25 17:47:22 +01:00  
				
					
						
							
							
								 
						
							
							
								cedc0b27a9 
								
							
								 
							
						 
						
							
							
								
								Handle redaction with no sender  
							
							
							
						 
						
							2017-10-25 17:37:20 +01:00  
				
					
						
							
							
								 
						
							
							
								5990e41bd7 
								
							
								 
							
						 
						
							
							
								
								Use the correct userId when displaying who redacted a message  
							
							
							
						 
						
							2017-10-25 17:24:45 +01:00  
				
					
						
							
							
								 
						
							
							
								fd7e057ec0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into t3chguy/invite_in_memberinfo  
							
							
							
						 
						
							2017-10-25 16:33:50 +01:00  
				
					
						
							
							
								 
						
							
							
								8ed3474b64 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1529  from matrix-org/luke/fix-can-edit-editable-item-lists  
							
							... 
							
							
							
							Only show editing UI for aliases/related_groups for users /w power 
							
						 
						
							2017-10-25 15:52:51 +01:00  
				
					
						
							
							
								 
						
							
							
								39fa866d68 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1535  from matrix-org/luke/fix-interactable-greyed-ui  
							
							... 
							
							
							
							Swap from `ui_opacity` to `panel_disabled` 
							
						 
						
							2017-10-25 15:47:18 +01:00  
				
					
						
							
							
								 
						
							
							
								b1f2a6c1e9 
								
							
								 
							
						 
						
							
							
								
								Dramatically simplify use of mx_fadable  
							
							... 
							
							
							
							by applying it to parent elements of things that need to be faded. 
							
						 
						
							2017-10-25 15:15:49 +01:00  
				
					
						
							
							
								 
						
							
							
								19364c25ee 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1536  from matrix-org/luke/fix-room-address-picker-default-name  
							
							... 
							
							
							
							Fix room address picker tiles default name 
							
						 
						
							2017-10-25 14:25:51 +01:00  
				
					
						
							
							
								 
						
							
							
								fbe0cc4927 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1531  from matrix-org/t3chguy/hide_level_change_on_50  
							
							... 
							
							
							
							T3chguy/hide level change on 50 
							
						 
						
							2017-10-25 14:09:59 +01:00  
				
					
						
							
							
								 
						
							
							
								813d0cd64c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1537  from matrix-org/t3chguy/missing_date_sep  
							
							... 
							
							
							
							fix missing date sep caused by hidden event at start of day 
							
						 
						
							2017-10-25 14:07:28 +01:00  
				
					
						
							
							
								 
						
							
							
								f3c8951d4e 
								
									
								
							
								 
							
						 
						
							
							
								
								remove unused lastPresenceTs  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-10-25 12:56:23 +01:00  
				
					
						
							
							
								 
						
							
							
								1bbc26a27f 
								
									
								
							
								 
							
						 
						
							
							
								
								fix missing date sep caused by hidden event at start of day  
							
							... 
							
							
							
							if first event in day was hidden, the date sep would go missing as the next event would compare its date to the hidden one instead of the one before it
due to naive N-1 check rather than a previous valid event comparison, now fixed by comparing date against the first event in MELS instead.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-10-25 12:52:51 +01:00  
				
					
						
							
							
								 
						
							
							
								27f845a7aa 
								
							
								 
							
						 
						
							
							
								
								Match on any alias  
							
							
							
						 
						
							2017-10-25 12:42:58 +01:00  
				
					
						
							
							
								 
						
							
							
								7029ab07fc 
								
							
								 
							
						 
						
							
							
								
								If no canonical alias, use first alias (and fallback to Unnamed)  
							
							
							
						 
						
							2017-10-25 12:38:39 +01:00  
				
					
						
							
							
								 
						
							
							
								37b55984ec 
								
							
								 
							
						 
						
							
							
								
								Fix group Leave button tooltip  
							
							
							
						 
						
							2017-10-25 12:09:13 +01:00  
				
					
						
							
							
								 
						
							
							
								2f8f2ce76e 
								
							
								 
							
						 
						
							
							
								
								Swap from `ui_opacity` to `panel_disabled`  
							
							... 
							
							
							
							to simplify the process of disabling panels in the UI. 
							
						 
						
							2017-10-25 11:23:51 +01:00  
				
					
						
							
							
								 
						
							
							
								fd85c74bc5 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1520  from matrix-org/rxl881/deleteWidget  
							
							... 
							
							
							
							Add a delete confirmation dialog for widgets 
							
						 
						
							2017-10-25 10:45:52 +01:00  
				
					
						
							
							
								 
						
							
							
								2e3bdfd55d 
								
							
								 
							
						 
						
							
							
								
								Fix string indentation.  
							
							
							
						 
						
							2017-10-25 10:45:17 +01:00  
				
					
						
							
							
								 
						
							
							
								b3463146ba 
								
									
								
							
								 
							
						 
						
							
							
								
								Add invite button to MemberInfo if user has left or wasn't in room  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-10-25 01:00:13 +01:00  
				
					
						
							
							
								 
						
							
							
								5514d81683 
								
									
								
							
								 
							
						 
						
							
							
								
								Add Mention button to MemberInfo  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-10-24 23:01:40 +01:00  
				
					
						
							
							
								 
						
							
							
								c896dfb17b 
								
									
								
							
								 
							
						 
						
							
							
								
								delint  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-10-24 22:21:33 +01:00  
				
					
						
							
							
								 
						
							
							
								f813a752e7 
								
									
								
							
								 
							
						 
						
							
							
								
								only show change power level option in MemberInfo if we can actually  
							
							... 
							
							
							
							send m.room.power_level AND are lower PL than them
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-10-24 22:12:48 +01:00  
				
					
						
							
							
								 
						
							
							
								e9ce7f97f5 
								
							
								 
							
						 
						
							
							
								
								canSetRelatedRooms -> canSetRelatedGroups  
							
							
							
						 
						
							2017-10-24 17:57:26 +01:00  
				
					
						
							
							
								 
						
							
							
								0463f0e581 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1530  from matrix-org/luke/fix-room-tile-highlighted-viewing-groups  
							
							... 
							
							
							
							When dispatching view_[my_]group[s], reset RoomViewStore 
							
						 
						
							2017-10-24 16:41:52 +01:00