mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-23 01:35:49 +03:00
Code Issues Projects Releases Packages Wiki Activity
2959 commits 203 branches 553 tags 406 MiB
Commit graph

2959 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kegsay
21e7b03e53 Merge pull request #586 from matrix-org/kegan/read-receipt-show-time-on-hover 
Add read receipt times to the hovertip of read markers
 2016-12-09 13:19:44 +00:00
Kegan Dougal
5d99d68a64 Show the full date and time if the receipt was sent days after the event 2016-12-09 11:43:23 +00:00
Kegan Dougal
49010c3e93 Refactor how 'readReceipts' are passed into EventTiles 
Instead of passing a list of RoomMembers, pass a list of records with a
`roomMember` prop and a `ts` prop so we can display the timestamp on hover.
 2016-12-09 11:24:10 +00:00
David Baker
aed5a95c8f Merge pull request #589 from matrix-org/dbkr/dont_crash_if_no_dmroommap 
Don't throw exception on stop if no DMRoomMap
 2016-12-09 11:04:33 +00:00
David Baker
6a017ba763 Merge pull request #587 from matrix-org/dbkr/fix_test_fail 
Fix failing test
 2016-12-09 11:04:23 +00:00
David Baker
e52907a462 Missed semicolon 2016-12-09 10:59:05 +00:00
David Baker
8d1095bc26 Don't throw exception on stop if no DMRoomMap 
Prevents an exception when running the riot 'loading' tests in
isolation
 2016-12-09 10:32:56 +00:00
David Baker
289f8ab439 Fix failing test 
For some reason, update webpack causes the promise to no longer
complete by the next tick. Change the test to not depend on how
fast the promise goes through.
 2016-12-08 18:44:38 +00:00
Kegan Dougal
bd7553d1ea Add read receipt times to the hovertip of read markers 
Fixes #2709. Surprisingly, this data was never passed down to
ReadReceiptMarker.
 2016-12-08 16:23:20 +00:00
Richard van der Hoff
587325b36c Merge pull request #585 from matrix-org/dbkr/fix_exception_roomdir 
Fix exception when clearing room dir search
 2016-12-06 15:58:07 +00:00
David Baker
fe0dc85d66 Merge pull request #583 from matrix-org/luke/fix-post-message-api-origin-check 
Allow integration UI URLs with paths
 2016-12-06 15:00:26 +00:00
David Baker
9e3c94edf4 Fix exception when clearing room dir search 
Needed more isMounted checks after promises return.
 2016-12-06 14:59:10 +00:00
Richard van der Hoff
b3f642e835 Merge pull request #584 from matrix-org/dbkr/search_box_field_name 
Give the search box field a name
 2016-12-06 14:48:25 +00:00
Richard van der Hoff
004b420eaa Merge pull request #582 from matrix-org/dbkr/fix_notification_click 
Pass the room object into displayNotification
 2016-12-06 14:47:37 +00:00
David Baker
a3ab59832e Give the search box field a name 
Should fix https://github.com/vector-im/riot-web/issues/2462
 2016-12-06 14:40:09 +00:00
Luke Barnard
ef1cb9530f Allow integration UI URLs with paths 
The postMessage API assumed that event origins contained paths of their window origins, but they do not (https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage). This changes the origin check such that the integrations UI URL must start with the event origin.
 2016-12-06 14:30:21 +00:00
David Baker
28e663dd48 Pass the room object into displayNotification 
It needs it to do the view_room if the notification is clicked.
 2016-12-06 13:27:36 +00:00
Richard van der Hoff
c0b931a837 Merge pull request #581 from matrix-org/dbkr/dont_crash_settings_if_no_e2e 
Don't throw an exception entering settings page
 2016-12-06 09:49:55 +00:00
David Baker
6777e07a41 Remove device name from crypto section 
As it was getting it by assuming our device was the first one,
which is just not a valid assumption.
 2016-12-05 20:03:43 +00:00
David Baker
8ffe14881e Don't throw an exception entering settings page 
if end to end encryption is disabled (eg. if you're a guest and
the server is too old to support e2e for guests).
 2016-12-05 18:33:38 +00:00
Matthew Hodgson
61cf08ca1b Merge pull request #579 from kyrias/irc-strip-click 
Strip (IRC) when clicking on username
 2016-12-03 01:17:33 +00:00
Johannes Löthberg
f321c6c346 Strip (IRC) when clicking on username 
Fixes vector-im/riot-web#2072.

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
 2016-12-03 01:20:50 +01:00
