7199 commits

Author	SHA1	Message	Date
Luke Barnard	7ffb542cb5	Do something more sensible for sender profile name/aux opacity ... - If no translation is needed, don't do it. - For now, ignore the fact that this doens't allow us easily to put Flair into "luke sent an image" but we don't kow where the flair should go for this anyway.	2017-11-16 15:24:36 +00:00
Weblate	2962a9f181	Merge remote-tracking branch 'origin/develop' into develop	2017-11-16 15:12:40 +00:00
Peter Vágner	c9a66d375f	Translated using Weblate (Slovak) ... Currently translated at 99.5% (928 of 932 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/	2017-11-16 15:12:40 +00:00
David Baker	6f8427a5af	Revert rest of https://github.com/matrix-org/matrix-react-sdk/pull/1584 ... Because apparently the revert did not revert this part	2017-11-16 15:11:47 +00:00
Weblate	b0f83dda03	Merge remote-tracking branch 'origin/develop' into develop	2017-11-16 13:36:20 +00:00
Andrey	1d2e13f91d	Translated using Weblate (Russian) ... Currently translated at 98.7% (920 of 932 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-11-16 13:36:20 +00:00
Luke Barnard	b54e563cb6	Merge branch 'develop' into luke/linting-keyword-spacing	2017-11-16 13:23:42 +00:00
Luke Barnard	dad797d4a2	Run linting --fix	2017-11-16 13:19:36 +00:00
Weblate	e96f96d1f2	Merge remote-tracking branch 'origin/develop' into develop	2017-11-16 13:13:13 +00:00
Matthew Hodgson	f62b04c3be	Merge branch 'develop' into travis/granular_bugs	2017-11-16 13:12:03 +00:00
Matthew Hodgson	3e13a919ed	remove rogue debug	2017-11-16 13:09:53 +00:00
Weblate	e0e21efcf4	Merge remote-tracking branch 'origin/develop' into develop	2017-11-16 13:06:41 +00:00
Peter Vágner	f4b7741449	Translated using Weblate (Slovak) ... Currently translated at 99.7% (928 of 930 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/	2017-11-16 13:06:41 +00:00
Walter	02ffa919c4	Translated using Weblate (Russian) ... Currently translated at 98.7% (918 of 930 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-11-16 13:06:41 +00:00
Bamstam	44e8a2cd54	Translated using Weblate (German) ... Currently translated at 99.6% (927 of 930 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-11-16 13:06:40 +00:00
Luke Barnard	f99755378a	Merge pull request #1612 from matrix-org/t3chguy/state_events ... differentiate between state events and message events	2017-11-16 13:06:36 +00:00
Weblate	68cb84700e	Merge remote-tracking branch 'origin/develop' into develop	2017-11-16 11:45:50 +00:00
Luke Barnard	a80935e181	JSX does not do comments in a way one might expect	2017-11-16 11:45:40 +00:00
Weblate	ba387f6287	Merge remote-tracking branch 'origin/develop' into develop	2017-11-16 11:29:08 +00:00
Bamstam	843bdd6e13	Translated using Weblate (German) ... Currently translated at 99.5% (928 of 932 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-11-16 11:29:08 +00:00
pafcu	342378f48a	Add space after if	2017-11-16 12:19:56 +01:00
David Baker	af8ff1b888	Don't blindly hangup on a call error. ... Not all errors means we want to send a hangup (in fact most don't, but the most notable being when we fail to answer a call: we should not then automatically reject it).	2017-11-16 11:07:57 +00:00
Travis Ralston	d0a0a9ce7f	Fix URL preview string not being translated ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-15 22:33:23 -07:00
Travis Ralston	fb1f20b7d4	Treat the master push rule as authoritative ... Previously the push rule was ignored, leading to all kinds of interesting issues regarding notifications. This fixes those issues by giving the master push rule the authority it deserves for reasonable defaults. Part 2 of the fix for: * https://github.com/vector-im/riot-web/issues/5603 * https://github.com/vector-im/riot-web/issues/5606 Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-15 22:33:23 -07:00
Travis Ralston	5976fb2eed	Treat null/undefined notification settings as "not set" ... Otherwise we end up lying and saying notifications are disabled, despite the push rules saying otherwise. Part 1 of the fix for: * https://github.com/vector-im/riot-web/issues/5603 * https://github.com/vector-im/riot-web/issues/5606 Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-15 22:08:13 -07:00
Travis Ralston	10a1d9cb29	Language is a local setting ... Fixes https://github.com/vector-im/riot-web/issues/5611 Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-15 21:16:12 -07:00
Travis Ralston	f141ee1944	Use the correct level order when getting arbitrary settings ... This shouldn't currently be causing problems, but will in teh future. The bug can be exposed by having a setting where the level order is completely reversed, therefore causing LEVEL_ORDER[0] to actually be the most generic, not the most specific. Instead, we'll pull in the setting's level order and fallback to LEVEL_ORDER, therefore requesting the most specific value. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-15 19:24:32 -07:00
Travis Ralston	cf8ff6aed3	Validate that URL previews are explicitly enabled/disabled ... Otherwise `!null` ends up being "true", therefore forcing URL previews on for everyone. Fixes https://github.com/vector-im/riot-web/issues/5607 Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-15 19:22:30 -07:00
Travis Ralston	022e40a127	Use SettingsStore for default theme ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-15 19:04:49 -07:00
Stefan Parviainen	2c1618bc10	Fix conflict and update strings ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-11-15 20:40:51 +01:00
Szimszon	0596925a86	Translated using Weblate (Hungarian) ... Currently translated at 100.0% (932 of 932 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/	2017-11-15 19:05:56 +00:00
Weblate	80b1a685a6	Merge remote-tracking branch 'origin/develop' into develop	2017-11-15 18:34:56 +00:00
Andrey	45a90ef038	Translated using Weblate (Russian) ... Currently translated at 98.3% (917 of 932 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-11-15 18:34:56 +00:00
Bamstam	1f1ca15219	Translated using Weblate (German) ... Currently translated at 98.9% (922 of 932 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-11-15 18:34:55 +00:00
David Baker	b0027525f3	Wire up Unknown Devices popup for outbound calls	2017-11-15 17:21:04 +00:00
Kévin C	648be26fb7	Translated using Weblate (French) ... Currently translated at 100.0% (932 of 932 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/	2017-11-15 16:27:32 +00:00
Michael Telatynski	c0002e7778	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/state_events	2017-11-15 16:03:07 +00:00
Michael Telatynski	5563b71c47	differentiate between state events and message events ... so that people can't fake state event types and have them rendered. Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-11-15 15:56:54 +00:00
David Baker	aeca83ff2e	Unused import	2017-11-15 15:20:45 +00:00
Richard Lewis	750e64deee	Pass required props to TintableSvg.	2017-11-15 15:17:21 +00:00
David Baker	93800be742	Factor out showing UnknownDeviceDialog ... So we can re-use it for calls that fail due to unknwon devices	2017-11-15 15:15:21 +00:00
Richard Lewis	24b9269ff5	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour	2017-11-15 15:08:28 +00:00
Weblate	c5b5a78e86	Merge remote-tracking branch 'origin/develop' into develop	2017-11-15 14:47:28 +00:00
Matthew Hodgson	f4ecc7fa5d	speculatively fix @lampholder's NPE	2017-11-15 14:47:20 +00:00
Weblate	e06ff8083d	Merge remote-tracking branch 'origin/develop' into develop	2017-11-15 14:30:40 +00:00
Matthew Hodgson	ec33806379	Merge pull request #1610 from matrix-org/rxl881/lintingErrors ... Fix linting errors.	2017-11-15 14:30:36 +00:00
Richard Lewis	7bab7813bb	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour	2017-11-15 13:26:29 +00:00
Richard Lewis	59d405d4fa	Use TintableSvgButtons for widget menubar icons.	2017-11-15 13:24:38 +00:00
Richard Lewis	6c2e9096cd	Tintable SVGs that behave like normal image buttons / links.	2017-11-15 13:08:24 +00:00
David Baker	f8fc6dc83e	Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show	2017-11-15 12:11:33 +00:00
Weblate	072a3cd622	Merge remote-tracking branch 'origin/develop' into develop	2017-11-15 11:26:05 +00:00
Matthew Hodgson	96a3eff5d3	lint hell	2017-11-15 11:25:56 +00:00
Weblate	0847596083	Merge remote-tracking branch 'origin/develop' into develop	2017-11-15 11:15:57 +00:00
Matthew Hodgson	84591729a8	unbreak tests	2017-11-15 11:15:49 +00:00
Weblate	6e74657d41	Merge remote-tracking branch 'origin/develop' into develop	2017-11-15 10:56:01 +00:00
Matthew Hodgson	060a890275	Merge pull request #1516 from turt2live/travis/granular-settings ... Granular settings	2017-11-15 10:55:55 +00:00
David Baker	63919befd0	Catch call failures due to unknown devices ... And show a specific dialog that you can then launch the UDD from (although currently with a 'Send Anyway' button which makes little sense for VoIP)	2017-11-15 10:49:29 +00:00
Richard Lewis	56a70f5530	Add tinting for lowlights.	2017-11-15 10:40:07 +00:00
Richard Lewis	06b319937f	Fix linting errors.	2017-11-15 10:14:16 +00:00
Weblate	7367a27df1	Merge remote-tracking branch 'origin/develop' into develop	2017-11-15 09:56:52 +00:00
Matthew Hodgson	e91e94fd42	fix unstyled CSS bug https://github.com/vector-im/riot-web/issues/5601	2017-11-15 09:56:44 +00:00
Szimszon	a226a4997b	Translated using Weblate (Hungarian) ... Currently translated at 100.0% (934 of 934 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/	2017-11-15 05:51:26 +00:00
Travis Ralston	f58e8826c0	Use the correct settings store for presence ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-14 19:18:04 -07:00
Travis Ralston	443bff5832	Presence feature ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-14 19:14:56 -07:00
Travis Ralston	bd4102eb3d	Merge branch 'develop' into travis/granular-settings	2017-11-14 19:12:48 -07:00
Weblate	cb32bac7fa	Merge remote-tracking branch 'origin/develop' into develop	2017-11-15 01:46:01 +00:00
Matthew Hodgson	546b062d82	automatically and correctly retint when changing theme	2017-11-15 01:45:51 +00:00
Weblate	06e38c2e48	Merge remote-tracking branch 'origin/develop' into develop	2017-11-15 01:01:24 +00:00
Bamstam	955362ee2d	Translated using Weblate (German) ... Currently translated at 99.4% (929 of 934 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-11-15 01:01:24 +00:00
Matthew Hodgson	d6fc4ebe3c	fix new tinter problems ... correctly handle skinned tertiaryColors (turns out they're used for the RoomSublist divider bars) handle the fact that some room accountData apparently has ended up with rgb() colors in it...	2017-11-15 01:01:17 +00:00
Weblate	247df92f17	Merge remote-tracking branch 'origin/develop' into develop	2017-11-14 23:53:21 +00:00
Matthew Hodgson	f05958e334	Merge pull request #1482 from turt2live/travis/presence ... Implement user-controlled presence	2017-11-14 23:53:16 +00:00
Stefan Parviainen	ae252f7e59	Log if no match is found	2017-11-14 21:34:20 +01:00
Szimszon	3a6e89584c	Translated using Weblate (Hungarian) ... Currently translated at 100.0% (933 of 933 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/	2017-11-14 20:33:16 +00:00
Weblate	26e5271d81	Merge remote-tracking branch 'origin/develop' into develop	2017-11-14 20:20:37 +00:00
Richard Lewis	58966c5c3d	Make edit icon green by default	2017-11-14 19:53:59 +00:00
Richard Lewis	e87940f63c	Make app tile title stronger	2017-11-14 19:53:32 +00:00
Stefan Parviainen	f8660de52d	Add note about alternative to opacity	2017-11-14 20:13:00 +01:00
Stefan Parviainen	df6d5cc2b4	Pass plain components, rather than functions returning them	2017-11-14 20:09:52 +01:00
Stefan Parviainen	788be67c75	Clarifications	2017-11-14 20:08:27 +01:00
Stefan Parviainen	772550a24a	Dont't add empty nodes	2017-11-14 19:33:12 +01:00
Weblate	4c4220e9dd	Merge remote-tracking branch 'origin/develop' into develop	2017-11-14 16:07:56 +00:00
Matthew Hodgson	7c98558b6a	fix neglible race when loading CSS	2017-11-14 16:07:48 +00:00
Weblate	869a2d158f	Merge remote-tracking branch 'origin/develop' into develop	2017-11-14 16:04:19 +00:00
Matthew Hodgson	1fd7ac30e4	turns out i made up the .complete property on link elements	2017-11-14 16:04:11 +00:00
Weblate	299a32fa98	Merge remote-tracking branch 'origin/develop' into develop	2017-11-14 15:37:12 +00:00
Matthew Hodgson	8d6e3dd27d	fix lint	2017-11-14 15:37:03 +00:00
Weblate	54b430c465	Merge remote-tracking branch 'origin/develop' into develop	2017-11-14 15:28:42 +00:00
Matthew Hodgson	dcfbe93409	fix race when loading CSS ... fixes https://github.com/vector-im/riot-web/issues/5590	2017-11-14 15:28:34 +00:00
Matthew Hodgson	805796e4e0	force the tinter to refresh when we change theme	2017-11-14 15:27:28 +00:00
Weblate	72754cf49c	Merge remote-tracking branch 'origin/develop' into develop	2017-11-14 15:17:59 +00:00
Peter Vágner	07addbe1e0	Translated using Weblate (Slovak) ... Currently translated at 99.7% (931 of 933 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/	2017-11-14 15:17:58 +00:00
Bamstam	eb2d5d0ac5	Translated using Weblate (German) ... Currently translated at 99.4% (928 of 933 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-11-14 15:17:58 +00:00
Matthew Hodgson	8c218557df	fix disable_custom_urls	2017-11-14 15:17:50 +00:00
Weblate	d6de8b8d58	Merge remote-tracking branch 'origin/develop' into develop	2017-11-14 14:27:34 +00:00
Peter Vágner	1038e44672	Translated using Weblate (Slovak) ... Currently translated at 99.7% (931 of 933 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/	2017-11-14 14:27:34 +00:00
Bamstam	20beb7990f	Translated using Weblate (German) ... Currently translated at 99.4% (928 of 933 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-11-14 14:27:33 +00:00
Matthew Hodgson	b58514f427	Stop FF quantum exploding on CSS edits	2017-11-14 14:27:27 +00:00
Kévin C	64958d05b9	Translated using Weblate (French) ... Currently translated at 100.0% (933 of 933 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/	2017-11-14 14:18:25 +00:00
David Baker	55260becc9	Revert "Lowercase all usernames"	2017-11-14 14:13:22 +00:00
Weblate	c1d70f28d7	Merge remote-tracking branch 'origin/develop' into develop	2017-11-14 14:05:54 +00:00
Peter Vágner	3d677d84fe	Translated using Weblate (Slovak) ... Currently translated at 100.0% (932 of 932 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/	2017-11-14 14:05:54 +00:00
Peter Vágner	9d19496011	Translated using Weblate (Slovak) ... Currently translated at 100.0% (932 of 932 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/	2017-11-14 13:23:15 +00:00
Luke Barnard	12d9f05883	Merge branch 'develop' into luke/fix-restrict-power-level-options	2017-11-14 13:08:31 +00:00
Luke Barnard	3fa1bece0a	Simplify further ... Also fix not-i18n-friendly "of" to be "=".	2017-11-14 13:06:54 +00:00
Weblate	61ee39b3b2	Merge remote-tracking branch 'origin/develop' into develop	2017-11-14 12:43:00 +00:00
Andrey	85f002b21c	Translated using Weblate (Russian) ... Currently translated at 98.4% (918 of 932 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-11-14 12:43:00 +00:00
David Baker	e7c99a71b6	Merge pull request #1606 from matrix-org/luke/fix-member-info-power-level-display ... Determine whether power level is custom once Roles have been determined	2017-11-14 12:42:55 +00:00
Luke Barnard	c3492634bd	Merge branch 'luke/fix-member-info-power-level-display' into luke/fix-restrict-power-level-options	2017-11-14 12:41:36 +00:00
Luke Barnard	d2ef6bffa8	Remove reverseRoles ... This variable seemed redundant in hindsight, it seemed better to remove it than to worry about where it went in the component.	2017-11-14 12:02:37 +00:00
Kévin C	acd2be4b68	Translated using Weblate (French) ... Currently translated at 100.0% (932 of 932 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/	2017-11-14 10:53:57 +00:00
Szimszon	6c8283b3a8	Translated using Weblate (Hungarian) ... Currently translated at 100.0% (932 of 932 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/	2017-11-14 06:41:28 +00:00
Travis Ralston	d92cba25ef	Use the SettingsStore to get the theme ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-13 13:14:00 -07:00
Stefan Parviainen	2acd42e7c5	Make eslint happy	2017-11-13 21:10:08 +01:00
Travis Ralston	63bebe9dfd	Split out avatar and display name hiding ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-13 12:58:10 -07:00
Travis Ralston	ffecb82bca	Groups were released ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-13 12:34:30 -07:00
Travis Ralston	0648b3eae7	Merge branch 'develop' into travis/granular-settings	2017-11-13 12:29:36 -07:00
Weblate	a44d717783	Merge remote-tracking branch 'origin/develop' into develop	2017-11-13 19:22:39 +00:00
Bamstam	beebe6b92b	Translated using Weblate (German) ... Currently translated at 100.0% (928 of 928 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-11-13 19:22:38 +00:00
Stefan Parviainen	3afbaf61e7	Refactor i18n stuff a bit	2017-11-13 20:19:33 +01:00
Travis Ralston	c5c346f0b7	Merge branch 'develop' into travis/granular-settings	2017-11-13 12:18:41 -07:00
David Baker	0659ac1ccb	Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show	2017-11-13 17:45:57 +00:00
Luke Barnard	52af7a7659	Attempt to clarify the affect that the users_default has on power levels ... This modifies displayed power levels such that: - If users_default is !== 0: - the power level 0 is displayed as "Restricted (0)" - the power level users_default is displayed as "Default ({users_default})" - Otherwise: - the power level 0 is displayed as "Default (0)" When changing users_default, to say, 10, when the textual powers are rendered again, they will take users_default into account. So those previously at 10 and which would have previously have been rendered "Custom of 10" will now read "Default (10)". Conversely, those that were "Default (0)" will now read "Restricted (0)".	2017-11-13 17:03:48 +00:00
Krombel	a97f530999	Translated using Weblate (German) ... Currently translated at 100.0% (928 of 928 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-11-13 14:05:02 +00:00
Luke Barnard	88010fa26c	Determine whether power level is custom once Roles have been determined ... Instead of potentially inspecting an empty {} before mounting. This fixes an issue where "Custom of N" would appear on the first mount of MemberInfo - part of https://github.com/vector-im/riot-web/issues/5107#issuecomment-331882294	2017-11-13 11:57:34 +00:00
Matthew Hodgson	ca531f83d2	remove needless case-squash on login, castrating https://github.com/matrix-org/matrix-react-sdk/pull/1550	2017-11-13 10:34:38 +00:00
Matthew Hodgson	6942e94394	unbreak tests	2017-11-12 00:00:46 +00:00
Matthew Hodgson	46387e135e	Merge branch 'develop' into matthew/status	2017-11-11 23:50:48 +00:00
Matthew Hodgson	2827bc0718	replace some of the status.im theme with general config options	2017-11-11 23:46:43 +00:00
Weblate	25a1dccffc	Merge remote-tracking branch 'origin/develop' into develop	2017-11-11 16:08:33 +00:00
David Baker	39763d668c	Revert "Lowercase all usernames"	2017-11-11 15:59:43 +00:00
David Baker	bce4815851	Initialise unread messages value correctly	2017-11-11 15:57:20 +00:00
Matthew Hodgson	a0cdaf29f9	Merge remote-tracking branch 'origin/develop' into matthew/status	2017-11-10 15:29:42 -08:00
Weblate	7cada3b227	Merge remote-tracking branch 'origin/develop' into develop	2017-11-10 16:19:40 +00:00
Luke Barnard	a96bfee9f2	Remove unused UserSettingsStore import	2017-11-10 16:12:27 +00:00
Luke Barnard	ceda5939f9	Remember to import React	2017-11-10 15:55:55 +00:00
Luke Barnard	853d33a93a	Make groups a fully-fleged baked-in feature	2017-11-10 15:42:11 +00:00
Tong Hui	0f8df97a47	Translated using Weblate (Chinese (Simplified)) ... Currently translated at 70.4% (654 of 928 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/	2017-11-10 15:08:52 +00:00
Luke Barnard	6e1cf6ce17	Merge pull request #1548 from matrix-org/rxl881/widgetrendering ... Improve widget rendering on prop updates	2017-11-10 12:41:20 +00:00
Luke Barnard	74c6ebc5c6	Merge pull request #1595 from matrix-org/luke/groups-show-user-profile-on-action ... Display group member profile (avatar/displayname) in ConfirmUserActionDialog	2017-11-10 12:31:47 +00:00
David Baker	d2549b621c	Merge pull request #1602 from matrix-org/dbkr/nullcheck_atroom_rule ... Don't crash if there isn't a room notif rule	2017-11-10 11:57:43 +00:00
Luke Barnard	981ca458ec	Merge pull request #1596 from matrix-org/luke/groups-show-name-in-flair-tootip ... Show group name in flair tooltip if one is set	2017-11-10 11:51:45 +00:00
Richard Lewis	ba8a9f2a43	Comment length	2017-11-10 11:50:14 +00:00
David Baker	ff5e00d244	Don't crash if there isn't a room notif rule	2017-11-10 11:50:00 +00:00
Luke Barnard	6deeaf94d6	group name not required	2017-11-10 11:43:05 +00:00
Richard Lewis	d2070a08d8	Replace 'qs' dep. with 'querystring'	2017-11-10 11:42:56 +00:00
Luke Barnard	90a63d78b9	Merge pull request #1597 from matrix-org/luke/groups-fix-invite-avatar ... Convert group avatar URL to HTTP before handing to BaseAvatar	2017-11-10 11:41:51 +00:00
Luke Barnard	d179267714	Add prop type	2017-11-10 11:41:36 +00:00
Luke Barnard	0d174ffe9a	Fix tests	2017-11-10 11:13:52 +00:00
Luke Barnard	f4428267a1	Refactor onboarding redirect, add groups to the onboarding starters	2017-11-10 10:51:28 +00:00
Luke Barnard	266a504981	Use the same MatrixClient for the duration of GroupView lifecycle ... Using the pegged matrix client would lead to trying to call removeListener on `null` when GroupView is unmounted during logout.	2017-11-10 10:49:14 +00:00
Peter Vágner	681f43913a	Make the disabled PowerSelector element showing custom value translatable. Fixes #5547	2017-11-10 11:26:53 +01:00
Richard Lewis	bd6b5c4498	Improve function name.	2017-11-10 10:17:55 +00:00
Richard Lewis	98ac3dd19b	Explicitly set initialisation state.	2017-11-10 09:44:58 +00:00
Luke Barnard	7893927e14	Merge pull request #1598 from matrix-org/luke/groups-update-group-room-visibility-api ... Modify the group room visibility API to reflect the js-sdk changes	2017-11-09 17:34:18 +00:00
Luke Barnard	31be27515c	Modify the group room visibility API to reflect the js-sdk changes ... See https://github.com/matrix-org/matrix-js-sdk/pull/569	2017-11-09 16:28:21 +00:00
David Baker	b1ec430523	Remove now-unused dispatches	2017-11-09 16:09:12 +00:00
David Baker	820d9c1c25	Show staus bar on Unknown Device Error ... Don't pop up the dialog as soon as we can't send a message. Also removes dispatches used to keep the RoomStatusBar up to date. We can get the same events straight from the js-sdk via the pending events event.	2017-11-09 15:58:15 +00:00
Luke Barnard	a8487c540f	Convert group avatar URL to HTTP before handing to BaseAvatar ... This is yet another component that imports the MatrixClient just for mxcUrlToHttp. It'd be much nicer to have an avatar component that accepted MXCs, e.g. by wrapping or modifying BaseAvatar.	2017-11-09 14:34:04 +00:00
Richard Lewis	da8b1ff1cd	Ensure that loading state is reset when showing app panel.	2017-11-09 14:28:24 +00:00
Weblate	3807d99a6a	Merge remote-tracking branch 'origin/develop' into develop	2017-11-09 14:17:07 +00:00
Peter Vágner	1c1acd6d12	Translated using Weblate (Slovak) ... Currently translated at 100.0% (928 of 928 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/	2017-11-09 14:17:06 +00:00
Andrey	f796c4c6d1	Translated using Weblate (Russian) ... Currently translated at 98.4% (914 of 928 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-11-09 14:17:06 +00:00
bldrzzy	9b7f302310	Translated using Weblate (Polish) ... Currently translated at 76.7% (712 of 928 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/	2017-11-09 14:17:06 +00:00
Xose M	0250958c25	Translated using Weblate (Galician) ... Currently translated at 1.7% (16 of 928 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/	2017-11-09 14:17:06 +00:00
Luke Barnard	9a6c9594a1	Correctly display group invite ... By making sure the groupName truncates in the right place	2017-11-09 14:16:54 +00:00
Richard Lewis	f796bc79c3	Fix addition of scalar token to widget URL. ... Add error logging.	2017-11-09 14:07:29 +00:00
Luke Barnard	9027780215	Show group name in flair tooltip if one is set ... e.g. "Group Name (+group_id:homeserver)" or "+group_id:homeserver" Fixes https://github.com/vector-im/riot-web/issues/5341	2017-11-09 12:38:43 +00:00
Luke Barnard	6eeb91ee2e	Display group member profile (avatar/displayname) in ConfirmUserActionDialog ... Fixes https://github.com/vector-im/riot-web/issues/5486	2017-11-09 12:24:20 +00:00
Xose M	9b7ab4b7bd	Added translation using Weblate (Galician)	2017-11-09 06:24:11 +00:00
Travis Ralston	030633fa90	Merge remote-tracking branch 'matrix-org/develop' into travis/granular-settings	2017-11-08 17:43:38 -07:00
Travis Ralston	2711da28b4	Use the SettingsStore in the UnknownDeviceDialog	2017-11-08 17:43:06 -07:00
Travis Ralston	f7da5836e1	Make blacklistUnverifiedDevices override the level order ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-08 17:41:32 -07:00
Travis Ralston	c7d8f3931f	Revert notification toolbar setting ... It isn't a setting. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-08 17:06:36 -07:00
Richard Lewis	8016fb82d7	Fix broken commit.	2017-11-08 20:38:54 +00:00
Richard Lewis	56581ef408	Fix various loadingElement related issues.	2017-11-08 20:38:31 +00:00
Richard Lewis	b2b07d9370	Formatting	2017-11-08 20:17:28 +00:00
Weblate	23c9324fa5	Merge remote-tracking branch 'origin/develop' into develop	2017-11-08 18:52:33 +00:00
David Baker	7b243bf64d	Revert "UnknownDeviceDialog: get devices from SDK"	2017-11-08 18:49:50 +00:00
Richard Lewis	be0a76dbd6	Update variable name and JSdoc for improved clarity.	2017-11-08 17:44:54 +00:00
Matthew Hodgson	58ee4d0a76	rewrite the tinter to be ES6, and correctly cache fixups per theme	2017-11-08 06:55:07 -08:00
Weblate	685e5b916b	Merge remote-tracking branch 'origin/develop' into develop	2017-11-08 14:04:32 +00:00
David Baker	b575df7da7	Merge pull request #1591 from matrix-org/luke/groups-order-admins-first ... Order users in the group member list with admins first	2017-11-08 14:04:28 +00:00
Luke Barnard	e2a0cba6cb	If group member privilege level is equal, disambiguate with displayname or userId	2017-11-08 13:57:38 +00:00
Weblate	02cce94c2b	Merge remote-tracking branch 'origin/develop' into develop	2017-11-08 13:35:58 +00:00
Luke Barnard	65cea53f3d	Merge pull request #1592 from matrix-org/luke/groups-fix-accept-invite-refresh-members ... Fetch group members after accepting an invite	2017-11-08 13:35:53 +00:00
Krombel	d583a12514	Translated using Weblate (German) ... Currently translated at 100.0% (928 of 928 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-11-08 13:00:39 +00:00
Kévin C	569a3a3ac4	Translated using Weblate (French) ... Currently translated at 100.0% (928 of 928 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/	2017-11-08 12:34:28 +00:00
Matthew Hodgson	e729bc431d	Merge remote-tracking branch 'origin/develop' into matthew/status	2017-11-08 04:29:52 -08:00
Peter Vágner	447f23796c	Translated using Weblate (Slovak) ... Currently translated at 100.0% (928 of 928 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/	2017-11-08 12:07:30 +00:00
Luke Barnard	3e3ebd6358	Fetch group members after accepting an invite	2017-11-08 11:52:52 +00:00
Luke Barnard	e3e161fbea	Order users in the group member list with admins first	2017-11-08 11:51:58 +00:00
Weblate	100053ff3d	Merge remote-tracking branch 'origin/develop' into develop	2017-11-08 11:49:49 +00:00
Luke Barnard	7075931c58	Merge pull request #1589 from matrix-org/luke/improve-room-address-picker ... Improve address picker for rooms	2017-11-08 11:49:45 +00:00
Weblate	63c8d676cf	Merge remote-tracking branch 'origin/develop' into develop	2017-11-08 11:36:35 +00:00
Peter Vágner	f14f2f99ab	Translated using Weblate (Slovak) ... Currently translated at 99.8% (927 of 928 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/	2017-11-08 11:31:58 +00:00
Luke Barnard	1c5e7f3048	Fix FlairStore getPublicisedGroupsCached to give the correct, existing promise	2017-11-08 11:31:04 +00:00
Peter Vágner	4a9752a482	Added translation using Weblate (Slovak)	2017-11-08 11:21:21 +00:00
Peter Vágner	1e7fc953b3	Ooops, also add the string to the default language file.	2017-11-08 11:56:30 +01:00
Weblate	b496eec523	Merge remote-tracking branch 'origin/develop' into develop	2017-11-08 10:55:59 +00:00
Luke Barnard	c1d9d3714a	Fix not being able to filter community rooms - fixes vector-im/vector-web#5538	2017-11-08 10:55:51 +00:00
Szimszon	8f2bb73229	Translated using Weblate (Hungarian) ... Currently translated at 100.0% (928 of 928 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/	2017-11-08 10:53:24 +00:00
Luke Barnard	077ca36b05	Rank rooms with shorter matching aliases first	2017-11-08 10:47:45 +00:00
Luke Barnard	b3674f503d	Do not search through room topics	2017-11-08 10:32:48 +00:00
Weblate	59bf3b231c	Merge remote-tracking branch 'origin/develop' into develop	2017-11-08 10:24:05 +00:00
Luke Barnard	120e7b821f	Merge pull request #1585 from matrix-org/luke/groups-inviter-profile ... Use the getProfileInfo API for group inviter profile	2017-11-08 10:24:00 +00:00
Luke Barnard	10778e075e	Merge branch 'develop' into luke/groups-inviter-profile	2017-11-08 10:10:43 +00:00
Luke Barnard	4bb083d959	Style	2017-11-08 10:08:04 +00:00
Luke Barnard	f53f9ed8ca	inviterProfile = null initially	2017-11-08 10:07:43 +00:00
Weblate	662a05e86f	Merge remote-tracking branch 'origin/develop' into develop	2017-11-08 10:04:45 +00:00
Luke Barnard	4c47f75918	Merge pull request #1587 from matrix-org/luke/groups-add-rooms-with-visibility ... Add checkbox to GroupAddressPicker for determining visibility of group rooms	2017-11-08 10:04:41 +00:00
Peter Vágner	a29ab0976b	Make the addresses heading on the aliases settings view translatable	2017-11-08 10:23:11 +01:00
Weblate	a79a687e59	Merge remote-tracking branch 'origin/develop' into develop	2017-11-07 22:46:15 +00:00
Matthew Hodgson	ce6957a288	Merge pull request #1581 from matrix-org/luke/groups-update-group-members-api ... Alter group member api	2017-11-07 22:46:11 +00:00
Travis Ralston	289b0c2b6a	Merge branch 'develop' into travis/granular-settings	2017-11-07 14:55:12 -07:00
Kévin C	d5d5b9e334	Translated using Weblate (French) ... Currently translated at 100.0% (928 of 928 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/	2017-11-07 21:41:16 +00:00
Szimszon	4e717f38d7	Translated using Weblate (Hungarian) ... Currently translated at 100.0% (928 of 928 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/	2017-11-07 19:41:02 +00:00
Weblate	17e7dc8eed	Merge remote-tracking branch 'origin/develop' into develop	2017-11-07 18:55:38 +00:00
Luke Barnard	8fbe50a1cf	Merge pull request #1580 from matrix-org/luke/groups-new-group-settings ... Improve group creation UX	2017-11-07 18:55:34 +00:00
Weblate	51ec12bfe9	Merge remote-tracking branch 'origin/develop' into develop	2017-11-07 18:53:08 +00:00
Luke Barnard	d777e370f2	Merge pull request #1583 from matrix-org/luke/groups-disable-rooms-whilst-editing ... Disable RoomDetailList in GroupView when editing	2017-11-07 18:53:04 +00:00
Luke Barnard	edc744067f	Add checkbox to GroupAddressPicker for determining visibility of group rooms	2017-11-07 18:51:41 +00:00
Weblate	85ea67494c	Merge remote-tracking branch 'origin/develop' into develop	2017-11-07 18:24:25 +00:00
Matthew Hodgson	3b1726657f	Merge pull request #1586 from turt2live/travis/message-pinning-fix1 ... Default to no read pins if there is no applicable account data	2017-11-07 18:24:21 +00:00
Weblate	343ffa6b97	Merge remote-tracking branch 'origin/develop' into develop	2017-11-07 18:16:04 +00:00
David Baker	49a935881f	Merge pull request #1584 from matrix-org/dbkr/udd_devices_from_sdk ... UnknownDeviceDialog: get devices from SDK	2017-11-07 18:15:59 +00:00
Travis Ralston	e0ddd88ec9	Default to no read pins if there is no applicable account data ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-07 11:14:27 -07:00
Weblate	ffd83f1faf	Merge remote-tracking branch 'origin/develop' into develop	2017-11-07 17:56:17 +00:00
Andrey	002086de69	Translated using Weblate (Russian) ... Currently translated at 98.7% (914 of 926 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-11-07 17:56:16 +00:00
Matthew Hodgson	e14e0bf200	Merge pull request #1486 from turt2live/travis/pinned-notice ... Add a small indicator for when a new event is pinned	2017-11-07 17:56:12 +00:00
David Baker	10f15dfc56	Unmounted guard	2017-11-07 17:10:40 +00:00
Luke Barnard	80d4873542	Disable RoomDetailList in GroupView when editing ... Otherwise the rooms can be clicked on.	2017-11-07 16:54:28 +00:00
Luke Barnard	ed709f52d1	Use the getProfileInfo API for group inviter profile	2017-11-07 16:42:43 +00:00
David Baker	ec560345c7	UnknownDeviceDialog: get devices from SDK ... rather than having to have the error message passed in. This is in preparation for not having the dialog pop up straight away when a message isn't sent so we don't have to keep the error object knocking around somewhere.	2017-11-07 16:37:43 +00:00
Travis Ralston	142d23a099	Cap the read pin event IDs to 10 ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-07 09:16:19 -07:00
Kévin C	2c096f45c2	Translated using Weblate (French) ... Currently translated at 100.0% (926 of 926 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/	2017-11-07 15:34:05 +00:00
Krombel	ed34c1cc63	Translated using Weblate (German) ... Currently translated at 100.0% (926 of 926 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-11-07 15:24:45 +00:00
Weblate	397d7724e5	Merge remote-tracking branch 'origin/develop' into develop	2017-11-07 15:22:40 +00:00
Andrey	a8ff8973f8	Translated using Weblate (Russian) ... Currently translated at 98.4% (911 of 925 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-11-07 15:22:39 +00:00
Luke Barnard	646cabf324	Add missing whitespace	2017-11-07 15:15:10 +00:00
Luke Barnard	ddc1ff2f23	Name things in a sane way	2017-11-07 15:13:26 +00:00
Luke Barnard	62305a1ccd	Implement tooltip for group rooms	2017-11-07 14:07:31 +00:00
Krombel	3e29a26766	Translated using Weblate (German) ... Currently translated at 100.0% (925 of 925 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-11-07 13:33:46 +00:00
Richard Lewis	96de72ab44	Switch to using existing dep "qs" and record in package.json	2017-11-07 12:45:12 +00:00
Richard Lewis	d3784b4925	Fix URL parameter encoding.	2017-11-07 12:33:38 +00:00
Richard Lewis	eb8c15075a	Fix url params parsing.	2017-11-07 11:58:38 +00:00
Luke Barnard	7a09127687	Alter group member api ... To match https://github.com/matrix-org/synapse/pull/2647	2017-11-07 11:27:42 +00:00
Richard Lewis	70c4100350	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering	2017-11-07 11:04:05 +00:00
Luke Barnard	9019fee49e	Adjust long desc placeholder text	2017-11-07 10:48:56 +00:00
Kévin C	b92156a1ff	Translated using Weblate (French) ... Currently translated at 100.0% (925 of 925 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/	2017-11-07 10:47:23 +00:00
Weblate	5e9bb4353a	Merge remote-tracking branch 'origin/develop' into develop	2017-11-07 10:25:54 +00:00
Luke Barnard	47bf991471	Merge pull request #1577 from matrix-org/dbkr/composer_at_room_pills ... Room notifs in autocomplete & composer	2017-11-07 10:25:48 +00:00
David Baker	df5c6470e8	get dict syntax right	2017-11-06 22:01:23 +00:00
Luke Barnard	956c5ff343	Use a constant for easy reading of long desc placeholder	2017-11-06 18:52:55 +00:00
Luke Barnard	477051cfa6	Add placeholder for when a long desc hasn't been set ... this is only visible to group admins.	2017-11-06 18:35:52 +00:00
Luke Barnard	137f1311b3	Add useful placeholder for the long description textarea	2017-11-06 18:35:23 +00:00
Luke Barnard	36cd22663a	Open group settings when the group is created	2017-11-06 18:02:50 +00:00
Weblate	afc9c36e4e	Merge remote-tracking branch 'origin/develop' into develop	2017-11-06 18:02:44 +00:00
Matthew Hodgson	17ae37bd3b	Merge pull request #1579 from matrix-org/luke/fix-img-no-src-bug ... Ignore img tags in HTML if src is not specified	2017-11-06 18:02:38 +00:00
Luke Barnard	d14f943629	Ignore img tags in HTML if src is not specified ... This applies to HTML messages and group summaries.	2017-11-06 17:52:46 +00:00
Weblate	16771cac4f	Merge remote-tracking branch 'origin/develop' into develop	2017-11-06 17:16:39 +00:00
David Baker	029853d379	Merge pull request #1578 from matrix-org/luke/groups-admin-badges ... Indicate admins in the group member list with a sheriff badge	2017-11-06 17:16:34 +00:00
David Baker	08d006d112	PR feedback	2017-11-06 17:15:09 +00:00
Luke Barnard	d6a6e59d6c	Indicate admins in the group member list with a sheriff badge	2017-11-06 16:37:16 +00:00
David Baker	41e7496ff1	unused var	2017-11-06 15:25:25 +00:00
David Baker	adc4290451	Pillify room notif pills in composer	2017-11-06 15:11:42 +00:00
Weblate	706981688a	Merge remote-tracking branch 'origin/develop' into develop	2017-11-06 14:29:30 +00:00
Richard Lewis	f1db564506	Merge pull request #1533 from anoadragon453/develop ... Remember whether widget drawer was hidden per-room	2017-11-06 14:29:25 +00:00
Weblate	0fdde954d4	Merge remote-tracking branch 'origin/develop' into develop	2017-11-06 13:02:51 +00:00
Walter	cb7b1268fe	Translated using Weblate (Ukrainian) ... Currently translated at 10.6% (98 of 923 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/	2017-11-06 13:02:51 +00:00
Luke Barnard	febeb0429e	Throw an error when trying to create a group store with falsey groupId	2017-11-06 10:18:10 +00:00
Travis Ralston	781b94c8f4	Appease the linter ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-05 15:37:06 -07:00
Travis Ralston	10519f9465	Fix the tests ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-05 14:56:41 -07:00
Travis Ralston	f0000f7400	Update documentation ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-05 14:33:40 -07:00
Travis Ralston	50807d498a	Use settings in slash commands too ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-05 13:06:55 -07:00
Travis Ralston	e31c89d360	Make the controller work for notifications ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 22:28:35 -07:00
Travis Ralston	7ce4316cc8	Initial support for notification settings ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 21:47:18 -07:00
Travis Ralston	8351ec7e73	Local echo on all setting levels ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 20:32:00 -07:00
Travis Ralston	3958e32672	Ensure blacklistUnverifiedDevices persists reloads ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 20:13:23 -07:00
Travis Ralston	45140cab69	Don't assume false means "use state" ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 19:52:42 -07:00
Travis Ralston	ef45d82ec6	Fix URL preview save calls ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 19:52:20 -07:00
Travis Ralston	b75be41f94	Fix split-brain for blacklistUnverifiedDevices ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 19:52:06 -07:00
Travis Ralston	cb17c0a379	Migrate blacklistUnverifiedDevicesPerRoom ... This currently causes a split-brain scenario for the application due to the priority of each level. Granular settings assumes a simple override, however the crypto setting wants per room to be overriden with the global setting, regardless of the room setting. Some additional comments are needed on the intended behaviour. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 19:15:55 -07:00
Matthew Hodgson	68115f5b9c	tint when theming correctly	2017-11-05 00:40:38 +00:00
Matthew Hodgson	8587b36715	Merge branch 'develop' into matthew/status	2017-11-04 23:51:26 +00:00
Matthew Hodgson	e72e30197a	calculate new CSS tinting when we change theme	2017-11-04 23:50:57 +00:00
Matthew Hodgson	b2ddcb8027	tint the colours in the theme rather than hardcode vector green	2017-11-04 23:43:20 +00:00
Travis Ralston	c7eee36990	Fix lanugage detection ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 16:38:26 -06:00
Travis Ralston	4f1ad974fc	Delay URL preview saving until the save button is pressed ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 16:32:13 -06:00
Travis Ralston	358298e4ee	Support room color in settings ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 16:10:25 -06:00
Travis Ralston	bb5f7bed85	Check the correct event type for the room ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 15:48:24 -06:00
Travis Ralston	a8169a682c	Throw errors if the setting isn't known ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 15:46:15 -06:00
Travis Ralston	257e1aabb8	Improve documentation of settings ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 15:44:01 -06:00
Weblate	ae844a048f	Merge remote-tracking branch 'origin/develop' into develop	2017-11-04 15:42:03 +00:00
Matthew Hodgson	3fd5937687	Merge pull request #1571 from matrix-org/t3chguy/class-warning-thing ... Fixes React warning	2017-11-04 15:41:57 +00:00
Travis Ralston	8282534f87	Add SettingsLevel enum; Move settings to own file. ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-03 23:19:45 -06:00
Travis Ralston	893c39bfbe	Merge branch 'develop' into travis/granular-settings	2017-11-03 22:00:07 -06:00
Travis Ralston	de6fc32a87	Show an indicator when there are any pins in the room ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-03 20:00:48 -06:00
Travis Ralston	a2b7f6d30e	Merge remote-tracking branch 'matrix-org/develop' into travis/pinned-notice	2017-11-03 19:57:39 -06:00
Travis Ralston	5c37155730	Don't assume we have a valid event. ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-03 18:18:09 -06:00
Travis Ralston	3656fdb571	Store read pinned events as an array to avoid racing saves. ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-03 18:12:57 -06:00
Weblate	107f83f84f	Merge remote-tracking branch 'origin/develop' into develop	2017-11-03 22:44:22 +00:00
Matthew Hodgson	d4adff3d25	Merge pull request #1575 from matrix-org/luke/fix-flair-store-again ... Fix Flair not appearing due to missing this._usersInFlight	2017-11-03 22:44:16 +00:00
Kévin C	6ddbaebb65	Translated using Weblate (French) ... Currently translated at 100.0% (923 of 923 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/	2017-11-03 19:54:40 +00:00
Luke Barnard	da23afdec2	Better comment on FlairStore _usersInFlight	2017-11-03 18:48:15 +00:00
Weblate	295bdae075	Merge remote-tracking branch 'origin/develop' into develop	2017-11-03 18:47:03 +00:00
Jan Kudrik	ed586bedbc	Translated using Weblate (Czech) ... Currently translated at 70.0% (647 of 923 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/	2017-11-03 18:47:02 +00:00
Luke Barnard	4d8f18742b	Check against non-existant promise to resolve a user's groups	2017-11-03 18:43:43 +00:00
Luke Barnard	d64fc4c842	Fix Flair not appearing due to missing this._usersInFlight	2017-11-03 18:19:10 +00:00
Luke Barnard	58f1757f0c	Handle rooms with no aliases or canonical alias	2017-11-03 17:52:36 +00:00
Luke Barnard	98312a4647	Use, if possible, a room's canonical or first alias when viewing the room ... (Only affects rooms the user has never joined)	2017-11-03 17:37:13 +00:00
Szimszon	dad5023728	Translated using Weblate (Hungarian) ... Currently translated at 100.0% (923 of 923 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/	2017-11-03 16:51:41 +00:00
Weblate	6796b5b70c	Merge remote-tracking branch 'origin/develop' into develop	2017-11-03 16:15:06 +00:00
Bamstam	04614de139	Translated using Weblate (German) ... Currently translated at 100.0% (923 of 923 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-11-03 16:15:05 +00:00
Luke Barnard	abff4ee6b5	Merge pull request #1573 from matrix-org/luke/groups-add-style-to-create-group-dialog ... Add CSS classes to group ID input in CreateGroupDialog	2017-11-03 16:14:59 +00:00
Luke Barnard	b88c13d527	Use prefixed class names to avoid collisions with other libraries	2017-11-03 16:02:41 +00:00
Luke Barnard	e84e4ed5f5	Add CSS classes to group ID input in CreateGroupDialog	2017-11-03 15:38:12 +00:00
Krombel	f96c0d8533	Translated using Weblate (German) ... Currently translated at 100.0% (923 of 923 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-11-03 15:35:45 +00:00
Matthew Hodgson	6747390333	merge	2017-11-03 15:12:24 +00:00
David Baker	49ee78dab1	Merge remote-tracking branch 'origin/develop' into dbkr/composer_at_room_pills	2017-11-03 14:39:52 +00:00
Weblate	6a5162b047	Merge remote-tracking branch 'origin/develop' into develop	2017-11-03 14:30:06 +00:00
David Baker	43a23d7e89	Merge pull request #1568 from matrix-org/dbkr/autocomplete_provider_room ... Give autocomplete providers the room they're in	2017-11-03 14:29:59 +00:00
Weblate	ec8afd185f	Merge remote-tracking branch 'origin/develop' into develop	2017-11-03 14:24:37 +00:00
David Baker	2c9a93a8ac	Merge pull request #1572 from matrix-org/dbkr/fix_multiple_pills ... Fix multiple pills on one line	2017-11-03 14:24:33 +00:00
David Baker	802ab16746	Fix multiple pills on one line	2017-11-03 14:06:59 +00:00
Weblate	1cc65044d4	Merge remote-tracking branch 'origin/develop' into develop	2017-11-03 13:54:04 +00:00
Luke Barnard	d0b3368445	Merge pull request #1570 from matrix-org/luke/fix-groups-invites-appearance ... Fix group invites such that they look similar to room invites	2017-11-03 13:53:58 +00:00
Michael Telatynski	b2cd65e182	Fixes React warning ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-11-03 12:30:58 +00:00
Luke Barnard	151f9917b1	Fix group invites such that they look similar to room invites ... - Change GroupInviteTile to use RoomTile CSS - Give group invites their own sub list, with heading "Community Invites"	2017-11-03 12:19:37 +00:00
Weblate	41cd3f0412	Merge remote-tracking branch 'origin/develop' into develop	2017-11-03 12:03:18 +00:00
Szimszon	fefe157c56	Translated using Weblate (Hungarian) ... Currently translated at 100.0% (922 of 922 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/	2017-11-03 12:03:17 +00:00
Bamstam	d43481d555	Translated using Weblate (German) ... Currently translated at 99.8% (921 of 922 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-11-03 12:03:17 +00:00
Luke Barnard	71c59eff2c	Add a GeminiScrollbar to Your Communities	2017-11-03 11:19:29 +00:00
Szimszon	b559e123d7	Translated using Weblate (Hungarian) ... Currently translated at 100.0% (922 of 922 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/	2017-11-02 21:41:04 +00:00
Kévin C	d4668d6c11	Translated using Weblate (French) ... Currently translated at 100.0% (922 of 922 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/	2017-11-02 19:12:48 +00:00
David Baker	112c74a255	Add NotifProvider to offer @room as a completion	2017-11-02 18:54:25 +00:00
Richard Lewis	853ada027d	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering	2017-11-02 18:34:46 +00:00
Richard Lewis	0e854ee356	Fix loading and initialisation spinners.	2017-11-02 18:33:11 +00:00
David Baker	843d797ded	Better type checking	2017-11-02 18:17:57 +00:00
David Baker	7f9967389d	Pass room into Autocompleter	2017-11-02 18:15:26 +00:00
David Baker	6ad4bb80dd	==	2017-11-02 18:14:46 +00:00
David Baker	3b58f0ca2a	Ignore removed events	2017-11-02 18:14:21 +00:00
David Baker	ee43c635d1	phrasing	2017-11-02 18:11:18 +00:00
David Baker	42589281d1	comment stub method	2017-11-02 18:10:13 +00:00
David Baker	f7201e8dee	Revert unintentional changes	2017-11-02 18:08:24 +00:00
David Baker	498b117d5a	copyrights	2017-11-02 18:01:28 +00:00
David Baker	4953d4de4d	Give autocomplete providers the room they're in ... Removes the gut-wrenching that RoomView does to jam the user list into the user autocomplete provider.	2017-11-02 17:51:08 +00:00
Richard Lewis	a52bb9d603	Pass URL to check.	2017-11-02 17:27:59 +00:00
Krombel	322cd6a2f8	Translated using Weblate (German) ... Currently translated at 100.0% (922 of 922 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-11-02 16:35:11 +00:00
Weblate	7bbae89235	Merge remote-tracking branch 'origin/develop' into develop	2017-11-02 16:09:12 +00:00
David Baker	8800081cb9	Merge pull request #1567 from matrix-org/luke/fix-flair-store ... Fix multiple requests for publicised groups of given user	2017-11-02 16:09:07 +00:00
Luke Barnard	21e09840dc	Fix multiple requests for publicised groups of given user ... Previously, a single user could end up in multiple batches, which would have been fine if the logic didn't assume otherwise. If a request took longer than 200ms, multiple batches would occur with intersecting sets of users, deleting promises that were then assumed to exist. The logic now takes all "in flight" users to also not be "pending". Pending now means that the user will be processed in the next batch. "In flight" means the user is part of an ongoing batch.	2017-11-02 15:59:26 +00:00
Weblate	ff3a555802	Merge remote-tracking branch 'origin/develop' into develop	2017-11-02 15:38:08 +00:00
David Baker	7c17ad8509	Merge pull request #1566 from matrix-org/luke/groups-room-publicity ... Add toggle to alter visibility of a room-group association	2017-11-02 15:38:03 +00:00
Luke Barnard	982e87e01c	Communities are communities, wrap div for label alignment	2017-11-02 15:04:40 +00:00
Weblate	b13bff77cb	Merge remote-tracking branch 'origin/develop' into develop	2017-11-02 14:23:05 +00:00
Bamstam	d698f9f8fd	Translated using Weblate (German) ... Currently translated at 99.8% (918 of 919 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-11-02 14:23:04 +00:00
David Baker	8895ab7e5b	Merge pull request #1564 from matrix-org/dbkr/pillify_at_room ... Pillify room notifs in the timeline	2017-11-02 14:22:58 +00:00
Luke Barnard	bf77b51b5e	Merge branch 'develop' into luke/groups-room-publicity	2017-11-02 13:39:33 +00:00
Luke Barnard	790db94fd7	Add toggle to alter the visibility of a room-group association	2017-11-02 13:31:11 +00:00
Weblate	8387fe7326	Merge remote-tracking branch 'origin/develop' into develop	2017-11-02 11:10:50 +00:00
Krombel	d9f19726a3	Translated using Weblate (German) ... Currently translated at 99.8% (918 of 919 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-11-02 11:10:49 +00:00
Luke Barnard	e909d859ab	Merge branch 'develop' into luke/groups-room-info	2017-11-02 10:56:33 +00:00
Weblate	7ff50d01b8	Merge remote-tracking branch 'origin/develop' into develop	2017-11-01 22:18:10 +00:00
Andrey	e68ab44596	Translated using Weblate (Russian) ... Currently translated at 98.6% (907 of 919 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-11-01 22:18:10 +00:00
Szimszon	9b5fd76dc7	Translated using Weblate (Hungarian) ... Currently translated at 100.0% (919 of 919 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/	2017-11-01 22:18:10 +00:00
Bamstam	b2ccf3fdf7	Translated using Weblate (German) ... Currently translated at 96.5% (887 of 919 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-11-01 22:18:09 +00:00
Matthew Hodgson	815b42f0ac	Merge pull request #1565 from matrix-org/matthew/group-promise-npe ... turn NPE on flair resolution errors into a logged error	2017-11-01 22:18:05 +00:00
Matthew Hodgson	7d7cd30e46	turn NPE on flair resolution errors into a logged error	2017-11-01 22:10:03 +00:00
Szimszon	6586a6ff36	Translated using Weblate (Hungarian) ... Currently translated at 100.0% (919 of 919 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/	2017-11-01 20:44:43 +00:00
Kévin C	44e408ca91	Translated using Weblate (French) ... Currently translated at 100.0% (919 of 919 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/	2017-11-01 19:59:55 +00:00
David Baker	4f8d6d8fbe	Pillify room notifs in the timeline ... This scans text nodes in the DOM for room notifications and turns them into pills. Changes the pillification code around a bit so it works with text nodes. Uses the push processor directly to test the event against the room notifiation rule so we know whether this event would actually trigger a room notification (needs to hook into push at a lower level because otherwise our own room notifications would not pillify since our own events never generate notifications). Requires https://github.com/matrix-org/matrix-js-sdk/pull/565	2017-11-01 19:42:47 +00:00
Luke Barnard	80f79e6b84	Generate translations	2017-11-01 17:58:45 +00:00
Weblate	fe495db6e2	Merge remote-tracking branch 'origin/develop' into develop	2017-11-01 17:44:09 +00:00
Luke Barnard	64a369216a	Implement simple GroupRoomInfo ... which replaces the "X" on the GroupRoomTile with "Remove from community" under Admin Tools.	2017-11-01 17:27:35 +00:00
Luke Barnard	0dcd52d88f	Fix some react warnings firing	2017-11-01 17:12:22 +00:00
Matthew Hodgson	b3a7d25ef8	lint hell	2017-11-01 15:31:44 +00:00
Matthew Hodgson	64d8c81897	Merge branch 'develop' into matthew/status	2017-11-01 15:24:30 +00:00
Matthew Hodgson	1ae9103d78	evil evil hack to temporarily hide avatar changes in status autojoin rooms	2017-11-01 15:24:02 +00:00
Stefan Parviainen	e1e4fc2dac	Make eslint happy ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-11-01 16:18:48 +01:00
Stefan Parviainen	15bafd6818	Convert from weblate to counterpart at runtime to make tests happy ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-11-01 15:55:58 +01:00
Stefan Parviainen	d6f1e12bee	Fix merge conflict ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-11-01 15:50:45 +01:00
Weblate	ccf4150b43	Merge remote-tracking branch 'origin/develop' into develop	2017-11-01 11:44:33 +00:00
Bamstam	ec260fb70c	Translated using Weblate (German) ... Currently translated at 100.0% (913 of 913 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-11-01 11:44:32 +00:00
Luke Barnard	047bf6e4dd	Redact group IDs from analytics	2017-11-01 11:30:25 +00:00
Bamstam	9ee7a2ea70	Translated using Weblate (German) ... Currently translated at 100.0% (913 of 913 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-31 23:44:18 +00:00
Andrey	1faf6770b7	Translated using Weblate (Russian) ... Currently translated at 100.0% (913 of 913 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-10-31 19:12:38 +00:00
Weblate	8cace59088	Merge remote-tracking branch 'origin/develop' into develop	2017-10-31 17:29:42 +00:00
Kévin C	33cffdae7a	Translated using Weblate (French) ... Currently translated at 91.3% (834 of 913 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/	2017-10-31 17:29:41 +00:00
Jan Kudrik	f4d277fbd0	Translated using Weblate (Czech) ... Currently translated at 70.0% (640 of 913 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/	2017-10-31 17:29:41 +00:00
David Baker	273aae207a	Merge pull request #1560 from matrix-org/luke/groups-expose-ready-state ... Display whether the group summary/room list is loading	2017-10-31 17:29:36 +00:00
Richard Lewis	17c0405862	Restructure to pass props from componentWillRecieveProps.	2017-10-31 16:31:46 +00:00
Luke Barnard	16dca08b77	Use constants instead of string literals	2017-10-31 16:13:13 +00:00
Szimszon	73f3aa8680	Translated using Weblate (Hungarian) ... Currently translated at 100.0% (913 of 913 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/	2017-10-31 16:02:50 +00:00
Antoine Proulx	f1ac0f5c75	Translated using Weblate (French) ... Currently translated at 89.5% (818 of 913 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/	2017-10-31 14:49:52 +00:00
Luke Barnard	5bfed67463	Merge branch 'luke/groups-expose-ready-state' of github.com:matrix-org/matrix-react-sdk into luke/groups-expose-ready-state	2017-10-31 14:25:10 +00:00
Luke Barnard	d6cbc44e0f	If groupRoomsLoading, replace RoomDetailList entirely with Spinner	2017-10-31 14:21:00 +00:00
Weblate	13d418fd8e	Merge remote-tracking branch 'origin/develop' into develop	2017-10-31 13:27:43 +00:00
David Baker	f24c64f071	Merge pull request #1558 from matrix-org/luke/fix-client-side-validation-group-id ... Change client-side validation of group IDs to match synapse	2017-10-31 13:27:38 +00:00
Luke Barnard	45e15fd865	Merge branch 'develop' into luke/groups-expose-ready-state	2017-10-31 11:50:12 +00:00
Luke Barnard	302bd6c3e9	Escape dash in regex	2017-10-31 11:48:56 +00:00
Weblate	465b95defe	Merge remote-tracking branch 'origin/develop' into develop	2017-10-31 11:47:23 +00:00
Luke Barnard	775468e71a	Display whether the group summary/room list is loading ... This uses a `ready` flag assigned to each fetching API used by the GroupServer. I've avoided making this generic for now for want of not doing so early.	2017-10-31 11:42:09 +00:00
Luke Barnard	20bf69c3c2	Prevent non-members from opening group settings	2017-10-31 10:54:44 +00:00
Richard Lewis	758df29b23	Fix onLoad on wrong element.	2017-10-31 10:43:17 +00:00
Richard Lewis	35b33263ea	Use querystring lib	2017-10-31 10:37:40 +00:00
Luke Barnard	f53a12d904	Generate en_EN translations	2017-10-31 10:25:48 +00:00
Luke Barnard	53938f7998	Change client-side validation of group IDs to match synapse	2017-10-31 10:25:06 +00:00
Richard Lewis	1cb878bb57	Formatting	2017-10-31 10:04:37 +00:00
Richard Lewis	648b295971	Removed comment	2017-10-31 10:04:02 +00:00
Travis Ralston	6f8523081b	Some documentation ... Far from complete, and probably needs a bit of work, but it's a start. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-30 21:09:24 -06:00
Travis Ralston	f070604350	Rename SettingsCheckbox to be a bit more generic ... Splitting out the logic to two components doesn't make sense, but this isn't always a checkbox. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-30 20:08:27 -06:00
Travis Ralston	3efb0fdeeb	Support default theme at config level ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-30 19:53:36 -06:00
Travis Ralston	9c846e4dd9	Fix URL preview options ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-30 19:49:44 -06:00
Weblate	c8b5a0068c	Merge remote-tracking branch 'origin/develop' into develop	2017-10-30 18:23:15 +00:00
Luke Barnard	4e234cfc3b	Alter UI for disinviting a group member ... The same API as kicking is used for disinviting, so only cosmetic changes needed here.	2017-10-30 18:17:35 +00:00
Weblate	1c71b72ff8	Merge remote-tracking branch 'origin/develop' into develop	2017-10-30 18:03:28 +00:00
Bamstam	27558b7d4b	Translated using Weblate (German) ... Currently translated at 100.0% (912 of 912 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-30 18:03:27 +00:00
Luke Barnard	19b798be10	Merge pull request #1555 from matrix-org/luke/groups-fix-admin-tools ... Only show admin tools to privileged users	2017-10-30 18:03:24 +00:00
Weblate	839d0dd5d5	Merge remote-tracking branch 'origin/develop' into develop	2017-10-30 17:28:06 +00:00
Bamstam	36d5c58426	Translated using Weblate (German) ... Currently translated at 100.0% (912 of 912 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-30 17:28:06 +00:00
Luke Barnard	c655e82867	Merge pull request #1550 from matrix-org/dbkr/try_lowercase_username ... Try lowercase username on login	2017-10-30 17:28:00 +00:00
David Baker	5ea19e2751	Log errors from other login attempts	2017-10-30 17:15:27 +00:00
David Baker	6874f313e3	log login errors	2017-10-30 17:04:21 +00:00
Luke Barnard	3e64333ada	Only show admin tools to privileged users	2017-10-30 16:45:45 +00:00
Weblate	3be7dc854e	Merge remote-tracking branch 'origin/develop' into develop	2017-10-30 16:35:38 +00:00
Jan Kudrik	e174a0ea00	Translated using Weblate (Czech) ... Currently translated at 68.0% (621 of 912 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/	2017-10-30 16:35:37 +00:00
David Baker	57d516f042	Don't refresh page on password change prompt ... It's on the form submit but missing a preventDefault	2017-10-30 16:28:27 +00:00
Weblate	e5a88dc04e	Merge remote-tracking branch 'origin/develop' into develop	2017-10-30 15:12:25 +00:00
Enrico Bacis	b43e1f1359	Translated using Weblate (Italian) ... Currently translated at 5.2% (48 of 912 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/	2017-10-30 15:12:24 +00:00
Bamstam	4b7e76a1e1	Translated using Weblate (German) ... Currently translated at 100.0% (912 of 912 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-30 15:12:24 +00:00
Kévin C	0349155b06	Translated using Weblate (French) ... Currently translated at 89.6% (818 of 912 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/	2017-10-30 15:12:24 +00:00
Jan Kudrik	cfdb615900	Translated using Weblate (Czech) ... Currently translated at 67.6% (617 of 912 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/	2017-10-30 15:12:23 +00:00
Luke Barnard	14d600a69f	Fix initial in GroupAvatar in GroupView	2017-10-30 15:04:12 +00:00
Michael Telatynski	44ec57358b	Send Access Token in Headers to help prevent it being spit out in errors ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-30 10:40:10 +00:00
Travis Ralston	72517f95bb	Don't explode if the SdkConfig isn't available ... This can happen prior to logging in, for some reason. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 22:53:59 -06:00
Travis Ralston	99ee58d13a	Don't break the room settings page ... A later commit will make the URL preview settings behave like the rest of the settings page. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 22:18:03 -06:00
Travis Ralston	c056f4faa6	Make URL preview checkboxes pretty again ... Works for all other settings too! Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 22:17:15 -06:00
Travis Ralston	b139c8d01c	Generate unique IDs for SettingsCheckbox ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 22:16:46 -06:00
Travis Ralston	f44622b3d8	i18n for URL previews ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 21:50:22 -06:00
Travis Ralston	786bd87fec	Support URL previews (with bugs) ... Known issues at this point: * The room-level setting accepts the current user's default, which is wrong * The checkboxes on RoomSettings are not independent * The checkboxes in RoomSettings need some layout fixes Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 21:48:29 -06:00
Travis Ralston	9fdc1be7bd	Make getLevelAt() return more generic responses ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 20:44:00 -06:00
Travis Ralston	b5d5c81f32	Add a new component to back various settings ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 20:43:27 -06:00
Travis Ralston	52f227cb3b	Drop the idea of "config" being automatically supported ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 17:08:39 -06:00
Travis Ralston	0d3f0eaf98	Convert local settings to granular settings ... This breaks language selection. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 16:53:00 -06:00
Travis Ralston	b3d17a7b51	Support legacy settings on the device ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 16:08:45 -06:00
Travis Ralston	e8acb0e102	Use getValueAt() ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 16:02:51 -06:00
Travis Ralston	ae10a11ac4	Convert synced settings to granular settings ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 01:43:52 -06:00
Travis Ralston	bf815f4be9	Support labs features ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-28 20:21:50 -06:00
Travis Ralston	7dda5e9196	Appease the linter round 1 ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-28 19:53:12 -06:00
Travis Ralston	23d159e21c	Make reading settings synchronous ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-28 19:45:48 -06:00
Travis Ralston	989bdcf5fb	Rebuild SettingsStore to be better supported ... This does away with the room- and account-style settings, and just replaces them with `supportedLevels`. The handlers have also been moved out to be in better support of the other options, like SdkConfig and per-room-per-device. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-28 19:13:06 -06:00
Matthew Hodgson	672fbb2873	hopefully fix NPE on toLowerCase	2017-10-28 18:33:38 +01:00
Travis Ralston	c43bf336a9	Appease the linter ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-28 11:26:40 -06:00
Travis Ralston	e02dcae3b6	Change wording to better describe the class ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-28 11:26:40 -06:00
Travis Ralston	8c3e5ebbad	Create GranularSettingStore ... GranularSettingStore is a class to manage settings of varying granularity, such as URL previews at the device, room, and account levels. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-28 11:26:40 -06:00
grrgui	8a2155822f	Translated using Weblate (French) ... Currently translated at 89.6% (818 of 912 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/	2017-10-28 08:10:27 +00:00
David Baker	063ab7e9b7	Merge branch 'dbkr/try_lowercase_username' into matthew/status	2017-10-27 19:09:31 +01:00
David Baker	858c3a2548	Merge remote-tracking branch 'origin/develop' into matthew/status	2017-10-27 18:59:57 +01:00
David Baker	b437a2559d	PR feedback	2017-10-27 18:59:13 +01:00
Weblate	94cf33d836	Merge remote-tracking branch 'origin/develop' into develop	2017-10-27 17:40:23 +00:00
Walter	d72f70dcfd	Translated using Weblate (Ukrainian) ... Currently translated at 11.1% (102 of 912 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/	2017-10-27 17:40:23 +00:00
David Baker	580d8dce19	Merge pull request #1549 from matrix-org/luke/groups-fix-mygroups-avatar-scale-method ... Use "crop" method to scale group avatars in MyGroups	2017-10-27 18:40:19 +01:00
David Baker	5312a869e4	Try lowercase username on login ... Fixes https://github.com/vector-im/riot-web/issues/5446	2017-10-27 18:36:59 +01:00
Luke Barnard	5209f29a5c	Use "crop" method to scale group avatars in MyGroups	2017-10-27 18:27:54 +01:00
Stefan Parviainen	95b2392104	Merge branch 'develop' into departify	2017-10-27 19:23:13 +02:00
Weblate	8f19e4c55c	Merge remote-tracking branch 'origin/develop' into develop	2017-10-27 17:01:36 +00:00
Walter	41257020c0	Translated using Weblate (Ukrainian) ... Currently translated at 11.0% (101 of 912 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/	2017-10-27 17:01:36 +00:00
Luke Barnard	27083df0f9	Merge pull request #1547 from matrix-org/dbkr/username_to_lower ... Lowercase all usernames	2017-10-27 18:01:32 +01:00
David Baker	4eb8fe3e6a	Lowercase all usernames ... As synapse doesn't accept usernames with capitals in them now Fixes https://github.com/vector-im/riot-web/issues/5445	2017-10-27 17:49:44 +01:00
Richard Lewis	3756ce606d	Check URL prop updates and ensure that widgets are refreshed.	2017-10-27 17:49:14 +01:00
Weblate	6618687b36	Merge remote-tracking branch 'origin/develop' into develop	2017-10-27 15:42:51 +00:00
Krombel	138a61c9ac	Translated using Weblate (German) ... Currently translated at 100.0% (912 of 912 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-27 15:42:51 +00:00
David Baker	2f3e0fb049	Lint	2017-10-27 16:29:56 +01:00
Bamstam	0dac8b0aa2	Translated using Weblate (German) ... Currently translated at 100.0% (912 of 912 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-27 15:26:56 +00:00
David Baker	5d0b9d73b4	Fix prompt to re-use chat room ... I managed to lose this when refactoring ChatInviteDialog in https://github.com/matrix-org/matrix-react-sdk/pull/1300 Fixes https://github.com/vector-im/riot-web/issues/5119	2017-10-27 16:20:17 +01:00
Weblate	4c4a933a09	Merge remote-tracking branch 'origin/develop' into develop	2017-10-27 15:10:33 +00:00
Bamstam	a281a1d278	Translated using Weblate (German) ... Currently translated at 100.0% (912 of 912 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-27 15:10:32 +00:00
Luke Barnard	175fadbb57	Add unregiseterListener to GroupStore	2017-10-27 15:08:38 +01:00
Krombel	be2935f814	Translated using Weblate (German) ... Currently translated at 100.0% (912 of 912 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-27 14:06:54 +00:00
Bamstam	e2cd2e9524	Translated using Weblate (German) ... Currently translated at 100.0% (912 of 912 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-27 14:04:58 +00:00
Krombel	e8db013d4b	Translated using Weblate (German) ... Currently translated at 100.0% (912 of 912 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-27 14:01:40 +00:00
Bamstam	1a1874e1b5	Translated using Weblate (German) ... Currently translated at 100.0% (912 of 912 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-27 14:00:53 +00:00
Krombel	3ceb63b97e	Translated using Weblate (German) ... Currently translated at 100.0% (912 of 912 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-27 13:49:23 +00:00
Matthew Hodgson	5d0629ff73	resolve matrix.status.im v. matrix.org confusion	2017-10-27 14:23:16 +01:00
Richard Lewis	7662b5ac8f	Unfinished, non-working changes to try and handle URL changes gracefully	2017-10-27 13:47:51 +01:00
Szimszon	86e587aefd	Translated using Weblate (Hungarian) ... Currently translated at 100.0% (912 of 912 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/	2017-10-27 11:03:30 +00:00
Weblate	67ba28d268	Merge remote-tracking branch 'origin/develop' into develop	2017-10-27 10:48:31 +00:00
Szimszon	0d7c83f9c4	Translated using Weblate (Hungarian) ... Currently translated at 99.5% (908 of 912 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/	2017-10-27 10:48:30 +00:00
Luke Barnard	5d0aa8d7f7	Handle 403 when inspecting invited users as non-member	2017-10-27 11:38:10 +01:00
Luke Barnard	e094c32c62	Simplify GroupStore listener registration	2017-10-27 11:38:10 +01:00
Matthew Hodgson	e3f896c5e0	don't forget login prompt class	2017-10-27 01:35:21 +01:00
Matthew Hodgson	1bf3ef6de4	fix password reset	2017-10-27 01:23:50 +01:00
Matthew Hodgson	0952befdea	target blank for tg	2017-10-27 01:09:37 +01:00
Matthew Hodgson	015aed0597	hide optionality of email for status	2017-10-27 01:03:04 +01:00
Andrey	de2bad2af4	Translated using Weblate (Russian) ... Currently translated at 100.0% (912 of 912 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-10-26 19:15:43 +00:00
Andrew (anoa)	b4868a6846	showWidget->hideWidgetDrawer and remove logs ... Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>	2017-10-26 11:27:58 -07:00
Weblate	ea89c9b9a6	Merge remote-tracking branch 'origin/develop' into develop	2017-10-26 17:38:34 +00:00
Jan Kudrik	6bac1ad755	Translated using Weblate (Czech) ... Currently translated at 62.8% (573 of 911 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/	2017-10-26 17:38:33 +00:00
Michael Telatynski	1d5b4a9d50	Merge branch 'develop' into t3chguy/mention_user	2017-10-26 18:10:10 +01:00
Matthew Hodgson	655d0c615a	remove spurious Sign In button and legacy Return to App buttons	2017-10-26 17:57:49 +01:00
Matthew Hodgson	14d9743e30	unbreak reg	2017-10-26 17:22:32 +01:00
Andrey	a0509d8b5d	Translated using Weblate (Russian) ... Currently translated at 100.0% (911 of 911 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-10-26 14:06:02 +00:00
Weblate	bd8097e44c	Merge remote-tracking branch 'origin/develop' into develop	2017-10-26 13:52:20 +00:00
David Baker	c8a489ca77	Merge pull request #1541 from matrix-org/luke/groups-only-show-settings-icon-to-members ... Only show group settings cog to members	2017-10-26 14:52:16 +01:00
Luke Barnard	9643784f85	Only show group settings cog to members ... Non-members have no settings to change.	2017-10-26 14:31:27 +01:00
Weblate	c5c74749b7	Merge remote-tracking branch 'origin/develop' into develop	2017-10-26 13:23:11 +00:00
Luke Barnard	eec6ed36cd	Use correct icon for group room deletion and make themeable ... Also fix cancel icons to have class mx_filterFlipColor	2017-10-26 14:05:58 +01:00
Andrey	8a9750bccb	Translated using Weblate (Russian) ... Currently translated at 100.0% (910 of 910 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-10-26 10:44:03 +00:00
Weblate	d3af886093	Merge remote-tracking branch 'origin/develop' into develop	2017-10-26 10:35:49 +00:00
David Baker	5871a74228	Merge pull request #1534 from matrix-org/t3chguy/invite_in_memberinfo ... Add invite button to MemberInfo if user has left or wasn't in room	2017-10-26 11:35:45 +01:00
Andrey	3a8b036687	Translated using Weblate (Russian) ... Currently translated at 100.0% (909 of 909 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-10-26 10:17:25 +00:00
Weblate	8fdc0432b0	Merge remote-tracking branch 'origin/develop' into develop	2017-10-26 09:36:11 +00:00
Andrey	93008272dd	Translated using Weblate (Russian) ... Currently translated at 100.0% (908 of 908 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-10-26 09:36:11 +00:00
Andreas Marek	d0ba79996f	Translated using Weblate (German) ... Currently translated at 99.8% (907 of 908 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-26 09:36:10 +00:00
Luke Barnard	591a7f4b86	Default to false	2017-10-26 10:06:04 +01:00
Luke Barnard	97b9cf6402	Actually use the synced setting	2017-10-26 09:58:46 +01:00
David Baker	e6c3483c8b	Add correct telegram link	2017-10-26 09:58:05 +01:00
Matthew Hodgson	5c32b5b11a	fix i18n	2017-10-26 02:10:03 +01:00
Matthew Hodgson	deb0f902e3	linting	2017-10-26 01:59:18 +01:00
Matthew Hodgson	1237de3ef0	Merge branch 'develop' into matthew/status	2017-10-26 01:47:22 +01:00
Matthew Hodgson	5a9dae5ff1	use generic 'text button' for delete buttons in UserSettings	2017-10-26 01:44:05 +01:00
Matthew Hodgson	ac7a94afb2	apply theme tint at launch	2017-10-26 01:43:42 +01:00
Matthew Hodgson	b3a8593468	make tinter coarsely theme aware	2017-10-25 22:48:27 +01:00
Andrey	935e6baf88	Translated using Weblate (Russian) ... Currently translated at 100.0% (908 of 908 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-10-25 17:52:03 +00:00
Travis Ralston	24000ee456	Re-add i18n for labs ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-25 11:23:04 -06:00
Travis Ralston	e773585a02	Merge remote-tracking branch 'matrix-org/develop' into travis/presence ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-25 11:21:39 -06:00
Travis Ralston	5c9970950b	Undo i18n change to make merge easier ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-25 11:21:12 -06:00
Luke Barnard	3ae97348f8	Add option to mirror local video feed	2017-10-25 18:17:33 +01:00
Weblate	a382834e56	Merge remote-tracking branch 'origin/develop' into develop	2017-10-25 16:47:29 +00:00
Bamstam	841e274b07	Translated using Weblate (German) ... Currently translated at 99.8% (906 of 907 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-25 16:47:28 +00:00
Jan Kudrik	9b93804afa	Translated using Weblate (Czech) ... Currently translated at 60.1% (546 of 907 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/	2017-10-25 16:47:28 +00:00
Luke Barnard	4cfbd66729	Merge pull request #1538 from matrix-org/luke/fix-redaction-sender-tooltip ... Use the correct userId when displaying who redacted a message	2017-10-25 17:47:22 +01:00
Luke Barnard	cedc0b27a9	Handle redaction with no sender	2017-10-25 17:37:20 +01:00
Luke Barnard	5990e41bd7	Use the correct userId when displaying who redacted a message	2017-10-25 17:24:45 +01:00
Stefan Parviainen	53e983f9c7	Fix merge conflict ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-25 18:19:27 +02:00
Andrey	45632b4191	Translated using Weblate (Russian) ... Currently translated at 100.0% (907 of 907 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-10-25 15:48:44 +00:00
Michael Telatynski	fd7e057ec0	Merge branch 'develop' into t3chguy/invite_in_memberinfo	2017-10-25 16:33:50 +01:00
Weblate	f8229b7d59	Merge remote-tracking branch 'origin/develop' into develop	2017-10-25 14:52:56 +00:00
David Baker	8ed3474b64	Merge pull request #1529 from matrix-org/luke/fix-can-edit-editable-item-lists ... Only show editing UI for aliases/related_groups for users /w power	2017-10-25 15:52:51 +01:00
Weblate	379dbe2ff5	Merge remote-tracking branch 'origin/develop' into develop	2017-10-25 14:47:22 +00:00
Luke Barnard	39fa866d68	Merge pull request #1535 from matrix-org/luke/fix-interactable-greyed-ui ... Swap from `ui_opacity` to `panel_disabled`	2017-10-25 15:47:18 +01:00
Luke Barnard	b1f2a6c1e9	Dramatically simplify use of mx_fadable ... by applying it to parent elements of things that need to be faded.	2017-10-25 15:15:49 +01:00
Weblate	9149475f1d	Merge remote-tracking branch 'origin/develop' into develop	2017-10-25 13:25:55 +00:00
David Baker	19364c25ee	Merge pull request #1536 from matrix-org/luke/fix-room-address-picker-default-name ... Fix room address picker tiles default name	2017-10-25 14:25:51 +01:00
Weblate	0592f36d2b	Merge remote-tracking branch 'origin/develop' into develop	2017-10-25 13:10:06 +00:00
Luke Barnard	fbe0cc4927	Merge pull request #1531 from matrix-org/t3chguy/hide_level_change_on_50 ... T3chguy/hide level change on 50	2017-10-25 14:09:59 +01:00
Weblate	feff4e85d4	Merge remote-tracking branch 'origin/develop' into develop	2017-10-25 13:07:34 +00:00
Luke Barnard	813d0cd64c	Merge pull request #1537 from matrix-org/t3chguy/missing_date_sep ... fix missing date sep caused by hidden event at start of day	2017-10-25 14:07:28 +01:00
Michael Telatynski	f3c8951d4e	remove unused lastPresenceTs ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-25 12:56:23 +01:00
Michael Telatynski	1bbc26a27f	fix missing date sep caused by hidden event at start of day ... if first event in day was hidden, the date sep would go missing as the next event would compare its date to the hidden one instead of the one before it due to naive N-1 check rather than a previous valid event comparison, now fixed by comparing date against the first event in MELS instead. Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-25 12:52:51 +01:00
Luke Barnard	27f845a7aa	Match on any alias	2017-10-25 12:42:58 +01:00
Luke Barnard	7029ab07fc	If no canonical alias, use first alias (and fallback to Unnamed)	2017-10-25 12:38:39 +01:00
Weblate	4775fffad9	Merge remote-tracking branch 'origin/develop' into develop	2017-10-25 11:09:22 +00:00
Luke Barnard	37b55984ec	Fix group Leave button tooltip	2017-10-25 12:09:13 +01:00
Luke Barnard	2f8f2ce76e	Swap from ui_opacity to panel_disabled ... to simplify the process of disabling panels in the UI.	2017-10-25 11:23:51 +01:00
Weblate	dd4e1fd3b6	Merge remote-tracking branch 'origin/develop' into develop	2017-10-25 09:45:57 +00:00
Bamstam	1476af9c8f	Translated using Weblate (German) ... Currently translated at 100.0% (905 of 905 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-25 09:45:57 +00:00
Richard Lewis	fd85c74bc5	Merge pull request #1520 from matrix-org/rxl881/deleteWidget ... Add a delete confirmation dialog for widgets	2017-10-25 10:45:52 +01:00
Richard Lewis	2e3bdfd55d	Fix string indentation.	2017-10-25 10:45:17 +01:00
Matthew Hodgson	6beb604cd0	fascist linting >:(	2017-10-25 02:31:30 +01:00
Matthew Hodgson	ae40ef4460	fix error layouts	2017-10-25 02:18:14 +01:00
Matthew Hodgson	eb4b7c78a0	skin register screen	2017-10-25 02:04:02 +01:00
Matthew Hodgson	67cc02df3b	hide header when error is up	2017-10-25 01:37:06 +01:00
Matthew Hodgson	adbea44d70	hide login options for status	2017-10-25 01:30:09 +01:00
Michael Telatynski	b3463146ba	Add invite button to MemberInfo if user has left or wasn't in room ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-25 01:00:13 +01:00
Andrew (anoa)	9821f0d459	Fix linting ... Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>	2017-10-24 16:42:06 -07:00
Andrew (anoa)	f032284eff	Remember whether widget drawer was hidden per-room ... Fixes #4850 Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>	2017-10-24 16:28:10 -07:00
Matthew Hodgson	59b2189909	unbreak tests	2017-10-24 23:58:54 +01:00
Matthew Hodgson	26e8b2c1b3	switch to a LoginPage wrapper component ... as it's much nicer in the CSS to wrap the LoginBox as needed rather than have separate header & footer divs floating above and below it which need to be correctly vertically centered	2017-10-24 23:37:26 +01:00
Bamstam	f64a5a3abd	Translated using Weblate (German) ... Currently translated at 100.0% (905 of 905 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-24 22:12:53 +00:00
Ruben Barkow	afdc6b523e	Translated using Weblate (German) ... Currently translated at 99.7% (903 of 905 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-24 22:12:19 +00:00
Michael Telatynski	5514d81683	Add Mention button to MemberInfo ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-24 23:01:40 +01:00
Michael Telatynski	c896dfb17b	delint ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-24 22:21:33 +01:00
Michael Telatynski	f813a752e7	only show change power level option in MemberInfo if we can actually ... send m.room.power_level AND are lower PL than them Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-24 22:12:48 +01:00
Stefan Parviainen	88fd60066f	Fix typo ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-24 20:07:57 +02:00
Szimszon	b0d4fb09c6	Translated using Weblate (Hungarian) ... Currently translated at 100.0% (905 of 905 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/	2017-10-24 17:48:58 +00:00
Stefan Parviainen	bc034f3083	Update strings ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-24 19:34:32 +02:00
Stefan Parviainen	b5024cca75	Further simplify MemberEventListSummary a bit ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-24 19:34:08 +02:00
Luke Barnard	e9ce7f97f5	canSetRelatedRooms -> canSetRelatedGroups	2017-10-24 17:57:26 +01:00
Stefan Parviainen	6406fc3865	Use plurals in WhoIsTyping	2017-10-24 18:32:50 +02:00
Stefan Parviainen	4ff369c884	Merge branch 'develop' into departify	2017-10-24 18:27:24 +02:00
Weblate	b2d5f4ce80	Merge remote-tracking branch 'origin/develop' into develop	2017-10-24 15:41:57 +00:00
Jan Kudrik	5d53f30619	Translated using Weblate (Czech) ... Currently translated at 57.2% (518 of 905 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/	2017-10-24 15:41:56 +00:00
Luke Barnard	7b666af24c	When dispatching view_[my_]group[s], reset RoomViewStore ... so that RoomTiles are not highlighted when the user is looking at MyGroups or GroupView	2017-10-24 16:32:52 +01:00
Andrey	2b0cb7e28e	Translated using Weblate (Russian) ... Currently translated at 100.0% (905 of 905 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-10-24 15:26:51 +00:00
Luke Barnard	640d88f25d	Typo	2017-10-24 16:21:18 +01:00
Luke Barnard	ee7ebc425c	Only show editing UI for aliases/related_groups for users /w power	2017-10-24 16:19:09 +01:00
Weblate	cd3d6f9642	Merge remote-tracking branch 'origin/develop' into develop	2017-10-24 14:51:21 +00:00
Jan Kudrik	825e7eb8ab	Translated using Weblate (Czech) ... Currently translated at 56.0% (507 of 905 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/	2017-10-24 14:51:20 +00:00
David Baker	f7dce8ec70	Merge pull request #1528 from matrix-org/luke/groups-settings-privileged-only ... Prevent editing of UI requiring user privilege if user unprivileged	2017-10-24 15:51:16 +01:00
Weblate	dc7037b4fa	Merge remote-tracking branch 'origin/develop' into develop	2017-10-24 14:31:54 +00:00
David Baker	9e54002983	Merge pull request #1526 from matrix-org/luke/fix-group-rooms-guest-can-join- ... Use the correct property of the API room objects	2017-10-24 15:31:49 +01:00
Luke Barnard	459ffc47d6	Prevent editing of UI requiring user privilege if user unprivileged	2017-10-24 15:25:35 +01:00
Weblate	78f1f5bae8	Merge remote-tracking branch 'origin/develop' into develop	2017-10-24 13:40:30 +00:00
David Baker	8447d15013	Don't include the |other in the translation value	2017-10-24 14:26:30 +01:00
Weblate	433d62e48c	Merge remote-tracking branch 'origin/develop' into develop	2017-10-24 12:56:47 +00:00
Luke Barnard	e955d27b5f	Use the correct property of the API room objects	2017-10-24 13:47:10 +01:00
David Baker	f9c45d2c45	Re-run gen-i18n after fixing https://github.com/matrix-org/matrix-react-sdk/pull/1521	2017-10-24 13:40:44 +01:00
Weblate	e9eb4a4647	Merge remote-tracking branch 'origin/develop' into develop	2017-10-24 10:18:07 +00:00
David Baker	ba46faf1b1	Merge pull request #1522 from matrix-org/luke/fix-group-react-warnings ... Fix some react warnings in GroupMemberList	2017-10-24 11:18:03 +01:00
Weblate	7a9908da60	Merge remote-tracking branch 'origin/develop' into develop	2017-10-24 10:05:18 +00:00
David Baker	f29f627c31	Merge pull request #1524 from matrix-org/luke/groups-store-true-global ... Make GroupStoreCache global for cross-package access	2017-10-24 11:05:14 +01:00
Luke Barnard	d1db0d6426	Deduplicate members, key by userId	2017-10-24 10:50:31 +01:00
Weblate	436fc95cdb	Merge remote-tracking branch 'origin/develop' into develop	2017-10-24 09:40:42 +00:00
Tirifto	2e7df425b9	Translated using Weblate (Esperanto) ... Currently translated at 4.5% (41 of 905 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/	2017-10-24 09:40:41 +00:00
Luke Barnard	3ae31dd426	Make GroupStoreCache global for cross-package access	2017-10-24 10:39:47 +01:00
Luke Barnard	e419446081	Add fields needed by RoomDetailList to groupRoomFromApiObject ... and also alter props API for RDL to match the returned rooms. (This doesn't affect RoomDirectory - this does not use RDL (yet))	2017-10-24 10:13:38 +01:00
Luke Barnard	1cc427ba46	Fix some react warnings in GroupMemberList ... - If the list contains two users twice, react would warn about duplicate keys. Use `index` instead. - Check if unmounted before setting state after fetching members.	2017-10-24 09:58:45 +01:00
Richard Lewis	11d4a63a32	Update text and split across multiple lines.	2017-10-23 23:59:36 +01:00
Richard Lewis	8b7f737c97	Remove logging. ... Return early.	2017-10-23 23:47:37 +01:00
Richard Lewis	54bd916862	Split string across multiple lines.	2017-10-23 20:08:52 +01:00
Stefan Parviainen	115772d526	Fix merge conflict ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-23 19:57:52 +02:00
Stefan Parviainen	ef30ba889b	Make MemberEventListSummary more translatable ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-23 19:55:40 +02:00
Richard Lewis	3c4c986aca	Update button text	2017-10-23 18:42:43 +01:00
Weblate	4819379d3e	Merge remote-tracking branch 'origin/develop' into develop	2017-10-23 16:12:22 +00:00
Jan Kudrik	64e998cdf9	Translated using Weblate (Czech) ... Currently translated at 53.9% (488 of 905 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/	2017-10-23 16:12:21 +00:00
Luke Barnard	2f418976aa	Only show flair for groups with avatars set ... Fix vector-im/riot-web#5377	2017-10-23 17:06:47 +01:00
Richard Lewis	ee60155846	Add delete widget confirmation dialog.	2017-10-23 17:05:44 +01:00
Bamstam	d7c9109a66	Translated using Weblate (German) ... Currently translated at 100.0% (905 of 905 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-23 15:45:31 +00:00
Weblate	ee94895f0f	Merge remote-tracking branch 'origin/develop' into develop	2017-10-23 15:25:13 +00:00
Jan Kudrik	015fa776fb	Translated using Weblate (Czech) ... Currently translated at 52.9% (479 of 905 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/	2017-10-23 15:25:12 +00:00
Luke Barnard	b9dc5cb5ed	Merge branch 'develop' into luke/groups-update-on-invite	2017-10-23 16:05:52 +01:00
Luke Barnard	0799e5cde4	Refresh group member lists after inviting users	2017-10-23 16:04:26 +01:00
Weblate	1243428836	Merge remote-tracking branch 'origin/develop' into develop	2017-10-23 14:59:38 +00:00
Luke Barnard	0ff5b9c6a7	Invalidate the user's public groups cache when changing group publicity ... This will make the changes to their Flair "live", but only from the user's own perspective.	2017-10-23 15:28:38 +01:00
Andrey	23dd059a7f	Translated using Weblate (Russian) ... Currently translated at 100.0% (905 of 905 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-10-23 14:02:21 +00:00
Weblate	554114a4e9	Merge remote-tracking branch 'origin/develop' into develop	2017-10-23 13:58:36 +00:00
Luke Barnard	03f4e6c622	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop	2017-10-23 14:57:50 +01:00
Luke Barnard	a133fd1cf4	Fix "failed to create community" message	2017-10-23 14:57:40 +01:00
Weblate	4b09577dc2	Merge remote-tracking branch 'origin/develop' into develop	2017-10-23 13:56:32 +00:00
Matthew Hodgson	440b8e0e31	16px for flair please	2017-10-23 14:56:24 +01:00
Matthew Hodgson	fb96f4fac2	fix typos	2017-10-23 14:55:54 +01:00
Luke Barnard	e89371fb1c	Add click-to-open-settings functionality to GroupAvatar	2017-10-23 14:54:57 +01:00
Andrey	5e134f244b	Translated using Weblate (Russian) ... Currently translated at 100.0% (905 of 905 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-10-23 13:12:32 +00:00
Szimszon	48396e1483	Translated using Weblate (Hungarian) ... Currently translated at 100.0% (905 of 905 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/	2017-10-23 13:12:32 +00:00
Bamstam	39b424bf26	Translated using Weblate (German) ... Currently translated at 100.0% (905 of 905 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-23 13:12:32 +00:00
Jeff Huang	18e50653d7	Translated using Weblate (Chinese (Traditional)) ... Currently translated at 85.7% (776 of 905 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/	2017-10-23 13:12:31 +00:00
Matthew Hodgson	f09fbccc19	WIP	2017-10-23 00:56:15 +01:00
Krombel	eb7d5fb90f	Translated using Weblate (German) ... Currently translated at 100.0% (905 of 905 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-22 12:30:06 +00:00
Rinat	01e5d74be3	Translated using Weblate (Russian) ... Currently translated at 100.0% (905 of 905 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-10-21 19:52:48 +00:00
Andrey	2ee07b6965	Translated using Weblate (Russian) ... Currently translated at 100.0% (905 of 905 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-10-20 19:51:17 +00:00
Walter	e3487fed79	Translated using Weblate (Russian) ... Currently translated at 95.6% (866 of 905 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-10-20 19:21:05 +00:00
Matthew Hodgson	37fd19290f	concept of default theme	2017-10-20 18:42:29 +01:00
Weblate	278b669785	Merge remote-tracking branch 'origin/develop' into develop	2017-10-20 17:16:33 +00:00
Luke Barnard	1a7710c192	Adjust wording on placeholder	2017-10-20 18:10:14 +01:00
Luke Barnard	a0e218d107	Add placeholder to MyGroups page, adjust CSS classes ... - This is part of a general improvement in the look of MyGroups - Wording on "Create a community to..." modified to not have the word "community" twice	2017-10-20 17:38:02 +01:00
Szimszon	f2e12c9edf	Translated using Weblate (Hungarian) ... Currently translated at 100.0% (904 of 904 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/	2017-10-20 16:11:09 +00:00
Bamstam	7c7c9d43fc	Translated using Weblate (German) ... Currently translated at 100.0% (904 of 904 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-20 16:11:09 +00:00
Krombel	43517964a8	Translated using Weblate (German) ... Currently translated at 100.0% (904 of 904 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-20 12:02:29 +00:00
Krombel	4d57140529	Translated using Weblate (German) ... Currently translated at 100.0% (904 of 904 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-20 11:57:51 +00:00
David Baker	00a13c780f	Run prunei18n	2017-10-20 11:39:01 +01:00
Weblate	639820cfc8	Merge remote-tracking branch 'origin/develop' into develop	2017-10-20 10:01:34 +00:00
David Baker	f829012045	Fix creation of DM rooms ... The check on whether a new chat was being started as a DM room got broken, so we weren't using the trusted_private_chat preset or setting the appropriate DM flags. Fixes https://github.com/vector-im/riot-web/issues/5318 and probably https://github.com/vector-im/riot-web/issues/3987	2017-10-20 10:16:51 +01:00
Szimszon	dea6f9ac9e	Translated using Weblate (Hungarian) ... Currently translated at 100.0% (906 of 906 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/	2017-10-20 05:09:45 +00:00
Weblate	81bb81b61b	Merge remote-tracking branch 'origin/develop' into develop	2017-10-19 17:06:42 +00:00
Luke Barnard	a85a011db9	Fix faulty translation in GroupView	2017-10-19 18:06:32 +01:00
Weblate	577f00e589	Merge remote-tracking branch 'origin/develop' into develop	2017-10-19 16:38:00 +00:00
Luke Barnard	d4aac4a69c	Merge pull request #1507 from matrix-org/dbkr/groupid_only_enter_localpart ... Group create dialog: only enter localpart	2017-10-19 17:37:56 +01:00
Weblate	93ae0a26fa	Merge remote-tracking branch 'origin/develop' into develop	2017-10-19 16:35:53 +00:00
Luke Barnard	877f213057	Merge pull request #1509 from matrix-org/luke/groups-my-groups ... Improve MyGroups UI	2017-10-19 17:35:48 +01:00
David Baker	cbb36f4780	Lint	2017-10-19 17:31:06 +01:00
Weblate	1bf295f733	Merge remote-tracking branch 'origin/develop' into develop	2017-10-19 16:28:54 +00:00
Luke Barnard	b0f8619754	Improve MyGroups UI ... as per design layed out by @tur2live!	2017-10-19 17:24:45 +01:00
Szimszon	40c301c400	Translated using Weblate (Hungarian) ... Currently translated at 100.0% (906 of 906 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/	2017-10-19 16:23:16 +00:00
David Baker	b74ad8634b	Use object URLs to load Files in to images ... Fixes https://github.com/vector-im/riot-web/issues/5326	2017-10-19 17:16:52 +01:00
David Baker	b9574ff382	Group create dialog: only enter localpart ... Since we currently can only create groups on the local server anyway, there's no point making the user jump through the hoop of forming the whole group ID and telling them off if they got the server name wrong.	2017-10-19 16:47:43 +01:00
Weblate	43f27e5d9d	Merge remote-tracking branch 'origin/develop' into develop	2017-10-19 15:43:20 +00:00
David Baker	19173ab4d6	Space, man.	2017-10-19 16:31:45 +01:00
David Baker	4abaa93cf0	Add clientside error for non-alphanumeric group ID	2017-10-19 16:28:02 +01:00
Weblate	7c7cf2714b	Merge remote-tracking branch 'origin/develop' into develop	2017-10-19 15:18:36 +00:00
David Baker	21b684381d	Merge pull request #1505 from matrix-org/luke/groups-fix-invites-to-unnamed-groups ... Fix invites to groups without names	2017-10-19 16:18:32 +01:00
Weblate	ca00a64da5	Merge remote-tracking branch 'origin/develop' into develop	2017-10-19 15:03:31 +00:00
David Baker	9141ba280a	Lint	2017-10-19 15:55:57 +01:00
Luke Barnard	ea1dbe1f76	Fix invites to groups without names	2017-10-19 15:47:52 +01:00
David Baker	f98fe7fa87	Add warning when adding group rooms/users	2017-10-19 15:37:35 +01:00
Weblate	284b8803c0	Merge remote-tracking branch 'origin/develop' into develop	2017-10-19 14:07:45 +00:00
Bamstam	388218be6e	Translated using Weblate (German) ... Currently translated at 97.5% (883 of 905 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-19 14:07:44 +00:00
Luke Barnard	2be0ebdd1d	More Groups->Communities	2017-10-19 15:01:16 +01:00
Weblate	28c4e80870	Merge remote-tracking branch 'origin/develop' into develop	2017-10-19 11:16:19 +00:00
Luke Barnard	fd65cb1396	Merge pull request #1501 from matrix-org/luke/groups-are-communities ... Groups -> Communities	2017-10-19 12:16:15 +01:00
Weblate	9d40e1ad46	Merge remote-tracking branch 'origin/develop' into develop	2017-10-19 11:05:10 +00:00
Luke Barnard	bafa2c6be0	Fix typo	2017-10-19 12:03:59 +01:00
Luke Barnard	25d14af616	Export a global.singletonFlairStore to allow cross-project singleton	2017-10-19 12:00:03 +01:00
Luke Barnard	c3f143acc3	Merge branch 'develop' into luke/groups-are-communities	2017-10-19 11:31:00 +01:00
Luke Barnard	2db0eab5c5	s/Groups/Communities	2017-10-19 11:29:03 +01:00
Bamstam	b1a59d73fd	Translated using Weblate (German) ... Currently translated at 100.0% (901 of 901 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-19 10:18:33 +00:00
Luke Barnard	71443e9b94	Remove logs comments	2017-10-19 10:34:24 +01:00
Luke Barnard	5f3c06b38a	Factor out Flair cache into FlairStore ... This will make invalidating the userGroups cache for the user architecturally more sound (the plan is to have GroupStore hit FlairStore as opposed to Flair itself in order to invalidate the cache).	2017-10-19 10:28:59 +01:00
Krombel	99520779e8	Translated using Weblate (German) ... Currently translated at 100.0% (901 of 901 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-19 08:29:51 +00:00
Weblate	2d3885b146	Merge remote-tracking branch 'origin/develop' into develop	2017-10-19 08:20:31 +00:00
Andrey	9180508bf8	Translated using Weblate (Russian) ... Currently translated at 100.0% (901 of 901 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-10-19 08:20:31 +00:00
Matthew Hodgson	7fe8c9cb01	fix lint	2017-10-19 01:48:49 +02:00
Matthew Hodgson	1087b36597	fix editing visuals on groupview header	2017-10-18 17:49:49 +01:00
Andrey	2781a04eca	Translated using Weblate (Russian) ... Currently translated at 100.0% (901 of 901 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2017-10-18 16:37:13 +00:00
Luke Barnard	a40704f085	Merge branch 'develop' into luke/groups-are-communities	2017-10-18 15:57:37 +01:00
Weblate	0ba409a715	Merge remote-tracking branch 'origin/develop' into develop	2017-10-18 14:54:26 +00:00
Krombel	653d5c7365	Translated using Weblate (German) ... Currently translated at 99.6% (926 of 929 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/	2017-10-18 14:54:25 +00:00
David Baker	12d6722265	Re-run the fun	2017-10-18 15:48:33 +01:00
David Baker	474b0c96ad	Merge pull request #1495 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk ... Update from Weblate.	2017-10-18 15:19:24 +01:00