44311 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Matthew Hodgson	a082a24f9a	fix previous commit to allow deep-linking to specific pages better	2015-11-11 02:32:16 +01:00
Matthew Hodgson	6ad210cde3	support tracking URLs for settings, new & directory	2015-11-11 02:01:48 +01:00
Matthew Hodgson	ab10f1d6b0	fix warning	2015-11-11 02:01:37 +01:00
Matthew Hodgson	a4968ca967	don't break if the user misses out an email address	2015-11-11 00:05:14 +01:00
Matthew Hodgson	b669f587de	be less shouty	2015-11-11 00:05:00 +01:00
Matthew Hodgson	e7be1ae832	you don't have to pass a description, and if you do, it could be JSX or a string	2015-11-11 00:04:50 +01:00
Matthew Hodgson	d0a4f908cf	fix nightmarish underscore-versus-camelcase confusion in propTypes, and track default URLs for placeholder content	2015-11-11 00:04:30 +01:00
Matthew Hodgson	368c24e146	s/React/ReactDOM	2015-11-10 19:53:29 +00:00
Matthew Hodgson	5fea3c2673	store the custom HS/IS URL in local storage, add some review commentary	2015-11-10 19:10:30 +00:00
Matthew Hodgson	02ad2b5152	remove react-loader (not that the controller should be rendering spinners in the first place :(	2015-11-10 18:25:10 +00:00
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
Matthew Hodgson	efd88b9a83	upgrade to react 0.14	2015-11-09 23:13:43 +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
Kegsay	f5116fe026	Merge pull request #27 from matrix-org/kegan/syncing ... Unbreak everything (JS SDK had breaking API change)	2015-11-05 15:20:42 +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
David Baker	d8edbd2e3c	Requires js-sdk develop	2015-11-05 14:45:48 +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	3fec3a7326	Better error message if there is no accessSync (which there isn't on old node)	2015-11-03 18:29:49 +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
Kegsay	e5e4e901d8	Merge pull request #26 from matrix-org/kegan/graceful-no-voip ... Gracefully handle browsers which don't do VoIP	2015-11-02 17:57:26 +00:00
Kegan Dougal	3485a74036	Gracefully handle browsers which don't do VoIP ... Specifically: - Don't show inbound call ringing - Don't let users place calls/conf calls - Show call records with "not supported by this browser".	2015-11-02 17:39:00 +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
Matthew Hodgson	40da7f500e	show m.room.name changes	2015-10-30 02:07:04 +00:00
Matthew Hodgson	9df7337a6d	actually commit ability to apply a custom class to modal dialogs, used for lightboxing	2015-10-29 10:17:34 +00:00
David Baker	966f44baa1	bump js-sdk -> 0.3.0 on the right branch	2015-10-28 18:06:10 +00:00
David Baker	c46f40c816	bump js-sdk -> 0.3.0	2015-10-28 18:02:50 +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
Kegan Dougal	24ac801417	Invoke onUserClick to allow impls to do whatever on user clicks.	2015-10-26 17:59:49 +00:00
Kegan Dougal	11ef1ac336	Prevent the url from being butchered when clicking user IDs	2015-10-26 17:36:03 +00:00
Kegan Dougal	a1444d3214	Linkify room aliases. Add listener for user ID clicks.	2015-10-26 17:32:31 +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