62782 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Matthew Hodgson	68c1ddd5d2	replace react-loader with Spinner everywhere	2015-11-10 18:12:26 +00:00
David Baker	9a6624d1c7	Do read receipt avatars with absolute positioning: this should be a lot easier to animate. Also mess around with the MemberAvatar a bit so it's easier to style.	2015-11-10 17:44:59 +00:00
David Baker	c9823d07fd	Limit number of read avatars, lay them out as per the design & order them.	2015-11-10 13:51:11 +00:00
David Baker	2f783a7ba9	Merge remote-tracking branch 'origin/develop' into read_receipts	2015-11-10 11:27:43 +00:00
David Baker	450036a6ed	Merge remote-tracking branch 'origin/develop' into read_receipts	2015-11-10 11:26:42 +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	ef7a38e558	gemini scrollbar on the memberlist too	2015-11-10 02:26:46 +00:00
Matthew Hodgson	2ca64d9c15	add gemini-scrollbar to the main roomview	2015-11-10 02:04:21 +00:00
Matthew Hodgson	cb887c699e	use gemini-scrollbar to provide fake scrollbars for the room list	2015-11-10 01:40:08 +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	2ccd881665	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:54:10 +00:00
Matthew Hodgson	87bb7c9b7b	upgrade to react 0.14	2015-11-09 23:13:46 +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
Matthew Hodgson	6d9817e5e7	Merge pull request #342 from vector-im/matthew/orderable-roomlist ... Implement reorderable rooms via room tagging.	2015-11-09 16:05:00 +00:00
Matthew Hodgson	23c93de82e	Merge branch 'develop' into matthew/orderable-roomlist	2015-11-09 16:04:20 +00:00
Matthew Hodgson	bea64082a9	put the DragDropContext on LeftPanel rather than MatrixChat to allow index.js to continue to abuse MatrixChat by directly invoking the showScreen method on it	2015-11-09 15:44:08 +00:00
Kegsay	c3385d597a	Merge pull request #332 from vector-im/kegan/syncing ... Implement connection lost bar + resend all	2015-11-09 15:35:38 +00:00
Matthew Hodgson	752f8bdbb8	remove random bold initials	2015-11-09 14:04:43 +00:00
Matthew Hodgson	1f69760173	fix comedy scrolling parallax avatar initial bug	2015-11-09 12:41:23 +00:00
Matthew Hodgson	66add5673b	de-hash rooms	2015-11-09 11:53:50 +00:00
Matthew Hodgson	a3082753ef	shove initials onto default room & member avatars as per the design	2015-11-09 02:12:26 +00:00
Matthew Hodgson	eaa2f94327	warning png	2015-11-09 00:13:40 +00:00
Matthew Hodgson	615879ffdd	skin to match CSS (spacing will need to be fixed once matthew/ordered-roomlist lands)	2015-11-09 00:13:25 +00:00
Matthew Hodgson	05d921256f	re-skin the notification bar	2015-11-08 23:37:14 +00:00
Matthew Hodgson	9526deb024	add error dialogs and order search results by recents	2015-11-08 16:19:53 +00:00
Matthew Hodgson	567176ea6c	put a load of margin on the bottommost sublist to increase its hit target size and avoid problems when toggling its hiddenness	2015-11-08 14:08:17 +00:00
Matthew Hodgson	5494a4ea6c	s/deprioritize/demote/	2015-11-08 13:50:36 +00:00
Matthew Hodgson	827c0da33c	commented out debug	2015-11-08 13:42:45 +00:00
Matthew Hodgson	f0dbb422f6	update the actual target list, which may not be the same as the one we dropped on	2015-11-08 13:13:01 +00:00
Matthew Hodgson	5c406856ed	adjust column widths to match design	2015-11-08 12:59:19 +00:00
Matthew Hodgson	b15def84bc	fix spacing of the layout to match latest designs	2015-11-08 12:48:23 +00:00
Matthew Hodgson	bbbe074d92	hide all the debugging behind if (debug)	2015-11-08 12:24:32 +00:00
Matthew Hodgson	36da1accca	click on CallView preview to jump to call	2015-11-08 12:14:10 +00:00
Matthew Hodgson	e289235e17	fix tooltip positioning when collapsed	2015-11-08 12:02:26 +00:00
Matthew Hodgson	c60e8736c1	handle collapsed drop-targets better	2015-11-08 11:50:15 +00:00
Matthew Hodgson	69899e3718	position sublist chevron better when collapsed	2015-11-08 11:44:13 +00:00
Matthew Hodgson	ed4c5b9f73	switch initial spinner to mx_Spinner	2015-11-07 20:16:44 +00:00
Matthew Hodgson	4e170a2831	fix onRoomTags signature	2015-11-07 20:16:05 +00:00
Matthew Hodgson	07200d7953	Merge branch 'develop' into matthew/orderable-roomlist	2015-11-07 17:29:18 +00:00
Matthew Hodgson	4a195dd3f0	sacrifice a small mountainside of goats to make placeholder-based work correctly	2015-11-07 02:57:56 +00:00
Matthew Hodgson	fe442f5c24	fix various edge cases when dragging stuff back to the conversations list	2015-11-06 23:30:57 +01:00
Matthew Hodgson	89327bd38f	precedence fail :(	2015-11-06 21:33:28 +01:00
Matthew Hodgson	f102e3b3b7	collapsible sublist graphics	2015-11-06 21:25:35 +01:00
Matthew Hodgson	1150e22190	collapsible sublists	2015-11-06 21:25:20 +01:00
Matthew Hodgson	886ffbf158	switch to m.* prefixes for tags before it's too late	2015-11-06 21:00:34 +01:00
Matthew Hodgson	c884c5fc33	actually manage manual ordering; support arbitrary tags; bug fixes	2015-11-06 20:54:07 +01:00
David Baker	d462e0b21b	Merge pull request #335 from stevenhammerton/sh-cas-token-login ... Replace CAS login with token login	2015-11-06 15:41:15 +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