34763 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Baker	1e945cd13b	Don't show the Notifications widget for guests since they can't use them (and it throws an error if you try to mount it).	2016-02-10 11:48:35 +00:00
David Baker	038f613079	Don;t try to fetch push rules if we're a guest: it throws.	2016-02-10 11:16:36 +00:00
Richard van der Hoff	0d2b042c0f	Merge pull request #148 from matrix-org/rav/keep_scrolling ... Don't stop scrolling at the read-up-to mark.	2016-02-10 10:20:03 +00:00
David Baker	bd73c4e0cc	Merge pull request #151 from matrix-org/dbkr/spinner_while_joining ... Joining a room can take a while. Show a spinner…	2016-02-09 17:45:09 +00:00
David Baker	f72e534ac0	Merge pull request #150 from matrix-org/dbkr/null_check_invite_member_list ... Add a null check here since room can be null and this was throwing	2016-02-09 17:23:38 +00:00
David Baker	af0597e0c8	Joining a room can take a while. Show a spinner otherwise we'll end up in multiple join city.	2016-02-09 16:55:03 +00:00
David Baker	b4a7124686	Add a null check here since room can be null and this was throwing	2016-02-09 16:48:12 +00:00
Richard van der Hoff	b5f7bd6cfb	Merge pull request #149 from matrix-org/rav/kill_autopeek ... Kill off the remains of auto_peek	2016-02-09 15:59:46 +00:00
Richard van der Hoff	f48f28eefe	Kill another scrollToToken ... Missed a place where we were scrolling the messagepanel manually	2016-02-09 15:50:09 +00:00
Richard van der Hoff	576b59be66	Kill off the remains of auto_peek ... Remove some dead code.	2016-02-09 15:45:41 +00:00
Matthew Hodgson	3fd7dff264	unbreak safari	2016-02-09 15:08:04 +00:00
Matthew Hodgson	baa6826409	better commenting	2016-02-09 15:08:04 +00:00
Richard van der Hoff	178e99385a	Merge remote-tracking branch 'origin/develop' into rav/keep_scrolling	2016-02-09 14:52:38 +00:00
Richard van der Hoff	30b4b91cf3	Show jump-to-bottom icon even when there is other stuff in the status bar ... Also includes a general simplification of the classes being used in the status bar. This should fix vector-im/vector-web#879. Obviously it needs corresponding changes in the CSS in vector-web.	2016-02-09 14:45:30 +00:00
Richard van der Hoff	7fd56351a9	Fix 'unread messages' in status ... This got broken in the previous commit	2016-02-09 12:40:11 +00:00
Richard van der Hoff	194110dd71	Merge pull request #147 from matrix-org/rav/factor_out_statusbar ... Factor the statusbar implementation out of RoomView.	2016-02-09 11:38:40 +00:00
Richard van der Hoff	81e95ca8c1	Wire up jump-to-bottom knob ... ... which I embarassingly forgot	2016-02-09 11:36:57 +00:00
Richard van der Hoff	8641dab756	Don't stop scrolling at the read-up-to mark. ... We want to keep things scrolling up after the read-up-to mark hits the middle of the screen. Do this by giving the ScrollPanel a stickyBottom (provided we're not in old history) instead of updating the scroll position when RRs arrive. Also, when we switch back to a room, if there was no special scroll state, jump to the end of the timeline instead of the RR mark.	2016-02-09 11:08:26 +00:00
Kegsay	da81d240e2	Merge pull request #146 from matrix-org/kegan/warning-bars-dom ... Use constant div nesting when warning bars appear	2016-02-09 11:03:31 +00:00
Richard van der Hoff	1d9c88698f	Factor the statusbar implementation out of RoomView ... ... because RoomView must die	2016-02-08 18:08:19 +00:00
Richard van der Hoff	4996164b46	Merge pull request #145 from matrix-org/rav/outdent_roomview_render ... Drop a redundant 'else' from RoomView.render, and outdent a load of code	2016-02-08 18:07:12 +00:00
Kegan Dougal	ecaa2c1e11	Fix the mess of warning bars so it doesn't trigger remounts of alllll the components	2016-02-08 17:20:52 +00:00
Richard van der Hoff	3ca2bbe31e	Drop a redundant 'else' from RoomView.render, and outdent a load of code ... ... in the hope of aiding readability slightly	2016-02-08 16:43:08 +00:00
David Baker	a2e50eb496	Merge pull request #143 from matrix-org/dbkr/fix_display_name_prompt_when_peeking ... Filter rooms by ones we're in: getRooms() is not the set of rooms we are joined.	2016-02-08 16:03:37 +00:00
David Baker	9bf8f37e5f	explicitly check join status as it's clearer	2016-02-08 16:03:04 +00:00
Kegsay	fba497d367	Merge pull request #144 from matrix-org/kegan/invite-autocompleting-race ... Factor out Invite / Search into its own component	2016-02-08 15:54:45 +00:00
Kegan Dougal	2027ed9f49	Fix bug where clicking on the email tile didn't work	2016-02-08 15:21:23 +00:00
Kegan Dougal	70ed0be389	Merge branch 'develop' into kegan/invite-autocompleting-race	2016-02-08 15:06:13 +00:00
Kegan Dougal	3fa23798ea	Split out invite memberlist logic into its own component	2016-02-08 15:05:35 +00:00
David Baker	baba500150	Filter rooms by ones we're in: getRooms() is not the set of rooms we are joined. ... Fixes https://github.com/vector-im/vector-web/issues/885	2016-02-08 14:33:10 +00:00
David Baker	05f1e1e205	Merge pull request #140 from matrix-org/dbkr/fix_tab_complete ... Fix tab complete	2016-02-08 14:19:06 +00:00
Kegan Dougal	7ccce1dc91	Reset truncation when the text box is cleared	2016-02-05 16:58:37 +00:00
Kegan Dougal	5dafe1f4a6	Fix canonical alias bug showing the first alias if one was not set. ... <select> rests on the first value if the defaultValue is null. This first value should've been 'not set'.	2016-02-05 16:22:24 +00:00
Kegsay	ac67cd556a	Merge pull request #142 from matrix-org/kegan/truncate-invite-search-list ... Fix vector-im/vector-web#851 by truncating the search results	2016-02-05 15:56:23 +00:00
Kegsay	4ce41f7f6c	Merge pull request #141 from matrix-org/kegan/room-settings-refactor ... Refactor room settings	2016-02-05 15:50:39 +00:00
Kegan Dougal	b99c6b9a97	camelCasePlease	2016-02-05 15:48:04 +00:00
Kegan Dougal	a0c5b30fd6	Fix vector-im/vector-web#851 by truncating the search results	2016-02-05 15:24:51 +00:00
Kegan Dougal	03f19eba55	Implement radio boxes ( vector-im/vector-web#731 ) for history visibility. Hook up remaining bits.	2016-02-05 14:38:28 +00:00
David Baker	500c12b1f2	Fix tab complete ... rate limited functions can't have arguments, so don't pass the room into _updateTabCompleteList as it's always the room in our state.	2016-02-05 14:32:30 +00:00
Kegan Dougal	ef9b4ab1e6	Log when sessions are saved/restored/not found	2016-02-05 13:32:01 +00:00
Kegan Dougal	0cbf9dba87	Glue more things back together	2016-02-05 11:59:19 +00:00
Kegan Dougal	78354d0bc7	Yank out color settings from RoomSettings to ColorSettings	2016-02-05 11:27:11 +00:00
David Baker	9525808cd0	Merge pull request #137 from matrix-org/dbkr/roomlist_unregister_event_handlers ... Unregister some event handlers we'd registered but never unregister.	2016-02-05 10:48:22 +00:00
David Baker	0ae548cf5d	Merge pull request #139 from matrix-org/dbkr/rate_limit_funcs ... Make the function call-rate limiting a generic thing and use it in more places.	2016-02-05 10:15:55 +00:00
David Baker	239abf4eca	Style things from PR comments	2016-02-05 09:51:09 +00:00
David Baker	63776509a6	Make the function call-rate limiting a generic thing and use it in more places.	2016-02-04 18:06:24 +00:00
Richard van der Hoff	5ae532dae2	Merge pull request #138 from matrix-org/rav/update_rr_semantics ... Tweaks to the semantics for sending RRs and handling room switches	2016-02-04 17:42:15 +01:00
Richard van der Hoff	d14c1a82b2	Tweaks to the semantics for sending RRs and handling room switches ... * Only send read receipts when we are at the bottom of a room; this is a simple and effective way of stopping the green bar of doom from jumping down the room slightly behind the scroll. * Jump to read-up-to mark when switching back to a room if we were following the live timeline before.	2016-02-04 16:27:49 +00:00
Kegan Dougal	74e16ac83e	Merge branch 'develop' into kegan/room-settings-refactor	2016-02-04 16:20:24 +00:00
Kegan Dougal	73df5a2828	Modify how checked state is passed around ... Prefer onChange -> setState to ref grabbing so we can expose public setters and not be tied down to certain element implementations.	2016-02-04 16:18:59 +00:00