mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 08:21:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
7141 commits 219 branches 562 tags 474 MiB
Commit graph

7141 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
carlos-am
b676d1818e 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 15:37:01 +00: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
carlos-am
077d4aafe2 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 15:06:24 +00:00
carlos-am
d221b20721 Translated using Weblate (Portuguese) 
Currently translated at 99.1% (848 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 15:00:08 +00: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
carlos-am
4d127db358 Translated using Weblate (Portuguese) 
Currently translated at 92.7% (793 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 14:05:44 +00: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
carlos-am
6352e5cca6 Translated using Weblate (Portuguese) 
Currently translated at 91.6% (784 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 13:54:14 +00: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