|  Richard Lewis | 1f1352786f | Temporarily disable Jitsi default | 2017-06-27 11:38:14 +01:00 | 
				
					
						|  Richard Lewis | 18ea76b864 | Removed commented code | 2017-06-27 11:31:00 +01:00 | 
				
					
						|  Richard Lewis | e343e99355 | Cleaned up unused files and removed commented code | 2017-06-27 11:28:38 +01:00 | 
				
					
						|  Richard Lewis | 2cb2c44bd8 | Remove unused logging | 2017-06-20 17:57:48 +01:00 | 
				
					
						|  Richard Lewis | 68473e118f | Ensure that Scalar Messaging is started and stopped on component mount / unmount | 2017-06-20 17:56:45 +01:00 | 
				
					
						|  Richard Lewis | a449588c1c | Replace add app dialog with scalar interface | 2017-06-20 10:54:41 +01:00 | 
				
					
						|  Richard Lewis | 59f6448b3e | Merge branch 'kegan/postmessage-widgets' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps | 2017-06-19 16:00:12 +01:00 | 
				
					
						|  Richard Lewis | 80c5a58fc3 | Fix custom widget form styling | 2017-06-19 12:06:16 +01:00 | 
				
					
						|  Richard Lewis | f676b58c00 | Add google ardboard logo | 2017-06-19 11:47:03 +01:00 | 
				
					
						|  Richard Lewis | 9d89bfe264 | Fix jitsi logo references | 2017-06-19 11:36:15 +01:00 | 
				
					
						|  Robert Swain | aba0d45db5 | Merge pull request #1086 from matrix-org/rob/apps App widget improvements and Jitsi | 2017-06-14 15:21:24 +02:00 | 
				
					
						|  Robert Swain | edb11d805e | AppsDrawer: Open add app widget if opening empty drawer This felt much better than having to also click the add app widget
button. | 2017-06-14 15:05:29 +02:00 | 
				
					
						|  Robert Swain | 5f020423bc | AddAppDialog: Put the submit button inside the form | 2017-06-14 15:05:11 +02:00 | 
				
					
						|  Robert Swain | 2d3c886646 | AppsDrawer: Generate room alias for vrdemo | 2017-06-14 13:27:15 +02:00 | 
				
					
						|  Robert Swain | 9c8ab2691b | AppsDrawer: Only append queryParams once | 2017-06-14 13:26:43 +02:00 | 
				
					
						|  Robert Swain | 880e7149f3 | ModularWidgets: Add a quick VR demo widget | 2017-06-14 13:05:43 +02:00 | 
				
					
						|  Robert Swain | d67e7289e8 | Merge branch 'develop' into rob/apps | 2017-06-13 15:50:43 +02:00 | 
				
					
						|  Robert Swain | 03ba3bd431 | Merge branch 'rxl881/apps' into rob/apps | 2017-06-13 15:41:52 +02:00 | 
				
					
						|  Robert Swain | 91eabbba60 | MessageComposer: Trigger Jitsi app from call buttons | 2017-06-13 15:35:13 +02:00 | 
				
					
						|  Robert Swain | 5d898dd098 | AuxPanel: Add type checking for userId and showApps properties | 2017-06-13 15:34:05 +02:00 | 
				
					
						|  Robert Swain | b63edcb390 | AppTile: Support deletion of apps from room state | 2017-06-13 15:33:17 +02:00 | 
				
					
						|  Robert Swain | bcb2f8408b | AppTile: Fix typo in property name | 2017-06-13 15:32:40 +02:00 | 
				
					
						|  Robert Swain | 2aa0aa61e3 | AddAppDialog: Support adding apps to room state | 2017-06-13 15:31:37 +02:00 | 
				
					
						|  Robert Swain | a72cb794f2 | AppsDrawer: Populate apps from room state | 2017-06-13 15:28:37 +02:00 | 
				
					
						|  Robert Swain | e2759774fc | RoomView: Correctly pass userId from matrix client It isn't set in the state anywhere. | 2017-06-13 15:19:38 +02:00 | 
				
					
						|  Robert Swain | 99b1de7f0e | RoomView: Display AppsDrawer if apps in room state | 2017-06-13 15:19:06 +02:00 | 
				
					
						|  David Baker | bd00c1d4b1 | Merge pull request #1083 from matrix-org/t3chguy/width_height_int width and height must be int otherwise synapse cries | 2017-06-13 13:23:12 +01:00 | 
				
					
						|  Richard van der Hoff | 392cd7861d | Merge pull request #1084 from matrix-org/rav/remove_roomstore_listener remove RoomViewStore listener from MatrixChat on unmount | 2017-06-13 13:10:49 +01:00 | 
				
					
						|  David Baker | 2e07a0fa12 | Merge pull request #1082 from matrix-org/dbkr/copy_translations Add script to copy translations between files | 2017-06-13 12:49:47 +01:00 | 
				
					
						|  Richard van der Hoff | 1ea9ed5d8c | remove RoomViewStore listener from MatrixChat on unmount ... to avoid spurious warnings from the tests. | 2017-06-13 12:39:26 +01:00 | 
				
					
						|  Michael Telatynski | ad7c835471 | width and height must be int otherwise synapse cries Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2017-06-13 12:19:20 +01:00 | 
				
					
						|  David Baker | 4eb7419335 | Don't put in spurious newline | 2017-06-13 11:54:28 +01:00 | 
				
					
						|  Richard Lewis | 876899948f | Merge in upstream changes | 2017-06-13 11:44:23 +01:00 | 
				
					
						|  David Baker | 89c7477bd6 | Add script to copy translations between files So we can fill in missing translations from different dialects
