2bc866b997 
								
							
								 
							
						 
						
							
							
								
								Clean up UserSettings for linting  
							
							... 
							
							
							
							Signed-off-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2017-09-14 16:08:20 -06:00  
				
					
						
							
							
								 
						
							
							
								4579d20fd0 
								
							
								 
							
						 
						
							
							
								
								Unignore people from the settings  
							
							... 
							
							
							
							Signed-off-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2017-09-14 15:33:36 -06:00  
				
					
						
							
							
								 
						
							
							
								4df16e8245 
								
							
								 
							
						 
						
							
							
								
								Display which users are ignored in the user settings  
							
							... 
							
							
							
							Adds https://github.com/vector-im/riot-web/issues/1767 
Signed-off-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2017-09-14 12:51:53 -06:00  
				
					
						
							
							
								 
						
							
							
								94ec11d3e1 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1384  from matrix-org/dbkr/fix_oobdata  
							
							... 
							
							
							
							Fix the avatar / room name in room preview 
							
						 
						
							2017-09-14 10:42:24 +01:00  
				
					
						
							
							
								 
						
							
							
								bb8538cd1a 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1381  from matrix-org/dbkr/remove_spurious_cancel_button  
							
							... 
							
							
							
							Remove spurious cancel button 
							
						 
						
							2017-09-14 10:38:26 +01:00  
				
					
						
							
							
								 
						
							
							
								34134f0d43 
								
							
								 
							
						 
						
							
							
								
								Fix starting a chat by email address  
							
							... 
							
							
							
							Regression introduced whilst refactoring for groups support. 
							
						 
						
							2017-09-13 17:37:43 +01:00  
				
					
						
							
							
								 
						
							
							
								ffb3d718d3 
								
							
								 
							
						 
						
							
							
								
								Fix the avatar / room name in room preview  
							
							... 
							
							
							
							When clicking on rooms from the room directory. When RoomViewStore
resolved the room alias, it threw away the out-of-band data in the
process. This must have been broken as part of the ILAG /
RoomViewStore stuff. 
							
						 
						
							2017-09-13 15:48:53 +01:00  
				
					
						
							
							
								 
						
							
							
								081a900524 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1363  from matrix-org/t3chguy/on_copy_tooltip  
							
							... 
							
							
							
							respond on copy code block 
							
						 
						
							2017-09-13 14:27:35 +01:00  
				
					
						
							
							
								 
						
							
							
								2c0dae8c52 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1383  from matrix-org/t3chguy/fix-dateutils  
							
							... 
							
							
							
							fix DateUtils inconsistency with 12/24h 
							
						 
						
							2017-09-13 14:27:04 +01:00  
				
					
						
							
							
								 
						
							
							
								fea7af11b4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/t3chguy/on_copy_tooltip' into t3chguy/on_copy_tooltip  
							
							
							
						 
						
							2017-09-13 14:18:56 +01:00  
				
					
						
							
							
								 
						
							
							
								d3bfdf495c 
								
									
								
							
								 
							
						 
						
							
							
								
								initialize value with false to prevent undefined.  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-09-13 14:18:31 +01:00  
				
					
						
							
							
								 
						
							
							
								c810665b92 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix-dateutils  
							
							
							
						 
						
							2017-09-13 13:24:48 +01:00  
				
					
						
							
							
								 
						
							
							
								1b73707e05 
								
									
								
							
								 
							
						 
						
							
							
								
								fix DateUtils inconsistency with 12/24h  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-09-13 13:20:24 +01:00  
				
					
						
							
							
								 
						
							
							
								39470c44a3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/sub-sup  
							
							
							
						 
						
							2017-09-13 12:15:12 +01:00  
				
					
						
							
							
								 
						
							
							
								a0855a2869 
								
									
								
							
								 
							
						 
						
							
							
								
								allow sending sub,sup and whitelist them on receive  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-09-13 12:04:46 +01:00  
				
					
						
							
							
								 
						
							
							
								8abd35f581 
								
							
								 
							
						 
						
							
							
								
								Remove spurious cancel button  
							
							... 
							
							
							
							That appeared if you clicked on a room from the room directory
