62584 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matthew Hodgson	feaf2a319b	Merge pull request #20 from matrix-org/screen-sharing ... Screen sharing	2015-10-21 01:35:16 +01:00
Matthew Hodgson	c8f6d46c8b	add remoteAudioElement	2015-10-21 01:23:15 +01:00
Matthew Hodgson	5d1ad4d259	only show the zoom button on video calls	2015-10-21 01:23:15 +01:00
Matthew Hodgson	3b988b0eac	set up remoteAudioElement	2015-10-21 01:21:39 +01:00
Matthew Hodgson	98ea35253a	shift-click the video button to screenshare rather than overriding the button entirely.	2015-10-21 01:21:21 +01:00
David Baker	006f0b00c6	Try refing the container using a functiob as it currently seems to be endinh up with no refs some of the time	2015-10-20 18:23:27 +01:00
David Baker	fe0707535c	binding makes no difference - put a null check in to catch the rogue exception	2015-10-20 17:46:11 +01:00
Kegan Dougal	8ff7d87b38	Bodge to make video = screen sharing	2015-10-20 16:45:26 +01:00
Kegan Dougal	48f162b9df	Better error messages	2015-10-20 14:03:37 +01:00
David Baker	044c75270f	This has changed in newer react sdk but in master, it should be state.memberDict	2015-10-20 12:41:16 +01:00
David Baker	209889210b	Remove unnececessary and wrong null check	2015-10-20 12:36:10 +01:00
David Baker	93d81d27ba	fix memberDict reference	2015-10-20 12:32:40 +01:00
David Baker	da6c5653b1	Try binding actin handler	2015-10-20 12:13:31 +01:00
Matthew Hodgson	79eda12656	doh	2015-10-20 12:10:31 +01:00
Kegan Dougal	c74f7c956f	Fix missing getAvatarUrlForMember	2015-10-20 11:49:21 +01:00
Matthew Hodgson	137439243a	fix layout	2015-10-20 11:49:08 +01:00
Matthew Hodgson	bb5895c157	move mute state into the existing voice/video buttons for now. move zoom button to that set for now	2015-10-20 11:30:54 +01:00
David Baker	34ad48a5d3	Wire up fullscreen button. Requires react-sdk with sync flag to dispatcher.	2015-10-20 11:03:32 +01:00
David Baker	3d8d9bac8e	Allow the dispatcher to dispatch sync if required.	2015-10-20 11:02:54 +01:00
David Baker	078134d481	Add fullscreen button (not wired up to anything)	2015-10-20 10:48:08 +01:00
David Baker	1041ee654e	Update for breaking js-sdk RoomAvatar / MemberAvatar changes	2015-10-20 10:31:29 +01:00
Kegan Dougal	f882ecc31b	'center' the buttons just like the cog/video/voice buttons are.	2015-10-20 10:22:23 +01:00
Kegan Dougal	d302f3eebb	Add in voip mute video/audio skin. Needs a bit more CSS tweaks.	2015-10-20 09:55:41 +01:00
Kegan Dougal	78f2f7cfd0	Add in voip mute video/audio code. Needs dev js-sdk	2015-10-20 09:55:00 +01:00
David Baker	bdbfc2b6e0	Add the little edit widgets and make those the things that bring up the message context menus. Still need to add them to all event tiles and make the context menus point the right way.	2015-10-19 19:30:04 +01:00
Matthew Hodgson	f256f79418	accidental regression that was causing the room list to scroll horizontally	2015-10-19 18:27:21 +01:00
Matthew Hodgson	d1cda75c8b	Date refinements. Show more detailed timestamps for older messages, and try to show a separator as the first message in every room	2015-10-19 18:19:26 +01:00
Matthew Hodgson	530b077a8e	reimplement 1a95148dae which somehow got lost during refactoring vector-web into matrix-react-sdk and vector-web	2015-10-19 17:13:51 +01:00
David Baker	11aa6f8c37	Null check userId on member. Fixes #5.	2015-10-19 14:33:45 +01:00
David Baker	e3e49daddb	Make 'view source' work	2015-10-15 14:41:12 +01:00
David Baker	4b904d90f2	Slightly improve source path tree in the browser debugger	2015-10-15 14:40:36 +01:00
David Baker	48924a6106	Change resend buttons to a context menu with working resending and non-working 'view source'	2015-10-15 14:14:33 +01:00
David Baker	6baf405a05	Remove the 'resending' state which was duplicating a property of the event itself for no obvious reason. Remove onResend whose purpose was mostly to manage that state (and really should have been 'onResendClicked'). Listen for action to see when a message is resent.	2015-10-15 14:09:19 +01:00
David Baker	2adb8bac5c	Actually turn on production mode: env vars need to be explicitly passed through	2015-10-14 09:20:18 +01:00
David Baker	02a2e06d52	unused code	2015-10-13 16:03:24 +01:00
David Baker	c0938f270e	Unused code	2015-10-13 16:03:07 +01:00
David Baker	47c1bb35db	Un-break member hovering	2015-10-13 15:17:20 +01:00
David Baker	7598be684c	Merge pull request #198 from stevenhammerton/sh-cas-auth ... Add support for CAS auth	2015-10-13 14:26:03 +01:00
David Baker	9e596ebb75	Merge pull request #19 from stevenhammerton/sh-cas-auth ... Add support for CAS login	2015-10-13 14:25:39 +01:00
David Baker	f7d3d4f9a9	Remove console.log	2015-10-13 11:44:45 +01:00
David Baker	d12ca92ea7	Avoid double updating: setting the state will cause a re-render so forcing an update is redundant. Also bump js sdk dep to newest to match vector.	2015-10-13 11:12:06 +01:00
David Baker	1dd707775a	Use new js-sdk modified time to avoid unnecessary member tile updates. Also avoid double-updating since we were setting state and then forcing an update which is redundant.	2015-10-13 11:10:43 +01:00
Steven Hammerton	293ee1bbcb	Fix typo in comment and remove console.log leftover from debugging	2015-10-12 17:41:56 +01:00
Steven Hammerton	fc333067c2	Rename required var to match convention	2015-10-12 17:38:04 +01:00
David Baker	030124a59a	Make state.members always defined	2015-10-12 16:25:49 +01:00
Steven Hammerton	b5357d3298	Remove whitespace	2015-10-12 10:28:39 +01:00
Steven Hammerton	c561647460	Add missing comma	2015-10-12 10:27:45 +01:00
Steven Hammerton	f5039ac9af	Use node querystring module to parse query string like name value pairs from fragment	2015-10-12 10:27:21 +01:00
Steven Hammerton	353af6c647	Move CasLogin logic to controller class and logic object in react-sdk	2015-10-12 10:27:16 +01:00
Steven Hammerton	4e0d930014	Pull down some CAS stuff from vector into controller and logic class	2015-10-12 10:20:03 +01:00