imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
62538 commits 222 branches 563 tags 470 MiB
Commit graph

62538 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard van der Hoff
7f4f30d7d5 Merge commit 'e3feae3' into rav/roomview_works 2016-02-23 12:01:53 +00:00
Richard van der Hoff
3acfab48fc Merge commit '014acba' into rav/roomview_works 
Conflicts:
	src/components/structures/RoomView.js
 2016-02-23 12:00:54 +00:00
Richard van der Hoff
8161a18efd Merge commit 'b1a6575' into rav/roomview_works 2016-02-23 11:56:51 +00:00
David Baker
497cb8bc9c Merge pull request #993 from vector-im/dbkr/keypair_3pid_invites 
Pass through params for other URLs
 2016-02-23 11:08:28 +00:00
Richard van der Hoff
d673249681 Wire up StatusBar size changes to a geminipanel update 
When the statusbar changes size, we need to tell the gemini panel to
update. This is slightly tortuous as figuring out the size of the statusbar
isn't completely trivial.

Fixes https://github.com/vector-im/vector-web/issues/945 and
https://github.com/vector-im/vector-web/issues/986
 2016-02-23 11:06:16 +00:00
David Baker
a063efe250 Remove no-longer accurate comment. 2016-02-23 10:57:50 +00:00
David Baker
45c8500f28 Pass through params for other URLs (in this case, for keypair invite signing urls) 2016-02-23 10:22:22 +00:00
David Baker
ac9f0f204d Wire up support for keypair 3pid invites. 2016-02-23 10:15:07 +00:00
Richard van der Hoff
bb6a36b911 Merge pull request #167 from matrix-org/rav/fix_image_load 
Update the scroll offset when images load
 2016-02-22 17:53:36 +00:00
Richard van der Hoff
3f1db5ac86 Merge pull request #166 from matrix-org/rav/keys_on_search_highlights 
Give <a> elements in search results a key
 2016-02-22 17:51:47 +00:00
Richard van der Hoff
4158a007db Give <a> elements in search results a key 
... to make react shut up about them
 2016-02-22 17:44:34 +00:00
Richard van der Hoff
99d2392b6f Update the scroll offset when images load 
In order to deal with image-loading reshaping the DOM, wire up
ScrollPanel.checkScroll to the image load events.

Fixes https://github.com/vector-im/vector-web/issues/984
 2016-02-22 17:43:33 +00:00
Richard van der Hoff
b04ce6a376 Fix default hs url after it was broken in 77b45e72 2016-02-22 17:07:26 +00:00
Richard van der Hoff
26e66326a2 Link search results to the right room 
Fixes https://github.com/vector-im/vector-web/issues/980
 2016-02-22 12:54:22 +00:00
Matthew Hodgson
f2fc4a88ae gemini up roomdirectory 2016-02-22 09:35:11 +00:00
Matthew Hodgson
77b45e7231 oooooooops - remember opensans v13 2016-02-22 09:18:56 +00:00
Matthew Hodgson
484736bf57 oops, add sanitize-html 2016-02-21 00:05:44 +00:00
Matthew Hodgson
e91a108738 Merge pull request #972 from vector-im/matthew/room-directory 
Skin RoomDirectory almost as per design
 2016-02-20 23:59:02 +00:00
Matthew Hodgson
2ca5529faa support hyperlinked topics 2016-02-20 23:54:47 +00:00
Matthew Hodgson
a35ab6bcef tart up room directory 2016-02-20 13:36:48 +00:00
Matthew Hodgson
e33e9b5d4a upgrade OpenSans and add semibold 2016-02-20 13:36:33 +00:00
David Baker
d7b3a24c18 Merge pull request #165 from matrix-org/dbkr/read_receipt_send_ignore_implicit 
Fix stuck notification bug
 2016-02-19 16:20:12 +00:00
David Baker
71e2495e81 Use new flag in js-sdk to look at the last read receipt the server actually has and ignore implicit ones, otherwise we can end up not sending an RR because we think there's already a more recent one, even though that one is implicit. 2016-02-19 14:45:02 +00:00
Matthew Hodgson
b4fe9473d5 improve error messages when failing to talk to a HS 2016-02-19 14:17:41 +00:00
David Baker
c053f90b18 Merge pull request #164 from matrix-org/make_room_links_valid 
Make the links we emit for room URLs valid
 2016-02-19 11:40:11 +00:00
