47562 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	feaf2a319b	Merge pull request #20 from matrix-org/screen-sharing ... Screen sharing	2015-10-21 01:35:16 +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	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	3d8d9bac8e	Allow the dispatcher to dispatch sync if required.	2015-10-20 11:02:54 +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
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	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
Matthew Hodgson	c5e3891a5a	shrink default roomavatar size to 36x36. surely this is vector specific...	2015-10-11 02:08:39 +01:00
Steven Hammerton	3f67d8541f	Add support for CAS login	2015-10-10 18:54:19 +01:00
David Baker	05d19121d8	Slightly change memberlist api to shift the sorting into the right place (in the skin).	2015-10-09 17:24:48 +01:00
David Baker	e158eec94d	Unset matrix client first otherwise login sets it, the it gets unset and you can't log in again.	2015-10-09 13:48:17 +01:00
David Baker	53a7f4b3a8	Set state to ready only if the SDK is synced.	2015-10-09 12:05:40 +01:00
David Baker	0791cac572	Add method to Modal to create dialog with instantiated React elements as well as Classes.	2015-10-09 11:54:46 +01:00
David Baker	05f7a3b4d1	Remove now redundant displayname stuff from UserSettings now it's in ChangeDisplayName	2015-10-07 18:44:32 +01:00
David Baker	79e468217a	Add button for user settings and a change display name widget	2015-10-07 18:19:29 +01:00
David Baker	27ca7b48f7	Just do all dispatches async: setting the flag obviously does not work for more than 2 nested dispatches.	2015-10-05 18:43:22 +01:00
David Baker	b8dd2452db	Display correct message for when an invited but not joined user is kicked.	2015-10-05 16:44:50 +01:00
David Baker	a1892ee963	Improve url / screen handling ... Including taking you to the room you asked for originally after login	2015-10-05 15:31:08 +01:00
David Baker	ad313d7711	Merge branch 'vector-merge'	2015-10-02 18:55:53 +01:00
David Baker	55f656f150	0.0.2	2015-10-02 18:55:09 +01:00
David Baker	711272a7c9	Merge pull request #18 from matrix-org/vector-merge ... Vector merge	2015-10-02 18:50:52 +01:00
David Baker	2d3b87d56d	Don't set empty mime types on metadata.	2015-10-02 18:37:15 +01:00
David Baker	2bce4e4d62	Merge c62d97ca04 from vector-im ... The hack is *evil*. Not dirty.	2015-10-02 14:37:34 +01:00
David Baker	54048ee37c	Update Readme	2015-10-01 16:02:21 +01:00
David Baker	7de136a930	Port over new logic for filtering actions: makes the end call button appear & disappear approriately	2015-10-01 10:19:18 +01:00
David Baker	5004a3a5b3	Make end call button work for conf calls	2015-10-01 09:42:58 +01:00
David Baker	cb89d3760a	Hacks to make sure we don't end up with multiple split-brain CallHandlers when npm linked.	2015-09-30 18:21:25 +01:00
David Baker	b68665ead5	Add support for the basic notion of conference calls and an experimental concept of modules to provide the actual functionality. Rejig Skinner to be simpler.	2015-09-30 16:50:46 +01:00
David Baker	9fb5702c2f	make MatrixClientPeg an actual global too otherwise things go very wierd	2015-09-28 17:46:49 +01:00