Commit Graph

6710 Commits (ae61b66f10b69d44b1cf9a260484e15a34749f1b)

Author SHA1 Message Date
Peter Vágner f033ada5a3 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-18 12:00:13 +00:00
Walter ca5ffb2029 Translated using Weblate (Russian)
Currently translated at 99.4% (927 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-18 09:05:40 +00:00
Travis Ralston 28ff0a4ee7 Disable presence controls if there's no presence
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-17 22:25:15 -07:00
Travis Ralston d010329f4a Make the room-level URL preview notification explicit
Fixes https://github.com/vector-im/riot-web/issues/5638

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-17 22:03:06 -07:00
Travis Ralston cdf5a6fb8a Fix typo that prevented URL previews on a room-account level from being saved
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-17 22:02:33 -07:00
Weblate 81bdb9c8ff Merge remote-tracking branch 'origin/develop' into develop 2017-11-17 17:48:52 +00:00
David Baker 1675737e7d Merge remote-tracking branch 'origin/master' into develop 2017-11-17 17:48:42 +00:00
David Baker 6d23182f5f Fix the force TURN option
The call object is created within the js-sdk for inbound calls, so
we never got the chance to set it.
2017-11-17 14:54:44 +00:00
Weblate ef2f13e45c Merge remote-tracking branch 'origin/develop' into develop 2017-11-17 14:51:07 +00:00
Andrey 1c8b306151 Translated using Weblate (Russian)
Currently translated at 98.8% (921 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-17 14:51:07 +00:00
Brenno Martins 979d1194db Translated using Weblate (Portuguese (Brazil))
Currently translated at 71.3% (665 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2017-11-17 14:51:07 +00:00
Bamstam c60c4c3463 Translated using Weblate (German)
Currently translated at 99.6% (929 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-17 14:51:06 +00:00
Kévin C ee5d43385c 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-17 14:51:06 +00:00
Stefan Parviainen 4de4b5206b Translated using Weblate (Finnish)
Currently translated at 89.0% (830 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2017-11-17 14:51:06 +00:00
Richard van der Hoff 4e7fd55fb4 MemberPresenceAvatar: fix null references
avoid assuming that `member` has a `user`
2017-11-17 14:35:33 +00:00
Richard van der Hoff c48994e981 Flairstore: Fix broken reference 2017-11-17 13:56:56 +00:00
Stefan Parviainen 8090aadb0e Add aria-labels to ActionButtons
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-17 14:33:39 +01:00
Walter 99bb64915f Translated using Weblate (Russian)
Currently translated at 98.8% (921 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-17 09:03:26 +00:00
Stefan Parviainen 414ee82582 Perform substitution on all parts, not just the last one
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>

This way the substitutions don't need to appear in the same order in the
translated string.
2017-11-17 08:47:31 +01:00
Travis Ralston 33a3b07d88 Pull the theme through the default process
This is to ensure the `config` level is respected.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-16 20:52:12 -07:00
Stefan Parviainen bceb11cde9 Translated using Weblate (Finnish)
Currently translated at 89.0% (830 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2017-11-16 20:23:47 +00:00
Szimszon c025d50400 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-16 19:44:04 +00:00
Stefan Parviainen df921438f3 Make PresenceLabel more easily translatable
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-16 18:36:54 +01:00
Weblate c87198b69f Merge remote-tracking branch 'origin/develop' into develop 2017-11-16 15:35:21 +00:00
David Baker 02629d13d9
Merge pull request #1615 from matrix-org/luke/fix-sender-profile-opacity
Do something more sensible for sender profile name/aux opacity
2017-11-16 15:35:16 +00:00
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
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
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
Richard Lewis 750e64deee Pass required props to TintableSvg. 2017-11-15 15:17: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
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
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
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
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
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