OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
6,712 Commits
215 Branches
561 Tags
465 MiB
Commit Graph

6712 Commits (0e2a1c90d55a5b6bedd9c7332bff18bd2ba4ed47)

Author SHA1 Message Date
Travis Ralston 0e2a1c90d5 Don't suggest grey as a color scheme for a room 
Fixes https://github.com/vector-im/riot-web/issues/5045

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 16:08:50 -06:00
Luke Barnard 0a53630806 Merge pull request #1435 from matrix-org/luke/groups-button 
Add button to get to MyGroups (view_my_groups or path #/groups)
 2017-09-29 11:00:22 +01:00
Luke Barnard c8b2158156 Lint 2017-09-29 10:42:23 +01:00
Luke Barnard 18e0d8da86 Rename Flair feature to Groups 2017-09-29 10:27:40 +01:00
Luke Barnard 739ddb8410 Merge branch 'develop' into luke/groups-button 2017-09-28 12:11:26 +01:00
Luke Barnard 6a988a0d08 Merge pull request #1436 from matrix-org/luke/lint-jsx-curly-spacing 
Add eslint rule to disallow spaces inside of curly braces
 2017-09-28 12:09:46 +01:00
Luke Barnard 07b6040c39 Update travis script to use lintwithexclusions 2017-09-28 11:33:36 +01:00
Luke Barnard f3d155b62c Merge pull request #1437 from matrix-org/lukebarnard1-patch-fix-inviting 
Fix ability to invite existing mx users
 2017-09-28 11:27:07 +01:00
Luke Barnard 010b8d8be6 Merge branch 'luke/lint-jsx-curly-spacing' of github.com:matrix-org/matrix-react-sdk into luke/lint-jsx-curly-spacing 2017-09-28 11:23:19 +01:00
Luke Barnard 6b9a2909df Add rule to enforce spacing in curly brackets in JSX children 
This required an updated in version of eslint-plugin-react to 7.4.0.
 2017-09-28 11:21:06 +01:00
Luke Barnard 3c99b2af3d Fix ability to invite existing mx users 
Bug introduced by https://github.com/matrix-org/matrix-react-sdk/pull/1432

We should really not be using string constant literals all over the place. 
We'd be less likely to run into this sort of bug these address types weren't copied literals.
 2017-09-28 10:55:09 +01:00
Luke Barnard e70336af11 Add rule to enforce JSX tag spacing 2017-09-28 10:27:03 +01:00
Luke Barnard 1699c37fcf Merge pull request #1434 from matrix-org/luke/fix-address-picker-error-message 
Construct address picker message using provided `validAddressTypes`
 2017-09-28 10:08:36 +01:00
Luke Barnard 6eedf8b073 Add eslint rule to disallow spaces inside of curly braces 2017-09-28 10:06:51 +01:00
Luke Barnard e9cf25f946 Remove "You have entered an invalid contact..." from translations 2017-09-28 10:06:51 +01:00
Luke Barnard 38fdd155f0 Construct address picker message using provided `validAddressTypes` 2017-09-28 10:06:51 +01:00
Luke Barnard c7728bd9ad Add eslint rule to disallow spaces inside of curly braces 2017-09-28 10:02:40 +01:00
Luke Barnard 1f66baca4b Remove "You have entered an invalid contact..." from translations 2017-09-27 17:55:09 +01:00
Luke Barnard 929c8627d3 Add button to get to MyGroups (view_my_groups or path #/groups) 2017-09-27 17:45:49 +01:00
Luke Barnard 3a8bfbf7e0 Construct address picker message using provided `validAddressTypes` 2017-09-27 17:11:30 +01:00
Luke Barnard 19e4e245c2 Merge pull request #1433 from matrix-org/luke/fix-groups-summary-rooms-with-no-avatar 
Fix GroupView summary rooms displaying without avatars
 2017-09-27 16:34:03 +01:00
Luke Barnard ac76154518 Merge pull request #1432 from matrix-org/luke/groups-add-rooms-by-id 
Implement adding rooms to a group (or group summary) by room ID
 2017-09-27 16:20:32 +01:00
Luke Barnard f3b6b2cc06 Fix GroupView summary rooms displaying without avatars 
- GroupView can now render with rooms in the summary that do not have an avatar
 - RoomAvatar no longer has a redundant fallback avatar (this is handled by BaseAvatar)
 - RoomAvatar was delinted
 2017-09-27 16:18:15 +01:00
Luke Barnard d52355f80e Implement adding rooms to a group (or group summary) by room ID 2017-09-27 15:30:58 +01:00
David Baker 2d8bc783b0 Merge pull request #1431 from matrix-org/luke/feature-flair-tooltip 
Give flair avatars a tooltip = the group ID
 2017-09-27 14:44:25 +01:00
Luke Barnard 3d30cc3733 Merge pull request #1430 from matrix-org/luke/groups-fix-feature-self 
Fix ability to feature self in a group summary
 2017-09-27 14:43:50 +01:00
Luke Barnard f528e147e3 Give flair avatars a tooltip = the group ID 2017-09-27 14:36:22 +01:00
Luke Barnard e3405cfd95 shouldOmitSelf -> includeSelf 2017-09-27 11:52:05 +01:00
Luke Barnard 6bc9b32ab7 Fix ability to feature self in a group summary 
By default the AddressPicker would omit the currently logged-in user. This adds a property to override that to allow "self" to be picked.
 2017-09-27 11:04:41 +01:00
Luke Barnard 1ca9102442 Fix spinner appearing above RP header 
By wrapping the spinner in the mx_MemberList class. Also, use mx_RoomHeader_cancelButton for group settings cancel
 2017-09-27 10:36:44 +01:00
David Baker 3bdf347a08 Merge pull request #1429 from matrix-org/luke/groups-add-rooms 
Implement "Add room to group" feature
 2017-09-26 18:15:50 +01:00
Luke Barnard 1b12602ea5 Merge branch 'develop' into luke/groups-add-rooms 2017-09-26 17:12:52 +01:00
Luke Barnard 20d65535c0 Use all known rooms instead of public rooms 2017-09-26 17:11:54 +01:00
David Baker c7d4c87c62 Merge pull request #1428 from matrix-org/dbkr/fix_publicity 
Fix group membership publicity
 2017-09-26 15:05:16 +01:00
David Baker 8ec1c3ecf4 lint 2017-09-26 14:58:49 +01:00
Luke Barnard ddab8d7b5c Implement "Add room to group" feature 2017-09-26 14:49:13 +01:00
David Baker 8d0983ab02 Fix group membership publicity 
* Read the new flag in the summary API (the one we were reading
   was actually whether the group server listed you as a member to
   non-members).
 * Remove call to now-dead _loadGroupFromServer andf use the store
   instead
 2017-09-26 14:46:57 +01:00
David Baker 79af97011c Merge pull request #1355 from matrix-org/rob/electron-screensharing 
Add support for Jitsi screensharing in electron app
 2017-09-25 16:59:56 +01:00
Robert Swain 24de01e21d AppTile: Test if widgetUrl startsWith instead of has a substring 
The event origin should be at the beginning of the URL.
 2017-09-25 17:14:25 +02:00
Robert Swain 6e49926228 AppTile: Do not test for electron platform 
The method platform method is instead stubbed on all other platforms.
 2017-09-25 17:13:18 +02:00
Robert Swain 7f1d8834a2 Add setupScreenSharingForIframe to BasePlatform 2017-09-25 17:12:37 +02:00
Luke Barnard b42cf74216 Merge pull request #1424 from matrix-org/t3chguy/delint&DRY_TextForEvent 
Delint and DRY TextForEvent
 2017-09-25 16:08:13 +01:00
Robert Swain b047f1caaa Merge branch 'develop' into rob/electron-screensharing 2017-09-25 17:02:30 +02:00
Michael Telatynski 796924ef35 Fix typo as found by Luke 2017-09-25 15:49:48 +01:00
David Baker 2ab860f487 Merge pull request #1427 from matrix-org/luke/feature-flair-cache-bust 
Bust the flair caches after 30mins
 2017-09-25 15:39:06 +01:00
Luke Barnard 20c731f627 Bust the flair caches after 30mins 
Group profile data and the groups a user has publicised will be removed from the cache 30mins after retrieval.

There may be some benefits to caching the group profiles for longer than the group memberships but for now they're naively busted after the same 30mins.
 2017-09-25 15:21:56 +01:00
David Baker d9c2f6e610 Merge pull request #1426 from matrix-org/dbkr/profile_in_group_member_info 
Show displayname / avatar in group member info
 2017-09-25 15:14:30 +01:00
David Baker 0b96871be4 Lint 2017-09-25 15:07:02 +01:00
David Baker af2df77b8e Merge pull request #1418 from matrix-org/luke/groups-summary-store 
Create GroupSummaryStore for storing group summary stuff
 2017-09-25 14:59:32 +01:00
Luke Barnard e42e7bd3ad Merge pull request #1419 from matrix-org/dbkr/publicity_toggle 
Add status & toggle for publicity
 2017-09-25 14:52:57 +01:00