Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 05:04:57 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,873 Commits 206 Branches 552 Tags 518 MiB
3b515cdebe
Commit Graph

6873 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Iru Cai (vimacs)
bb5551aeda Translated using Weblate (Chinese (Simplified)) 
Currently translated at 85.1% (728 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2017-09-26 07:42:54 +00: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
David Baker
58ec732fb3 Add width/height/resizeMethod params 2017-09-25 14:51:21 +01:00
Kévin C
56bb932a9b Translated using Weblate (French) 
Currently translated at 99.8% (854 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2017-09-25 13:50:37 +00:00
Luke Barnard
1bd200f1b1 Merge pull request #1417 from matrix-org/dbkr/member_list_show_more 
MemberList: show 100 more on overflow tile click
 2017-09-25 14:50:33 +01:00
Luke Barnard
83e6218930 Remove listeners from group summary store on unmount 2017-09-25 14:49:12 +01:00
Luke Barnard
8e7d58797d _loadGroupFromServer -> _initGroupSummaryStore 2017-09-25 14:48:49 +01:00
David Baker
5b312ffb03 Show displayname / avatar in group member info 2017-09-25 14:38:43 +01:00
David Baker
1a82f121c0 lint 2017-09-25 13:17:07 +01:00
Walter
7dfff429f2 Translated using Weblate (Ukrainian) 
Currently translated at 13.0% (112 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2017-09-25 10:09:01 +00:00
Kévin C
38f884f285 Translated using Weblate (French) 
Currently translated at 99.8% (854 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2017-09-25 10:09:01 +00:00
David Baker
175fed490f Merge pull request #1425 from matrix-org/rav/memberlist_fixes 
Fix NPE in MemberList
 2017-09-25 11:08:56 +01:00
Richard van der Hoff
e2f8bb2ec0 Fix NPE in MemberList 
_getChildCountInvited would throw an NPE if invoked before the js-sdk had found
the room. Make sure we initialise the state correctly.
 2017-09-25 10:25:21 +01:00
Luke Barnard
b8dca58f4f Pass matrixClient as an argument to GSS constructor 2017-09-25 10:02:13 +01:00
Michael Telatynski
c8922ba7f5
This file was hurting my eyes. Delint and DRY 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-25 09:48:00 +01:00
Bruno Bigras
b9584cd421 Translated using Weblate (French) 
Currently translated at 98.8% (845 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2017-09-24 09:43:58 +00:00
Stefan Parviainen
2b5b708057 Translate unknown presence label 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-09-24 10:14:04 +02:00
Stefan Parviainen
dbae5a66e3 Use translation in img alt text 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-09-24 09:43:52 +02:00
Stefan Parviainen
14bce1119c Make theme names translatable 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-09-23 21:36:10 +02:00
Jan Kudrik
198dc7ea5c Translated using Weblate (Czech) 
Currently translated at 47.6% (407 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2017-09-23 17:01:10 +00:00
David Baker
26af29183e Merge pull request #1422 from pafcu/var-typofix 
Fix incorrect variable in string
 2017-09-23 18:01:06 +01:00
Stefan Parviainen
4da7a368a4 Fix incorrect variable in string 2017-09-23 10:04:59 +02:00
Stefan Parviainen
f2f5302a7b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2017-09-23 09:47:51 +02:00
Stefan Parviainen
cc441f42f9 Some more translatable strings 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-09-23 09:02:51 +02:00
David Baker
4b7c50810c Merge pull request #1420 from matrix-org/t3chguy/missing-i18n 
apply i18n _t to string which has already been translated
 2017-09-22 20:58:59 +01:00
Stefan Parviainen
d4929b558e Add dummy translation function to mark translatable strings 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-09-22 21:43:27 +02:00
Michael Telatynski
6d530eeb6e
apply i18n _t to string which has already been translated 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-22 20:04:04 +01:00
David Baker
af73f1c3bb Add status & toggle for publicity 
This doesn't work at the moment because it looks like it's broken
in synapse as per https://github.com/matrix-org/sytest/pull/391

But if it did work, the client side code might look something
like this.
 2017-09-22 19:27:02 +01:00
Luke Barnard
791bc5e7ac Create GroupSummaryStore for storing group summary stuff 
- Acts as a layer between GroupView and the group APIs that modify the summary individually. This allows for abstraction of getting the new summary once a successful API hit has been done.
 - The plan is to also control the avatar, topic, body of the summary via the same class
 2017-09-22 18:52:06 +01:00
David Baker
86ceef712d Fix broken i18n files 2017-09-22 18:24:45 +01:00
David Baker
5004d90a3a Merge remote-tracking branch 'origin/develop' into dbkr/member_list_show_more 2017-09-22 18:03:16 +01:00