OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
7,153 Commits
214 Branches
562 Tags
496 MiB
Commit Graph

7153 Commits (4ff369c884bdfbf51bb4ae0f41bd3974ba85e009)

Author SHA1 Message Date
David Baker 78e806f7f9 Merge branch 'master' into develop 2017-09-21 21:48:08 +01:00
David Baker 3552f08aad v0.10.6 2017-09-21 21:47:28 +01:00
David Baker c40a3b9aab Prepare changelog for v0.10.6 2017-09-21 21:47:28 +01:00
David Baker daac0ebdc0 js-sdk v0.8.4 2017-09-21 21:43:35 +01:00
Matthew Hodgson 946c439c28 hopefully fix https://github.com/vector-im/riot-web/issues/4166 2017-09-21 18:56:47 +01:00
David Baker c6e4f606f9 Merge branch 'master' into develop 2017-09-21 18:02:16 +01:00
David Baker 99e4221e61 v0.10.5 2017-09-21 18:01:42 +01:00
David Baker 671743bcae Prepare changelog for v0.10.5 2017-09-21 18:01:41 +01:00
David Baker 3ac67077f9 Merge pull request #1410 from matrix-org/dbkr/prerelease_clean 
Clean on prerelease
 2017-09-21 17:59:48 +01:00
Luke Barnard c19ee66565 Merge pull request #1408 from matrix-org/luke/groups-membership-section-redesign 
Redesign membership section in GroupView
 2017-09-21 17:49:47 +01:00
David Baker a0b4d8a9f8 Clean on prerelease 
To avoid any further problems where we ship build files with the
wrong capitalisation because npm is dumb
 2017-09-21 17:39:34 +01:00
Luke Barnard b5f141456c Merge pull request #1406 from matrix-org/luke/groups-add-feature-rooms 
Implement adding rooms to the group summary
 2017-09-21 17:27:40 +01:00
Luke Barnard 3351770b54 Fix dodgy merge 2017-09-21 17:26:16 +01:00
Stefan Parviainen 411a67c6b0 Remove unneeded strings 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-09-21 18:25:45 +02:00
Luke Barnard d75efb83f1 Merge branch 'develop' into luke/groups-membership-section-redesign 2017-09-21 17:25:12 +01:00
Luke Barnard cf23ac5931 Merge branch 'develop' into luke/groups-add-feature-rooms 2017-09-21 17:20:12 +01:00
David Baker f27750e03e Merge pull request #1407 from matrix-org/dbkr/groups_is_privileged 
Honour the is_privileged flag in GroupView
 2017-09-21 17:10:28 +01:00
David Baker 3c2e6fdf9e Honour the is_privileged flag in GroupView 2017-09-21 16:55:56 +01:00
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
Andrey 2bc2d30a0e Translated using Weblate (Russian) 
Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-09-21 14:18:33 +00: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
Walter 5f73fa5a77 Translated using Weblate (Russian) 
Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-09-21 13:20:04 +00: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
Szimszon 94a30c0889 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2017-09-19 18:49:42 +00: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
Carlos 29be5878dd Translated using Weblate (Portuguese) 
Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
 2017-09-19 16:21:46 +00: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