Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								b1973d7998 
								
							
								 
							
						 
						
							
							
								
								undefined =/= ''  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-06-02 00:42:19 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								f4db83a031 
								
							
								 
							
						 
						
							
							
								
								try empty string as falsey key  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-06-02 00:31:43 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								6b4daf02a9 
								
							
								 
							
						 
						
							
							
								
								i18 missed things  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-06-02 00:27:20 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								0bafd6458a 
								
							
								 
							
						 
						
							
							
								
								Revert voodoo  
							
							 
							
							
							
						 
						
							2017-06-02 00:26:31 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								c7285b9053 
								
							
								 
							
						 
						
							
							
								
								fix fr layout  
							
							 
							
							
							
						 
						
							2017-06-02 00:21:00 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								46a9326607 
								
							
								 
							
						 
						
							
							
								
								special case default - CallMediaHandler can figure it out  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-06-02 00:20:34 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								6a225d1ac2 
								
							
								 
							
						 
						
							
							
								
								use new sign-in string  
							
							 
							
							
							
						 
						
							2017-06-02 00:16:17 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								3eb519b227 
								
							
								 
							
						 
						
							
							
								
								this is just endless  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-06-01 23:54:17 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								beedeec163 
								
							
								 
							
						 
						
							
							
								
								copy the arrays so we're not making a mess  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-06-01 23:50:14 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								0f2c89d525 
								
							
								 
							
						 
						
							
							
								
								lets actually make things work, eh?  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-06-01 23:39:54 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								4e36c10c38 
								
							
								 
							
						 
						
							
							
								
								only unshift default if there is no deviceId===default  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-06-01 23:33:36 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								dd4480f8c3 
								
							
								 
							
						 
						
							
							
								
								change device data structure to array of objects  
							
							 
							
							... 
							
							
							
							so that we can set falsey values, for unsetting device
                               most dolphinately needs testing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-06-01 23:26:43 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								aa90d6b097 
								
							
								 
							
						 
						
							
							
								
								fix **AMAZING** C&P derp  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-06-01 23:00:25 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								dbba1dedb6 
								
							
								 
							
						 
						
							
							
								
								i18nize all the things and change show logic  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-06-01 22:58:17 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								04b86e5d1d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into webrtc_settings  
							
							 
							
							... 
							
							
							
							and i18nize webrtc stufffs
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
#	src/components/structures/UserSettings.js 
							
						 
						
							2017-06-01 22:56:31 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								ee965a89a7 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #986  from uhoreg/compact  
							
							 
							
							... 
							
							
							
							enable useCompactLayout user setting an add a class when it's enabled 
							
						 
						
							2017-06-01 21:32:54 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								6c56fa3381 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #990  from matrix-org/kegan/translation-marmoset  
							
							 
							
							... 
							
							
							
							Translation fixes for everything but src/components 
							
						 
						
							2017-06-01 21:22:00 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								8e34b59d32 
								
							
								 
							
						 
						
							
							
								
								Revert "Revert "add labels to language picker""  
							
							 
							
							
							
						 
						
							2017-06-01 19:46:25 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								33214b8752 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #991  from turt2live/travis/date-sep-12hr  
							
							 
							
							... 
							
							
							
							Support 12hr time on DateSeparator 
							
						 
						
							2017-06-01 18:26:13 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								16c4c14a16 
								
							
								 
							
						 
						
							
							
								
								Fix to show the correct room  
							
							 
							
							
							
						 
						
							2017-06-01 18:01:30 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								b3e9716126 
								
							
								 
							
						 
						
							
							
								
								Revert "add labels to language picker"  
							
							 
							
							
							
						 
						
							2017-06-01 17:52:25 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								53ebc8d7bd 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #983  from matrix-org/rav/clear_storage_on_logout  
							
							 
							
							... 
							
							
							
							Call MatrixClient.clearStores on logout 
							
						 
						
							2017-06-01 17:34:21 +01:00  
						
					 
				
					
						
							
							
								 
								turt2live
							
						 
						
							 
							
							
							
								
							
								ab1e277f5f 
								
							
								 
							
						 
						
							
							
								
								Support 12hr time on DateSeparator  
							
							 
							
							... 
							
							
							
							Signed-off-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2017-06-01 09:53:24 -06:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								ced68f2719 
								
							
								 
							
						 
						
							
							
								
								Find a way to translate the name of RTE in user settings  
							
							 
							
							... 
							
							
							
							I never said it was a *nice* way... 
							
						 
						
							2017-06-01 15:53:08 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								547f10bcbb 
								
							
								 
							
						 
						
							
							
								
								Add translations for slash command failures  
							
							 
							
							
							
						 
						
							2017-06-01 15:44:56 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								ecbc724a3f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #988  from matrix-org/matthew/room-avatar-event  
							
							 
							
							... 
							
							
							
							Matthew/room avatar event 
							
						 
						
							2017-06-01 14:43:29 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								e6cf93e237 
								
							
								 
							
						 
						
							
							
								
								switch to imports  
							
							 
							
							
							
						 
						
							2017-06-01 14:42:44 +01:00  
						
					 
				
					
						
							
							
								 
								daniel tygel
							
						 
						
							 
							
							
							
								
							
								b8e26ddf3d 
								
							
								 
							
						 
						
							
							
								
								add labels to language picker  
							
							 
							
							
							
						 
						
							2017-06-01 09:48:36 -03:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								00750b4686 
								
							
								 
							
						 
						
							
							
								
								quick and dirty RoomAvatarEvent  
							
							 
							
							
							
						 
						
							2017-06-01 13:31:24 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								d689d4e1fa 
								
							
								 
							
						 
						
							
							
								
								quick and dirty RoomAvatarEvent  
							
							 
							
							
							
						 
						
							2017-06-01 13:31:15 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								dd48b3f055 
								
							
								 
							
						 
						
							
							
								
								Add comment  
							
							 
							
							
							
						 
						
							2017-06-01 10:08:02 +01:00  
						
					 
				
					
						
							
							
								 
								Hubert Chathi
							
						 
						
							 
							
							
							
								
							
								92d1a9a6ff 
								
							
								 
							
						 
						
							
							
								
								enable useCompactLayout user setting an add a class when it's enabled  
							
							 
							
							... 
							
							
							
							Signed-off-by: Hubert Chathi <hubert@uhoreg.ca> 
							
						 
						
							2017-05-31 22:00:30 -04:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								3d91b31637 
								
							
								 
							
						 
						
							
							
								
								i18n invited, and delete stale warning  
							
							 
							
							
							
						 
						
							2017-06-01 01:29:07 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								b4284cf000 
								
							
								 
							
						 
						
							
							
								
								fix up Can't connect to HS i18n with _tJsx  
							
							 
							
							
							
						 
						
							2017-06-01 01:17:39 +01:00  
						
					 
				
					
						
							
							
								 
								turt2live
							
						 
						
							 
							
							
							
								
							
								165dfeccb9 
								
							
								 
							
						 
						
							
							
								
								Fix rare case where presence duration is undefined & i18n  
							
							 
							
							
							
						 
						
							2017-05-31 11:56:04 -06:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								cbbed3f544 
								
							
								 
							
						 
						
							
							
								
								Fixes to i18n code  
							
							 
							
							
							
						 
						
							2017-05-31 18:31:10 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								c3d37c1ff9 
								
							
								 
							
						 
						
							
							
								
								Call MatrixClient.clearStores on logout  
							
							 
							
							... 
							
							
							
							... to make sure that we don't have any sensitive data sitting around in the
