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

6756 Commits (99aabd9025bc4dc924090347ed795c1f7bad4dd4)

Author SHA1 Message Date
Luke Barnard 5f840a3031 Implement adding rooms to the group summary 
This includes making UserPickerDialog more generic such that it can also pick rooms from groups.
 2017-09-21 16:53:10 +01:00
David Baker 3f0ee4e6ad Merge pull request #1405 from matrix-org/dbkr/update_on_group_invite 
Update when a group arrives
 2017-09-21 16:39:46 +01:00
David Baker add91f9a7d Update when a group arrives 2017-09-21 16:28:49 +01:00
David Baker 5940b11fd2 Merge pull request #1404 from matrix-org/luke/feature-flair-click-for-group 
Implement `view_group` dispatch when clicking flair
 2017-09-21 15:18:28 +01:00
Luke Barnard 16f5a667c6 Redesign membership section in GroupView 2017-09-21 15:03:30 +01:00
Luke Barnard 41a9ff22fb Rename profile object properties to camelCase 
Also, add correct PropTypes for FlairAvatar
 2017-09-21 14:22:43 +01:00
David Baker 60d444b841 Merge pull request #1402 from matrix-org/luke/groups-add-featured-rooms-and-users 
GroupView: Add a User
 2017-09-21 14:19:58 +01:00
Luke Barnard e64cc3b666 Implement `view_group` dispatch when clicking flair 2017-09-21 13:25:36 +01:00
Luke Barnard 3f0e596e97 Only show "Add" button when editing the group 2017-09-21 12:44:17 +01:00
Luke Barnard 4d9c43b3c8 Display dialog when errors occur whilst featuring users 2017-09-21 12:34:16 +01:00
Luke Barnard 9cd4cdf6df Filter group users results based on query 2017-09-21 10:52:28 +01:00
Luke Barnard 03ddb63507 Remove redundant slice 2017-09-21 10:34:11 +01:00
Luke Barnard a0c5bbb3eb Merge pull request #1403 from matrix-org/luke/track-action-buttons 
Track action button click event
 2017-09-20 17:53:11 +01:00
Luke Barnard 515222c25f Track action button click event 2017-09-20 17:16:49 +01:00
Luke Barnard 7ef55946da Fix console error log statement 2017-09-20 17:04:05 +01:00
Luke Barnard 5471431ee5 Disable "Add a Room" button for when we have a room picker 2017-09-20 17:02:20 +01:00
Luke Barnard adf0a79585 Implement avatar, displayname for featured users 
Profile data has been added to the API response for users in the group summary
 2017-09-20 16:54:12 +01:00
Luke Barnard 1c1bf82c2a Add users to group summary using new API 2017-09-20 16:32:02 +01:00
Luke Barnard 44c38652ab Implement UserPickerDialog for adding users 
Also, use AccessibleButtons.
 2017-09-20 15:44:42 +01:00
David Baker 4dd83de6d1 Merge branch 'master' into develop 2017-09-20 15:14:10 +01:00
David Baker 6c5f4983da v0.10.4 2017-09-20 15:13:20 +01:00
David Baker 4a9886b4da Prepare changelog for v0.10.4 2017-09-20 15:13:19 +01:00
David Baker 22271ced0d released js-sdk 2017-09-20 15:09:14 +01:00
Luke Barnard 1c6cecbd43 Add "Add a User/Room" buttons and always display default lists 2017-09-20 14:41:29 +01:00
David Baker 6ad4ba767b Merge pull request #1401 from matrix-org/luke/fix-separate-sender-profile 
Separate sender profile into elements with classes
 2017-09-19 17:21:52 +01:00
David Baker 173370dfc2 Merge pull request #1399 from matrix-org/luke/fix-ugly-integ-button 
Fix ugly integration button, use hover to show error
 2017-09-19 17:21:42 +01:00
Luke Barnard 979b580e1f Merge branch 'develop' into luke/fix-ugly-integ-button 2017-09-19 17:04:06 +01:00
Luke Barnard e2ae6e6235 Separate sender profile into elements with classes 
For separate CSS manipulation so that we can vary opacity independently for flair/name/aux
 2017-09-19 16:56:14 +01:00
Luke Barnard 668e096194 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2017-09-19 16:36:51 +01:00
Luke Barnard 7414d4d1f9 Fix issue with "props.aux" being inserted instead of e.g. "sent an image" 2017-09-19 16:36:30 +01:00
David Baker d38e950f8b Merge pull request #1400 from matrix-org/dbkr/flair_bluebird 
Fix promise error in flair
 2017-09-19 16:00:02 +01:00
David Baker 80e0205b78 Fix promise error in flair 
Import bluebird other wise it gets a native promise on my dev box
which does not have a finally method
 2017-09-19 15:53:54 +01:00
Luke Barnard b4ed9d7c87 Merge pull request #1351 from matrix-org/luke/feature-flair 
Flair!
 2017-09-19 15:05:40 +01:00
Luke Barnard 5295d7f058 Merge branch 'develop' into luke/feature-flair 2017-09-19 14:55:54 +01:00
Luke Barnard a1e3115046 Merge pull request #1328 from matrix-org/dbkr/group_userlist 
Group Membership UI
 2017-09-19 14:54:08 +01:00
Luke Barnard e9fb5712bd Merge branch 'develop' into dbkr/group_userlist 2017-09-19 13:26:55 +01:00
Luke Barnard 61a0f1ef67 Fix ugly integration button, use hover to show error 
This simplifies the implementation of the button but also adjusts the appeareance such that a warning triangle appears in the top-right of button if an error has occured. The error popup will now appear when hovering over the button (with related CSS).
 2017-09-19 11:57:23 +01:00
David Baker 620ca5f211 v0.10.4-rc.1 2017-09-19 10:50:34 +01:00
David Baker fba66557b5 Prepare changelog for v0.10.4-rc.1 2017-09-19 10:50:33 +01:00
David Baker d992d6937e js-sdk rc.1 2017-09-19 10:47:18 +01:00
David Baker 658285ebbf Merge pull request #1396 from matrix-org/dbkr/3pid_invite_update_when_joined 
Fix RoomView stuck in 'accept invite' state
 2017-09-19 10:34:39 +01:00
David Baker 4d8eadad4f Clarify comment 2017-09-19 10:21:20 +01:00
Luke Barnard 925cb2dccf Do translation correctly 2017-09-18 17:44:13 +01:00
Luke Barnard 241d442284 Fail gracefully for non-supporting servers 2017-09-18 15:12:38 +01:00
Luke Barnard 6add06db44 Fix big with rejecting promises upon error 2017-09-18 15:11:49 +01:00
Luke Barnard 26941e994f Merge branch 'develop' into luke/feature-flair 2017-09-18 14:46:50 +01:00
Luke Barnard 3476cfca79 getPublicGroups->getPublicisedGroups 
To match dbkrs js-sdk wrappers for flair: matrix-org/matrix-js-sdk/pull#542
 2017-09-18 14:44:35 +01:00
Luke Barnard 548e5f516c Put flair into labs 2017-09-18 14:38:41 +01:00
David Baker 0958689d25 Merge pull request #1398 from matrix-org/luke/fix-ugly-manage-integs-button 
Only show the integ management button if user is joined
 2017-09-18 13:42:11 +01:00
Luke Barnard caaf5cca14 Only show the integ management button if user is joined 2017-09-18 13:34:33 +01:00