Mark Haines
81e429eb14 Fix e2e attachment download by using iframes. (#562) 
* Render attachments inside iframes.

* Fix up the image and video views

* Fix m.audio

* Comments, and only use the cross domain renderer if the attachment is encrypted

* Fix whitespace

* Don't decrypt file attachments immediately

* Use https://usercontent.riot.im/v1.html by default

* typos

* Put the config in the React context.

Use it in MFileBody to configure the cross origin renderer URL.

* Call it appConfig in the context

* Return the promises so they don't get dropped
 2016-12-02 14:21:07 +00:00
Richard van der Hoff
0a42a78b13 Merge pull request #577 from matrix-org/luke/fix-scroll-jump-on-image-decryption 
Fix scroll jump on image decryption
 2016-12-02 11:28:55 +00:00
Luke Barnard
5665a0ef37 Fix scroll jump on image decryption 
`onWidgetLoad` is now being called when an image has been decrypted so that the ScrollPanel maintains its scroll position (whether it's stuckAtBottom or not). This attempts to fix https://github.com/vector-im/riot-web/issues/2624
 2016-12-02 11:11:35 +00:00
Mark Haines
3aa1e0dd9e Update browser-encrypt-attachment to v0.3.0 (#570) 2016-12-01 13:12:22 +00:00
David Baker
868e16c366 Merge pull request #576 from matrix-org/kegan/cutting-doesnt-clear-tab-complete 
Make cut operations update the tab complete list
 2016-11-30 11:08:18 +00:00
Kegan Dougal
5d03543f85 Make cut operations update the tab complete list 2016-11-30 10:49:40 +00:00
David Baker
03bd4b1457 Merge pull request #574 from matrix-org/rav/s_block_blacklist 
s/block/blacklist for e2e
 2016-11-29 19:09:18 +00:00
Richard van der Hoff
c7fb83ed2d s/block/blacklist for e2e 
Fixes https://github.com/vector-im/vector-web/issues/2315
 2016-11-29 18:48:43 +00:00
Richard van der Hoff
1a4163747e Merge pull request #573 from matrix-org/dbkr/electron_fix_download_icon 
Fix the download icon on attachments
 2016-11-29 11:44:09 +00:00
David Baker
21d65d2ad1 Fix the download icon on attachments 2016-11-25 23:19:20 +00:00
Richard van der Hoff
57d82eb39e Merge pull request #572 from matrix-org/dbkr/fix_tests 
Don't default the page_type to room directory
 2016-11-24 16:47:36 +00:00
David Baker
8547d00f32 Don't default the page_type to room directory 
As it breaks the behaviour of redirecting to /#/directory
 2016-11-24 16:39:48 +00:00
David Baker
56f224e513 Merge pull request #571 from matrix-org/dbkr/fix_login_crash 
Fix crash on logging in
 2016-11-24 15:10:40 +00:00
David Baker
2aba646acd Clear room alias etc. on logout 2016-11-24 14:58:37 +00:00
David Baker
0069393650 Go back to same room after logging in 2016-11-24 13:28:51 +00:00
David Baker
0bc4659fe0 Fix crash on logging in 
If you arrived at the page via a link to a room.

Fixes https://github.com/vector-im/vector-web/issues/2634
 2016-11-24 12:33:31 +00:00
Richard van der Hoff
7650e3de6e Merge pull request #569 from matrix-org/rav/reinstate_devices_list 
Reinstate missing sections from the UserSettings
 2016-11-23 11:27:59 +00:00
Richard van der Hoff
6e6bcf8b78 Reinstate missing sections from the UserSettings 
The 'devices' and 'cryptography' sections got removed from UserSettings by #566.
 2016-11-23 11:08:21 +00:00
Richard van der Hoff
6842544cd7 Unpin js-sdk 2016-11-22 22:12:50 +00:00
David Baker
815f676cbe Merge pull request #568 from matrix-org/markjh/bump 
Bump browser-encrypt-attachment to v0.2.0
 2016-11-22 19:20:02 +00:00
Mark Haines
b67fcf8109 Bump browser-encrypt-attachment to v0.2.0 2016-11-22 18:18:16 +00:00
Richard van der Hoff
422d5c0c92 Merge pull request #567 from matrix-org/luke/fix-agressive-unpagination 
Make the unpagination process less aggressive
 2016-11-22 17:53:44 +00:00
Luke Barnard
8a6ed1d7e9 Do not assume unpagination will occur during scroll test 2016-11-22 17:43:45 +00:00
Luke Barnard
42fc7b1b66 Use UNFILL_REQUEST_DEBOUNCE_MS constant, reset unfillDebouncer timeout reference. 2016-11-22 17:23:06 +00:00
Luke Barnard
d1a5d94916 Make the unpagination process less aggressive 
This increases `UNPAGINATION_PADDING` (see the ASCII on ScrollPanel.js, `_getExcessHeight`), and also debounces unfilling requests made for 200ms. This forces unfilling requests not to be sent unless the next 200ms has no scrolling, effectively.
 2016-11-22 16:47:56 +00:00
Richard van der Hoff
06f12b91b8 Merge pull request #566 from matrix-org/rav/remove_dead_labs_settings 
Get rid of always-on labs settings
 2016-11-21 10:38:06 +00:00
Richard van der Hoff
4476b09ce7 Get rid of always-on labs settings 
If the setting is on by default, it's not much use as a Labs setting. The E2e
setting was only confusing everyone anyway.
 2016-11-21 10:25:48 +00:00
David Baker
9c0ee84fb8 Merge pull request #565 from matrix-org/rav/fix_quote_e2e 
Fix 'Quote' for e2e messages
 2016-11-21 10:06:37 +00:00