OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
7,857 Commits
210 Branches
549 Tags
658 MiB
Commit Graph

7857 Commits (49a298551512696ebf3b96a71d1aab5c9fd0bc66)

Author SHA1 Message Date
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
Matthew Hodgson ddd230d798
Merge pull request #1605 from matrix-org/matthew/status 
Status.im theme
 2017-11-13 19:22:34 +00:00
Stefan Parviainen 672d5080ad Add unit tests for translation 2017-11-13 20:20:41 +01:00
Stefan Parviainen 9cf7e1b480 Validate tag replacements in gen-i18n 2017-11-13 20:20:14 +01: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 4b206a0117
Merge pull request #1604 from matrix-org/revert-1547-dbkr/username_to_lower 
Revert "Lowercase all usernames"
 2017-11-11 16:08:27 +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 21ead6e48e v0.11.0-rc.2 2017-11-10 16:45:30 +00:00
Luke Barnard 34fec5bd57 Prepare changelog for v0.11.0-rc.2 2017-11-10 16:45:30 +00:00
Luke Barnard 477133a3fb Merge branch 'develop' into release-v0.11.0 2017-11-10 16:38:24 +00:00
Luke Barnard b3ddec4131
Merge pull request #1603 from matrix-org/luke/groups-enable 
Make groups a fully-fleged baked-in feature
 2017-11-10 16:19:35 +00:00
Luke Barnard a96bfee9f2 Remove unused UserSettingsStore import 2017-11-10 16:12:27 +00:00
Luke Barnard 1c82df216e Ignore unused React when using JSX 2017-11-10 16:11:59 +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 07b6c55982 v0.11.0-rc.1 2017-11-10 13:40:17 +00:00
Luke Barnard a47f92c0c6 Prepare changelog for v0.11.0-rc.1 2017-11-10 13:40:16 +00:00
Luke Barnard b68b60c04c Bump js-sdk dep 2017-11-10 13:37:12 +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 fcd7a15afa
Merge pull request #1601 from matrix-org/luke/groups-guest-flow 
Add group features as starting points for ILAG
 2017-11-10 11:23:19 +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