(it didn't do anything). It's only supposed to be shown when
editing room settings. 
							
						 
						
							2017-09-12 15:48:13 +01:00  
				
					
						
							
							
								 
						
							
							
								757bc9fe32 
								
							
								 
							
						 
						
							
							
								
								Update roomlist when an event is decrypted  
							
							... 
							
							
							
							Events are now decrypted asynchronously, so are not decrypted
at the time of the Room.timeline which is when our RoomList
got the chance to update. It needs to update once the event has
been decrypted.
Ideally we would not update the whole room list order, but this is
how all the room list re-ordering happens right now, so staying
consistent with this.
Fixes https://github.com/vector-im/riot-web/issues/5020  
							
						 
						
							2017-09-12 14:47:26 +01:00  
				
					
						
							
							
								 
						
							
							
								130a2fe978 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Polish)  
							
							... 
							
							
							
							Currently translated at 96.1% (820 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/  
							
						 
						
							2017-09-12 11:51:44 +00:00  
				
					
						
							
							
								 
						
							
							
								1e400fd9a6 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Czech)  
							
							... 
							
							
							
							Currently translated at 25.7% (220 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/  
							
						 
						
							2017-09-12 11:51:44 +00:00  
				
					
						
							
							
								 
						
							
							
								e84d30cd11 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Polish)  
							
							... 
							
							
							
							Currently translated at 96.1% (820 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/  
							
						 
						
							2017-09-12 11:42:09 +00:00  
				
					
						
							
							
								 
						
							
							
								b2a22bc8e3 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Polish)  
							
							... 
							
							
							
							Currently translated at 96.1% (820 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/  
							
						 
						
							2017-09-12 11:39:15 +00:00  
				
					
						
							
							
								 
						
							
							
								ae64d32b70 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop  
							
							
							
						 
						
							2017-09-12 10:56:28 +00:00  
				
					
						
							
							
								 
						
							
							
								75e8e247ae 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Swedish)  
							
							... 
							
							
							
							Currently translated at 50.0% (427 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/  
							
						 
						
							2017-09-12 10:56:26 +00:00  
				
					
						
							
							
								 
						
							
							
								24009eb7b0 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Polish)  
							
							... 
							
							
							
							Currently translated at 95.7% (817 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/  
							
						 
						
							2017-09-12 10:56:26 +00:00  
				
					
						
							
							
								 
						
							
							
								3fca607d07 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Hungarian)  
							
							... 
							
							
							
							Currently translated at 99.7% (851 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/  
							
						 
						
							2017-09-12 10:56:26 +00:00  
				
					
						
							
							
								 
						
							
							
								5a73b4c51b 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (German)  
							
							... 
							
							
							
							Currently translated at 100.0% (853 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/  
							
						 
						
							2017-09-12 10:56:26 +00:00  
				
					
						
							
							
								 
						
							
							
								fd0e8314b1 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Finnish)  
							
							... 
							
							
							
							Currently translated at 10.9% (93 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/  
							
						 
						
							2017-09-12 10:56:26 +00:00  
				
					
						
							
							
								 
						
							
							
								50db05c614 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Dutch)  
							
							... 
							
							
							
							Currently translated at 99.7% (851 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/  
							
						 
						
							2017-09-12 10:56:25 +00:00  
				
					
						
							
							
								 
						
							
							
								79f834d184 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Basque)  
							
							... 
							
							
							
							Currently translated at 99.6% (850 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/  
							
						 
						
							2017-09-12 10:56:25 +00:00  
				
					
						
							
							
								 
						
							
							
								dd952ad432 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Polish)  
							
							... 
							
							
							
							Currently translated at 95.6% (816 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/  
							
						 
						
							2017-09-12 10:56:24 +00:00  
				
					
						
							
							
								 
						
							
							
								ac8adbb1a2 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Polish)  
							
							... 
							
							
							
							Currently translated at 95.6% (816 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/  
							
						 
						
							2017-09-12 10:54:54 +00:00  
				
					
						
							
							
								 
						
							
							
								d90aa6ec20 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1368  from matrix-org/t3chguy/fix_theme  
							
							... 
							
							
							
							fix radio for theme selection 
							
						 
						
							2017-09-12 11:54:49 +01:00  
				
					
						
							
							
								 
						
							
							
								dc88a5ba5e 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (German)  
							
							... 
							
							
							
							Currently translated at 100.0% (853 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/  
							
						 
						
							2017-09-12 10:41:58 +00:00  
				
					
						
							
							
								 
						
							
							
								33c8907267 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop  
							
							
							
						 
						
							2017-09-12 09:52:22 +00:00  
				
					
						
							
							
								 
						
							
							
								0b6d352cf4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/matrix-org/matrix-react-sdk  into develop  
							
							... 
							
							
							
							Conflicts:
	src/i18n/strings/de_DE.json
	src/i18n/strings/fi.json
	src/i18n/strings/hu.json
	src/i18n/strings/nl.json
	src/i18n/strings/pl.json
	src/i18n/strings/ru.json
	src/i18n/strings/zh_Hant.json 
							
						 
						
							2017-09-12 09:33:58 +00:00  
				
					
						
							
							
								 
						
							
							
								9920cd4f55 
								
							
								 
							
						 
						
							
							
								
								fix some more zh_Hans - remove entirely broken lines  
							
							
							
						 
						
							2017-09-12 10:24:56 +01:00  
				
					
						
							
							
								 
						
							
							
								0cdb9322e9 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Spanish)  
							
							... 
							
							
							
							Currently translated at 80.7% (785 of 972 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/  
							
						 
						
							2017-09-12 09:10:07 +00:00  
				
					
						
							
							
								 
						
							
							
								f124a9069b 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Polish)  
							
							... 
							
							
							
							Currently translated at 97.3% (946 of 972 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/  
							
						 
						
							2017-09-12 09:10:07 +00:00  
				
					
						
							
							
								 
						
							
							
								cf3118fb5e 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (German)  
							
							... 
							
							
							
							Currently translated at 100.0% (972 of 972 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/  
							
						 
						
							2017-09-12 09:10:07 +00:00  
				
					
						
							
							
								 
						
							
							
								56125d6e38 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Finnish)  
							
							... 
							
							
							
							Currently translated at 9.4% (92 of 972 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/  
							
						 
						
							2017-09-12 09:10:07 +00:00  
				
					
						
							
							
								 
						
							
							
								e3b70a76a4 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Dutch)  
							
							... 
							
							
							
							Currently translated at 100.0% (972 of 972 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/  
							
						 
						
							2017-09-12 09:10:06 +00:00  
				
					
						
							
							
								 
						
							
							
								aa4bad5b67 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Czech)  
							
							... 
							
							
							
							Currently translated at 35.0% (341 of 972 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/  
							
						 
						
							2017-09-12 09:10:06 +00:00  
				
					
						
							
							
								 
						
							
							
								7ab7461a37 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Catalan)  
							
							... 
							
							
							
							Currently translated at 6.7% (66 of 972 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/  
							
						 
						
							2017-09-12 09:10:06 +00:00  
				
					
						
							
							
								 
						
							
							
								7425f9b066 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1377  from matrix-org/t3chguy/zh_Hans  
							
							... 
							
							
							
							fix placeholder causing app to break when using zh 
							
						 
						
							2017-09-12 10:09:31 +01:00  
				
					
						
							
							
								 
						
							
							
								92ae0db1bd 
								
							
								 
							
						 
						
							
							
								
								fix placeholder causing app to break when using zh  
							
							
							
						 
						
							2017-09-12 09:35:47 +01:00  
				
					
						
							
							
								 
						
							
							
								3c70b86668 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1375  from matrix-org/dbkr/active_room_observer  
							
							... 
							
							
							
							Avoid re-rendering RoomList on room switch 
							
						 
						
							2017-09-11 18:52:09 +01:00  
				
					
						
							
							
								 
						
							
							
								7e1886c2ab 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1376  from matrix-org/dbkr/fix_failed_to_load_timeline_pos  
							
							... 
							
							
							
							Fix 'Failed to load timeline position' regression 
							
						 
						
							2017-09-11 18:51:41 +01:00  
				
					
						
							
							
								 
						
							
							
								6cb98d7196 
								
							
								 
							
						 
						
							
							
								
								Hopefully make comment clearer  
							
							
							
						 
						
							2017-09-11 18:39:30 +01:00  
				
					
						
							
							
								 
						
							
							
								531fc3ac54 
								
							
								 
							
						 
						
							
							
								
								Fix 'Failed to load timeline position' regression  
							
							... 
							
							
							
							Ignore the update that comes in from the RoomViewStore when the
current room changes or we save our scoll state against the new
room rather than the old one.
Fixes https://github.com/vector-im/riot-web/issues/5010  
							
						 
						
							2017-09-11 17:57:52 +01:00  
				
					
						
							
							
								 
						
							
							
								be8f0991a6 
								
							
								 
							
						 
						
							
							
								
								Avoid re-rendering RoomList on room switch  
							
							... 
							
							
							
							Introduce a class that consumes updates from the RoomViewStore and
announces to listeners if the active room ID is now or is no longer
the room ID they specified. Naming suggestions welcome: it's
currently called ActiveRoomObserver.
Avoids passing the selectedRoomId down from MatrixChat all the way
through the LeftPanel / RoomList / RoomSubList to the RoomTiles.
Also introduce a CallPreview class that listens directly for
RoomViewStore changes as the call preview in the left panel needs
to know when the room changes, so this allows this component to
update without having to update the entire left panel. 
							
						 
						
							2017-09-11 16:59:09 +01:00