3883 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matthew Hodgson	aa0658d9ce	Merge pull request #802 from t3chguy/t3chguy/file_download_improvements ... File Download Consistency	2017-04-22 02:59:25 +01:00
Matthew Hodgson	6c177bc617	Merge pull request #806 from t3chguy/t3chguy/show_access_token ... Show Access Token under Advanced in Settings	2017-04-22 02:51:54 +01:00
Matthew Hodgson	ad76dd0dd1	Merge pull request #810 from t3chguy/t3chguy/settings_versions_improvements ... Link tags/commit hashes in the UserSettings version section	2017-04-22 02:38:30 +01:00
Matthew Hodgson	febd9c637e	Merge pull request #813 from t3chguy/RoomSettings_close_focus_composer ... On return to RoomView from auxPanel, send focus back to Composer	2017-04-22 02:08:48 +01:00
Matthew Hodgson	ba0bb677c8	Merge pull request #817 from turt2live/travis/rw-3626 ... Change presence status labels to 'for' instead of 'ago'	2017-04-22 01:45:21 +01:00
Matthew Hodgson	304136766d	Merge pull request #816 from t3chguy/ability_to_disable_scalar ... Disable Scalar Integrations if urls passed to it are falsey	2017-04-22 01:39:20 +01:00
Matthew Hodgson	d2d24bf0fa	Merge pull request #818 from turt2live/travis/hide-read-receipts ... Add option to hide other people's read receipts.	2017-04-22 01:36:45 +01:00
Matthew Hodgson	872d0e0f50	Merge branch 'develop' into travis/hide-read-receipts	2017-04-22 01:36:38 +01:00
Matthew Hodgson	b36eb90a10	Merge pull request #819 from turt2live/travis/no-typing-notifs ... Add option to not send typing notifications	2017-04-22 01:35:07 +01:00
Matthew Hodgson	1faecfd0f7	fix sticky headers on resize	2017-04-22 01:29:48 +01:00
Matthew Hodgson	ec6a1c4c75	recalculate roomlist when your invites change	2017-04-22 01:16:25 +01:00
turt2live	80b8be64d1	Transform h1 and h2 tags to h3 tags ... Addresses vector-im/riot-web#1772 Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-04-21 15:09:56 -06:00
turt2live	64e416e117	Add option to not send typing notifications ... Addresses vector-im/riot-web#3220 Fix applies to both the RTE and plain editor. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-04-21 14:50:26 -06:00
turt2live	e4c4adc517	Add option to hide other people's read receipts. ... Addresses vector-im/riot-web#2526 Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-04-21 14:28:28 -06:00
turt2live	2d39b59556	Change presence status labels to be more clear. ... As per vector-im/riot-web#3626 the current labels are unclear. Changing the verbage should make it more clear. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-04-21 13:41:37 -06:00
Michael Telatynski	8e9f52e217	Disable Scalar Integrations if urls passed to it are falsey ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-21 19:46:19 +01:00
Michael Telatynski	fdc26a490a	On return to RoomView from auxPanel, send focus back to Composer ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-21 18:45:28 +01:00
Luke Barnard	ae8d04b35d	Merge pull request #805 from matrix-org/luke/feature-read-marker ... Sync RM across instances of Riot	2017-04-21 16:52:46 +01:00
Luke Barnard	29c2bd3d18	reset last_rr_sent on error ... Indicate that setting the RR was a failure and that hitting the API should be retried (in the case where the errcode !== "M_UNRECOGNISED")	2017-04-21 16:46:36 +01:00
Luke Barnard	19d6d1ef4b	Merge pull request #811 from matrix-org/luke/login-ui ... First iteration on improving login UI	2017-04-21 16:25:16 +01:00
Luke Barnard	9c4c706120	Remove :server.name for custom servers ... Custom servers may not be configured such that their domain name === domain part.	2017-04-21 16:09:11 +01:00
Matthew Hodgson	b0288ebd89	fix stupid typos in RoomList's shouldComponentUpdate	2017-04-21 12:40:13 +01:00
Luke Barnard	2b9cb999ba	autoFocus PasswordLogin	2017-04-21 11:50:19 +01:00
Luke Barnard	9cd7914ea5	Finishing off the first iteration on login UI ... This makes the following changes: - Improve CountryDropdown by allowing all countries to be displayed at once and using PNGs for performance (trading of quality - the pngs are scaled down from 32px to 25px) - "I want to sign in with" dropdown to select login method - MXID login field that suffixes HS domain (whether custom or matrix.org) and prefixes "@" - Email field which is secretly the same as the username field but with a different placeholder - No more login flickering when changing ServerConfig (!) fixes https://github.com/vector-im/riot-web/issues/1517 This implements most of the design in https://github.com/vector-im/riot-web/issues/3524 but neglects the phone number login:  This will be updated in another PR to implement desired things: - Country code visible once a country has been selected (propbably but as a prefix to the phone number input box. - Use square flags - Move CountryDropdown above phone input and make it show the full country name when not expanded - Auto-select country based on IP	2017-04-21 11:37:08 +01:00
Michael Telatynski	bbd1f34336	Prepend REACT_SDK_VERSION with a v to match riot-web version output ... Add simple helper to construct version/commit hash urls var -> let/const and prepend olmVersionString with v for same reason for both matrix-react-sdk and riot-web, if unknown/local don't do anything else try to create a link to the commit hash/tag name Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-21 03:04:34 +01:00
Matthew Hodgson	9de8148dfc	Merge pull request #809 from t3chguy/t3chguy/autofocus_composer_on_jump_to_bottom ... focus on composer after jumping to bottom	2017-04-21 01:27:34 +01:00
Michael Telatynski	be9b858193	focus on composer after jumping to bottom ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-21 01:06:00 +01:00
Matthew Hodgson	35a16edccc	oops, actually refresh roomlist when its state changes!	2017-04-20 15:47:59 +01:00
Matthew Hodgson	0d8d3c6710	HOW DID THIS EVER WORK?	2017-04-20 15:15:20 +01:00
Luke Barnard	67089cb527	If new RR-RM API not implemented, fallback to RR-only API	2017-04-20 14:34:59 +01:00
Matthew Hodgson	238f59dc87	return the event from RoomTile's onClick to distinguish clicks from keypresses	2017-04-20 14:16:45 +01:00
Matthew Hodgson	e69ea68133	unbreak stack overflow which fires on tests due to mocked timers	2017-04-20 13:53:36 +01:00
Matthew Hodgson	0ad1d8caf3	Merge pull request #807 from matrix-org/matthew/quick-search ... Improve RoomList performance via side-stepping React	2017-04-20 11:26:04 +01:00
Matthew Hodgson	5a3b4b6a60	various bug fixes: ... don't redraw RoomList when the selectedRoom changes keep passing selectedRoom through to RoomTiles so they have correct initial state handle onAccountData at the RoomList, not RoomTile level Fix some typos	2017-04-20 01:12:57 +01:00
Matthew Hodgson	90f526bdeb	autofocus doesn't seem to work on this button	2017-04-20 00:42:13 +01:00
Matthew Hodgson	8da07740d1	bump react-gemini-scrollbar	2017-04-19 23:34:29 +01:00
Matthew Hodgson	9f99224a1f	fix bugs from PR review	2017-04-19 17:59:06 +01:00
Luke Barnard	a4ba5f041c	Remove log, reinstate comment	2017-04-19 10:46:08 +01:00
Luke Barnard	edeaef8c2f	Initialise last_rm_sent_event_id	2017-04-19 10:28:38 +01:00
Luke Barnard	81bf2be13b	Make note of inconsistant roomReadMarkerTsMap ... This will become redundant when there is server support for directionality of the RM	2017-04-19 10:27:43 +01:00
Luke Barnard	a787ee8480	Remove spammy log	2017-04-19 10:20:53 +01:00
Luke Barnard	00cf5b5918	Revert change	2017-04-19 10:20:24 +01:00
Luke Barnard	e32f153573	Remove Room.accountData listener on unmount	2017-04-19 10:18:25 +01:00
Luke Barnard	28818b857a	Remove log	2017-04-19 10:17:44 +01:00
Luke Barnard	81bdfe2126	Update to match renamed API	2017-04-19 10:14:57 +01:00
Luke Barnard	566a315242	Initial commit on riot-web#3524 (login UI update)	2017-04-19 10:08:04 +01:00
Matthew Hodgson	fb6252a16b	fix invite highlights take 3	2017-04-19 00:16:17 +01:00
Matthew Hodgson	4a9c168682	fix invite highlights	2017-04-19 00:13:01 +01:00
Matthew Hodgson	abf2300c0d	highlight invites correctly	2017-04-19 00:09:03 +01:00
Matthew Hodgson	093b9a0b52	kick the roomtile on RoomState.members	2017-04-18 23:29:28 +01:00