163 commits

Author	SHA1	Message	Date
David Baker	2f783a7ba9	Merge remote-tracking branch 'origin/develop' into read_receipts	2015-11-10 11:27:43 +00:00
Kegsay	d4549e60cc	Merge pull request #30 from matrix-org/kegan/3pid-invites ... Support inviting by email address and hit the right API.	2015-11-10 10:57:17 +00:00
Matthew Hodgson	b5402d0fa0	port to react 0.14, removing getDOMNode()s for DOM components and turning them into ReactDOM.findDOMNode()s for React components	2015-11-09 23:59:28 +00:00
Kegan Dougal	143483ec12	Support inviting by email address and hit the right API.	2015-11-09 17:36:14 +00:00
David Baker	b556eff492	Merge pull request #28 from stevenhammerton/sh-cas-token-login ... SH - CAS / Login Token Login Update	2015-11-06 15:40:56 +00:00
Steven Hammerton	fec362c4df	JS SDK no longer does redirect for us, get the URL and update browser window location	2015-11-06 12:12:51 +00:00
Steven Hammerton	a7c53e99d9	Clear query params from url with a nasty location update	2015-11-06 11:42:13 +00:00
Steven Hammerton	de165ea6ad	Update CAS login to allow HS to do interaction with CAS and client receives and redeems login token	2015-11-06 11:21:13 +00:00
Kegan Dougal	b0e71c9872	Fix bugs from typos from hackathon	2015-11-06 09:57:22 +00:00
David Baker	7882780357	Merge remote-tracking branch 'origin/develop' into read_receipts	2015-11-05 15:33:50 +00:00
David Baker	f4e65f8e17	Remove name event listener	2015-11-05 15:07:46 +00:00
David Baker	3114422cb7	Merge remote-tracking branch 'origin/develop' into read_receipts	2015-11-05 15:05:29 +00:00
Kegan Dougal	a7c6a923f0	Unbreak everything (JS SDK had breaking API change)	2015-11-05 14:37:05 +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
David Baker	86ef0e762e	Merge code to send read receipts into react-sdk RoomView controller	2015-11-03 14:08:51 +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	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
David Baker	2365fe8ceb	Refresh room & member avatars when a roommember.name event comes in	2015-10-28 15:15:35 +00:00
Kegsay	184af9df76	Merge pull request #25 from matrix-org/246-creating-room-state ... Add creatingRoom state to know when to show a spinner.	2015-10-28 11:38:47 +00:00
Kegan Dougal	2a1b9cd716	Add creatingRoom state to know when to show a spinner.	2015-10-27 17:01:03 +00:00
Kegsay	15af44f5fc	Merge pull request #24 from matrix-org/linkify ... Add callback support for linkified users/aliases	2015-10-27 12:25:20 +00:00
Kegsay	e6f9c6e777	Merge pull request #23 from matrix-org/kegan/reg-errors-176 ... Add missing enum value to registration password complexity check	2015-10-27 11:11:39 +00:00
Kegan Dougal	16ddb47466	Defer entirely to the end app for handling links	2015-10-27 10:44:41 +00:00
Kegsay	66b577dc89	Merge pull request #22 from matrix-org/kegan/delete-empty-files ... Remove empty controllers	2015-10-27 10:19:14 +00:00
Kegan Dougal	77d1b9af04	Hook up aliases via listeners too.	2015-10-27 09:58:55 +00:00
Kegsay	a2b77ad5b5	Merge pull request #21 from matrix-org/220-login-error-msgs ... Login error messages	2015-10-26 16:58:46 +00:00
David Baker	a850f19cd4	Separate out the activity watcher from presence code so I can hook read receipts into it without tangling it into the presence code.	2015-10-26 13:54:54 +00:00
David Baker	5a760b71d0	Make ChangeAvatar support room avatars and tweak RoomAvatar respond to componentWillReceiveProps	2015-10-23 17:34:53 +01:00
Matthew Hodgson	03dfd57a79	really kill mime types as they are ugly (3rd time lucky)	2015-10-22 16:32:27 +01:00
David Baker	7e93b75aa0	API Change: better fallback for room avatars	2015-10-22 13:08:35 +01:00
David Baker	549d992293	API change: Make EventTiles which hold stuff common to all events that appear in a room timeline.	2015-10-21 17:50:40 +01:00
Kegan Dougal	ac5111c162	Add missing enum value	2015-10-21 17:44:05 +01:00
Kegan Dougal	0488f03b5a	Remove empty controllers	2015-10-21 15:36:59 +01:00
Kegan Dougal	d4a5ab11d4	Fix NPE if you cold boot vector on a URL with a room which you were invited to but not yet joined.	2015-10-21 14:45:39 +01:00
Kegan Dougal	d1af5a2232	More tweaks on error messages	2015-10-21 14:30:59 +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
Kegan Dougal	48f162b9df	Better error messages	2015-10-20 14:03:37 +01:00
David Baker	1041ee654e	Update for breaking js-sdk RoomAvatar / MemberAvatar changes	2015-10-20 10:31:29 +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	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	02a2e06d52	unused code	2015-10-13 16:03:24 +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	030124a59a	Make state.members always defined	2015-10-12 16:25:49 +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
Matthew Hodgson	f6d577d0c6	track RHS collapse state	2015-10-11 16:07:01 +01:00
Matthew Hodgson	8228a7d485	track whether the LHS is collapsed. (shouldn't this be vector specific too?)	2015-10-11 13:49:44 +01:00