577c411a39 
								
							
								 
							
						 
						
							
							
								
								experimental fix for  https://github.com/vector-im/riot-web/issues/2985  
							
							... 
							
							
							
							needs server to support 1600x1200 thumbnails for retina large ones.
ideally need to cap maximum thumbnail size to 800x600 rather than expand to arbitrary widths.
need to check that luke's funky timeline code doesn't get confused between naturalWidth and infoWidth etc.
also need to consider whether to encode a resolution metric in the event rather than lying about resolution. 
							
						 
						
							2019-01-14 17:10:22 +00:00  
				
					
						
							
							
								 
						
							
							
								736b76bbb0 
								
							
								 
							
						 
						
							
							
								
								If HttpStatus == 413, refresh media limits  
							
							
							
						 
						
							2018-06-23 13:00:56 +01:00  
				
					
						
							
							
								 
						
							
							
								1ae51a8332 
								
									
								
							
								 
							
						 
						
							
							
								
								use changed argument in js-sdk  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-06-18 13:48:23 +01:00  
				
					
						
							
							
								 
						
							
							
								da93c6d040 
								
									
								
							
								 
							
						 
						
							
							
								
								pass omitFilename to stop sending filename=undefined  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-06-15 10:27:39 +01:00  
				
					
						
							
							
								 
						
							
							
								a1581ad2dc 
								
							
								 
							
						 
						
							
							
								
								Don't swallow error.  
							
							
							
						 
						
							2018-03-29 16:24:03 +01:00  
				
					
						
							
							
								 
						
							
							
								5fc9b8a6b8 
								
							
								 
							
						 
						
							
							
								
								Indentation.  
							
							
							
						 
						
							2018-03-29 16:23:20 +01:00  
				
					
						
							
							
								 
						
							
							
								54671ab67e 
								
							
								 
							
						 
						
							
							
								
								Send m.sticker messages  
							
							
							
						 
						
							2018-01-04 21:57:24 +00:00  
				
					
						
							
							
								 
						
							
							
								e96d199b28 
								
							
								 
							
						 
						
							
							
								
								Inject stickers  
							
							
							
						 
						
							2018-01-04 09:53:26 +00:00  
				
					
						
							
							
								 
						
							
							
								b74ad8634b 
								
							
								 
							
						 
						
							
							
								
								Use object URLs to load Files in to images  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/5326  
							
						 
						
							2017-10-19 17:16:52 +01:00  
				
					
						
							
							
								 
						
							
							
								d3f9a3aeb5 
								
							
								 
							
						 
						
							
							
								
								Run eslint --fix  
							
							... 
							
							
							
							Fixing 1000s of lint issues. Some rules cannot be `--fix`ed but this goes some way to linting the entire codebase. 
							
						 
						
							2017-10-11 17:56:17 +01:00  
				
					
						
							
							
								 
						
							
							
								56ea528f43 
								
									
								
							
								 
							
						 
						
							
							
								
								don't track error messages .2  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-08-10 15:17:52 +01:00  
				
					
						
							
							
								 
						
							
							
								bf98c0da7c 
								
									
								
							
								 
							
						 
						
							
							
								
								un-i18n Modal Analytics  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-07-27 17:19:18 +01:00  
				
					
						
							
							
								 
						
							
							
								ad085a6273 
								
							
								 
							
						 
						
							
							
								
								Fix file uploading  
							
							... 
							
							
							
							File uploading no longer supports the .progress API; we now need to pass a
callback to get updates on the upload. 
							
						 
						
							2017-07-14 17:01:03 +01:00  
				
					
						
							
							
								 
						
							
							
								0d7cc59d99 
								
							
								 
							
						 
						
							
							
								
								replace q method calls with bluebird ones  
							
							... 
							
							
							
							```
find src test -name '*.js' |
    xargs perl -i -pe 's/q\.(all|defer|reject|delay|try|isFulfilled)\(/Promise.$1(/'
``` 
							
						 
						
							2017-07-12 18:05:40 +01:00  
				
					
						
							
							
								 
						
							
							
								a06bd84213 
								
							
								 
							
						 
						
							
							
								
								replace imports of `q` with bluebird  
							
							... 
							
							
							
							update `package.json`
