mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-13 04:05:48 +03:00
Code Issues Projects Releases Packages Wiki Activity
8075 commits 219 branches 562 tags 474 MiB
Commit graph

6742 commits

Author SHA1 Message Date
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
Matthew Hodgson
7c98558b6a fix neglible race when loading CSS 2017-11-14 16:07:48 +00:00
Matthew Hodgson
1fd7ac30e4 turns out i made up the .complete property on link elements 2017-11-14 16:04:11 +00:00
Matthew Hodgson
8d6e3dd27d fix lint 2017-11-14 15:37:03 +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
Matthew Hodgson
8c218557df fix disable_custom_urls 2017-11-14 15:17:50 +00:00
Matthew Hodgson
b58514f427 Stop FF quantum exploding on CSS edits 2017-11-14 14:27:27 +00:00
David Baker
55260becc9 Revert "Lowercase all usernames" 2017-11-14 14:13:22 +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
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
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
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
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
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
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
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