stores. 
							
						 
						
							2017-05-31 18:28:21 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								8192374481 
								
							
								 
							
						 
						
							
							
								
								Add missing _t import  
							
							 
							
							
							
						 
						
							2017-05-31 16:02:42 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								7abaadddde 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #977  from matrix-org/luke/session-store-null-on-logout  
							
							 
							
							... 
							
							
							
							Remove cachedPassword from localStorage on_logged_out 
							
						 
						
							2017-05-31 16:00:24 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								d0e270bd1c 
								
							
								 
							
						 
						
							
							
								
								Only re-render LoggedInView if MatrixClientPeg.get() is truthy  
							
							 
							
							
							
						 
						
							2017-05-31 15:15:27 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								2d73f094ff 
								
							
								 
							
						 
						
							
							
								
								Delint MatrixChat, again ( #979 )  
							
							 
							
							... 
							
							
							
							grrr. 
							
						 
						
							2017-05-31 15:09:09 +01:00  
						
					 
				
					
						
							
							
								 
								daniel tygel
							
						 
						
							 
							
							
							
								
							
								d4a89cc2df 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop  
							
							 
							
							
							
						 
						
							2017-05-31 09:09:27 -03:00  
						
					 
				
					
						
							
							
								 
								Richard Lewis
							
						 
						
							 
							
							
							
								
							
								dac154f828 
								
							
								 
							
						 
						
							
							
								
								Add full width widgets  
							
							 
							
							
							
						 
						
							2017-05-31 10:08:39 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								dcd99ac3de 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_settings  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	src/components/structures/UserSettings.js
#	src/i18n/strings/en_EN.json
First time using JetBrains Merge Tool, MAY HAVE GONE HORRIBLY WRONG
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-30 23:54:57 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								0d930c0553 
								
							
								 
							
						 
						
							
							
								
								change wording and i18n it  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-30 23:46:51 +01:00  
						
					 
				
					
						
							
							
								 
								daniel tygel
							
						 
						
							 
							
							
							
								
							
								f4e5039e70 
								
							
								 
							
						 
						
							
							
								
								add string to translate  
							
							 
							
							
							
						 
						
							2017-05-30 19:01:23 -03:00  
						
					 
				
					
						
							
							
								 
								daniel tygel
							
						 
						
							 
							
							
							
								
							
								12f923bc81 
								
							
								 
							
						 
						
							
							
								
								add new string to translate  
							
							 
							
							
							
						 
						
							2017-05-30 18:56:52 -03:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								e30e45a82c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into new-guest-access  
							
							 
							
							
							
						 
						
							2017-05-30 21:05:07 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								48a2ad93da 
								
							
								 
							
						 
						
							
							
								
								fix {integrationsUrl} thinko  
							
							 
							
							
							
						 
						
							2017-05-30 20:32:12 +01:00  
						
					 
				
					
						
							
							
								 
								Richard Lewis
							
						 
						
							 
							
							
							
								
							
								ae1753bce6 
								
							
								 
							
						 
						
							
							
								
								Add tipping widgets  
							
							 
							
							
							
						 
						
							2017-05-30 18:39:51 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								40154df930 
								
							
								 
							
						 
						
							
							
								
								Show People/Rooms emptySubListTip even when total rooms !== 0  
							
							 
							
							
							
						 
						
							2017-05-30 16:14:27 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								b51f5ac6d1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'new-guest-access' of github.com:matrix-org/matrix-react-sdk into new-guest-access  
							
							 
							
							
							
						 
						
							2017-05-30 16:11:11 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								6f8d5b1db3 
								
							
								 
							
						 
						
							
							
								
								Remove spurious reference to `otherTagNames`  
							
							 
							
							
							
						 
						
							2017-05-30 16:10:19 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								93a35dc07a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into t3chguy/piwik  
							
							 
							
							
							
						 
						
							2017-05-30 15:58:55 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								90c2fc01d2 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #964  from matrix-org/luke/start-url  
							
							 
							
							... 
							
							
							
							Add /start to show the setMxId above HomePage 
							
						 
						
							2017-05-30 15:45:43 +01:00  
						
					 
				
					
						
							
							
								 
								Richard Lewis
							
						 
						
							 
							
							
							
								
							
								0d7e3a15f7 
								
							
								 
							
						 
						
							
							
								
								Add room config  
							
							 
							
							
							
						 
						
							2017-05-30 15:32:53 +01:00  
						
					 
				
					
						
							
							
								 
								Marcel
							
						 
						
							 
							
							
							
								
							
								70e7d81093 
								
							
								 
							
						 
						
							
							
								
								More i18n strings ( #963 )  
							
							 
							
							... 
							
							
							
							* Add i18n for E2E import and Export Dialogs
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add various previous missing i18n strings
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Translate CreateRoomButton
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add ChatInviteDialog and fix missing to.
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add ConfitmRedactDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add DeactivateAccountDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add DeviceVerifyDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add SessionRestoreErrorDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add SetDisplayNameDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add UnknownDeviceDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add AddressTile translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add DeviceVerifyButtons translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add Dropdown translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add UserSelector translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add CaptchaForm translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add CasLogin translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add CustomServerDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add InteractiveAuthEntryComponents translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add LoginFooter translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add RegistrationForm translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add ServerConfig translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add MAudioBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add MImageBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add MVideoBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add TextualBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add UnknownBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add UrlPreviewSettings translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add AuxPanel translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add PresenceLabel translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* fix syntax error
* weird space :P
* missing ','
* fix missing value
* fix json fail
* remove acidential added file
* fix another json fail 
							
						 
						
							2017-05-30 15:09:57 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								2baef643e3 
								
							
								 
							
						 
						
							
							
								
								Add /start to show the setMxId above HomePage  
							
							 
							
							
							
						 
						
							2017-05-30 14:27:02 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								9b8b562499 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #960  from matrix-org/luke/fix-chat-invite-perf  
							
							 
							
							... 
							
							
							
							Improve ChatInviteDialog perf by ditching fuse, using indexOf and lastActiveTs() 
							
						 
						
							2017-05-30 14:26:37 +01:00  
						
					 
				
					
						
							
							
								 
								Richard Lewis
							
						 
						
							 
							
							
							
								
							
								0e7bb6791f 
								
							
								 
							
						 
						
							
							
								
								Static widget config per room  
							
							 
							
							
							
						 
						
							2017-05-30 13:47:17 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								47bf5401fa 
								
							
								 
							
						 
						
							
							
								
								Use KeyCode.ENTER instead of 13  
							
							 
							
							
							
						 
						
							2017-05-30 13:14:14 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								952651c685 
								
							
								 
							
						 
						
							
							
								
								Allow pressing Enter to submit setMxId  
							
							 
							
							
							
						 
						
							2017-05-30 13:02:35 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								4e4c670458 
								
							
								 
							
						 
						
							
							
								
								Improve ChatInviteDialog perf by ditching fuse, using indexOf and lastActiveTs()  
							
							 
							
							
							
						 
						
							2017-05-30 12:34:19 +01:00  
						
					 
				
					
						
							
							
								 
								Richard Lewis
							
						 
						
							 
							
							
							
								
							
								143f68ec56 
								
							
								 
							
						 
						
							
							
								
								Add locally hosted recepie widget  
							
							 
							
							
							
						 
						
							2017-05-30 11:40:29 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								ee6789ed15 
								
							
								 
							
						 
						
							
							
								
								change aux order so room settings is top most, forwarding could go weird  
							
							 
							
							... 
							
							
							
							if you clicked roomsettings whilst forwarding
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-30 11:22:27 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								baba2e12e2 
								
							
								 
							
						 
						
							
							
								
								fix weird indentation  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-30 11:21:33 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								ff9141e424 
								
							
								 
							
						 
						
							
							
								
								add a hideCancel flag as some things have own cancel etc on RoomHeader  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-30 11:20:41 +01:00  
						
					 
				
					
						
							
							
								 
								Richard Lewis
							
						 
						
							 
							
							
							
								
							
								ec03cf4de3 
								
							
								 
							
						 
						
							
							
								
								disable iframe sandboxing. Remove BBC news iframe  
							
							 
							
							
							
						 
						
							2017-05-30 10:46:51 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								9536e1ef36 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #954  from matrix-org/matthew/ilag-login  
							
							 
							
							... 
							
							
							
							add login link to SetMxIdDialog 
							
						 
						
							2017-05-30 09:48:33 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								ad1b14967b 
								
							
								 
							
						 
						
							
							
								
								hide rightpanel on welcome page  
							
							 
							
							
							
						 
						
							2017-05-30 03:59:06 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								7e02977c27 
								
							
								 
							
						 
						
							
							
								
								i18n  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-29 22:32:45 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								a2229ced11 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_settings  
							
							 
							
							
							
						 
						
							2017-05-29 21:56:45 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								b65e4960a5 
								
							
								 
							
						 
						
							
							
								
								move Dialog analytics to Modal controller  
							
							 
							
							... 
							
							
							
							mark title as required, it sorta is, why isn't this based on BaseDialog?
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-29 17:39:03 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								42e20c38f9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/piwik  
							
							 
							
							
							
						 
						
							2017-05-29 15:23:05 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								9b8dcaf274 
								
							
								 
							
						 
						
							
							
								
								make analytics setting use new thing  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-29 15:11:37 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								97d0c41d30 
								
							
								 
							
						 
						
							
							
								
								fix ugly special casing in generic settings renderer  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-29 15:08:11 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								f5d336103e 
								
							
								 
							
						 
						
							
							
								
								add opt out / un opt out toggle  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-29 14:36:50 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								7e8123e5fe 
								
							
								 
							
						 
						
							
							
								
								move all init/enable/disable logic to Analytics/MatrixChat  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-29 14:26:29 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								df599890c5 
								
							
								 
							
						 
						
							
							
								
								add login link to SetMxIdDialog  
							
							 
							
							
							
						 
						
							2017-05-29 01:32:31 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								1efc5c2b25 
								
							
								 
							
						 
						
							
							
								
								speed up SetMxIdDialog user check to 250ms as it was driving me MAD  
							
							 
							
							... 
							
							
							
							i18nize new bottomleftmenu buttons 
							
						 
						
							2017-05-28 23:28:40 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								5c885922d9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into new-guest-access  
							
							 
							
							
							
						 
						
							2017-05-28 22:58:18 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								1b6685c5da 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/redact-to-remove  
							
							 
							
							
							
						 
						
							2017-05-28 17:45:32 -04:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								b55503e67f 
								
							
								 
							
						 
						
							
							
								
								i18n the forwarding aux panel  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-28 13:27:57 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								fb3187b58e 
								
							
								 
							
						 
						
							
							
								
								change event wording  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-28 13:26:33 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								0a1b361141 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/piwik  
							
							 
							
							
							
						 
						
							2017-05-28 13:21:33 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								accc17a39a 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #812  from t3chguy/forward_message  
							
							 
							
							... 
							
							
							
							Message Forwarding 
							
						 
						
							2017-05-28 02:37:31 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								10a9313bba 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #944  from matrix-org/t3chguy/fix-focus-steal  
							
							 
							
							... 
							
							
							
							don't focus_composer on window focus 
							
						 
						
							2017-05-27 23:30:00 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								45cd80dedb 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/piwik  
							
							 
							
							
							
						 
						
							2017-05-27 20:59:35 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								98c2f9201b 
								
							
								 
							
						 
						
							
							
								
								initial piwik stuff  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-27 20:47:09 +01:00  
						
					 
				
					
						
							
							
								 
								Marcel
							
						 
						
							 
							
							
							
								
							
								8935e9706e 
								
							
								 
							
						 
						
							
							
								
								Change variable name as mentioned by t3chguy  
							
							 
							
							
							
						 
						
							2017-05-27 21:21:23 +02:00  
						
					 
				
					
						
							
							
								 
								Marcel
							
						 
						
							 
							
							
							
								
							
								a30110b5d3 
								
							
								 
							
						 
						
							
							
								
								Fix   vector-im/riot-web#4042  
							
							 
							
							
							
						 
						
							2017-05-27 21:11:00 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								4cd7964b58 
								
							
								 
							
						 
						
							
							
								
								remove window onFocus handling entirely  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-27 18:43:59 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								3703306a9e 
								
							
								 
							
						 
						
							
							
								
								oops  
							
							 
							
							
							
						 
						
							2017-05-27 18:35:18 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								3302fc690f 
								
							
								 
							
						 
						
							
							
								
								fix all missing translations picked up by check-i18n.pl  
							
							 
							
							
							
						 
						
							2017-05-27 18:20:44 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								1eb7993aa7 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #946  from matrix-org/t3chguy/fix_imports  
							
							 
							
							... 
							
							
							
							import _t, drop two unused imports 
							
						 
						
							2017-05-27 18:08:00 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								8524f5868c 
								
							
								 
							
						 
						
							
							
								
								import _t, drop two unused imports  
							
							 
							
							... 
							
							
							
							without this FilePanel would ever-load
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-27 17:59:11 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								957aa0403d 
								
							
								 
							
						 
						
							
							
								
								fix  https://github.com/vector-im/riot-web/issues/4052  
							
							 
							
							
							
						 
						
							2017-05-27 16:03:07 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								8e1db84bee 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix-focus-steal  
							
							 
							
							
							
						 
						
							2017-05-27 14:29:06 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								2bcb381aa7 
								
							
								 
							
						 
						
							
							
								
								maybe window focus should be ignored so focus is left as what it was  
							
							 
							
							... 
							
							
							
							but with this at least clicking on a text input will not make you
be thrown into composer instead
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-27 14:19:34 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								03194e66b3 
								
							
								 
							
						 
						
							
							
								
								actually wire up alwaysShowTimestamps  
							
							 
							
							
							
						 
						
							2017-05-27 00:14:16 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								81704a5b5e 
								
							
								 
							
						 
						
							
							
								
								s/username/User name/  
							
							 
							
							
							
						 
						
							2017-05-27 00:13:16 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								fd27d6dab1 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #936  from matrix-org/luke/new-guest-access-need-to-set-mx-id-beore-user-settings  
							
							 
							
							... 
							
							
							
							Block user settings with view_set_mxid 
							
						 
						
							2017-05-26 18:48:55 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								647c1b6169 
								
							
								 
							
						 
						
							
							
								
								Once more, with braces  
							
							 
							
							
							
						 
						
							2017-05-26 18:19:32 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								97aeb57a8b 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/translations  
							
							 
							
							
							
						 
						
							2017-05-26 18:15:32 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								276d3cad9c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #906  from matrix-org/luke/revert-login-username-prefix-suffix  
							
							 
							
							... 
							
							
							
							Remove suffix and prefix from login input username 
							
						 
						
							2017-05-26 18:07:10 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								62ffe929e4 
								
							
								 
							
						 
						
							
							
								
								Translate Add Threepid labels  
							
							 
							
							
							
						 
						
							2017-05-26 18:03:24 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								23fbce66a2 
								
							
								 
							
						 
						
							
							
								
								Translate 'email' threepid label  
							
							 
							
							
							
						 
						
							2017-05-26 17:56:51 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								ed79a3adef 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #935  from matrix-org/luke/new-guest-access-no-barf-on-username-check-err  
							
							 
							
							... 
							
							
							
							Show "Something went wrong!" when errcode undefined 
							
						 
						
							2017-05-26 17:47:52 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c22978d033 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/translations  
							
							 
							
							
							
						 
						
							2017-05-26 17:30:02 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								3d688a6ada 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #933  from matrix-org/luke/new-guest-access-set-display-name-to-useridlocalpart  
							
							 
							
							... 
							
							
							
							Set the displayname to the mxid once PWLU 
							
						 
						
							2017-05-26 17:17:23 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								1c7785535f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #929  from matrix-org/luke/new-guest-access-fix-view-next-room  
							
							 
							
							... 
							
							
							
							Fix view_next_room, view_previous_room and view_indexed_room 
							
						 
						
							2017-05-26 17:09:35 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								fbc3f83625 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #928  from matrix-org/luke/new-guest-access-inidicate-joining-early  
							
							 
							
							... 
							
							
							
							Use RVS to indicate "joining" when setting a mxid 
							
						 
						
							2017-05-26 17:08:34 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								fde553a809 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #903  from Kieran-Gould/kierangould/12hourtimestamp  
							
							 
							
							... 
							
							
							
							Kierangould/12hourtimestamp 
							
						 
						
							2017-05-26 16:52:09 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								9f902c1190 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #932  from matrix-org/luke/new-guest-access-no-notif-bar-if-is-guest  
							
							 
							
							... 
							
							
							
							Don't show notif nag bar if guest 
							
						 
						
							2017-05-26 16:42:12 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								e3e848d09e 
								
							
								 
							
						 
						
							
							
								
								Fix missing full stop on translation key  
							
							 
							
							
							
						 
						
							2017-05-26 13:19:46 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								5e136863b0 
								
							
								 
							
						 
						
							
							
								
								Block user settings with view_set_mxid  
							
							 
							
							
							
						 
						
							2017-05-26 13:18:44 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								28094a9a66 
								
							
								 
							
						 
						
							
							
								
								Show "Something went wrong!" when errcode undefined  
							
							 
							
							
							
						 
						
							2017-05-26 13:13:57 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								e44f3cc709 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							... 
							
							
							
							* Serve translation files from the karma server
 * Port UserSettingsStore to ES6 exports because the test runner
   gets confused by ES6 importing a commonjs module
 * Remove extra spaces in translations strings for MELS
 * Fix 'his/her' back to be 'their'
 * Change test to expect singular 'invitation' for a single person
   (there may be multiple invitations, but IMO this should be
   'rejected n invitations' and we can play with the wording later,
   I don't think the singular is any worse than the plural).
 * set language in the MELS tests (and wait for it to complete)
 * Don't bother setting lang in other tests for now 
							
						 
						
							2017-05-26 11:58:45 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								ad3373789f 
								
							
								 
							
						 
						
							
							
								
								Warn about LifecycleStore not explicitly being used  
							
							 
							
							
							
						 
						
							2017-05-26 11:50:32 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								c0f43a14fd 
								
							
								 
							
						 
						
							
							
								
								Improve comment  
							
							 
							
							
							
						 
						
							2017-05-26 11:47:55 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								2dcc03960a 
								
							
								 
							
						 
						
							
							
								
								Set the displayname to the mxid once PWLU  
							
							 
							
							
							
						 
						
							2017-05-26 11:46:33 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								b5b157a0fb 
								
							
								 
							
						 
						
							
							
								
								Don't show notif nag bar if guest  
							
							 
							
							
							
						 
						
							2017-05-26 10:34:36 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2d6bf5fa91 
								
							
								 
							
						 
						
							
							
								
								Remove messages with HTML formatting  
							
							 
							
							... 
							
							
							
							The translations strings are not HTML and it gets escaped. 
							
						 
						
							2017-05-25 20:04:28 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								ab92cc2254 
								
							
								 
							
						 
						
							
							
								
								Question marks do not internationalise  
							
							 
							
							
							
						 
						
							2017-05-25 19:55:54 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								e7fbf889fa 
								
							
								 
							
						 
						
							
							
								
								Make current language more accurate  
							
							 
							
							... 
							
							
							
							Make it reflect reality if it's been taken from the browser langs
by just getting what was saet in counterpart rather than the saved
setting.
Also fix style. 
							
						 
						
							2017-05-25 19:53:27 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								6c41be3c14 
								
							
								 
							
						 
						
							
							
								
								Missed OKs  
							
							 
							
							
							
						 
						
							2017-05-25 18:23:15 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								443ab1add7 
								
							
								 
							
						 
						
							
							
								
								Put back default strings on dialogs  
							
							 
							
							... 
							
							
							
							But make them work by calling _t in render rather than
getDefaultProps().
Also sort out some 'Warning!' strings 
							
						 
						
							2017-05-25 18:20:48 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								9112fc231a 
								
							
								 
							
						 
						
							
							
								
								More translation string fixups  
							
							 
							
							
							
						 
						
							2017-05-25 17:35:18 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								0849b0e205 
								
							
								 
							
						 
						
							
							
								
								Fix view_next_room, view_previous_room and view_indexed_room  
							
							 
							
							... 
							
							
							
							These must now make a dispatch to RoomViewStore instead of calling `viewRoom` directly on MatrixChat. This will call both `viewRoom` of MatrixChat _and_ the logic in RVS so there is some redundancy here. It'd be best to move as much as possible of viewRoom out to the RVS itself.
But for now, this fixes a bug that occures when leaving (the viewed room would not change). 
							
						 
						
							2017-05-25 17:10:49 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								91edc06441 
								
							
								 
							
						 
						
							
							
								
								Use RVS to indicate "joining" when setting a mxid  
							
							 
							
							... 
							
							
							
							This prevents RoomView from doing any peeking whilst the join/registration is in progress, causing weirdness with TimelinePanel getPendingEventList (which throws an error if called when peeking). 
							
						 
						
							2017-05-25 17:04:42 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								3a379d09de 
								
							
								 
							
						 
						
							
							
								
								Update translations  
							
							 
							
							... 
							
							
							
							Actually translate the language dropdown label & add the string.
Remove some unused ones. 
							
						 
						
							2017-05-25 16:52:15 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								11799b4c71 
								
							
								 
							
						 
						
							
							
								
								Show "Password" instead of "New Password" when the existing password has been cached  
							
							 
							
							
							
						 
						
							2017-05-25 15:27:54 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								0707b7440a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'new-guest-access' of github.com:matrix-org/matrix-react-sdk into new-guest-access  
							
							 
							
							
							
						 
						
							2017-05-25 15:20:22 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								ce17df0883 
								
							
								 
							
						 
						
							
							
								
								Unbreak the roomlist  
							
							 
							
							
							
						 
						
							2017-05-25 15:20:02 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								1214b01330 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #926  from matrix-org/luke/new-guest-access-set-mxid-warm-fuzzy-revert  
							
							 
							
							... 
							
							
							
							Remove warm-fuzzy after setting mxid 
							
						 
						
							2017-05-25 15:16:52 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								2265b59287 
								
							
								 
							
						 
						
							
							
								
								Remove warm-fuzzy after setting mxid  
							
							 
							
							
							
						 
						
							2017-05-25 14:54:28 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								51c8ee6db2 
								
							
								 
							
						 
						
							
							
								
								Allow teamServerConfig to be missing  
							
							 
							
							
							
						 
						
							2017-05-25 14:38:12 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c54a24c49a 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #923  from matrix-org/luke/remove-guest-warning-bar  
							
							 
							
							... 
							
							
							
							Remove GuestWarningBar 
							
						 
						
							2017-05-25 14:30:10 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								7900bf1c7d 
								
							
								 
							
						 
						
							
							
								
								Don't show "Drop to ..." if total rooms = 0  
							
							 
							
							
							
						 
						
							2017-05-25 13:55:37 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								3185d3ed41 
								
							
								 
							
						 
						
							
							
								
								Re-add bouncing/callout animation to action buttons  
							
							 
							
							
							
						 
						
							2017-05-25 13:54:59 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								548f319816 
								
							
								 
							
						 
						
							
							
								
								Remove redundant role elements  
							
							 
							
							
							
						 
						
							2017-05-25 12:09:08 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								5e855e6fee 
								
							
								 
							
						 
						
							
							
								
								Size is a string, import react  
							
							 
							
							... 
							
							
							
							React gets put in by the JSX transpile 
							
						 
						
							2017-05-25 12:09:01 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								9337158a47 
								
							
								 
							
						 
						
							
							
								
								Separate classes for the different buttons  
							
							 
							
							... 
							
							
							
							Also rename RoleButton to ActionButton because it's not being
given a Role any more.
Conflicts:
	src/component-index.js
cherry-picking commit 4a5821e . 
							
						 
						
							2017-05-25 12:08:42 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								dc2274df54 
								
							
								 
							
						 
						
							
							
								
								Hide empty tips if collapsed  
							
							 
							
							
							
						 
						
							2017-05-25 12:05:06 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								3d3d89202e 
								
							
								 
							
						 
						
							
							
								
								Year  
							
							 
							
							
							
						 
						
							2017-05-25 12:04:36 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a996f52ea3 
								
							
								 
							
						 
						
							
							
								
								Make bottom left menu buttons use RoleButton too  
							
							 
							
							
							
						 
						
							2017-05-25 12:04:22 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								54af06e8e1 
								
							
								 
							
						 
						
							
							
								
								What year is it? Who's the president?  
							
							 
							
							
							
						 
						
							2017-05-25 12:04:14 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								9fa6e8b1e2 
								
							
								 
							
						 
						
							
							
								
								Add us to copyright  
							
							 
							
							... 
							
							
							
							As I've now added code to this file 
							
						 
						
							2017-05-25 12:02:05 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								bff0577cb6 
								
							
								 
							
						 
						
							
							
								
								Add buttons to room sub list headers  
							
							 
							
							... 
							
							
							
							Conflicts:
	src/component-index.js
	src/components/views/rooms/RoomList.js
cherry-picking commit ce119a6 . 
							
						 
						
							2017-05-25 11:49:45 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								d6d9a89453 
								
							
								 
							
						 
						
							
							
								
								Other empty sections no longer need to be greyed  
							
							 
							
							
							
						 
						
							2017-05-25 11:47:21 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								5c359e63ab 
								
							
								 
							
						 
						
							
							
								
								Bulk change counterpart imports  
							
							 
							
							... 
							
							
							
							to use languageHandler wrapper func 
							
						 
						
							2017-05-25 11:39:08 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								5531f27435 
								
							
								 
							
						 
						
							
							
								
								Make the left panel more friendly to new users  
							
							 
							
							... 
							
							
							
							https://github.com/vector-im/riot-web/issues/3609 
Conflicts:
	src/components/views/rooms/RoomList.js
cherry-picking commit f5f35e3 . 
							
						 
						
							2017-05-25 11:24:45 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								c894c83fbe 
								
							
								 
							
						 
						
							
							
								
								Remove GuestWarningBar  
							
							 
							
							
							
						 
						
							2017-05-25 11:02:48 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								f3fc459875 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #922  from matrix-org/luke/new-guest-access-default-welcome  
							
							 
							
							... 
							
							
							
							Implement default welcome page and allow custom URL /w config 
							
						 
						
							2017-05-25 10:08:34 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								8fc44a9b66 
								
							
								 
							
						 
						
							
							
								
								Add comment to explain sync_state dispatch  
							
							 
							
							
							
						 
						
							2017-05-25 09:31:14 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								8158ec6d54 
								
							
								 
							
						 
						
							
							
								
								touchups  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-25 01:25:17 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								09d0ab7df5 
								
							
								 
							
						 
						
							
							
								
								attempt to make media selector work everywhere (TM)  
							
							 
							
							... 
							
							
							
							loadDevices not only in electron
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-25 01:01:40 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								a4b2bacc7e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into webrtc_settings  
							
							 
							
							
							
						 
						
							2017-05-25 00:26:38 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								fffe425730 
								
							
								 
							
						 
						
							
							
								
								Add non-null RoomView key  
							
							 
							
							
							
						 
						
							2017-05-24 18:04:04 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								5f36f797da 
								
							
								 
							
						 
						
							
							
								
								Implement default welcome page and allow custom URL /w config  
							
							 
							
							... 
							
							
							
							This changes the default behaviour of displaying the room directory to instead displaying the default homepage. If specified, the config "welcomePageUrl" can be used to override the default '/home.html'. 
							
						 
						
							2017-05-24 17:55:36 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								298c5e4df3 
								
							
								 
							
						 
						
							
							
								
								Implement a store for RoomView  
							
							 
							
							... 
							
							
							
							This allows for a truely flux-y way of storing the currently viewed room, making some callbacks (like onRoomIdResolved) redundant and making sure that the currently viewed room (ID) is only stored in one place as opposed to the previous many places.
This was required for the `join_room` action which can be dispatched to join the currently viewed room.
Another change was to introduce `LifeCycleStore` which is a start at encorporating state related to the lifecycle of the app into a flux store. Currently it only contains an action which will be dispatched when the sync state has become PREPARED. This was necessary to do a deferred dispatch of `join_room` following the registration of a PWLU (PassWord-Less User).
The following actions are introduced:
 - RoomViewStore:
    - `view_room`: dispatch to change the currently viewed room ID
    - `join_room`: dispatch to join the currently viewed room
 - LifecycleStore:
    - `do_after_sync_prepared`: dispatch to store an action which will be dispatched when `sync_state` is dispatched with `state = 'PREPARED'`
 - MatrixChat:
    - `sync_state`: dispatched when the sync state changes. Ideally there'd be a SyncStateStore that emitted an `update` upon receiving this, but for now the `LifecycleStore` will listen for `sync_state` directly. 
							
						 
						
							2017-05-24 16:56:13 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								b9ac1222ed 
								
							
								 
							
						 
						
							
							
								
								remove listener on unmount  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-24 15:55:37 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								1186207658 
								
							
								 
							
						 
						
							
							
								
								Initial Electron Settings - for Auto Launch  
							
							 
							
							... 
							
							
							
							(opens path for Proxy Settings)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-24 15:51:11 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								b677a2002f 
								
							
								 
							
						 
						
							
							
								
								Minimal UI fixes  
							
							 
							
							... 
							
							
							
							Add a label. Make css selector match style. Also fix import. 
							
						 
						
							2017-05-24 14:36:14 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								aef068b00e 
								
							
								 
							
						 
						
							
							
								
								Indenting  
							
							 
							
							
							
						 
						
							2017-05-24 14:28:30 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c2df23395d 
								
							
								 
							
						 
						
							
							
								
								Fix up language dropdown  
							
							 
							
							... 
							
							
							
							* Read languages from the available ones rather than the config
 * Make the search work (add searchEnabled=true)
 * Move variables to the class since they were populated there 
							
						 
						
							2017-05-24 11:25:06 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a95f3252b8 
								
							
								 
							
						 
						
							
							
								
								s/tabs/spaces/  
							
							 
							
							
							
						 
						
							2017-05-24 10:48:10 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								f412552c2c 
								
							
								 
							
						 
						
							
							
								
								Fix imports/exports  
							
							 
							
							
							
						 
						
							2017-05-23 18:32:45 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								cc0924f1c7 
								
							
								 
							
						 
						
							
							
								
								Fix imports  
							
							 
							
							
							
						 
						
							2017-05-23 18:16:02 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								d419c42a4f 
								
							
								 
							
						 
						
							
							
								
								Squash merge  https://github.com/matrix-org/matrix-react-sdk/pull/801  
							
							 
							
							
							
						 
						
							2017-05-23 15:16:31 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								46bb29a3af 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #910  from matrix-org/t3chguy/version_anchor_newtab  
							
							 
							
							... 
							
							
							
							Make the linked versions open a new tab, turt2live complained :P 
							
						 
						
							2017-05-23 13:51:40 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								a10c2faac1 
								
							
								 
							
						 
						
							
							
								
								lets not open an attack vector :)  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-23 13:12:21 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								6d30bc7182 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #911  from matrix-org/t3chguy/autofocus_directorysearchbox  
							
							 
							
							... 
							
							
							
							autoFocus input box 
							
						 
						
							2017-05-23 09:57:20 +01:00  
						
					 
				
					
						
							
							
								 
								Richard Lewis
							
						 
						
							 
							
							
							
								
							
								b111579aed 
								
							
								 
							
						 
						
							
							
								
								App tile events  
							
							 
							
							
							
						 
						
							2017-05-22 18:00:17 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								b0a824c941 
								
							
								 
							
						 
						
							
							
								
								Remove double declaration of TextInputDialog  
							
							 
							
							
							
						 
						
							2017-05-22 16:28:23 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								05aaa599cc 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into new-guest-access  
							
							 
							
							... 
							
							
							
							Conflicts:
	src/components/structures/MatrixChat.js 
							
						 
						
							2017-05-22 16:19:10 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								a1f10ff46d 
								
							
								 
							
						 
						
							
							
								
								Add prop to toggle whether new password input is autoFocused  
							
							 
							
							
							
						 
						
							2017-05-22 14:46:49 +01:00  
						
					 
				
					
						
							
							
								 
								Richard Lewis
							
						 
						
							 
							
							
							
								
							
								e8837d28ef 
								
							
								 
							
						 
						
							
							
								
								App tile and app dialog styling  
							
							 
							
							
							
						 
						
							2017-05-22 12:34:27 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								fc08dc33c6 
								
							
								 
							
						 
						
							
							
								
								Group e2e keys into blocks of 4 characters  
							
							 
							
							... 
							
							
							
							Hopefully this will make them a bit easier to compare. 
							
						 
						
							2017-05-22 12:01:09 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								574b820d11 
								
							
								 
							
						 
						
							
							
								
								Factor out DeviceVerifyDialog  
							
							 
							
							
							
						 
						
							2017-05-22 11:12:36 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								02a1c1868c 
								
							
								 
							
						 
						
							
							
								
								autoFocus input box  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-20 00:08:53 +01:00  
						
					 
				
					
						
							
							
								 
								Kieran Gould
							
						 
						
							 
							
							
							
								
							
								47e5e8d678 
								
							
								 
							
						 
						
							
							
								
								Moved isTwelveHour alllll the way up to TimelinePanel.  
							
							 
							
							
							
						 
						
							2017-05-19 23:04:37 +01:00  
						
					 
				
					
						
							
							
								 
								Kieran Gould
							
						 
						
							 
							
							
							
								
							
								6b32975e0c 
								
							
								 
							
						 
						
							
							
								
								Add 12 hour class to mx_EventTile  
							
							 
							
							
							
						 
						
							2017-05-19 22:36:13 +01:00  
						
					 
				
					
						
							
							
								 
								Maxwell Kepler
							
						 
						
							 
							
							
							
								
							
								008cc95e9c 
								
							
								 
							
						 
						
							
							
								
								Add 12 hour support  
							
							 
							
							
							
						 
						
							2017-05-19 22:29:49 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								cc3673d2d2 
								
							
								 
							
						 
						
							
							
								
								Make the linked versions open a new tab, turt2live complained :P  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-19 17:39:21 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								e3dbf057fb 
								
							
								 
							
						 
						
							
							
								
								Fix 'missing page_type' error  
							
							 
							
							... 
							
							
							
							LoggedInView will complain if it is instantiated without a page_type, so let's
keep showing the syncing spinner until we have one. 
							
						 
						
							2017-05-19 14:09:20 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								c61294f71c 
								
							
								 
							
						 
						
							
							
								
								Delintify some of MatrixChat ( #907 )  
							
							 
							
							... 
							
							
							
							... it annoyed me too much. 
							
						 
						
							2017-05-19 13:53:11 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								2bec44a517 
								
							
								 
							
						 
						
							
							
								
								Remove suffix and prefix from login input username  
							
							 
							
							... 
							
							
							
							This is an attempt reduce confusion when entering a custom home server: https://github.com/vector-im/riot-web/issues/3736  
							
						 
						
							2017-05-19 10:03:51 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								96c3bf56f8 
								
							
								 
							
						 
						
							
							
								
								Implement warm-fuzzy success dialog for SetMxIdDialog  
							
							 
							
							
							
						 
						
							2017-05-19 09:43:56 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								cc7edbf86d 
								
							
								 
							
						 
						
							
							
								
								allow for sending arbitrary events, also override highlight with  
							
							 
							
							... 
							
							
							
							event currently being forwarded while forwardingEvent is set
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-19 01:29:11 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								475646a2a7 
								
							
								 
							
						 
						
							
							
								
								Change wording  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-19 00:34:35 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								a2ab36f598 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into forward_message  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-19 00:33:36 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								bf0fe63759 
								
							
								 
							
						 
						
							
							
								
								don't know why I'm even tracking mounted state. Never refd  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-19 00:20:51 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								0e7e4d8595 
								
							
								 
							
						 
						
							
							
								
								replace weird sidebar snapping with better ui_opacity  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-19 00:20:32 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								3e7a31ac75 
								
							
								 
							
						 
						
							
							
								
								Revert "fix scroll behaviour on macs with no gemini"  
							
							 
							
							... 
							
							
							
							This reverts commit 1347d9fa65 . 
							
						 
						
							2017-05-18 19:03:51 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								726cd60127 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #902  from matrix-org/dbkr/prevent_illegal_finddomnode  
							
							 
							
							... 
							
							
							
							Prevent an exception getting scroll node 
							
						 
						
							2017-05-18 17:56:29 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								8fe3fa9178 
								
							
								 
							
						 
						
							
							
								
								Remove debug logging  
							
							 
							
							
							
						 
						
							2017-05-18 17:35:22 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								01955146e9 
								
							
								 
							
						 
						
							
							
								
								Prevent an exception getting scroll node  
							
							 
							
							... 
							
							
							
							Don't try to findDOMNode before we're mounted as it makes react
angry. 
							
						 
						
							2017-05-18 17:33:32 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								32818aff4f 
								
							
								 
							
						 
						
							
							
								
								Simplify expression  
							
							 
							
							
							
						 
						
							2017-05-18 17:08:26 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								ee64f4a8dd 
								
							
								 
							
						 
						
							
							
								
								Add country prefix to country dd options  
							
							 
							
							
							
						 
						
							2017-05-18 17:02:19 +01:00