14330 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Travis Ralston	879fa22416	Merge branch 'develop' into travis/encryption-warning	2019-03-04 23:14:30 -07:00
Travis Ralston	5a9095288e	Merge pull request #2743 from matrix-org/travis/infinite-ignore ... Don't loop forever if you demote yourself via Enter on a PowerSelector	2019-03-04 15:57:39 -07:00
Travis Ralston	363964e423	Don't loop forever if you demote yourself via Enter on a PowerSelector ... The included comment explains what happens and why this is bad. Fixes https://github.com/vector-im/riot-web/issues/9039	2019-03-04 13:08:54 -07:00
Travis Ralston	3c1da4e875	Merge pull request #2734 from matrix-org/travis/reinvite ... Check if users are already in the room before inviting them	2019-03-04 10:34:49 -07:00
Travis Ralston	7d9e58b3c3	Merge pull request #2735 from matrix-org/travis/duplicated-people ... Don't duplicate direct chats from other tags	2019-03-04 10:34:32 -07:00
David Baker	a6a3716576	Merge pull request #2739 from matrix-org/dbkr/devices_toggle_update ... Fix media device selectors not updating	2019-03-04 14:49:50 +00:00
David Baker	c7b019830d	Fix media device selectors not updating ... Missed a setState Fixes https://github.com/vector-im/riot-web/issues/9036	2019-03-04 14:35:41 +00:00
Michael Telatynski	080c67439b	Merge pull request #2708 from matrix-org/fix_room_dict ... Fix Room Directory custom homeserver entry not showing properly	2019-03-04 11:44:11 +00:00
Michael Telatynski	6b0b5e4aa3	Merge pull request #2729 from matrix-org/t3chguy/missing_permalinkCreator ... Add missing permalinkCreator prop	2019-03-04 11:15:53 +00:00
Travis Ralston	86b79ef51d	Merge pull request #2738 from matrix-org/travis/fix-user-not-existing ... Patch users not existing when opening settings	2019-03-03 12:59:58 -07:00
Travis Ralston	71630af201	Patch users not existing when opening settings ... Fixes https://github.com/vector-im/riot-web/issues/9022	2019-03-02 10:59:53 -07:00
Travis Ralston	ead73ee7b7	Merge pull request #2737 from matrix-org/travis/continuation-icon ... Use a mask for the continuation icon	2019-03-01 18:40:50 -07:00
Travis Ralston	329c1eec1a	Merge pull request #2736 from matrix-org/travis/upgraded-rooms ... Always insert rooms into lists when they get lost	2019-03-01 18:40:31 -07:00
Travis Ralston	454251d17c	Use a div instead of an image ... There's no source, so just make it a block element	2019-03-01 17:21:37 -07:00
Travis Ralston	49f506cef4	More clearly fix issues with room insertion to lists ... Instead of having a catch-all insert, try and fix the common cases with a bit more care.	2019-03-01 17:18:16 -07:00
Travis Ralston	8a6ae6b48e	Use a mask for the continuation icon ... Fixes https://github.com/vector-im/riot-web/issues/7990	2019-03-01 15:59:19 -07:00
Travis Ralston	43d099836b	Always insert rooms into lists when they get lost ... Room upgrades, direct chats, etc all end up being lost in these scenarios. Instead of losing them to the list, try and put them into a relevant spot of the list. Fixes https://github.com/vector-im/riot-web/issues/9020	2019-03-01 15:48:10 -07:00
Travis Ralston	3c2403ca54	Don't duplicate direct chats from other tags ... Fixes https://github.com/vector-im/riot-web/issues/8971	2019-03-01 15:29:24 -07:00
Travis Ralston	4c4b2eedaf	Check if users are already in the room before inviting them ... Fixes https://github.com/vector-im/riot-web/issues/8965 This also addresses another issue where inviting a banned user shows up as "Unknown server error".	2019-03-01 13:36:24 -07:00
Travis Ralston	593bd8ff66	Merge pull request #2732 from matrix-org/travis/rageshake-errors ... Convert objects and such to usable strings in rageshake	2019-03-01 10:20:23 -07:00
Travis Ralston	e1f26059a7	Convert objects and such to usable strings in rageshake ... Fixes https://github.com/vector-im/riot-web/issues/7844	2019-03-01 09:58:54 -07:00
Travis Ralston	3ce2c3a76d	Merge pull request #2724 from matrix-org/travis/stacked-dialogs ... Support stacking dialogs to prevent unmounting	2019-03-01 09:03:39 -07:00
Travis Ralston	5a4676ac66	Merge pull request #2725 from matrix-org/travis/settings/pl-dropdowns ... Convert PowerSelector to use mxField instead	2019-03-01 09:03:16 -07:00
Travis Ralston	f9d6d42781	Merge pull request #2726 from matrix-org/travis/settings/save-feedback ... Don't re-enable the save button after saving profiles	2019-03-01 09:02:54 -07:00
Travis Ralston	ad2a98926a	Merge pull request #2727 from matrix-org/travis/email-notifs ... Support multiple email pushers and remove the legacy UserSettingsStore	2019-03-01 09:02:36 -07:00
Bruno Windels	eb33b2dcbb	Merge pull request #2731 from matrix-org/bwindels/bringback528fix ... Bring back #528 fix as it still seems broken on OSX	2019-03-01 16:49:52 +01:00
Bruno Windels	65807c7a66	Revert "remove test for #528 as we removed that fix" ... This reverts commit 42030796c7.	2019-03-01 16:08:58 +01:00
Bruno Windels	37593c117a	Revert "remove fix for old chrome bug" ... This reverts commit ecb074862e.	2019-03-01 16:08:41 +01:00
Bruno Windels	60c4c55010	Merge pull request #2721 from matrix-org/bwindels/e2emembericonmargin ... Fix margin on e2e icon in member panel	2019-03-01 11:11:14 +01:00
Bruno Windels	fe3fe208e1	Merge pull request #2676 from matrix-org/bwindels/improvedscrolling ... Improved scrolling & pagination	2019-03-01 11:09:23 +01:00
Michael Telatynski	eb46e62a2e	delint NetworkDropdown ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-03-01 09:39:39 +00:00
J. Ryan Stinnett	0bc4243215	Merge pull request #2719 from matrix-org/jryans/nudge-karma ... Nudge karma to 3.1.2	2019-03-01 09:36:57 +00:00
Michael Telatynski	6b07195b63	Add missing permalinkCreator prop ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-03-01 09:36:36 +00:00
Travis Ralston	7d207ca2c3	speeling	2019-02-28 20:45:31 -07:00
Travis Ralston	9402e81835	Get confirmation before enabling encryption ... Fixes https://github.com/vector-im/riot-web/issues/8843	2019-02-28 20:39:07 -07:00
Travis Ralston	12d939b36f	Support multiple email pushers and remove the legacy UserSettingsStore ... Fixes https://github.com/vector-im/riot-web/issues/5496 Fixes https://github.com/vector-im/riot-web/issues/8424	2019-02-28 19:57:45 -07:00
Travis Ralston	b84b11d3bd	Don't re-enable the save button after saving profiles ... Fixes https://github.com/vector-im/riot-web/issues/8569	2019-02-28 19:13:28 -07:00
Travis Ralston	a41df7ab68	Convert PowerSelector to use mxField instead	2019-02-28 19:00:57 -07:00
Travis Ralston	0978ab3da0	Support stacking dialogs to prevent unmounting ... Fixes https://github.com/vector-im/riot-web/issues/8371	2019-02-28 15:55:58 -07:00
Travis Ralston	8d7837829e	Merge pull request #2722 from matrix-org/travis/misc-roomlist ... Misc room list improvements & invite fix	2019-02-28 15:13:06 -07:00
Travis Ralston	940ba51f9f	Merge pull request #2723 from matrix-org/travis/destate-stickerpicker ... Stop listening to account data when the stickerpicker is unmounted	2019-02-28 15:01:43 -07:00
Travis Ralston	b5ffd4a538	Stop listening to account data when the stickerpicker is unmounted ... Fixes https://github.com/vector-im/riot-web/issues/8994	2019-02-28 14:15:01 -07:00
Travis Ralston	805676a511	Don't lose invites when multiple are pending	2019-02-28 14:03:28 -07:00
Travis Ralston	872cdaa9b3	Use the already available state for checking if custom tags are enabled	2019-02-28 14:03:28 -07:00
Travis Ralston	b1e16e9f49	Fix stacktrace when starting riot up with rooms ... Settings can trigger before we're ready, so don't generate the room list. This also includes a comment to signify to future people that we need to track settings still.	2019-02-28 13:55:20 -07:00
Travis Ralston	b2f4de4488	Merge pull request #2716 from matrix-org/travis/what-even-is-a-category ... Move complex part of room sorting to a dedicated function	2019-02-28 13:36:09 -07:00
Travis Ralston	a3342a5790	Standardize on "Category" being the canonical term for room list sections	2019-02-28 13:24:05 -07:00
Bruno Windels	0c06a702dc	pr feedback	2019-02-28 16:05:55 +01:00
Bruno Windels	69016e32a4	fix margin on e2e icon in member panel	2019-02-28 15:39:10 +01:00
Jason Robinson	c4c9c77330	Merge pull request #2718 from matrix-org/jaywink/stickerpicker-button-warning ... Remove unnecessary ref from Stickerpicker	2019-02-28 16:23:09 +02:00