mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-01 11:03:18 +03:00
Code Issues Projects Releases Packages Wiki Activity
7327 commits 217 branches 561 tags 443 MiB
Commit graph

7327 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke Barnard
b9dc5cb5ed Merge branch 'develop' into luke/groups-update-on-invite 2017-10-23 16:05:52 +01:00
Luke Barnard
0799e5cde4 Refresh group member lists after inviting users 2017-10-23 16:04:26 +01:00
Luke Barnard
59c5dfda86 Merge pull request #1517 from matrix-org/luke/groups-invalidate-flair-cache 
Invalidate the user's public groups cache when changing group publicity
 2017-10-23 15:59:33 +01:00
Luke Barnard
0ff5b9c6a7 Invalidate the user's public groups cache when changing group publicity 
This will make the changes to their Flair "live", but only from the user's own perspective.
 2017-10-23 15:28:38 +01:00
Luke Barnard
03f4e6c622 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2017-10-23 14:57:50 +01:00
Luke Barnard
a133fd1cf4 Fix "failed to create community" message 2017-10-23 14:57:40 +01:00
Matthew Hodgson
440b8e0e31 16px for flair please 2017-10-23 14:56:24 +01:00
Matthew Hodgson
fb96f4fac2 fix typos 2017-10-23 14:55:54 +01:00
Luke Barnard
e3de8ff72f Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2017-10-23 14:55:08 +01:00
Luke Barnard
e89371fb1c Add click-to-open-settings functionality to GroupAvatar 2017-10-23 14:54:57 +01:00
Luke Barnard
c73ef2f83b Merge pull request #1515 from matrix-org/dbkr/geni18n_check_format_strings 
Make the gen-i18n script validate _t calls
 2017-10-23 14:12:28 +01:00
David Baker
54458f1438 Actually even out brackets 2017-10-23 14:02:58 +01:00
David Baker
8d1aea5b2e Misc PR review fixes 2017-10-23 10:18:29 +01:00
David Baker
317ad64ae6 Make the gen-i18n script validate _t calls 
And throw a massive tantrum if you've messed up your format strings.

Because broken format strings making their way into the app cause it
to throw exceptions.
 2017-10-20 18:38:22 +01:00
Luke Barnard
b5c9fa4caa Merge pull request #1514 from matrix-org/luke/groups-my-groups-placeholder 
Add placeholder to MyGroups page, adjust CSS classes
 2017-10-20 18:16:28 +01:00
Luke Barnard
1a7710c192 Adjust wording on placeholder 2017-10-20 18:10:14 +01:00
Luke Barnard
a0e218d107 Add placeholder to MyGroups page, adjust CSS classes 
- This is part of a general improvement in the look of MyGroups
 - Wording on "Create a community to..." modified to not have the word "community" twice
 2017-10-20 17:38:02 +01:00
Richard Lewis
f4e3e84765 Merge pull request #1338 from matrix-org/rxl881/parallelshell 
Rxl881/parallelshell
 2017-10-20 17:11:03 +01:00
Luke Barnard
d859504276 Merge pull request #1513 from matrix-org/dbkr/prunei18n_oct17 
Run prunei18n
 2017-10-20 11:56:35 +01:00
David Baker
00a13c780f Run prunei18n 2017-10-20 11:39:01 +01:00
David Baker
6fb8f06095 Merge pull request #1512 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2017-10-20 11:31:24 +01:00
Weblate
db4d96a1eb Merge remote-tracking branch 'origin/develop' into develop 2017-10-20 10:21:50 +00:00
Luke Barnard
93997ac5fd Merge pull request #1502 from matrix-org/dbkr/prunei18n 
Add script to prune unused translations
 2017-10-20 11:21:45 +01:00
Weblate
639820cfc8 Merge remote-tracking branch 'origin/develop' into develop 2017-10-20 10:01:34 +00:00
Luke Barnard
f15bf8931a Merge pull request #1510 from matrix-org/dbkr/fix_dms 
Fix creation of DM rooms
 2017-10-20 11:01:28 +01:00
