|  Michael Telatynski | f0bd4a54e7 | Refactor tests to understand sendMessage instead of send{Text,Html}Message Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-05-01 13:26:24 +01:00 | 
				
					
						|  Michael Telatynski | bbce6eea5b | update comment Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-30 23:28:55 +01:00 | 
				
					
						|  Michael Telatynski | 41af9f7a96 | fix changed method name Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-29 08:23:35 +01:00 | 
				
					
						|  Michael Telatynski | 4021fc049c | re-arrange method order to group statics before instance methods Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-29 00:54:54 +01:00 | 
				
					
						|  Michael Telatynski | c00c52e537 | added another comment Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-29 00:53:35 +01:00 | 
				
					
						|  Michael Telatynski | 407be88c92 | add comment Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-29 00:51:39 +01:00 | 
				
					
						|  Michael Telatynski | 5bb15b1002 | simplify logic Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-29 00:48:44 +01:00 | 
				
					
						|  Michael Telatynski | bbf4d3e39f | add comment Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-29 00:34:27 +01:00 | 
				
					
						|  Michael Telatynski | 2e29a0857b | improve stripPlainReply comment and fix leading NewLine Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-27 12:12:01 +01:00 | 
				
					
						|  Michael Telatynski | 68dd57f56e | rename two methods Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-27 11:47:18 +01:00 | 
				
					
						|  Michael Telatynski | 3050553fc2 | rename and change getInReplyTo Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-27 11:44:14 +01:00 | 
				
					
						|  Michael Telatynski | ca766df598 | call onWidgetLoad on componentDidUpdate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-27 11:32:04 +01:00 | 
				
					
						|  Michael Telatynski | fdf63fd440 | replace concat on comment from review Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-27 11:31:04 +01:00 | 
				
					
						|  Michael Telatynski | 3ba9f560d4 | get MatrixClient from context Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-27 11:30:47 +01:00 | 
				
					
						|  Michael Telatynski | 88f48914b4 | improve comment Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-27 11:28:17 +01:00 | 
				
					
						|  Michael Telatynski | 97fecaedc2 | improve wording Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-27 11:26:42 +01:00 | 
				
					
						|  Michael Telatynski | 4a0a5c6bef | Merge remote-tracking branch 'origin/t3chguy/m.relates_to' into t3chguy/m.relates_to | 2018-04-27 11:23:12 +01:00 | 
				
					
						|  Michael Telatynski | 82d117974f | Remove unused import Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-27 11:16:29 +01:00 | 
				
					
						|  Michael Telatynski | 3de679b084 | Add comment to HtmlUtils.js Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-27 11:14:50 +01:00 | 
				
					
						|  Michael Telatynski | 71acf87c04 | Add comments to _EventTile.scss Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-27 11:13:09 +01:00 | 
				
					
						|  Michael Telatynski | 0f11bc62cc | undo code style change | 2018-04-23 10:58:39 +01:00 | 
				
					
						|  Michael Telatynski | 5f920f729b | Reset accidental merge changes 2.0 Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-23 10:35:02 +01:00 | 
				
					
						|  Michael Telatynski | 057815ac9f | Reset accidental merge changes Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-23 10:30:14 +01:00 | 
				
					
						|  Michael Telatynski | d680d805ce | Merge branch 'develop' into t3chguy/m.relates_to | 2018-04-23 10:14:48 +01:00 | 
				
					
						|  Matthew Hodgson | 44d92bb32e | Merge pull request #1843 from aidalgol/room-avatar-lightbox Add UI for displaying room avatars full size | 2018-04-21 20:35:13 +01:00 | 
				
					
						|  Aidan Gauland | 6a918861bb | Add UI for displaying room avatars full size Change the onClick action on the RoomAvatar inside RoomHeader so that it brings
up a lightbox with the full-size avatar. | 2018-04-21 15:47:31 +12:00 | 
				
					
						|  David Baker | 196b855cd5 | Merge translations from riot-web Translations that were added to the riot-web repo after the
