62735 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	17c81c1101	icons	2015-10-11 22:51:00 +01:00
Matthew Hodgson	50ebce69b7	make file upload look slightly less crap	2015-10-11 18:42:54 +01:00
Matthew Hodgson	191d56673b	fix message spacing on Safari caused by switching back to <li/>s...	2015-10-11 18:21:36 +01:00
Matthew Hodgson	5d962e1feb	improve horizontal flexing of timeline	2015-10-11 18:04:01 +01:00
Matthew Hodgson	201caed773	fix rubberband bounce on OSX and iOS	2015-10-11 17:50:24 +01:00
Matthew Hodgson	9be98058b7	fix horizontal overscroll	2015-10-11 17:50:16 +01:00
Matthew Hodgson	ba0ae5ba59	various cosmetic fixes based on design feedback	2015-10-11 17:28:36 +01:00
Matthew Hodgson	9a8a9a4ce4	track RHS collapse state, and implement a basic responsive design	2015-10-11 16:09:46 +01:00
Matthew Hodgson	f6d577d0c6	track RHS collapse state	2015-10-11 16:07:01 +01:00
Matthew Hodgson	b05f3343e2	tooltipize BottomLeftMenu too for consistency	2015-10-11 15:00:43 +01:00
Matthew Hodgson	ae506b5b1f	fix cursor for unhide LHS button	2015-10-11 13:56:25 +01:00
Matthew Hodgson	93de2307c1	improve collapsed LHS implementation - split the tooltip into its own component; position it with javascript as overflow-y + position absolute = clipping hell; preserve the collapse state between MatrixChat re-renders; fix positioning of the 'show' button; switch to dispatcher for show/hide LHS; remove errant scrollbars	2015-10-11 13:54:38 +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	8bdb5c0745	implement right panel collapsing more correctly too	2015-10-11 02:25:26 +01:00
Matthew Hodgson	47ed8971e3	implement collapsible leftpanel at last	2015-10-11 02:09:14 +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
Steven Hammerton	a8d51cdf58	Add support for CAS auth	2015-10-10 18:52:44 +01:00
Matthew Hodgson	a05437e81f	add npm i source-map-loader troubleshooting step	2015-10-10 18:51:22 +01:00
David Baker	93f266a4fa	Update to new memberlist api and hopefully sort out presence (list wasn't being re-sorted at the right time) ... Hopefully fix #11	2015-10-09 17:26:28 +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	aed1fe9bf1	Merge branch 'master' into develop	2015-10-09 16:40:27 +01:00
David Baker	7296cbfd5b	Spellig	2015-10-09 16:38:37 +01:00
David Baker	023034ce4f	Check for existence of content.size. Fixes #201.	2015-10-09 16:28:51 +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	c68ef38399	Use ChangeDisplayNname / ChangeAvatar widgets to prompt for display name & avatar at signup. ... Fixes #7.	2015-10-09 11:56:16 +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	ccc5f30c9b	Get the vector 'ongoing conference' bar back (vector now needs a custom RoomView for this: it would be nice it it didn't)	2015-10-08 15:22:16 +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	c22442f6d1	Add ChangeDisplayName component and use it	2015-10-07 18:44:07 +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	fca65a8cdb	Show invited members separately. ... May not be the final look. Fixes #6	2015-10-06 15:09:42 +01:00
David Baker	807e947146	Add spinner for inviting. Fixes #13.	2015-10-06 14:12:45 +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	85636ccdad	Show end call button in states other than connected and ringback: it's perfectly valid to want to end the call at other times. ... Fixes #9	2015-10-05 16:29:07 +01:00
David Baker	490e56bfbb	Improved url / hash change handling	2015-10-05 15:32:34 +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	61f951a33e	Merge pull request #190 from vector-im/reactsdk-unfork ... New vector using react-sdk	2015-10-05 10:31:39 +01:00
David Baker	53c8b9bcf7	no single quotes because windows	2015-10-05 10:20:02 +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	df39c3a281	Changes from PR feedback	2015-10-02 16:44:35 +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	050c6cf72f	Dummy merge branch 'master' into reactsdk-unfork ... (affected file no longer in this repo)	2015-10-02 14:36:07 +01:00
David Baker	2247d951d6	Add config file for default hs/is urls	2015-10-02 11:48:52 +01:00