28828 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matthew Hodgson	aa412bed0f	reindent promises as per dave's PR feedback	2016-01-18 13:38:40 +00:00
Matthew Hodgson	d0eedb4faa	merge develop	2016-01-18 13:34:09 +00:00
Kegan Dougal	fd99b260f4	Merge branch 'develop' into kegan/invite-search	2016-01-18 12:07:36 +00:00
Kegan Dougal	2a64d0feb3	Merge branch 'develop' into matthew/roomsettings2	2016-01-18 10:49:45 +00:00
Kegsay	6e42d00727	Merge pull request #95 from matrix-org/kegan/base-avatar ... Factor out common Avatar code	2016-01-18 10:18:04 +00:00
Matthew Hodgson	8f83621c4c	hide Mod button for muted users	2016-01-18 01:40:19 +00:00
Matthew Hodgson	6e3245a3b0	make linkify userid jump to memberinfo	2016-01-18 01:26:15 +00:00
Matthew Hodgson	8e1ab8e6b4	vaguely skin MemberInfo correctly	2016-01-18 01:18:02 +00:00
Matthew Hodgson	430c90f4a4	oops ,forgot PowerSelector	2016-01-18 00:42:20 +00:00
Matthew Hodgson	a768b7fe4b	bring back power badges	2016-01-18 00:16:31 +00:00
Matthew Hodgson	0553551d92	oops ,forgot PowerSelector	2016-01-17 23:58:38 +00:00
Matthew Hodgson	f3aeda7af9	merge develop	2016-01-17 23:31:21 +00:00
Matthew Hodgson	1467aacfa4	support saving tag changes (untested)	2016-01-17 12:27:21 +00:00
Matthew Hodgson	06e1674f23	UI for tag management	2016-01-17 05:13:16 +00:00
Matthew Hodgson	5b5bd9aef1	remove create_room for now. lots of stupid bugfixes across the board.	2016-01-17 03:59:31 +00:00
Matthew Hodgson	82a159d651	make roomsettings actually work, including alias editing. (using staged UX rather than direct manipulation). loads of tweaks and fixes across the board	2016-01-17 02:48:55 +00:00
David Baker	7045906d5d	Show user settings screen on registration instead of the PostRegister stuff.	2016-01-15 18:58:18 +00:00
David Baker	a90f63f72c	null check	2016-01-15 18:49:12 +00:00
David Baker	52de322789	Change history scolling so it doesn't interfere with moving between lines, even when those lines are wrapped rather than hard line breaks.	2016-01-15 18:31:07 +00:00
Kegan Dougal	d6c7631dcc	Show User avatar URLs	2016-01-15 17:31:32 +00:00
Kegan Dougal	4d47d9875b	Merge branch 'kegan/base-avatar' into kegan/invite-search	2016-01-15 17:19:34 +00:00
Kegan Dougal	855bef17fa	Fold BaseAvatar state mainly into state.urls to avoid too many code paths.	2016-01-15 17:05:05 +00:00
David Baker	a849955c51	Merge pull request #93 from matrix-org/registration_field_validate ... Do (more) client side validation of registration parameters.	2016-01-15 16:38:46 +00:00
Matthew Hodgson	90184235bb	improve RoomSettings layout	2016-01-15 16:33:50 +00:00
Matthew Hodgson	f476150591	fix changeavatar to avoid duplicate click on label	2016-01-15 16:33:34 +00:00
David Baker	ecfdd3593c	Validate everything on form submit. Don't use pwd1 where we didn't define it & fix some error codes.	2016-01-15 16:17:27 +00:00
Kegan Dougal	d8d79722ac	Make RoomAvatar use BaseAvatar	2016-01-15 16:13:25 +00:00
David Baker	6bd09512de	Merge pull request #94 from matrix-org/share_history_invite_warning ... Add warning on inviting a user if sharing history with new users.	2016-01-15 15:57:42 +00:00
Matthew Hodgson	293f5c7120	shrink auxpanel a bit for roomsettings	2016-01-15 15:53:53 +00:00
Matthew Hodgson	0caf5e0cdc	manage permissions on whether people can actually edit name, topic, avatar etc or not	2016-01-15 15:51:40 +00:00
Matthew Hodgson	57e62bf0ba	remove change avatar from here as it's now in the header	2016-01-15 15:50:38 +00:00
Matthew Hodgson	aefecfc645	tweak roomheader layout when editing	2016-01-15 15:23:41 +00:00
Matthew Hodgson	b8afccd445	fix droptarget behaviour	2016-01-15 15:23:02 +00:00
David Baker	2638ee974e	Add warning on inviting a user if sharing history with new users. ... Fixes https://github.com/vector-im/vector-web/issues/60	2016-01-15 15:18:55 +00:00
David Baker	80c2361805	Merge pull request #92 from matrix-org/invalid_user_name ... Catch new invalid user name error	2016-01-15 14:33:45 +00:00
Matthew Hodgson	4a2c2d9656	fix broken merge and revert some of 243b2e45 and document evil magic numbers	2016-01-15 14:22:17 +00:00
David Baker	b60d14a408	Merge pull request #91 from matrix-org/show_upload_in_current_room_only ... Only show uploads that are going to the current room	2016-01-15 13:45:23 +00:00
David Baker	02e41450b4	Do (more) client side validation of registration parameters.	2016-01-15 13:31:41 +00:00
Matthew Hodgson	7cc5925ec4	increase initialSyncLimit enormously to avoid slow gappy /syncs for now	2016-01-15 13:28:41 +00:00
Matthew Hodgson	f2dc1e835b	placeholder for displayname	2016-01-15 13:11:37 +00:00
Matthew Hodgson	e1e46be220	apply gemini scrollbar	2016-01-15 13:11:14 +00:00
Matthew Hodgson	828b1f4837	fix up look and feel of UserSettings a bit more	2016-01-15 12:35:30 +00:00
Matthew Hodgson	84b46dae4e	make ChangeAvatar customisable size...	2016-01-15 12:35:18 +00:00
Matthew Hodgson	8e9e33fa2a	fix NPE and make enter work again	2016-01-15 12:34:53 +00:00
Kegan Dougal	cfb81a4aec	Factor out avatar stuff to BaseAvatar. Make MemberAvatar use it instead.	2016-01-15 12:02:28 +00:00
Kegan Dougal	aea833ec87	Display User objects in search results	2016-01-15 10:31:31 +00:00
David Baker	51ce76aeab	M_INVALID_USERNAME to be consistent with param name	2016-01-15 10:08:16 +00:00
Kegan Dougal	266aee2c6b	Factor out data model -> Entity logic to Entities.js	2016-01-15 09:58:48 +00:00
manuroe	f868f7813b	Room settings: Added notifications mute checkbox	2016-01-14 19:06:48 +01:00
Kegan Dougal	83a458938e	Unbreak things	2016-01-14 17:41:04 +00:00