14272 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Baker	6cdb318cd0	Merge pull request #2713 from matrix-org/dbkr/fix_logout_dialog_backup ... Fix backup button in logout dialog	2019-02-27 12:45:52 +00:00
David Baker	c4db9dc315	Merge pull request #2712 from jryans/reg-spinner ... Keep registration spinner inside the auth modal	2019-02-27 11:50:22 +00:00
David Baker	98402e7eae	Fix backup button in logout dialog ... We set the caption appropriately but forgot to actually do the right thing depending on whether there was a key backup already. Also fix the loadihng spinner which was never shown. Fixes https://github.com/vector-im/riot-web/issues/8369	2019-02-27 11:45:00 +00:00
J. Ryan Stinnett	404c60fb0e	Keep registration spinner inside the auth modal ... The spinner was taking on the full height of the modal and escaping off the page. This keeps it contained inside the modal. Fixes https://github.com/vector-im/riot-web/issues/8661	2019-02-27 11:21:39 +00:00
J. Ryan Stinnett	4b340450b9	Rename Feather icon directory to feather-customised ... These icons are based on Feather as the original source, but they have various tweaks applied, such as stroke width, color, etc. Hopefully the tweaked name makes this more obvious in the future.	2019-02-27 10:42:10 +00:00
Bruno Windels	909c6a6d4b	Merge pull request #2707 from matrix-org/travis/rename-read-receipts-setting ... Try to clarify that "Show read receipts" is just for visibility	2019-02-27 09:51:00 +01:00
Bruno Windels	f422e9db98	Merge pull request #2711 from matrix-org/travis/fix-dm-invites ... Make sure direct chat invites are treated as invites	2019-02-27 09:28:31 +01:00
Travis Ralston	143f218e08	Make sure direct chat invites are treated as invites ... Fixes https://github.com/vector-im/riot-web/issues/8966 The DMRoomMap updates before we accept the invite, so make sure to check if it is an invite before checking if it is a direct chat.	2019-02-26 23:40:07 -07:00
Michael Telatynski	f16011394e	Merge branches 'develop' and 't3chguy/composer_demote' of github.com:matrix-org/matrix-react-sdk into t3chguy/composer_demote ... # Conflicts: # src/components/views/rooms/MessageComposer.js	2019-02-27 00:28:16 +00:00
Michael Telatynski	7dfbf3feb2	move canSendMessages into state so that it will re-render the composer ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-27 00:23:37 +00:00
Michael Telatynski	93323421de	Show nearest lower badge, e.g show Mod for 51... etc ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-26 23:59:40 +00:00
Travis Ralston	ad374b3118	Try to clarify that "Show read receipts" is just for visibility ... The setting does not apply to sending them, just seeing them.	2019-02-26 15:27:50 -07:00
J. Ryan Stinnett	1a89a4e87d	Move logos out of feather dir ... These clearly aren't from the Feather set.	2019-02-26 20:41:33 +00:00
J. Ryan Stinnett	3b3f0ea957	Move E2E icons out of feather dir ... They appear to all be created by Nad, according to https://github.com/matrix-org/matrix-react-sdk/pull/2557.	2019-02-26 20:31:32 +00:00
Travis Ralston	fbffd3e97e	Make the settings documentation fit within 120 characters per line	2019-02-26 12:52:59 -07:00
Travis Ralston	93673eff12	Use a global WatchManager for settings ... Fixes https://github.com/vector-im/riot-web/issues/8936 Watchers are now managed by the SettingsStore itself through a global/default watch manager. As per the included documentation, the watch manager dispatches updates to callbacks which are redirected by the SettingsStore for consumer safety.	2019-02-26 12:52:59 -07:00
J. Ryan Stinnett	426bdafe22	Merge pull request #2672 from jryans/password-validation ... Report validity state of all registration fields on any change	2019-02-26 18:20:38 +00:00
J. Ryan Stinnett	4b29d5e228	Clarify finding first non-null field error	2019-02-26 16:41:17 +00:00
Travis Ralston	da7b05f706	Merge pull request #2687 from matrix-org/travis/generate-sample-config ... Export the defaults for SdkConfig	2019-02-26 09:30:36 -07:00
Travis Ralston	f82cc28f96	Merge pull request #2701 from matrix-org/travis/fix-invites ... Change the room list algo to eagerly delete and carefully insert	2019-02-26 09:26:32 -07:00
Bruno Windels	68ba14909b	Merge pull request #2671 from matrix-org/bwindels/permalinkperf ... Improve permalink performance	2019-02-26 10:48:20 +01:00
Bruno Windels	0a404d5adc	Merge pull request #2702 from matrix-org/nadonomy/room-list ... Normalise room list font weight, bold unreads	2019-02-26 10:43:21 +01:00
Bruno Windels	4d95af705d	fix lint	2019-02-26 10:26:33 +01:00
Travis Ralston	18b27a72d8	Merge pull request #2692 from matrix-org/t3chguy/room_context_menu_settings ... Settings button in Room Context Menu	2019-02-25 20:28:38 -07:00
Travis Ralston	28805da9f6	Merge pull request #2689 from matrix-org/t3chguy/roomnick ... add roomnick SlashCommand	2019-02-25 20:28:13 -07:00
Michael Telatynski	7029695224	make it i18n friendly ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-25 23:26:24 +00:00
Travis Ralston	f6021e78b1	Merge pull request #2697 from matrix-org/t3chguy/pretty_Devtools ... replace text Inputs in Devtools with Field bcuz prettier	2019-02-25 16:13:14 -07:00
Michael Telatynski	8d149575ea	Merge branches 'develop' and 't3chguy/room_context_menu_settings' of github.com:matrix-org/matrix-react-sdk into t3chguy/room_context_menu_settings	2019-02-25 23:12:06 +00:00
Michael Telatynski	d4b6ce6932	Apply PR feedback, don't change room to go to its settings ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-25 23:08:51 +00:00
Michael Telatynski	dd9077f1e4	Merge branches 'develop' and 't3chguy/pretty_Devtools' of github.com:matrix-org/matrix-react-sdk into t3chguy/pretty_Devtools	2019-02-25 22:39:37 +00:00
Michael Telatynski	56d58f8600	make better use of space ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-25 22:38:33 +00:00
Michael Telatynski	fd2acb18f3	Merge branches 'develop' and 't3chguy/roomnick' of github.com:matrix-org/matrix-react-sdk into t3chguy/roomnick	2019-02-25 22:24:45 +00:00
Michael Telatynski	175938f5a0	set membership in case we don't get the ev ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-25 22:15:50 +00:00
Michael Telatynski	5bdd61111d	Fix textareas ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-02-25 22:12:06 +00:00
Travis Ralston	3d152da822	Support custom tags in the new algorithm	2019-02-25 13:39:08 -07:00
Travis Ralston	e083d50e31	Merge branch 'develop' into travis/fix-invites	2019-02-25 12:41:19 -07:00
Travis Ralston	9a42d2edee	Merge pull request #2685 from matrix-org/travis/settings-cleanup-1 ... Maintenance: Clean up some stuff around settings	2019-02-25 11:53:23 -07:00
Travis Ralston	1aef157d2a	Fix variable reference	2019-02-25 11:52:45 -07:00
Nad Chishtie	88dfd3287f	Normalise room list font weight and make bold when there are unreads.	2019-02-25 11:02:27 -07:00
Travis Ralston	24099de2a4	Merge branch 'develop' into travis/settings-cleanup-1	2019-02-25 10:56:43 -07:00
Travis Ralston	e0a5eeca75	Merge pull request #2686 from matrix-org/travis/old-room-sorting ... Support the old room sorting algorithm and SettingsStore watchers	2019-02-25 10:51:10 -07:00
Travis Ralston	cdf09300ac	Merge remote-tracking branch 'origin/develop' into travis/settings-cleanup-1	2019-02-25 10:44:33 -07:00
Bruno Windels	77f979ed6d	also pass permalinkCreator here	2019-02-25 18:43:08 +01:00
Bruno Windels	a7db42c6cf	use nesting instead of short-circuited && operator	2019-02-25 18:43:08 +01:00
Bruno Windels	b8c6bed906	adjust permalink code for tombstone message	2019-02-25 18:43:08 +01:00
Bruno Windels	fb672ffb28	change handling of event permalinks in replies	2019-02-25 18:43:08 +01:00
Bruno Windels	31dda34e6b	use new permalink class in share dialog & context menu	2019-02-25 18:43:08 +01:00
Bruno Windels	f7ea9cfeb2	rename all instances of permalinkCreator	2019-02-25 18:43:08 +01:00
Bruno Windels	be3d12721c	check room exists	2019-02-25 18:43:08 +01:00
Bruno Windels	fe71c17bb7	keep previous >= pl limit	2019-02-25 18:43:08 +01:00