David Baker
|
3114422cb7
|
Merge remote-tracking branch 'origin/develop' into read_receipts
|
2015-11-05 15:05:29 +00:00 |
|
Kegan Dougal
|
804af341ac
|
Add a 'connection lost' bar.
|
2015-11-05 14:52:44 +00:00 |
|
David Baker
|
d8edbd2e3c
|
Requires js-sdk develop
|
2015-11-05 14:45:48 +00:00 |
|
David Baker
|
0aa90d918c
|
bump js-sdk dep to develop
|
2015-11-05 14:45:16 +00:00 |
|
Kegan Dougal
|
a7c6a923f0
|
Unbreak everything (JS SDK had breaking API change)
|
2015-11-05 14:37:05 +00:00 |
|
David Baker
|
4bf6992398
|
Don't send read receipts for our own events and null check in a few places.
|
2015-11-05 14:16:15 +00:00 |
|
David Baker
|
f9385b455a
|
Don't try to send read receipts if the room is null
|
2015-11-05 13:27:03 +00:00 |
|
Matthew Hodgson
|
8842147ec3
|
skin RoomDropTarget correctly
|
2015-11-05 11:21:45 +00:00 |
|
David Baker
|
942659df0d
|
Work around the bug where some channels have no name from the js sdk which was causing vector to exception and never load.
|
2015-11-04 14:15:57 +00:00 |
|
Matthew Hodgson
|
61e55b3ca3
|
implement most of drag & drop.
|
2015-11-04 02:25:08 +00:00 |
|
Matthew Hodgson
|
7fe7af6026
|
refactor out the sections of the RoomList into RoomSubLists. Start wiring up tags
|
2015-11-04 00:19:37 +00:00 |
|
Erik Johnston
|
7dc5f91fad
|
Remove unused code
|
2015-11-03 18:59:45 +00:00 |
|
Erik Johnston
|
5b773b99c0
|
Add basic m.video view support
|
2015-11-03 18:56:55 +00:00 |
|
David Baker
|
3fec3a7326
|
Better error message if there is no accessSync (which there isn't on old node)
|
2015-11-03 18:29:49 +00:00 |
|
Matthew Hodgson
|
8b9b268ec0
|
make our state explicit
|
2015-11-03 14:35:55 +00:00 |
|
Matthew Hodgson
|
27cf9cf561
|
put invites above recents
|
2015-11-03 14:35:48 +00:00 |
|
Matthew Hodgson
|
b1b2704bed
|
avoid racey NPE on first login
|
2015-11-03 14:35:39 +00:00 |
|
David Baker
|
86ef0e762e
|
Merge code to send read receipts into react-sdk RoomView controller
|
2015-11-03 14:08:51 +00:00 |
|
David Baker
|
2a4a02f36e
|
More on read receipts: listen for events, add keys & class / very minimal css.
|
2015-11-03 13:44:40 +00:00 |
|
David Baker
|
5a72f199e1
|
listen for read receipts
|
2015-11-03 11:41:18 +00:00 |
|
David Baker
|
7c9b773bf8
|
unintentionally comitted logging
|
2015-11-03 11:22:18 +00:00 |
|
Matthew Hodgson
|
ff35e02b4d
|
Merge pull request #317 from vector-im/erikj/icons
Use relative rather than absolute paths for icons
|
2015-11-02 23:53:27 +00:00 |
|
Erik Johnston
|
4dac9bc1b8
|
Use relative rather than absolute paths for icons
|
2015-11-02 23:47:04 +00:00 |
|
David Baker
|
11c38014e5
|
Sort of display read avatars but without live updating
|
2015-11-02 18:55:28 +00:00 |
|
Kegsay
|
842d6b6c2c
|
Merge pull request #314 from vector-im/kegan/graceful-no-voip
Add unsupported suffix on Ongoing conf notification if conf calls are…
|
2015-11-02 18:18:46 +00:00 |
|
Kegan Dougal
|
6e63153d83
|
Add unsupported suffix on Ongoing conf notification if conf calls are unsupported in the browser
|
2015-11-02 18:01:20 +00:00 |
|
Kegsay
|
e5e4e901d8
|
Merge pull request #26 from matrix-org/kegan/graceful-no-voip
Gracefully handle browsers which don't do VoIP
|
2015-11-02 17:57:26 +00:00 |
|
Kegan Dougal
|
3485a74036
|
Gracefully handle browsers which don't do VoIP
Specifically:
- Don't show inbound call ringing
- Don't let users place calls/conf calls
- Show call records with "not supported by this browser".
|
2015-11-02 17:39:00 +00:00 |
|
David Baker
|
159f0c9594
|
Merge remote-tracking branch 'origin/develop' into read_receipts
|
2015-11-02 14:29:20 +00:00 |
|
David Baker
|
e869814f2d
|
Don't display anything if TextForEvent doesn't give us any text. Fixes #253 (catapillar of doom).
|
2015-11-02 14:14:47 +00:00 |
|
Kegsay
|
3b82884947
|
Merge pull request #298 from vector-im/kegan/reject-invites
Add invite rejection
|
2015-11-02 09:50:17 +00:00 |
|
Kegan Dougal
|
38780ad492
|
Merge branch 'develop' into kegan/reject-invites
|
2015-11-02 09:47:51 +00:00 |
|
Matthew Hodgson
|
e792201cd6
|
back out ctrl-alt-number room switching as nobody used it and it broke Tor's keyboard
|
2015-10-31 14:00:23 +00:00 |
|
Matthew Hodgson
|
e25d31a9fe
|
Merge pull request #296 from vector-im/matthew/redesign
Matthew/redesign
|
2015-10-30 18:30:13 +00:00 |
|
Matthew Hodgson
|
56d00c2ec7
|
make onFinished required prop for modal contents
|
2015-10-30 18:26:22 +00:00 |
|
Matthew Hodgson
|
79af89fd1b
|
fix missing decl
|
2015-10-30 18:26:05 +00:00 |
|
Matthew Hodgson
|
11e176df66
|
comment for the hidden collapse button
|
2015-10-30 18:23:08 +00:00 |
|
Matthew Hodgson
|
75bc878657
|
comment what a CR is
|
2015-10-30 18:22:21 +00:00 |
|
Matthew Hodgson
|
ddbc8dffb3
|
switch from enums to string literals for SearchBar.Scope
|
2015-10-30 18:21:54 +00:00 |
|
Matthew Hodgson
|
6aad99a505
|
comment \u200b
|
2015-10-30 18:20:29 +00:00 |
|
Matthew Hodgson
|
35cebc56d3
|
rewrite the HTML message stuff to fix XSS and improve clarity
|
2015-10-30 18:19:20 +00:00 |
|
Kegan Dougal
|
668234be4c
|
Add reject button and impl
|
2015-10-30 17:18:25 +00:00 |
|
Kegsay
|
626e8bab1a
|
Merge pull request #283 from vector-im/kegan/blocking
Add feature-based browser blocking
|
2015-10-30 14:59:06 +00:00 |
|
Kegan Dougal
|
633bbd8f29
|
Review comments: add chrome blurb.
|
2015-10-30 14:58:47 +00:00 |
|
David Baker
|
ffb9ce89c7
|
Merge branch 'develop' into matthew/redesign
|
2015-10-30 11:50:34 +00:00 |
|
David Baker
|
ce9a91e155
|
bundle.css shouldn't be necessary apart from the vector/bundle.* above
|
2015-10-30 11:33:33 +00:00 |
|
Matthew Hodgson
|
fdfa0cbd0e
|
display search results correct; support HTML markup
|
2015-10-30 04:10:37 +00:00 |
|
Matthew Hodgson
|
40da7f500e
|
show m.room.name changes
|
2015-10-30 02:07:04 +00:00 |
|
Matthew Hodgson
|
d315e4afcd
|
show m.room.names
|
2015-10-30 02:06:34 +00:00 |
|
Matthew Hodgson
|
80c04048d0
|
cancel viewsource dialog with escape
|
2015-10-29 21:30:29 +00:00 |
|