mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-27 05:05:56 +03:00
Code Issues Projects Releases Packages Wiki Activity
7791 commits 208 branches 547 tags 609 MiB
Commit graph

6484 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
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
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
Richard Lewis
bd6b5c4498 Improve function name. 2017-11-10 10:17:55 +00:00
Richard Lewis
98ac3dd19b Explicitly set initialisation state. 2017-11-10 09:44:58 +00:00
Luke Barnard
7893927e14
Merge pull request #1598 from matrix-org/luke/groups-update-group-room-visibility-api 
Modify the group room visibility API to reflect the js-sdk changes
 2017-11-09 17:34:18 +00:00
Luke Barnard
31be27515c Modify the group room visibility API to reflect the js-sdk changes 
See https://github.com/matrix-org/matrix-js-sdk/pull/569
 2017-11-09 16:28:21 +00:00
Luke Barnard
a8487c540f Convert group avatar URL to HTTP before handing to BaseAvatar 
This is yet another component that imports the MatrixClient just for mxcUrlToHttp. It'd be much nicer to have an avatar component that accepted MXCs, e.g. by wrapping or modifying BaseAvatar.
 2017-11-09 14:34:04 +00:00
Richard Lewis
da8b1ff1cd Ensure that loading state is reset when showing app panel. 2017-11-09 14:28:24 +00:00
Weblate
3807d99a6a Merge remote-tracking branch 'origin/develop' into develop 2017-11-09 14:17:07 +00:00
Peter Vágner
1c1acd6d12 Translated using Weblate (Slovak) 
Currently translated at 100.0% (928 of 928 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2017-11-09 14:17:06 +00:00
Andrey
f796c4c6d1 Translated using Weblate (Russian) 
Currently translated at 98.4% (914 of 928 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-11-09 14:17:06 +00:00
bldrzzy
9b7f302310 Translated using Weblate (Polish) 
Currently translated at 76.7% (712 of 928 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2017-11-09 14:17:06 +00:00
Xose M
0250958c25 Translated using Weblate (Galician) 
Currently translated at 1.7% (16 of 928 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2017-11-09 14:17:06 +00:00
Luke Barnard
9a6c9594a1 Correctly display group invite 
By making sure the groupName truncates in the right place
 2017-11-09 14:16:54 +00:00
Richard Lewis
f796bc79c3 Fix addition of scalar token to widget URL. 
Add error logging.
 2017-11-09 14:07:29 +00:00
Luke Barnard
9027780215 Show group name in flair tooltip if one is set 
e.g. "Group Name (+group_id:homeserver)" or "+group_id:homeserver"

Fixes https://github.com/vector-im/riot-web/issues/5341
 2017-11-09 12:38:43 +00:00
Luke Barnard
6eeb91ee2e Display group member profile (avatar/displayname) in ConfirmUserActionDialog 
Fixes https://github.com/vector-im/riot-web/issues/5486
 2017-11-09 12:24:20 +00:00
Xose M
9b7ab4b7bd Added translation using Weblate (Galician) 2017-11-09 06:24:11 +00:00
Travis Ralston
030633fa90 Merge remote-tracking branch 'matrix-org/develop' into travis/granular-settings 2017-11-08 17:43:38 -07:00
Travis Ralston
2711da28b4 Use the SettingsStore in the UnknownDeviceDialog 2017-11-08 17:43:06 -07:00
Travis Ralston
f7da5836e1 Make blacklistUnverifiedDevices override the level order 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-08 17:41:32 -07:00
Travis Ralston
c7d8f3931f Revert notification toolbar setting 
It isn't a setting.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-08 17:06:36 -07:00
Richard Lewis
8016fb82d7 Fix broken commit. 2017-11-08 20:38:54 +00:00
Richard Lewis
56581ef408 Fix various loadingElement related issues. 2017-11-08 20:38:31 +00:00
Richard Lewis
b2b07d9370 Formatting 2017-11-08 20:17:28 +00:00
Weblate
23c9324fa5 Merge remote-tracking branch 'origin/develop' into develop 2017-11-08 18:52:33 +00:00
David Baker
7b243bf64d
Revert "UnknownDeviceDialog: get devices from SDK" 2017-11-08 18:49:50 +00:00
Richard Lewis
be0a76dbd6 Update variable name and JSdoc for improved clarity. 2017-11-08 17:44:54 +00:00
Matthew Hodgson
58ee4d0a76 rewrite the tinter to be ES6, and correctly cache fixups per theme 2017-11-08 06:55:07 -08:00
Weblate
685e5b916b Merge remote-tracking branch 'origin/develop' into develop 2017-11-08 14:04:32 +00:00
David Baker
b575df7da7
Merge pull request #1591 from matrix-org/luke/groups-order-admins-first 
Order users in the group member list with admins first
 2017-11-08 14:04:28 +00:00
Luke Barnard
e2a0cba6cb If group member privilege level is equal, disambiguate with displayname or userId 2017-11-08 13:57:38 +00:00
Weblate
02cce94c2b Merge remote-tracking branch 'origin/develop' into develop 2017-11-08 13:35:58 +00:00
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
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