Use it to fill in missing strings in pt from pt_BR | 2017-06-13 11:39:37 +01:00 | 
				
					
						|  Luke Barnard | 29371120ff | Merge pull request #1081 from matrix-org/luke/fix-chat-invite-dialog-clobbered-request Only process user_directory response if it's for the current query | 2017-06-13 11:14:34 +01:00 | 
				
					
						|  Luke Barnard | 10ba5f8c3c | Only process user_directory response if it's for the current query | 2017-06-13 11:03:22 +01:00 | 
				
					
						|  David Baker | 701242a36b | Merge pull request #1080 from matrix-org/luke/fix-start-1-1-regression Fix regressions with starting a 1-1. | 2017-06-13 10:42:55 +01:00 | 
				
					
						|  David Baker | 27bc6dd16b | Merge new translations Merge remote-tracking branch 'weblate/develop' into develop | 2017-06-13 10:37:45 +01:00 | 
				
					
						|  Richard Lewis | 2da30137ec | Fix import path and add LG widget | 2017-06-13 10:31:16 +01:00 | 
				
					
						|  Luke Barnard | 1ce1984858 | Fix regressions with starting a 1-1. | 2017-06-13 10:15:29 +01:00 | 
				
					
						|  Robert Swain | e2cd8a7233 | Translated using Weblate (Swedish) Currently translated at 32.7% (295 of 901 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/ | 2017-06-13 09:11:46 +00:00 | 
				
					
						|  Tom Tryfonidis | 6f2f3f3fb1 | Translated using Weblate (Greek) Currently translated at 96.8% (873 of 901 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/ | 2017-06-13 09:11:46 +00:00 | 
				
					
						|  Justin | 387b3a1229 | Translated using Weblate (Dutch) Currently translated at 27.6% (249 of 901 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/ | 2017-06-13 09:11:46 +00:00 | 
				
					
						|  Jean | 0ea3b78163 | Translated using Weblate (French) Currently translated at 100.0% (901 of 901 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/ | 2017-06-13 08:12:20 +00:00 | 
				
					
						|  Hubert Chathi | bf76c76e53 | Translated using Weblate (French) Currently translated at 99.6% (898 of 901 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/ | 2017-06-13 08:11:58 +00:00 | 
				
					
						|  Jean | 2447b3fbbb | Translated using Weblate (French) Currently translated at 99.5% (897 of 901 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/ | 2017-06-13 08:09:37 +00:00 | 
				
					
						|  Hubert Chathi | 435c8885f0 | Translated using Weblate (French) Currently translated at 99.5% (897 of 901 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/ | 2017-06-13 07:46:52 +00:00 | 
				
					
						|  Jean | 301080ab7e | Translated using Weblate (French) Currently translated at 99.4% (896 of 901 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/ | 2017-06-13 07:46:32 +00:00 | 
				
					
						|  Hubert Chathi | 4b07bd8584 | Translated using Weblate (French) Currently translated at 99.3% (895 of 901 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/ | 2017-06-13 07:46:23 +00:00 | 
				
					
						|  Jean | a185f75bd3 | Translated using Weblate (French) Currently translated at 99.1% (893 of 901 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/ | 2017-06-13 07:46:05 +00:00 |