Richard Lewis
3cf5864879 Update deps 2017-10-20 10:27:33 +01:00
David Baker
f829012045 Fix creation of DM rooms 
The check on whether a new chat was being started as a DM room got
broken, so we weren't using the trusted_private_chat preset or
setting the appropriate DM flags.

Fixes https://github.com/vector-im/riot-web/issues/5318 and
probably https://github.com/vector-im/riot-web/issues/3987
 2017-10-20 10:16:51 +01:00
Szimszon
dea6f9ac9e Translated using Weblate (Hungarian) 
Currently translated at 100.0% (906 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2017-10-20 05:09:45 +00:00
Weblate
81bb81b61b Merge remote-tracking branch 'origin/develop' into develop 2017-10-19 17:06:42 +00:00
Luke Barnard
a85a011db9 Fix faulty translation in GroupView 2017-10-19 18:06:32 +01:00
Weblate
577f00e589 Merge remote-tracking branch 'origin/develop' into develop 2017-10-19 16:38:00 +00:00
Luke Barnard
d4aac4a69c Merge pull request #1507 from matrix-org/dbkr/groupid_only_enter_localpart 
Group create dialog: only enter localpart
 2017-10-19 17:37:56 +01:00
Weblate
93ae0a26fa Merge remote-tracking branch 'origin/develop' into develop 2017-10-19 16:35:53 +00:00
Luke Barnard
877f213057 Merge pull request #1509 from matrix-org/luke/groups-my-groups 
Improve MyGroups UI
 2017-10-19 17:35:48 +01:00
David Baker
cbb36f4780 Lint 2017-10-19 17:31:06 +01:00
Weblate
1bf295f733 Merge remote-tracking branch 'origin/develop' into develop 2017-10-19 16:28:54 +00:00
Luke Barnard
bd982cf0ae Merge pull request #1508 from matrix-org/dbkr/image_objecturl 
Use object URLs to load Files in to images
 2017-10-19 17:28:49 +01:00
Luke Barnard
b0f8619754 Improve MyGroups UI 
as per design layed out by @tur2live!
 2017-10-19 17:24:45 +01:00
Szimszon
40c301c400 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (906 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2017-10-19 16:23:16 +00:00
David Baker
b74ad8634b Use object URLs to load Files in to images 
Fixes https://github.com/vector-im/riot-web/issues/5326
 2017-10-19 17:16:52 +01:00
David Baker
b9574ff382 Group create dialog: only enter localpart 
Since we currently can only create groups on the local server anyway,
there's no point making the user jump through the hoop of forming the
whole group ID and telling them off if they got the server name wrong.
 2017-10-19 16:47:43 +01:00
Weblate
43f27e5d9d Merge remote-tracking branch 'origin/develop' into develop 2017-10-19 15:43:20 +00:00
David Baker
0f4ca1992d Merge pull request #1506 from matrix-org/dbkr/group_id_alphanum 
Add clientside error for non-alphanumeric group ID
 2017-10-19 16:43:16 +01:00
David Baker
19173ab4d6 Space, man. 2017-10-19 16:31:45 +01:00
David Baker
4abaa93cf0 Add clientside error for non-alphanumeric group ID 2017-10-19 16:28:02 +01:00
Richard Lewis
a49eabda4c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into rxl881/parallelshell 2017-10-19 16:26:22 +01:00
Weblate
7c7cf2714b Merge remote-tracking branch 'origin/develop' into develop 2017-10-19 15:18:36 +00:00
David Baker
21b684381d Merge pull request #1505 from matrix-org/luke/groups-fix-invites-to-unnamed-groups 
Fix invites to groups without names
 2017-10-19 16:18:32 +01:00
Weblate
ca00a64da5 Merge remote-tracking branch 'origin/develop' into develop 2017-10-19 15:03:31 +00:00
Luke Barnard
8b047737b9 Merge pull request #1504 from matrix-org/dbkr/group_add_warning 
Add warning when adding group rooms/users
 2017-10-19 16:03:27 +01:00