Mark Haines
b56417f46e
Remove spurious TODO
2016-11-11 13:55:57 +00:00
Mark Haines
95e8889857
Decypt m.video events
2016-11-11 13:55:57 +00:00
Mark Haines
a4a0d02848
Move decryptFile into a utility function so that it can be shared between different components
...
Conflicts:
src/components/views/messages/MImageBody.js
2016-11-11 13:55:48 +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
Mark Haines
23e764604c
Merge remote-tracking branch 'origin/master' into develop
2016-11-11 12:00:53 +00:00
Mark Haines
f6b3248c9d
Merge pull request #546 from matrix-org/revert-533-markjh/encrypted-attachments
...
Revert "Encrypt attachments in encrypted rooms,"
2016-11-11 12:00:43 +00:00
Mark Haines
61921327c2
Merge remote-tracking branch 'origin/master' into develop
2016-11-11 12:00:30 +00:00
David Baker
1e163eabf0
Revert "Encrypt attachments in encrypted rooms,"
2016-11-11 11:59:08 +00:00
Richard van der Hoff
998690431f
Merge pull request #542 from matrix-org/dbkr/get_app_version
...
Fix the vector web version in UserSettings
2016-11-11 11:11:36 +00:00
Richard van der Hoff
00ecff7497
Merge pull request #544 from matrix-org/luke/feature-truncate-m-room-member-events
...
Truncate consecutive member events
2016-11-11 11:01:47 +00:00
David Baker
857c0d1747
Wrap getAppVersion() in promise
...
in case it throws
2016-11-11 10:05:53 +00:00
Luke Barnard
d3a548773a
Remove redundant lines
2016-11-10 18:01:34 +00:00
Luke Barnard
3d7f6919cf
Refactor renderNameList (thanks, @richvdh)
2016-11-10 17:36:22 +00:00
Luke Barnard
0695037f5f
pass in prop onClick by default
2016-11-10 17:30:35 +00:00
Luke Barnard
87e8f0e4da
trailing commas
2016-11-10 17:27:59 +00:00
Luke Barnard
3ec7940d12
Inline renderEvents
2016-11-10 17:26:36 +00:00
Luke Barnard
d2d7ebc979
correct comment
2016-11-10 17:22:16 +00:00
Luke Barnard
b11dd9542f
Add class to expand link for pointer and colour
2016-11-10 17:09:18 +00:00
Luke Barnard
e05aeb35a1
npm run reskindex
2016-11-10 17:03:24 +00:00
Luke Barnard
ac460122cc
revert now redundant TruncatedList edits
2016-11-10 15:51:27 +00:00
Luke Barnard
f71ac93946
Prefer null to falsy, use correct plural
2016-11-10 15:38:20 +00:00
Luke Barnard
1a4df38500
remove href
2016-11-10 15:20:53 +00:00
Luke Barnard
d8bc4d9a6f
Factor out avatar click leads to view_user
2016-11-10 15:18:59 +00:00
Luke Barnard
6b2aa43b71
Factor out "and others"
2016-11-10 14:33:41 +00:00
Luke Barnard
d6b74becfc
Children are required
2016-11-10 14:12:45 +00:00
Luke Barnard
370f5f0a11
Use _ prefix for private methods
2016-11-10 14:12:05 +00:00
Luke Barnard
8422017827
events are required
2016-11-10 14:09:40 +00:00
Luke Barnard
dcbb31279f
Prefer import React, set prevEvent to last MemberhsipChange
2016-11-10 14:08:11 +00:00
Luke Barnard
e2936376b6
Unnecessary props
2016-11-10 13:26:27 +00:00
Luke Barnard
566034cf2b
Render children EventTiles before passing to summary element
2016-11-10 13:25:48 +00:00
Luke Barnard
764959ec1c
Comment on i after membershipchanges
2016-11-10 13:14:04 +00:00
Luke Barnard
0ec5eebfc9
Hoist isMembershipChange out of for loop
2016-11-10 13:03:17 +00:00
Luke Barnard
d01bb0b78f
Use sdk.getComponent
2016-11-10 13:01:48 +00:00
Luke Barnard
79c01fa1a4
Remove empty lines
2016-11-10 11:03:43 +00:00
Luke Barnard
f5bc8d1fe0
Removed logs, updated phrasing on 'others joined'
...
Now it's:
1 user joined and left
>1 others joined and left
2016-11-10 10:42:33 +00:00
Luke Barnard
5f0b891d47
Add date seperator to the expanded events
...
netsplits across midnight is not handled, and @richvdh suggested splitting the list in two
2016-11-09 17:44:43 +00:00
Luke Barnard
04a934f738
Trying to get rid of the date separator problem
2016-11-09 16:24:56 +00:00
Luke Barnard
2f02c4b84e
WIP nicer join/part folding
2016-11-09 16:03:35 +00:00
David Baker
3e9414b21e
Merge pull request #533 from matrix-org/markjh/encrypted-attachments
...
Encrypt attachments in encrypted rooms,
2016-11-09 09:45:01 +00:00
Richard van der Hoff
f2222c84a8
Merge pull request #545 from matrix-org/dbkr/fix_ctrl_e
...
Fix the ctrl+e mute camera shortcut
2016-11-08 18:37:58 +00:00
David Baker
a008f5010a
Fix the ctrl+e mute camera shortcut
...
* Fixes the altgr+e shortcut on Windows
(Fixes https://github.com/vector-im/vector-web/issues/2561 )
* Fixes the shortcuts to be cmd+e on mac rather than ctrl+e
which is more normal and doesn't clobber ctrl+e which old
school unix types use for go-to-end-of-line.
2016-11-08 18:04:22 +00:00
Luke Barnard
cd241a4a17
Truncate consecutive member events
...
This is needed for the IRC bridge to be able to do full membership list syncing without cluttering the message panel.
2016-11-08 16:34:02 +00:00
Mark Haines
c838164f40
Make the promises be q promises
2016-11-08 16:26:25 +00:00
Mark Haines
93ddb5539e
Make imports more consistent, fix m.video
2016-11-08 12:57:24 +00:00
David Baker
d871ca2b24
PR feedback
2016-11-08 11:43:24 +00:00
Mark Haines
911f9e4e63
Review comments
2016-11-08 11:42:20 +00:00
Luke Barnard
5a61a1e6e1
Merge pull request #543 from matrix-org/luke/feature-show-integration-error-popup
...
Show the error that occured when trying to reach scalar
2016-11-08 11:27:32 +00:00
Luke Barnard
de83e578e7
Use generic error message
2016-11-08 11:18:44 +00:00
Luke Barnard
c0c662aeaf
Show the error that occured when trying to reach scalar
...
Instead of removing the button and printing an error to console, show the error in a popup that appears next to the `Manage Integrations` button.
2016-11-08 10:57:48 +00:00
David Baker
d44adcb7a9
Fix the vector web version in UserSettings
...
Add a getAppVersion() function to the platform rather than relying
on the updater code firing an event before we know what the app
version is.
2016-11-08 10:45:19 +00:00