Matthew Hodgson
a44ef5bd48 fix incomingCallBox vertical offset if MatrixToolbar is present 2016-02-19 02:21:17 +00:00
Matthew Hodgson
3910877f8f ensure local activity bumps rooms up the roomlist 2016-02-19 02:09:04 +00:00
Matthew Hodgson
957ef9cdc8 fix self-highlight 2016-02-19 01:56:03 +00:00
Matthew Hodgson
d2a731e255 only resize the video element if not fullscreen 2016-02-19 01:18:53 +00:00
Matthew Hodgson
7f310ce307 fix nasty overscroll bug on video element caused by inline v. block 2016-02-19 01:18:37 +00:00
Matthew Hodgson
f538a0d5de scale local video feed to fit on the page properly 2016-02-19 01:16:55 +00:00
Matthew Hodgson
dc94df4b06 accomodate 800px wide thumbs and support horizontal scaling 2016-02-18 19:09:58 +00:00
Matthew Hodgson
4e5b971d3a accomodate 800px wide thumbs 2016-02-18 19:09:32 +00:00
Matthew Hodgson
ffb1584e10 horizontally scale images properly 2016-02-18 18:59:45 +00:00
Matthew Hodgson
12f5407392 remove ... in error view 2016-02-18 18:16:48 +00:00
David Baker
aef04d682b Make the links we emit for room URLs valid rather than relying on the onClick handler (ie. make them work if you c+p them) 2016-02-18 18:16:39 +00:00
Matthew Hodgson
dbf3439e35 fix statusbar layout some more 2016-02-18 18:13:23 +00:00
Matthew Hodgson
11ac6defed tint searchbar 2016-02-18 17:32:15 +00:00
Matthew Hodgson
4d7eb5795c tint border-left 2016-02-18 00:32:46 +00:00
Matthew Hodgson
9a0ea56bba don't suppress conf join/parts 2016-02-18 00:07:35 +00:00
Richard van der Hoff
4c149480c9 Merge pull request #159 from matrix-org/rav/move_ghostmarker_to_messagepanel 
Move the ghost-read-marker logic to MessagePanel
 2016-02-17 21:44:24 +00:00
Richard van der Hoff
e9726865fc Merge pull request #162 from matrix-org/rav/keep_redactions 
Handle redacted events
 2016-02-17 21:42:39 +00:00
Richard van der Hoff
c4176ab706 Merge pull request #163 from matrix-org/rav/fix_search_clickthrough 
Fix search clickthrough for HTML events
 2016-02-17 21:35:39 +00:00
Richard van der Hoff
718c1cbe6f Merge branch 'rav/update_status_bar' into develop 2016-02-17 21:16:22 +00:00
Richard van der Hoff
e3feae32e1 Fix search clickthrough for HTML events 
Switch to using a normal <a href="..."> link for search result
clickthrough. Apart from generally giving a better experience, this means that
it also works on html messages. The problem there was that we were attaching
onClick handlers to <span>s which we were then flattening into HTML with
ReactDOMServer (which meant the onClick handlers were never attached to React's
list of listeners).

To make this work without jumping through React hoops, the highlighter now
returns either a list of strings or a list of nodes, depending on whether we
are dealing with an HTML event or a text one. We therefore have a separate
HtmlHighlighter and TextHighlighter.
 2016-02-17 21:06:27 +00:00
Matthew Hodgson
27222a54c7 somewhat cryptic hack to make empty RoomStatusBars not take up 41px rather than 36px of height 2016-02-17 18:54:46 +00:00
Matthew Hodgson
b087157855 Merge branch 'develop' into rav/update_status_bar 2016-02-17 18:38:47 +00:00
Matthew Hodgson
3263076ea6 Merge branch 'develop' into rav/update_status_bar 2016-02-17 18:37:40 +00:00
Matthew Hodgson
3c659dcf57 experimental fix for https://github.com/vector-im/vector-web/issues/947 and https://github.com/vector-im/vector-web/issues/946. may well introduce more problems 2016-02-17 12:43:42 +00:00
Richard van der Hoff
b393234147 Merge pull request #158 from matrix-org/rav/refactor_eventtile_loop 
Refactor the EventTile loop
 2016-02-16 22:25:49 +00:00