1143 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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	2a4a02f36e	More on read receipts: listen for events, add keys & class / very minimal css.	2015-11-03 13:44:40 +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
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	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	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
Matthew Hodgson	05d96f4cfb	fix filters, and stop react exploding on unrecognised event tiles	2015-10-29 18:28:30 +00:00
Matthew Hodgson	8239e57fa1	more lightbox tweaks	2015-10-29 18:28:30 +00:00
David Baker	f4ca30bb38	Throw exception if EventTile is instantiated with an event type it doesn't support.	2015-10-29 18:12:42 +00:00
Kegan Dougal	cc313f350c	Merge branch 'develop' into kegan/blocking	2015-10-29 16:03:26 +00:00
Erik Johnston	ae2768af9c	Remove left/right padding from ongoing call notification, so that we don't get scrollbars in chrome	2015-10-29 15:57:31 +00:00
Kegan Dougal	511b1f409c	Add objectfit and localstorage to browser features	2015-10-29 15:56:03 +00:00
David Baker	f00ee95563	Merge branch 'develop' of github.com:vector-im/vector-web into read_receipts	2015-10-29 11:27:56 +00:00
Matthew Hodgson	9fd2bf0989	remove transparent background for now; specify image width & height; punt the label over to the far RHS; to get around various layout problems in Chrome 44 and Safari 8	2015-10-29 11:01:23 +00:00
Matthew Hodgson	2c05515141	simplify keys	2015-10-29 02:34:06 +00:00
Matthew Hodgson	eb6fbe6a5a	theoretically scope the search, but it doesn't work	2015-10-29 02:24:35 +00:00
Matthew Hodgson	2ee840922d	basic implementation of search	2015-10-29 02:03:04 +00:00
Matthew Hodgson	0ade5ff640	lightbox buttons	2015-10-29 00:39:12 +00:00
Matthew Hodgson	dc401075a7	try to make the edit button more reliable	2015-10-29 00:38:51 +00:00
Matthew Hodgson	de1e8e9f93	implement redact and links	2015-10-29 00:38:26 +00:00
Matthew Hodgson	dbac2e299e	tweak spacing of label on lightbox	2015-10-28 22:49:20 +00:00
Matthew Hodgson	8eaa96b0b3	black magic fixes to the lightbox	2015-10-28 19:41:49 +00:00