```
find src test -name '*.js' |
   xargs perl -i -pe 'if (/require\(.[qQ].\)/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'
find src test -name '*.js' |
   xargs perl -i -pe 'if (/import [qQ]/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'
``` 
							
						 
						
							2017-07-12 18:05:08 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								5c359e63ab 
								
							
								 
							
						 
						
							
							
								
								Bulk change counterpart imports  
							
							... 
							
							
							
							to use languageHandler wrapper func 
							
						 
						
							2017-05-25 11:39:08 +01:00  
				
					
						
							
							
								 
						
							
							
								d419c42a4f 
								
							
								 
							
						 
						
							
							
								
								Squash merge  https://github.com/matrix-org/matrix-react-sdk/pull/801  
							
							
							
						 
						
							2017-05-23 15:16:31 +01:00  
				
					
						
							
							
								 
						
							
							
								6c7b191577 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #605  from SijmenSchoon/feature/pastefiles  
							
							... 
							
							
							
							Add support for pasting files into the text box 
							
						 
						
							2017-03-09 17:55:58 +00:00  
				
					
						
							
							
								 
						
							
							
								18d4d3392a 
								
							
								 
							
						 
						
							
							
								
								Fix a bunch of linting errors  
							
							... 
							
							
							
							eslint --fix and a few manual ones 
							
						 
						
							2017-01-20 14:22:27 +00:00  
				
					
						
							
							
								 
						
							
							
								ef88e02931 
								
							
								 
							
						 
						
							
							
								
								Add support for pasting into the text box  
							
							... 
							
							
							
							Only supports the new rich-text-supporting text editor 
							
						 
						
							2017-01-08 02:21:36 +01:00  
				
					
						
							
							
								 
						
							
							
								4be14080e1 
								
							
								 
							
						 
						
							
							
								
								Fix cancel button on uploads  
							
							
							
						 
						
							2016-12-16 17:12:04 +00:00  
				
					
						
							
							
								 
						
							
							
								13f28e53e1 
								
							
								 
							
						 
						
							
							
								
								Generate thumbnails when sending m.image and m.video messages. ( #555 )  
							
							... 
							
							
							
							* Send a thumbnail when sending a m.image
* Use the 'thumbnail_file' when displaying encrypted images
* Whitespace
* Generate thumbnails for m.video
* Fix docstring, remove unused vars, use const
* Don't change the upload promise behaviour
* Polyfill for Canvas.toBlob to support older browsers
* Lowercase for integer types in jsdoc 
							
						 
						
							2016-11-15 11:22:39 +00:00  
				
					
						
							
							
								 
						
							
							
								34df6ea242 
								
							
								 
							
						 
						
							
							
								
								Complete attachment-encryption patch  
							
							... 
							
							
							
							https://github.com/matrix-org/matrix-react-sdk/pull/533  originally landed in
the wrong branch, and was reverted by
https://github.com/matrix-org/matrix-react-sdk/pull/546 .
https://github.com/matrix-org/matrix-react-sdk/pull/548  attempted to land it on
the develop branch, but omitted a small amount of the patch.
This lands the final part, which got missed out. 
						
							2016-11-12 12:20:36 +00:00  
				
					
						
							
							
								 
						
							
							
								bf5ecbd016 
								
							
								 
							
						 
						
							
							
								
								Review comments  
							
							... 
							
							
							
							Conflicts:
	src/ContentMessages.js 
							
						 
						
							2016-11-11 13:57:42 +00:00  
				
					
						
							
							
								 
						
							
							
								49b3aec1e2 
								
							
								 
							
						 
						
							
							
								
								Include the mimetype with the file info. Store the objectURL in state so that it can be used normally by the exising templates  
							
							... 
							
							
							
							Conflicts:
	src/ContentMessages.js
	src/components/views/messages/MImageBody.js 
							
						 
						
							2016-11-11 13:54:07 +00:00  
				
					
						
							
							
								 
						
							
							
								1e163eabf0 
								
							
								 
							
						 
						
							
							
								
								Revert "Encrypt attachments in encrypted rooms,"  
							
							
							
						 
						
							2016-11-11 11:59:08 +00:00  
				
					
						
							
							
								 
						
							
							
								911f9e4e63 
								
							
								 
							
						 
						
							
							
								
								Review comments  
							
							
							
						 
						
							2016-11-08 11:42:20 +00:00  
				
					
						
							
							
								 
						
							
							
								12fc70c671 
								
							
								 
							
						 
						
							
							
								
								Include the mimetype with the file info. Store the objectURL in state so that it can be used normally by the exising templates  
							
							
							
						 
						
							2016-11-04 11:52:47 +00:00  
				
					
						
							
							
								 
						
							
							
								842b5aed56 
								
							
								 
							
						 
						
							
							
								
								The variable is called roomId here  
							
							
							
						 
						
							2016-11-03 17:13:02 +00:00  
				
					
						
							
							
								 
						
							
							
								e0cea74c7e 
								
							
								 
							
						 
						
							
							
								
								Encrypt attachments in encrypted rooms, decrypt image attachments when displaying them  
							
							
							
						 
						
							2016-11-02 16:26:10 +00:00  
				
					
						
							
							
								 
						
							
							
								569b6057c3 
								
							
								 
							
						 
						
							
							
								
								fix upload for video or image files where sniffing the content.info fails  
							
							
							
						 
						
							2016-08-03 13:27:06 +01:00  
				
					
						
							
							
								 
						
							
							
								4bd2b93f59 
								
							
								 
							
						 
						
							
							
								
								Add support for sending uploaded content as m.video  
							
							
							
						 
						
							2016-07-19 16:05:15 +01:00  
				
					
						
							
							
								 
						
							
							
								bfec6d4ed9 
								
							
								 
							
						 
						
							
							
								
								merge aviral's audio player  
							
							
							
						 
						
							2016-04-13 00:00:24 +01:00  
				
					
						
							
							
								 
						
							
							
								af5a866596 
								
							
								 
							
						 
						
							
							
								
								clear upload bar correctly after upload completes by fixing a race and moving the upload_finished dispatch after clearing up the inprogress uploads data structure. I have zero idea how this ever worked... :/  
							
							
							
						 
						
							2016-02-15 21:29:56 +02:00  
				
					
						
							
							
								 
						
							
							
								0772f50fab 
								
							
								 
							
						 
						
							
							
								
								update copyright for 2016  
							
							
							
						 
						
							2016-01-07 04:06:52 +00:00  
				
					
						
							
							
								 
						
							
							
								4c2fe55fdc 
								
							
								 
							
						 
						
							
							
								
								Don't show the error dialog if the request was canceled. Handle 'request entity too large'.  
							
							
							
						 
						
							2015-12-03 10:52:06 +00:00  
				
					
						
							
							
								 
						
							
							
								e8f5131ed6 
								
							
								 
							
						 
						
							
							
								
								Make file uploads cancelable, make them not go weird if you change rooms, error if they fail and move upload status bar out into its own component.  
							
							
							
						 
						
							2015-12-02 18:16:16 +00:00  
				
					
						
							
							
								 
						
							
							
								2d3b87d56d 
								
							
								 
							
						 
						
							
							
								
								Don't set empty mime types on metadata.  
							
							
							
						 
						
							2015-10-02 18:37:15 +01:00  
				
					
						
							
							
								 
						
							
							
								36ecbfc87f 
								
							
								 
							
						 
						
							
							
								
								Upload files and images  
							
							
							
						 
						
							2015-07-08 14:34:53 +01:00