OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
18,729 Commits
211 Branches
549 Tags
658 MiB
Commit Graph

56 Commits (f8358fa4d0dfeb29057bbd74a4be6349e9285e13)

Author SHA1 Message Date
Bruno Windels ceb53dc0bb Revert "remove unnessary manual focussing of composer" 
This reverts commit 57abbc4273.
 2019-07-23 09:13:51 +02:00
Bruno Windels 57abbc4273 remove unnessary manual focussing of composer 
now that composer is focused automatically when no other shortcuts
apply, remove the manual focusing we have in place where it's not needed
 2019-07-15 18:21:10 +02:00
Michael Telatynski 2fc2e32e60 Add Upload All button to UploadConfirmDialog 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-16 11:43:13 +01:00
Andrew Morgan d431e37d9b Move and lint 2019-04-12 10:37:14 +01:00
Andrew Morgan cecd2cbd71 Focus the composer view on file upload 2019-04-11 18:42:32 +01:00
Bruno Windels 774314badd prevent png chunk parsing and image loading racing with each other 2019-04-09 12:32:44 +02:00
Bruno Windels ea71970299 name fn to camel case 2019-04-09 12:18:06 +02:00
Bruno Windels 15ba24f7fb Merge branch 'develop' into matthew/retina 2019-04-09 10:55:05 +02:00
David Baker 3ad54df454 Consistent spelling of canceled 2019-04-08 19:07:17 +01:00
David Baker 59210564b7 Fix upload cancel in e2e rooms 
This is a bit of a mess of passing promises around - we weren't
taking the right promise to pass to cancelUpload.

Also e2e uploads take time to read into memory & encrypt, so allow
cancelling them during those phases too, even though we can't abort
those phases before they're done - we do mark the upload as cancelled
though so filter the current uploads for cancelled ones.

Fixes https://github.com/vector-im/riot-web/issues/4891
 2019-04-08 17:53:39 +01:00
Bruno Windels 20aedce62f more lint 2019-04-08 15:26:11 +02:00
Bruno Windels e002a59650 mistake during merge 2019-04-05 15:07:24 +02:00
Bruno Windels f1b00dff35 Merge branch 'develop' into matthew/retina 2019-04-05 13:35:54 +02:00
David Baker b6faaf419c PR feedback 2019-04-02 10:50:17 +01:00
David Baker 5b2cee2fc1 Implement redesigned upload confirmation screens 
Also fairly significant refactor of the uploading code: there are
a number of different ways of triggerring a file upload and each
went through a different code path (the media config size limit
worked on one of those paths). Basically take a lot of code out
of the views and put it into ContentMessages.

Sorry about the size of this patch.

https://github.com/vector-im/riot-web/issues/7565
 2019-04-01 16:42:41 +01:00
J. Ryan Stinnett 68ae72f855 Spell homeserver correctly 2019-01-31 18:52:39 -06:00
Matthew Hodgson 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
Will Hunt 736b76bbb0 If HttpStatus == 413, refresh media limits 2018-06-23 13:00:56 +01:00
Michael Telatynski 1ae51a8332
use changed argument in js-sdk 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 13:48:23 +01:00
Michael Telatynski da93c6d040
pass omitFilename to stop sending filename=undefined 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-15 10:27:39 +01:00
Richard Lewis a1581ad2dc Don't swallow error. 2018-03-29 16:24:03 +01:00
Richard Lewis 5fc9b8a6b8 Indentation. 2018-03-29 16:23:20 +01:00
Richard Lewis 54671ab67e Send m.sticker messages 2018-01-04 21:57:24 +00:00
Richard Lewis e96d199b28 Inject stickers 2018-01-04 09:53:26 +00:00
David Baker 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
Luke Barnard 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
Michael Telatynski 56ea528f43
don't track error messages .2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 15:17:52 +01:00
Michael Telatynski bf98c0da7c
un-i18n Modal Analytics 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-27 17:19:18 +01:00
Richard van der Hoff 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
Richard van der Hoff 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
Richard van der Hoff 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
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 5c359e63ab Bulk change counterpart imports 
to use languageHandler wrapper func
 2017-05-25 11:39:08 +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
Matthew Hodgson 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
David Baker 18d4d3392a Fix a bunch of linting errors 
eslint --fix and a few manual ones
 2017-01-20 14:22:27 +00:00
Sijmen Schoon 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
David Baker 4be14080e1 Fix cancel button on uploads 2016-12-16 17:12:04 +00:00
Mark Haines 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
Richard van der Hoff 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
Mark Haines bf5ecbd016 Review comments 
Conflicts:
	src/ContentMessages.js
 2016-11-11 13:57:42 +00:00
Mark Haines 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
David Baker 1e163eabf0 Revert "Encrypt attachments in encrypted rooms," 2016-11-11 11:59:08 +00:00
Mark Haines 911f9e4e63 Review comments 2016-11-08 11:42:20 +00:00
Mark Haines 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
David Baker 842b5aed56 The variable is called roomId here 2016-11-03 17:13:02 +00:00
Mark Haines e0cea74c7e Encrypt attachments in encrypted rooms, decrypt image attachments when displaying them 2016-11-02 16:26:10 +00:00
Matthew Hodgson 569b6057c3 fix upload for video or image files where sniffing the content.info fails 2016-08-03 13:27:06 +01:00
Will Hunt 4bd2b93f59 Add support for sending uploaded content as m.video 2016-07-19 16:05:15 +01:00
Matthew Hodgson bfec6d4ed9 merge aviral's audio player 2016-04-13 00:00:24 +01:00