810 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Steven Hammerton	fdf79d709e	Replace CAS login with token login	2015-11-06 11:22:59 +00:00
Matthew Hodgson	8842147ec3	skin RoomDropTarget correctly	2015-11-05 11:21:45 +00:00
David Baker	942659df0d	Work around the bug where some channels have no name from the js sdk which was causing vector to exception and never load.	2015-11-04 14:15:57 +00:00
Matthew Hodgson	61e55b3ca3	implement most of drag & drop.	2015-11-04 02:25:08 +00:00
Matthew Hodgson	7fe7af6026	refactor out the sections of the RoomList into RoomSubLists. Start wiring up tags	2015-11-04 00:19:37 +00:00
Matthew Hodgson	8b9b268ec0	make our state explicit	2015-11-03 14:35:55 +00:00
Matthew Hodgson	27cf9cf561	put invites above recents	2015-11-03 14:35:48 +00:00
Matthew Hodgson	b1b2704bed	avoid racey NPE on first login	2015-11-03 14:35:39 +00:00
Matthew Hodgson	ff35e02b4d	Merge pull request #317 from vector-im/erikj/icons ... Use relative rather than absolute paths for icons	2015-11-02 23:53:27 +00:00
Erik Johnston	4dac9bc1b8	Use relative rather than absolute paths for icons	2015-11-02 23:47:04 +00:00
Kegsay	842d6b6c2c	Merge pull request #314 from vector-im/kegan/graceful-no-voip ... Add unsupported suffix on Ongoing conf notification if conf calls are…	2015-11-02 18:18:46 +00:00
Kegan Dougal	6e63153d83	Add unsupported suffix on Ongoing conf notification if conf calls are unsupported in the browser	2015-11-02 18:01:20 +00:00
David Baker	e869814f2d	Don't display anything if TextForEvent doesn't give us any text. Fixes #253 (catapillar of doom).	2015-11-02 14:14:47 +00:00
Kegsay	3b82884947	Merge pull request #298 from vector-im/kegan/reject-invites ... Add invite rejection	2015-11-02 09:50:17 +00:00
Kegan Dougal	38780ad492	Merge branch 'develop' into kegan/reject-invites	2015-11-02 09:47:51 +00:00
Matthew Hodgson	e25d31a9fe	Merge pull request #296 from vector-im/matthew/redesign ... Matthew/redesign	2015-10-30 18:30:13 +00:00
Matthew Hodgson	56d00c2ec7	make onFinished required prop for modal contents	2015-10-30 18:26:22 +00:00
Matthew Hodgson	79af89fd1b	fix missing decl	2015-10-30 18:26:05 +00:00
Matthew Hodgson	11e176df66	comment for the hidden collapse button	2015-10-30 18:23:08 +00:00
Matthew Hodgson	75bc878657	comment what a CR is	2015-10-30 18:22:21 +00:00
Matthew Hodgson	ddbc8dffb3	switch from enums to string literals for SearchBar.Scope	2015-10-30 18:21:54 +00:00
Matthew Hodgson	6aad99a505	comment \u200b	2015-10-30 18:20:29 +00:00
Matthew Hodgson	35cebc56d3	rewrite the HTML message stuff to fix XSS and improve clarity	2015-10-30 18:19:20 +00:00
Kegan Dougal	668234be4c	Add reject button and impl	2015-10-30 17:18:25 +00:00
Kegsay	626e8bab1a	Merge pull request #283 from vector-im/kegan/blocking ... Add feature-based browser blocking	2015-10-30 14:59:06 +00:00
Kegan Dougal	633bbd8f29	Review comments: add chrome blurb.	2015-10-30 14:58:47 +00:00
David Baker	ffb9ce89c7	Merge branch 'develop' into matthew/redesign	2015-10-30 11:50:34 +00:00
David Baker	ce9a91e155	bundle.css shouldn't be necessary apart from the vector/bundle.* above	2015-10-30 11:33:33 +00:00