From f39f2e525b0cee79d9ddfb07d43b6e05a9c65fe5 Mon Sep 17 00:00:00 2001 From: Richard Lewis Date: Fri, 25 Aug 2017 09:52:44 +0100 Subject: [PATCH 001/224] Update parallelshell version. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cc352cb8db..2dc72386df 100644 --- a/package.json +++ b/package.json @@ -114,7 +114,7 @@ "karma-webpack": "^1.7.0", "matrix-react-test-utils": "^0.1.1", "mocha": "^2.4.5", - "parallelshell": "^1.2.0", + "parallelshell": "^3.0.1", "react-addons-test-utils": "^15.4.0", "require-json": "0.0.1", "rimraf": "^2.4.3", From c046f4bf36e2f603f22e010cdfad746e8f09e250 Mon Sep 17 00:00:00 2001 From: Richard Lewis Date: Fri, 25 Aug 2017 09:53:40 +0100 Subject: [PATCH 002/224] Ignore package-lock.json --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index f828c37393..14e9b0c846 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,6 @@ npm-debug.log /src/component-index.js .DS_Store + +package-lock.json + From a0b3b29b6835122a33074e3daf930ff08769eae3 Mon Sep 17 00:00:00 2001 From: Osoitz Date: Thu, 12 Oct 2017 17:17:07 +0000 Subject: [PATCH 003/224] Translated using Weblate (Basque) Currently translated at 92.4% (846 of 915 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/ --- src/i18n/strings/eu.json | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json index fcad984ff5..234e888f7c 100644 --- a/src/i18n/strings/eu.json +++ b/src/i18n/strings/eu.json @@ -825,5 +825,27 @@ "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(fullYear)sko %(monthName)sk %(day)s", "Copied!": "Kopiatuta!", "Failed to copy": "Kopiak huts egin du", - "Cancel": "Utzi" + "Cancel": "Utzi", + "Advanced options": "Aukera aurreratuak", + "Block users on other matrix homeservers from joining this room": "Eragotzi beste matrix hasiera-zerbitzarietako erabiltzaileak gela honetara elkartzea", + "This setting cannot be changed later!": "Ezarpen hau ezin da gero aldatu!", + "Ignored Users": "Ezikusitako erabiltzaileak", + "Ignore": "Ezikusi", + "Unignore": "Ez ezikusi", + "User Options": "Erabiltzaile-aukerak", + "You are now ignoring %(userId)s": "%(userId)s ezikusten ari zara", + "You are no longer ignoring %(userId)s": "Ez zaude jada %(userId)s ezikusten", + "Unignored user": "Ez ezikusitako erabiltzailea", + "Ignored user": "Ezikusitako erabiltzailea", + "Stops ignoring a user, showing their messages going forward": "Utzi erabiltzailea ezikusteari, erakutsi bere mezuak", + "Ignores a user, hiding their messages from you": "Ezikusi erabiltzailea, ezkutatu bere mezuak zuretzat", + "Disable Emoji suggestions while typing": "Desgaitu Emoji proposamenak idaztean", + "Banned by %(displayName)s": "%(displayName)s erabiltzaileak debekatuta", + "Message removed by %(userId)s": "%(userId)s erabiltzaileak kendu du mezua", + "To send messages, you must be a": "Mezuak bidaltzeko hau izan behar zara:", + "To invite users into the room, you must be a": "Erabiltzaileak gonbidatzeko hau izan behar zara:", + "To configure the room, you must be a": "Gela konfiguratzeko hau izan behar zara:", + "To kick users, you must be a": "Erabiltzaileak kanporatzeko hau izan behar zara:", + "To ban users, you must be a": "Erabiltzaileak debekatzeko hau izan behar zara:", + "To remove other users' messages, you must be a": "Beste erabiltzaileen mezuak kentzeko hau izan behar zara:" } From 915c15b4544a1a08ab340cd0ed0797fd87500479 Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 12 Oct 2017 17:37:48 +0000 Subject: [PATCH 004/224] Translated using Weblate (Russian) Currently translated at 91.4% (837 of 915 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/ --- src/i18n/strings/ru.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index ab09fd1700..e233b02f5b 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -877,5 +877,17 @@ "%(weekDayName)s, %(monthName)s %(day)s": "%(weekDayName)s, %(monthName)s %(day)s", "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s", "Copied!": "Скопировано!", - "Failed to copy": "Не удалось скопировать" + "Failed to copy": "Не удалось скопировать", + "Advanced options": "Дополнительные параметры", + "Block users on other matrix homeservers from joining this room": "Блокировать пользователей, входящих в эту комнату с других серверов matrix", + "This setting cannot be changed later!": "Этот параметр нельзя изменить позднее!", + "Ignored Users": "Игнорируемые пользователи", + "Ignore": "Игнорировать", + "Unignore": "Перестать игнорировать", + "User Options": "Параметры пользователя", + "You are now ignoring %(userId)s": "Теперь вы игнорируете %(userId)s", + "You are no longer ignoring %(userId)s": "Вы больше не игнорируете %(userId)s", + "Unignored user": "Неигнорируемый пользователь", + "Ignored user": "Игнорируемый пользователь", + "Stops ignoring a user, showing their messages going forward": "Прекращает игнорирование пользователя, показывая их будущие сообщения" } From 1f44233e05d2a9ef1bf00c51004f0d395b9f9fb3 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Thu, 12 Oct 2017 21:24:45 +0200 Subject: [PATCH 005/224] Better translations in RoomList.js Signed-off-by: Stefan Parviainen --- src/components/views/rooms/RoomList.js | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js index da77174dff..56589353f9 100644 --- a/src/components/views/rooms/RoomList.js +++ b/src/components/views/rooms/RoomList.js @@ -34,27 +34,18 @@ const Receipt = require('../../../utils/Receipt'); const HIDE_CONFERENCE_CHANS = true; function phraseForSection(section) { - // These would probably be better as individual strings, - // but for some reason we have translations for these strings - // as-is, so keeping it like this for now. - let verb; switch (section) { case 'm.favourite': - verb = _t('to favourite'); - break; + return _t('Drop here to favourite'); case 'im.vector.fake.direct': - verb = _t('to tag direct chat'); - break; + return _t('Drop here to tag direct chat'); case 'im.vector.fake.recent': - verb = _t('to restore'); - break; + return _t('Drop here to restore'); case 'm.lowpriority': - verb = _t('to demote'); - break; + return _t('Drop here to demote'); default: return _t('Drop here to tag %(section)s', {section: section}); } - return _t('Drop here %(toAction)s', {toAction: verb}); } module.exports = React.createClass({ From 9495ccdbb53f8bf7e30388cdb39b61fe6b2dadb2 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Thu, 12 Oct 2017 21:37:12 +0200 Subject: [PATCH 006/224] Don't hardcode ConfirmUserActionDialog title Signed-off-by: Stefan Parviainen --- src/components/views/dialogs/ConfirmUserActionDialog.js | 4 ++-- src/components/views/groups/GroupMemberInfo.js | 1 + src/components/views/rooms/MemberInfo.js | 5 +++-- src/components/views/rooms/RoomSettings.js | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/components/views/dialogs/ConfirmUserActionDialog.js b/src/components/views/dialogs/ConfirmUserActionDialog.js index 9091d8975e..64e25df5f1 100644 --- a/src/components/views/dialogs/ConfirmUserActionDialog.js +++ b/src/components/views/dialogs/ConfirmUserActionDialog.js @@ -36,6 +36,7 @@ export default React.createClass({ // group member object. Supply either this or 'member' groupMember: GroupMemberType, action: React.PropTypes.string.isRequired, // eg. 'Ban' + title: React.PropTypes.string.isRequired, // eg. 'Ban this user?' // Whether to display a text field for a reason // If true, the second argument to onFinished will @@ -75,7 +76,6 @@ export default React.createClass({ const MemberAvatar = sdk.getComponent("views.avatars.MemberAvatar"); const BaseAvatar = sdk.getComponent("views.avatars.BaseAvatar"); - const title = _t("%(actionVerb)s this person?", { actionVerb: this.props.action}); const confirmButtonClass = classnames({ 'mx_Dialog_primary': true, 'danger': this.props.danger, @@ -113,7 +113,7 @@ export default React.createClass({ return (
diff --git a/src/components/views/groups/GroupMemberInfo.js b/src/components/views/groups/GroupMemberInfo.js index 6f1a370f26..aca2b1b222 100644 --- a/src/components/views/groups/GroupMemberInfo.js +++ b/src/components/views/groups/GroupMemberInfo.js @@ -69,6 +69,7 @@ module.exports = withMatrixClient(React.createClass({ Modal.createDialog(ConfirmUserActionDialog, { groupMember: this.props.groupMember, action: _t('Remove from group'), + title: _t('Remove this user from group?'), danger: true, onFinished: (proceed) => { if (!proceed) return; diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js index 856d3ebad4..180db1d5dd 100644 --- a/src/components/views/rooms/MemberInfo.js +++ b/src/components/views/rooms/MemberInfo.js @@ -247,11 +247,11 @@ module.exports = withMatrixClient(React.createClass({ onKick: function() { const membership = this.props.member.membership; - const kickLabel = membership === "invite" ? _t("Disinvite") : _t("Kick"); const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog"); Modal.createTrackedDialog('Confirm User Action Dialog', 'onKick', ConfirmUserActionDialog, { member: this.props.member, - action: kickLabel, + action: membership === "invite" ? _t("Disinvite") : _t("Kick"), + title: membership === "invite" ? _t("Disinvite this user?") : _t("Kick this user?"), askReason: membership == "join", danger: true, onFinished: (proceed, reason) => { @@ -285,6 +285,7 @@ module.exports = withMatrixClient(React.createClass({ Modal.createTrackedDialog('Confirm User Action Dialog', 'onBanOrUnban', ConfirmUserActionDialog, { member: this.props.member, action: this.props.member.membership == 'ban' ? _t("Unban") : _t("Ban"), + title: this.props.member.membership == 'ban' ? _t("Unban this user?") : _t("Ban this user?"), askReason: this.props.member.membership != 'ban', danger: this.props.member.membership != 'ban', onFinished: (proceed, reason) => { diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js index 9934456597..b1a2f41cec 100644 --- a/src/components/views/rooms/RoomSettings.js +++ b/src/components/views/rooms/RoomSettings.js @@ -72,6 +72,7 @@ const BannedUser = React.createClass({ Modal.createTrackedDialog('Confirm User Action Dialog', 'onUnbanClick', ConfirmUserActionDialog, { member: this.props.member, action: _t('Unban'), + title: _t('Unban this user?'), danger: false, onFinished: (proceed) => { if (!proceed) return; From 264fe81f206150dc661aa9bb16e13ecf58cc9cbf Mon Sep 17 00:00:00 2001 From: Bamstam Date: Thu, 12 Oct 2017 23:32:59 +0000 Subject: [PATCH 007/224] Translated using Weblate (German) Currently translated at 93.1% (852 of 915 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/ --- src/i18n/strings/de_DE.json | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 63f21e80a1..9e1c7bbb13 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -899,5 +899,32 @@ "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s", "%(weekDayName)s, %(monthName)s %(day)s": "%(weekDayName)s, %(day)s %(monthName)s", "Copied!": "Kopiert!", - "Failed to copy": "Kopieren fehlgeschlagen" + "Failed to copy": "Kopieren fehlgeschlagen", + "Ignored Users": "Ignorierte Benutzer", + "Ignore": "Ignorieren", + "You are now ignoring %(userId)s": "%(userId)s wird jetzt ignoriert", + "You are no longer ignoring %(userId)s": "%(userId)s wird nicht mehr ignoriert", + "Message removed by %(userId)s": "Nachricht wurde von %(userId)s entfernt", + "Filter group members": "Gruppen-Mitglieder filtern", + "Filter group rooms": "Gruppen-Räume filtern", + "Remove from group": "Aus der Gruppe entfernen", + "Invite new group members": "Neue Gruppen-Mitglieder einladen", + "Who would you like to add to this group?": "Wen möchtest Du zu dieser Gruppe hinzufügen?", + "Name or matrix ID": "Name oder Matrix-ID", + "Unable to leave room": "Verlassen des Raumes fehlgeschlagen", + "%(inviter)s has invited you to join this group": "%(inviter)s hat dich eingeladen, dieser Gruppe beizutreten", + "You are a member of this group": "Du bist ein Mitglied dieser Gruppe", + "Leave": "Verlassen", + "Failed to invite the following users to %(groupId)s:": "Die folgenden Benutzer konnten nicht in die Gruppe %(groupId)s eingeladen werden:", + "Leave Group": "Gruppe verlassen", + "Leave %(groupName)s?": "%(groupName)s verlassen?", + "Add a Room": "Raum hinzufügen", + "Add a User": "Benutzer hinzufügen", + "You are an administrator of this group": "Du bist ein Administrator in dieser Gruppe", + "Light theme": "Light-Theme", + "Dark theme": "Dark-Theme", + "You have entered an invalid address.": "Du hast eine ungültige Adresse eingegeben.", + "Matrix ID": "Matrix-ID", + "This group is not published on your profile": "Diese Gruppe wird nicht in deinem Profil angezeigt", + "Which rooms would you like to add to this group?": "Welche Räume möchtest du zu dieser Gruppe hinzufügen?" } From ead0b5d43f1c98637eeed0f03bd53b0d394b6ca2 Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 12 Oct 2017 18:03:26 +0000 Subject: [PATCH 008/224] Translated using Weblate (Russian) Currently translated at 92.8% (850 of 915 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/ --- src/i18n/strings/ru.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index e233b02f5b..13fd06dc6b 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -889,5 +889,18 @@ "You are no longer ignoring %(userId)s": "Вы больше не игнорируете %(userId)s", "Unignored user": "Неигнорируемый пользователь", "Ignored user": "Игнорируемый пользователь", - "Stops ignoring a user, showing their messages going forward": "Прекращает игнорирование пользователя, показывая их будущие сообщения" + "Stops ignoring a user, showing their messages going forward": "Прекращает игнорирование пользователя, показывая их будущие сообщения", + "Ignores a user, hiding their messages from you": "Игнорирует пользователя, скрывая сообщения от вас", + "Disable Emoji suggestions while typing": "Отключить предложения Emoji при наборе текста", + "Banned by %(displayName)s": "Запрещено %(displayName)s", + "Message removed by %(userId)s": "Сообщение удалено %(userId)s", + "To send messages, you must be a": "Для отправки сообщений необходимо быть", + "To invite users into the room, you must be a": "Чтобы пригласить пользователей в комнату, необходимо быть", + "To configure the room, you must be a": "Чтобы настроить комнату, необходимо быть", + "To kick users, you must be a": "Чтобы выкидывать пользователей, необходимо быть", + "To ban users, you must be a": "Чтобы банить пользователей, необходимо быть", + "To remove other users' messages, you must be a": "Чтобы удалять сообщения других пользователей, необходимо быть", + "To send events of type , you must be a": "Для отправки событий типа , необходимо быть", + "To change the room's avatar, you must be a": "Чтобы изменить аватар комнаты, необходимо быть", + "To change the room's name, you must be a": "Чтобы изменить имя комнаты, необходимо быть" } From 289fc230feba274d96e6f390c5e5a90aef7797a0 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 13 Oct 2017 11:05:58 +0100 Subject: [PATCH 009/224] js-sdk rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e185a9027d..d89f29e958 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "isomorphic-fetch": "^2.2.1", "linkifyjs": "^2.1.3", "lodash": "^4.13.1", - "matrix-js-sdk": "0.8.4", + "matrix-js-sdk": "0.8.5-rc.1", "optimist": "^0.6.1", "prop-types": "^15.5.8", "react": "^15.4.0", From 5fe48e44a031a3c127d8b0f30cc3e8d22b99254b Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 13 Oct 2017 11:10:21 +0100 Subject: [PATCH 010/224] Prepare changelog for v0.10.7-rc.1 --- CHANGELOG.md | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 97523e9189..0d29fbc7a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,136 @@ +Changes in [0.10.7-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.10.7-rc.1) (2017-10-13) +=============================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.10.6...v0.10.7-rc.1) + + * Add warm fuzzy dialog for inviting users to a group + [\#1459](https://github.com/matrix-org/matrix-react-sdk/pull/1459) + * enable/disable features in config.json + [\#1468](https://github.com/matrix-org/matrix-react-sdk/pull/1468) + * Update from Weblate. + [\#1469](https://github.com/matrix-org/matrix-react-sdk/pull/1469) + * Don't send RR or RM when peeking at a room + [\#1463](https://github.com/matrix-org/matrix-react-sdk/pull/1463) + * Fix bug that inserted emoji when typing + [\#1467](https://github.com/matrix-org/matrix-react-sdk/pull/1467) + * Ignore VS16 char in RTE + [\#1458](https://github.com/matrix-org/matrix-react-sdk/pull/1458) + * Show failures when sending messages + [\#1460](https://github.com/matrix-org/matrix-react-sdk/pull/1460) + * Run eslint --fix + [\#1461](https://github.com/matrix-org/matrix-react-sdk/pull/1461) + * Show who banned the user on hover + [\#1441](https://github.com/matrix-org/matrix-react-sdk/pull/1441) + * Enhancements to room power level settings + [\#1440](https://github.com/matrix-org/matrix-react-sdk/pull/1440) + * Added TextInputWithCheckbox dialog + [\#868](https://github.com/matrix-org/matrix-react-sdk/pull/868) + * Make it clearer which HS you're logging into + [\#1456](https://github.com/matrix-org/matrix-react-sdk/pull/1456) + * Remove redundant stale onKeyDown + [\#1451](https://github.com/matrix-org/matrix-react-sdk/pull/1451) + * Only allow event state event handlers on state events + [\#1453](https://github.com/matrix-org/matrix-react-sdk/pull/1453) + * Modify the group store to include group rooms + [\#1452](https://github.com/matrix-org/matrix-react-sdk/pull/1452) + * Factor-out GroupStore and create GroupStoreCache + [\#1449](https://github.com/matrix-org/matrix-react-sdk/pull/1449) + * Put related groups UI behind groups labs flag + [\#1448](https://github.com/matrix-org/matrix-react-sdk/pull/1448) + * Restrict Flair in the timeline to related groups of the room + [\#1447](https://github.com/matrix-org/matrix-react-sdk/pull/1447) + * Implement UI for editing related groups of a room + [\#1446](https://github.com/matrix-org/matrix-react-sdk/pull/1446) + * Fix a couple of bugs with EditableItemList + [\#1445](https://github.com/matrix-org/matrix-react-sdk/pull/1445) + * Factor out EditableItemList from AliasSettings + [\#1444](https://github.com/matrix-org/matrix-react-sdk/pull/1444) + * Add dummy translation function to mark translatable strings + [\#1421](https://github.com/matrix-org/matrix-react-sdk/pull/1421) + * Implement button to remove a room from a group + [\#1438](https://github.com/matrix-org/matrix-react-sdk/pull/1438) + * Fix showing 3pid invites in member list + [\#1443](https://github.com/matrix-org/matrix-react-sdk/pull/1443) + * Add button to get to MyGroups (view_my_groups or path #/groups) + [\#1435](https://github.com/matrix-org/matrix-react-sdk/pull/1435) + * Add eslint rule to disallow spaces inside of curly braces + [\#1436](https://github.com/matrix-org/matrix-react-sdk/pull/1436) + * Fix ability to invite existing mx users + [\#1437](https://github.com/matrix-org/matrix-react-sdk/pull/1437) + * Construct address picker message using provided `validAddressTypes` + [\#1434](https://github.com/matrix-org/matrix-react-sdk/pull/1434) + * Fix GroupView summary rooms displaying without avatars + [\#1433](https://github.com/matrix-org/matrix-react-sdk/pull/1433) + * Implement adding rooms to a group (or group summary) by room ID + [\#1432](https://github.com/matrix-org/matrix-react-sdk/pull/1432) + * Give flair avatars a tooltip = the group ID + [\#1431](https://github.com/matrix-org/matrix-react-sdk/pull/1431) + * Fix ability to feature self in a group summary + [\#1430](https://github.com/matrix-org/matrix-react-sdk/pull/1430) + * Implement "Add room to group" feature + [\#1429](https://github.com/matrix-org/matrix-react-sdk/pull/1429) + * Fix group membership publicity + [\#1428](https://github.com/matrix-org/matrix-react-sdk/pull/1428) + * Add support for Jitsi screensharing in electron app + [\#1355](https://github.com/matrix-org/matrix-react-sdk/pull/1355) + * Delint and DRY TextForEvent + [\#1424](https://github.com/matrix-org/matrix-react-sdk/pull/1424) + * Bust the flair caches after 30mins + [\#1427](https://github.com/matrix-org/matrix-react-sdk/pull/1427) + * Show displayname / avatar in group member info + [\#1426](https://github.com/matrix-org/matrix-react-sdk/pull/1426) + * Create GroupSummaryStore for storing group summary stuff + [\#1418](https://github.com/matrix-org/matrix-react-sdk/pull/1418) + * Add status & toggle for publicity + [\#1419](https://github.com/matrix-org/matrix-react-sdk/pull/1419) + * MemberList: show 100 more on overflow tile click + [\#1417](https://github.com/matrix-org/matrix-react-sdk/pull/1417) + * Fix NPE in MemberList + [\#1425](https://github.com/matrix-org/matrix-react-sdk/pull/1425) + * Fix incorrect variable in string + [\#1422](https://github.com/matrix-org/matrix-react-sdk/pull/1422) + * apply i18n _t to string which has already been translated + [\#1420](https://github.com/matrix-org/matrix-react-sdk/pull/1420) + * Make the invite section a truncatedlist too + [\#1416](https://github.com/matrix-org/matrix-react-sdk/pull/1416) + * Implement removal function of features users/rooms + [\#1415](https://github.com/matrix-org/matrix-react-sdk/pull/1415) + * Allow TruncatedList to get children via a callback + [\#1412](https://github.com/matrix-org/matrix-react-sdk/pull/1412) + * Experimental: Lazy load user autocomplete entries + [\#1413](https://github.com/matrix-org/matrix-react-sdk/pull/1413) + * Show displayname & avatar url in group member list + [\#1414](https://github.com/matrix-org/matrix-react-sdk/pull/1414) + * De-lint TruncatedList + [\#1411](https://github.com/matrix-org/matrix-react-sdk/pull/1411) + * Remove unneeded strings + [\#1409](https://github.com/matrix-org/matrix-react-sdk/pull/1409) + * Clean on prerelease + [\#1410](https://github.com/matrix-org/matrix-react-sdk/pull/1410) + * Redesign membership section in GroupView + [\#1408](https://github.com/matrix-org/matrix-react-sdk/pull/1408) + * Implement adding rooms to the group summary + [\#1406](https://github.com/matrix-org/matrix-react-sdk/pull/1406) + * Honour the is_privileged flag in GroupView + [\#1407](https://github.com/matrix-org/matrix-react-sdk/pull/1407) + * Update when a group arrives + [\#1405](https://github.com/matrix-org/matrix-react-sdk/pull/1405) + * Implement `view_group` dispatch when clicking flair + [\#1404](https://github.com/matrix-org/matrix-react-sdk/pull/1404) + * GroupView: Add a User + [\#1402](https://github.com/matrix-org/matrix-react-sdk/pull/1402) + * Track action button click event + [\#1403](https://github.com/matrix-org/matrix-react-sdk/pull/1403) + * Separate sender profile into elements with classes + [\#1401](https://github.com/matrix-org/matrix-react-sdk/pull/1401) + * Fix ugly integration button, use hover to show error + [\#1399](https://github.com/matrix-org/matrix-react-sdk/pull/1399) + * Fix promise error in flair + [\#1400](https://github.com/matrix-org/matrix-react-sdk/pull/1400) + * Flair! + [\#1351](https://github.com/matrix-org/matrix-react-sdk/pull/1351) + * Group Membership UI + [\#1328](https://github.com/matrix-org/matrix-react-sdk/pull/1328) + Changes in [0.10.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.10.6) (2017-09-21) ===================================================================================================== [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.10.5...v0.10.6) From 9036f786e71954de72d7cd2bac8129750b38ca9a Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 13 Oct 2017 11:10:21 +0100 Subject: [PATCH 011/224] v0.10.7-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d89f29e958..672fca4060 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "0.10.6", + "version": "0.10.7-rc.1", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { From e9cc088f7b35d5e43338bb4cad58a38e48c7a64c Mon Sep 17 00:00:00 2001 From: Bamstam Date: Fri, 13 Oct 2017 10:25:53 +0000 Subject: [PATCH 012/224] Translated using Weblate (German) Currently translated at 92.9% (852 of 917 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/ --- src/i18n/strings/de_DE.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 9e1c7bbb13..0fff224b41 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -336,7 +336,7 @@ "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s hat den Anzeigenamen von \"%(oldDisplayName)s\" auf \"%(displayName)s\" geändert.", "%(senderName)s changed their profile picture.": "%(senderName)s hat das Profilbild geändert.", "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s hat das Berechtigungslevel von %(powerLevelDiffText)s geändert.", - "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s änderte den Raumnamen zu %(roomName)s.", + "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s hat den Raumnamen geändert zu %(roomName)s.", "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s hat das Thema geändert in \"%(topic)s\".", "/ddg is not a command": "/ddg ist kein Kommando", "%(senderName)s ended the call.": "%(senderName)s hat den Anruf beendet.", @@ -350,7 +350,7 @@ "%(targetName)s left the room.": "%(targetName)s hat den Raum verlassen.", "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für alle Raum-Mitglieder (ab dem Zeitpunkt, an dem sie eingeladen wurden).", "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für alle Raum-Mitglieder (ab dem Zeitpunkt, an dem sie beigetreten sind).", - "%(senderName)s made future room history visible to all room members.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für Alle Raum-Mitglieder.", + "%(senderName)s made future room history visible to all room members.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für alle Raum-Mitglieder.", "%(senderName)s made future room history visible to anyone.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für Jeder.", "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für unbekannt (%(visibility)s).", "Missing room_id in request": "Fehlende room_id in Anfrage", From a9831f342ff43407433e07f3624ba9f1278b2906 Mon Sep 17 00:00:00 2001 From: Krombel Date: Fri, 13 Oct 2017 10:53:25 +0000 Subject: [PATCH 013/224] Translated using Weblate (German) Currently translated at 93.4% (857 of 917 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/ --- src/i18n/strings/de_DE.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 0fff224b41..b73f79a3de 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -926,5 +926,10 @@ "You have entered an invalid address.": "Du hast eine ungültige Adresse eingegeben.", "Matrix ID": "Matrix-ID", "This group is not published on your profile": "Diese Gruppe wird nicht in deinem Profil angezeigt", - "Which rooms would you like to add to this group?": "Welche Räume möchtest du zu dieser Gruppe hinzufügen?" + "Which rooms would you like to add to this group?": "Welche Räume möchtest du zu dieser Gruppe hinzufügen?", + "Advanced options": "Erweiterte Optionen", + "Block users on other matrix homeservers from joining this room": "Blockiere Nutzer anderer Matrix-Heimserver die diesen Raum betreten wollen", + "This setting cannot be changed later!": "Diese Einstellung kann nicht nachträglich geändert werden!", + "Unignore": "Entignorieren", + "User Options": "Benutzer-Optionen" } From 8405ec327e38a20db4e725f662e42e77d76146d3 Mon Sep 17 00:00:00 2001 From: Krombel Date: Fri, 13 Oct 2017 11:49:00 +0000 Subject: [PATCH 014/224] Translated using Weblate (German) Currently translated at 99.8% (916 of 917 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/ --- src/i18n/strings/de_DE.json | 65 +++++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 3 deletions(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index b73f79a3de..7cd7060429 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -921,8 +921,8 @@ "Add a Room": "Raum hinzufügen", "Add a User": "Benutzer hinzufügen", "You are an administrator of this group": "Du bist ein Administrator in dieser Gruppe", - "Light theme": "Light-Theme", - "Dark theme": "Dark-Theme", + "Light theme": "Helles Thema", + "Dark theme": "Dunkles Thema", "You have entered an invalid address.": "Du hast eine ungültige Adresse eingegeben.", "Matrix ID": "Matrix-ID", "This group is not published on your profile": "Diese Gruppe wird nicht in deinem Profil angezeigt", @@ -931,5 +931,64 @@ "Block users on other matrix homeservers from joining this room": "Blockiere Nutzer anderer Matrix-Heimserver die diesen Raum betreten wollen", "This setting cannot be changed later!": "Diese Einstellung kann nicht nachträglich geändert werden!", "Unignore": "Entignorieren", - "User Options": "Benutzer-Optionen" + "User Options": "Benutzer-Optionen", + "Unignored user": "Benutzer entignoriert", + "Ignored user": "Benutzer ignoriert", + "Stops ignoring a user, showing their messages going forward": "Stoppt das Ignorieren eines Benutzers, nachfolgende Nachrichten werden angezeigt", + "Ignores a user, hiding their messages from you": "Ignoriert einen Benutzer, verbirgt ihre Nachrichten vor dir", + "Disable Emoji suggestions while typing": "Deaktiviere Emoji-Vorschläge während des Tippens", + "Banned by %(displayName)s": "Gebannt von %(displayName)s", + "To send messages, you must be a": "Um Nachrichten zu senden musst du sein ein", + "To invite users into the room, you must be a": "Um Benutzer in diesen Raum einzuladen, musst du sein ein", + "To configure the room, you must be a": "Um diesen Raum zu konfigurieren, musst du sein ein", + "To kick users, you must be a": "Um Benutzer zu kicken, musst du sein ein", + "To ban users, you must be a": "Um einen Benutzer zu bannen, musst du sein ein", + "To remove other users' messages, you must be a": "Um Nachrichten von Benutzern zu löschen, musst du sein ein", + "To send events of type , you must be a": "Um Ereignisse desTyps zu senden, musst du sein ein", + "To change the room's avatar, you must be a": "Um das Raumbild zu ändern, musst du sein ein", + "To change the room's name, you must be a": "Um den Raumnamen zu ändern, musst du sein ein", + "To change the room's main address, you must be a": "Um die Hauptadresse des Raumes zu ändern, musst du sein ein", + "To change the room's history visibility, you must be a": "Um die Sichtbarkeit der Raum-Historie zu ändern, musst du sein ein", + "To change the permissions in the room, you must be a": "Um Berechtigungen in diesem Raum zu ändern, musst du sein ein", + "To change the topic, you must be a": "Um das Thema zu ändern, musst du sein ein", + "To modify widgets in the room, you must be a": "Um Widgets in dem Raum zu ändern, musst du sein ein", + "Description": "Beschreibung", + "Invite to Group": "In Gruppe einladen", + "Unable to accept invite": "Einladung kann nicht akzeptiert werden", + "Failed to remove user from group": "Benutzer konnte nicht aus Gruppe entfernt werden", + "Failed to invite users group": "Benutzer-Gruppe konnte nicht eingeladen werden", + "Failed to invite users to %(groupId)s": "Benutzer konnten nicht in %(groupId)s eingeladen werden", + "Unable to reject invite": "Einladung konnte nicht abgelehnt werden", + "Add users to the group summary": "Füge Benutzer zur Gruppen-Übersicht hinzu", + "Who would you like to add to this summary?": "Wen möchtest zu dieser Übersicht hinzufügen?", + "Add to summary": "Zur Übersicht hinzufügen", + "Failed to add the following users to the summary of %(groupId)s:": "Hinzufügen der folgenden Benutzer zur Übersicht von %(groupId)s fehlgeschlagen:", + "Add rooms to the group summary": "Füge Räume zur Gruppen-Übersicht hinzu", + "Which rooms would you like to add to this summary?": "Welche Räume möchtest du zu dieser Übersicht hinzufügen?", + "Room name or alias": "Raum-Name oder Alias", + "Failed to add the following rooms to the summary of %(groupId)s:": "Folgende Räume konnten nicht zu der Übersicht von %(groupId)s hinzugefügt werden:", + "Failed to remove the room from the summary of %(groupId)s": "Raum konnte nicht aus der Übersicht von %(groupId)s entfernt werden", + "The room '%(roomName)s' could not be removed from the summary.": "Der Raum '%(roomName)s' konnte nicht aus der Übersicht entfernt werden.", + "Failed to remove a user from the summary of %(groupId)s": "Benutzer konnte nicht aus der Übersicht von %(groupId)s entfernt werden", + "The user '%(displayName)s' could not be removed from the summary.": "Der Benutzer '%(displayName)s' konnte nicht aus der Übersicht entfernt werden.", + "Unknown": "Unbekannt", + "Add rooms to the group": "Füge Räume der Gruppe hinzu", + "Add to group": "Zur Gruppe hinzufügen", + "Failed to add the following rooms to %(groupId)s:": "Die folgenden Räume konnten %(groupId)s nicht hinzugefügt werden:", + "Unpublish": "Depublizieren", + "This group is published on your profile": "Diese Gruppe ist in deinem Profil veröffentlicht", + "Publish": "Veröffentlichen", + "Matrix Room ID": "Matrix-Raum-ID", + "email address": "E-Mail-Adresse", + "Try using one of the following valid address types: %(validTypesList)s.": "Versuche eine der folgenden validen Adresstypen zu benutzen: %(validTypesList)s.", + "Failed to remove room from group": "Entfernen des Raumes aus der Gruppe fehlgeschagen", + "Failed to remove '%(roomName)s' from %(groupId)s": "Entfernen von '%(roomName)s' aus %(groupId)s fehlgeschlagen", + "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Bist du sicher, dass du '%(roomName)s' aus '%(groupId)s' entfernen möchtest?", + "Removing a room from the group will also remove it from the group page.": "Das Entfernen eines Raumes aus der Gruppe wird ihn auch aus der Gruppen-Seite entfernen.", + "Related Groups": "Verbundene Gruppen", + "Related groups for this room:": "Verbundene Gruppen in diesen Raum:", + "This room has no related groups": "Dieser Raum hat keine zugehörigen Gruppen", + "New group ID (e.g. +foo:%(localDomain)s)": "Neue Gruppen-ID (z.B. +foo:%(localDomain)s)", + "Invites sent": "Einladungen gesendet", + "Your group invitations have been sent.": "Deine Gruppen-Einladungen wurden gesendet." } From 56825efc722d5ace3cc63b379a1a00365eaa53a7 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 13 Oct 2017 15:02:36 +0100 Subject: [PATCH 015/224] Prepare changelog for v0.10.7-rc.2 --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d29fbc7a7..3dceeef955 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +Changes in [0.10.7-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.10.7-rc.2) (2017-10-13) +=============================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.10.7-rc.1...v0.10.7-rc.2) + + * Honour the (now legacy) enableLabs flag + [\#1473](https://github.com/matrix-org/matrix-react-sdk/pull/1473) + * Don't show labs features by default + [\#1472](https://github.com/matrix-org/matrix-react-sdk/pull/1472) + * Make features disabled by default + [\#1470](https://github.com/matrix-org/matrix-react-sdk/pull/1470) + Changes in [0.10.7-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.10.7-rc.1) (2017-10-13) =============================================================================================================== [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.10.6...v0.10.7-rc.1) From b95c2368a683595c765b7e3906b74cb50a1a735e Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 13 Oct 2017 15:02:37 +0100 Subject: [PATCH 016/224] v0.10.7-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 672fca4060..731137a5ae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "0.10.7-rc.1", + "version": "0.10.7-rc.2", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { From f5abd1c2c8adc4a02177096faeac4d25e120dbf7 Mon Sep 17 00:00:00 2001 From: Szimszon Date: Fri, 13 Oct 2017 15:10:56 +0000 Subject: [PATCH 017/224] Translated using Weblate (Hungarian) Currently translated at 93.5% (858 of 917 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/ --- src/i18n/strings/hu.json | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index bcd3452a6c..cedde7d34e 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -827,5 +827,38 @@ "%(weekDayName)s, %(monthName)s %(day)s": "%(weekDayName)s, %(monthName)s %(day)s", "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(fullYear)s %(monthName)s %(day)s", "Copied!": "Lemásolva!", - "Failed to copy": "Sikertelen másolás" + "Failed to copy": "Sikertelen másolás", + "Advanced options": "További beállítások", + "Block users on other matrix homeservers from joining this room": "Felhasználók szobába való belépésének megakadályozása távoli szerverekről", + "This setting cannot be changed later!": "Ezt a beállítást később nem lehet megváltoztatni!", + "Ignored Users": "Figyelmen kívül hagyott felhasználók", + "Ignore": "Figyelmen kívül hagy", + "Unignore": "Figyelembe vesz", + "User Options": "Felhasználói beállítások", + "You are now ignoring %(userId)s": "Most figyelmen kívül hagyod: %(userId)s", + "You are no longer ignoring %(userId)s": "Ismét figyelembe veszed: %(userId)s", + "Unignored user": "Figyelembe vett felhasználó", + "Ignored user": "Figyelmen kívül hagyott felhasználó", + "Stops ignoring a user, showing their messages going forward": "Felhasználót újra figyelembe vesszük és megmutatjuk az új üzeneteit", + "Ignores a user, hiding their messages from you": "Felhasználó figyelmen kívül hagyásával elrejtheted az üzeneteit magad elől", + "Disable Emoji suggestions while typing": "Emoji ajánlások kikapcsolása gépelés közben", + "Banned by %(displayName)s": "Kitiltotta: %(displayName)s", + "Message removed by %(userId)s": "Üzenetet törölte: %(userId)s", + "To send messages, you must be a": "Ahhoz, hogy üzenetet tudj küldeni, neked ilyen szinten kell lenned:", + "To invite users into the room, you must be a": "Hogy meghívj valakit a szobába, ilyen szinten kell lenned:", + "To configure the room, you must be a": "A szoba beállításához ilyen szinten kell lenned:", + "To kick users, you must be a": "Felhasználó kirúgásához ilyen szinten kell lenned:", + "To ban users, you must be a": "Felhasználó kizárásához ilyen szinten kell lenned:", + "To remove other users' messages, you must be a": "Más üzenetének a törléséhez ilyen szinten kell lenned:", + "To send events of type , you must be a": " esemény küldéséhez ilyen szinten kell lenned:", + "To change the room's avatar, you must be a": "A szoba avatar-jának a megváltoztatásához ilyen szinten kell lenned:", + "To change the room's name, you must be a": "A szoba nevének megváltoztatásához ilyen szinten kell lenned:", + "To change the room's main address, you must be a": "A szoba elsődleges címének a megváltoztatásához ilyen szinten kell lenned:", + "To change the room's history visibility, you must be a": "A szoba naplója elérhetőségének a megváltoztatásához ilyen szinten kell lenned:", + "To change the permissions in the room, you must be a": "A szobában a jogosultság megváltoztatásához ilyen szinten kell lenned:", + "To change the topic, you must be a": "A téma megváltoztatásához ilyen szinten kell lenned:", + "To modify widgets in the room, you must be a": "A szoba kisalkalmazásainak megváltoztatásához ilyen szinten kell lenned:", + "Description": "Leírás", + "Filter group members": "Csoport tagok szürése", + "Filter group rooms": "Csoport szobák szűrése" } From 8470a035303f28b2a868a9f9ce1d58df9ef7ece9 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 13 Oct 2017 16:31:34 +0100 Subject: [PATCH 018/224] Prepare changelog for v0.10.7-rc.3 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3dceeef955..75c99e299b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [0.10.7-rc.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.10.7-rc.3) (2017-10-13) +=============================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.10.7-rc.2...v0.10.7-rc.3) + + * Fix the enableLabs flag, again + [\#1474](https://github.com/matrix-org/matrix-react-sdk/pull/1474) + Changes in [0.10.7-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.10.7-rc.2) (2017-10-13) =============================================================================================================== [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.10.7-rc.1...v0.10.7-rc.2) From 3b515cdebe397252ceb50cb1e362bf031dbf3617 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 13 Oct 2017 16:31:35 +0100 Subject: [PATCH 019/224] v0.10.7-rc.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 731137a5ae..e564366e61 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "0.10.7-rc.2", + "version": "0.10.7-rc.3", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { From 77418f535eec554062ad31171a0561d1712db55a Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Fri, 13 Oct 2017 16:46:33 +0100 Subject: [PATCH 020/224] Modify GroupView UI - Remove featured users/rooms - Add "Rooms" section to show all rooms in the group in a room-directory-esque list. This has a "+" button in "edit" mode. - Make the group view body scrollable --- src/components/structures/GroupView.js | 71 ++++++++--- src/components/structures/ScrollPanel.js | 1 + src/components/views/rooms/RoomDetailList.js | 122 +++++++++++++++++++ src/i18n/strings/en_EN.json | 3 +- 4 files changed, 179 insertions(+), 18 deletions(-) create mode 100644 src/components/views/rooms/RoomDetailList.js diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js index 337ac6ab75..a43e1a4cd3 100644 --- a/src/components/structures/GroupView.js +++ b/src/components/structures/GroupView.js @@ -29,6 +29,8 @@ import classnames from 'classnames'; import GroupStoreCache from '../../stores/GroupStoreCache'; import GroupStore from '../../stores/GroupStore'; +import { showGroupAddRoomDialog } from '../../GroupAddressPicker'; + const RoomSummaryType = PropTypes.shape({ room_id: PropTypes.string.isRequired, @@ -64,7 +66,7 @@ const CategoryRoomList = React.createClass({ editing: PropTypes.bool.isRequired, }, - onAddRoomsClicked: function(ev) { + onAddRoomsToSummaryClicked: function(ev) { ev.preventDefault(); const AddressPickerDialog = sdk.getComponent("dialogs.AddressPickerDialog"); Modal.createTrackedDialog('Add Rooms to Group Summary', '', AddressPickerDialog, { @@ -106,7 +108,7 @@ const CategoryRoomList = React.createClass({ render: function() { const TintableSvg = sdk.getComponent("elements.TintableSvg"); const addButton = this.props.editing ? - ( + (
{ _t('Add a Room') } @@ -450,6 +452,7 @@ export default React.createClass({ }); }); this._groupStore.on('error', (err) => { + console.error(err); this.setState({ summary: null, error: err, @@ -601,6 +604,10 @@ export default React.createClass({ this._setPublicity(true); }, + _onAddRoomsClick: function() { + showGroupAddRoomDialog(this.props.groupId); + }, + _setPublicity: function(publicity) { this.setState({ publicityBusy: true, @@ -612,6 +619,28 @@ export default React.createClass({ }); }, + _getRoomsNode: function() { + const RoomDetailList = sdk.getComponent('rooms.RoomDetailList'); + const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); + const TintableSvg = sdk.getComponent('elements.TintableSvg'); + const addButton = this.state.editing ? + ( +
+ +
+
+ { _t('Add rooms to this group') } +
+ ) :
; + return
+
+

Rooms

+ { addButton } +
+ +
; + }, + _getFeaturedRoomsNode: function() { const summary = this.state.summary; @@ -790,6 +819,7 @@ export default React.createClass({ const GroupAvatar = sdk.getComponent("avatars.GroupAvatar"); const Loader = sdk.getComponent("elements.Spinner"); const TintableSvg = sdk.getComponent("elements.TintableSvg"); + const ScrollPanel = sdk.getComponent("structures.ScrollPanel"); if (this.state.summary === null && this.state.error === null || this.state.saving) { return ; @@ -799,7 +829,7 @@ export default React.createClass({ let avatarNode; let nameNode; let shortDescNode; - let roomBody; + let bodyNodes = []; const rightButtons = []; const headerClasses = { mx_GroupView_header: true, @@ -856,14 +886,15 @@ export default React.createClass({ width="18" height="18" alt={_t("Cancel")} /> , ); - roomBody =
-