containing files had been moved here. | 2018-04-20 15:50:23 +01:00 | 
				
					
						|  David Baker | ce3d813c12 | Prune i18n | 2018-04-20 15:37:19 +01:00 | 
				
					
						|  David Baker | 6154c13c95 | Re-run npm run i18n | 2018-04-20 15:35:31 +01:00 | 
				
					
						|  David Baker | a3c03de75e | Merge pull request #1842 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk Update from Weblate. | 2018-04-20 15:03:32 +01:00 | 
				
					
						|  Weblate | 54561b655a | Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop Conflicts:
	src/i18n/strings/bg.json
	src/i18n/strings/da.json
	src/i18n/strings/de_DE.json
	src/i18n/strings/eo.json
	src/i18n/strings/eu.json
	src/i18n/strings/gl.json
	src/i18n/strings/it.json
	src/i18n/strings/ja.json
	src/i18n/strings/nl.json
	src/i18n/strings/pl.json
	src/i18n/strings/ru.json
	src/i18n/strings/sk.json
	src/i18n/strings/zh_Hans.json | 2018-04-20 13:57:45 +00:00 | 
				
					
						|  adrian-007 | 105a0d6891 | Translated using Weblate (Polish) Currently translated at 76.9% (778 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/ | 2018-04-20 13:43:36 +00:00 | 
				
					
						|  toriko | 53889706d7 | Translated using Weblate (Japanese) Currently translated at 8.8% (89 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/ | 2018-04-20 13:43:36 +00:00 | 
				
					
						|  Gergely Bakos | e04c762a50 | Translated using Weblate (Hungarian) Currently translated at 100.0% (1011 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/ | 2018-04-20 13:43:36 +00:00 | 
				
					
						|  Kévin C | a5f4782964 | Translated using Weblate (French) Currently translated at 100.0% (1011 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/ | 2018-04-20 13:43:36 +00:00 | 
				
					
						|  RainSlide | 9685118f16 | Translated using Weblate (Chinese (Simplified)) Currently translated at 97.0% (981 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/ | 2018-04-20 13:43:35 +00:00 | 
				
					
						|  Krombel | 6177a42dbf | Translated using Weblate (German) Currently translated at 100.0% (1011 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/ | 2018-04-20 12:07:18 +00:00 | 
				
					
						|  Michael Telatynski | 941bb94234 | fix reply fallback blunder Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-20 10:15:15 +01:00 | 
				
					
						|  Michael Telatynski | 7e8288f7ae | i18n-gen, i18n-prune Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-20 09:39:14 +01:00 | 
				
					
						|  Michael Telatynski | 563fc9adc7 | fix bad copy-paste from other diff Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-20 09:37:25 +01:00 | 
				
					
						|  Michael Telatynski | 06408f843b | post BigMerge fixup - merge in stuff from riot-web PR Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-20 09:23:27 +01:00 | 
				
					
						|  Michael Telatynski | 58cd585e86 | start of BigMerge fixup Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2018-04-20 09:12:02 +01:00 | 
				
					
						|  Val | ccd295bc00 | Translated using Weblate (French) Currently translated at 100.0% (1011 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/ | 2018-04-20 06:21:09 +00:00 | 
				
					
						|  Peter Vágner | b0eb350c41 | Translated using Weblate (Slovak) Currently translated at 100.0% (1011 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/ | 2018-04-18 15:31:05 +00:00 | 
				
					
						|  Walter | 7934c50407 | Translated using Weblate (Russian) Currently translated at 99.9% (1010 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/ | 2018-04-18 15:31:04 +00:00 | 
				
					
						|  toriko | 7700df4c2d | Translated using Weblate (Japanese) Currently translated at 7.4% (75 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/ | 2018-04-18 15:31:04 +00:00 | 
				
					
						|  random | 8fc7cc4075 | Translated using Weblate (Italian) Currently translated at 99.5% (1006 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/ | 2018-04-18 15:31:04 +00:00 | 
				
					
						|  Xose M | 249edb7b76 | Translated using Weblate (Galician) Currently translated at 100.0% (1011 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/ | 2018-04-18 15:31:04 +00:00 | 
				
					
						|  RainSlide | 895521f0e8 | Translated using Weblate (Chinese (Simplified)) Currently translated at 90.8% (918 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/ | 2018-04-18 15:31:03 +00:00 | 
				
					
						|  Matthew Hodgson | 1aadaa3cc5 | Merge pull request #1836 from matrix-org/matthew/fix_layering move everything not explicitly riot (or status) branded into matrix-react-sdk | 2018-04-18 16:30:55 +01:00 |