PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
6879 commits 1 branch 0 tags 338 MiB
Commit graph

5715 commits

Author SHA1 Message Date
Luke Barnard
c128655321 Merge branch 'develop' into luke/groups-invite-warm-fuzzy 2017-10-11 16:05:51 +02:00
Luke Barnard
36666b3fc3 Add warm fuzzy dialog for inviting users to a group 2017-10-11 15:04:52 +01:00
Luke Barnard
f6eca14bee Merge pull request #1456 from matrix-org/dbkr/say_which_homeserver 
Make it clearer which HS you're logging into
 2017-10-11 15:11:22 +02:00
David Baker
0f84216a9f Grey out login form when no valid HS 2017-10-11 14:05:34 +01:00
Luke Barnard
99aabd9025 Merge pull request #1451 from matrix-org/t3chguy/redundant_thing 
Remove redundant stale onKeyDown
 2017-10-11 14:31:08 +02:00
Andrey
6ad0f2d8f8 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-10-11 12:30:08 +00:00
Luke Barnard
8aee5e1c25 Merge pull request #1453 from matrix-org/t3chguy/textForEvent 
Only allow event state event handlers on state events
 2017-10-11 14:30:02 +02:00
David Baker
fa24b4bd2d Remove this log - it's not an error worth logging 2017-10-11 09:48:12 +01:00
Pitchaya Boonsarngsuk
b4d6d654ca Translated using Weblate (Thai) 
Currently translated at 61.4% (525 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/th/
 2017-10-11 08:42:48 +00:00
Andrey
9cee2b3662 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-10-11 08:42:47 +00:00
Miloslav Nenadál
ce607d18b9 Translated using Weblate (Czech) 
Currently translated at 59.0% (505 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2017-10-11 08:42:47 +00:00
Stefan Parviainen
8266286e99 Ignore VS16 char in RTE 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-11 08:45:36 +02:00
David Baker
80ad7d4ad6 Update translations 2017-10-10 19:27:51 +01:00
David Baker
92be3af990 Make it clearer which HS you're logging into 
Otherwise there's no indication without clicking 'custom server'
 2017-10-10 19:16:42 +01:00
Iru Cai (vimacs)
8855a5e30a Translated using Weblate (Chinese (Simplified)) 
Currently translated at 89.7% (767 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2017-10-07 11:44:25 +00:00
Michael Telatynski
152499a17d
DRY map lookup 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-06 12:16:54 +01:00
Michael Telatynski
91ba939e23
tiny bit of de-lint for consistency 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-06 12:10:07 +01:00
Michael Telatynski
6a4e3792d4
split handlers into state and non-states 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-06 12:07:38 +01:00
Luke Barnard
917957c1dc Modify the group store to include group rooms 
and modify components to use this new part of the store such that feedback can be given
when adding or removing a room from the room list.
 2017-10-05 14:30:04 +01:00
Michael Telatynski
a8231f7bf9
Remove redundant stale onKeyDown 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-05 08:26:57 +01:00
Michael Telatynski
c115980f21
remove redundant&stale onKeyDown 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-05 08:08:39 +01:00
Michael Telatynski
38de4ae152
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-05 08:00:22 +01:00
Michael Telatynski
7492f2dffa
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into set_default_federate_by_settings 2017-10-04 22:35:29 +01:00
Luke Barnard
cbb36b163b Typo 2017-10-04 18:05:40 +01:00
Luke Barnard
c1318e9102 Only maintain one GroupStore in the GroupStoreCache 
So that the group store data is up-to-date and to prevent group stores hanging around in memory
 2017-10-04 17:51:38 +01:00
Luke Barnard
b16eb1713e Typo 2017-10-04 17:01:44 +01:00
Luke Barnard
4017fa7f1d Factor-out GroupStore and create GroupStoreCache 
In order to provide feedback when adding a room to a group, the group summarry store needs to be extended to store the list of rooms in a group. This commit is the first step required.

The next step is to get the GroupRoomList listening to updates from GroupStore and expose the list of rooms from GroupStore.

(We're running out of words to describe the hierachy of things that store things)
 2017-10-04 16:56:35 +01:00
Luke Barnard
ed74ac394b Put related groups UI behind groups labs flag 2017-10-04 14:35:13 +01:00
Luke Barnard
a400c03768 Merge pull request #1447 from matrix-org/luke/feature-flair-related-only 
Restrict Flair in the timeline to related groups of the room
 2017-10-04 14:24:59 +01:00
Luke Barnard
0c6b5776ec Remove commented imports 2017-10-04 14:09:51 +01:00
Luke Barnard
02e7287123 Remove constraint on groups being local, remove logging 2017-10-04 14:08:31 +01:00
Luke Barnard
8d46b19916 Restrict Flair in the timeline to related groups of the room 2017-10-04 14:06:49 +01:00
Luke Barnard
7be5e685f7 Implement UI for editing related groups of a room 
(using the new EditableItemList)
 2017-10-04 13:19:57 +01:00
Luke Barnard
9e3954865a Fix a couple of bugs with EditableItemList 
- fix entering the same thing twice (which had the bug of not emptying the "new" field)
 - fix editing items in the list (which would stack overflow because of typo)
 2017-10-04 13:15:38 +01:00
Luke Barnard
28b8582bd6 Merge branch 'develop' into luke/refactor-editable-list-from-alias-settings 2017-10-04 10:37:45 +01:00
Luke Barnard
4e9694be6d Maintain "blur to add" function to match previous UX 2017-10-04 10:28:26 +01:00
Luke Barnard
407a632a8d Fix typo 2017-10-04 10:26:43 +01:00
Luke Barnard
d25ebfb844 Remove cruft from EIL 2017-10-04 10:15:44 +01:00
Walter
5abf30f373 Translated using Weblate (Ukrainian) 
Currently translated at 13.6% (117 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2017-10-04 09:09:15 +00:00
Walter
a9a2b60dfc 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-10-04 09:09:14 +00:00
Danilo Resende
00a89f8263 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.3% (790 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
 2017-10-04 09:09:14 +00:00
Luke Barnard
011aadcb94 Merge pull request #1421 from pafcu/develop 
Add dummy translation function to mark translatable strings
 2017-10-04 10:09:09 +01:00
Luke Barnard
8243c39d83 Factor out EditableItemList from AliasSettings 
Such that we can reuse the same UI elsewhere, namely when editing related groups of a room (which is an upcoming feature).
 2017-10-04 10:00:01 +01:00
Pitchaya Boonsarngsuk
fa0a87ae39 Translated using Weblate (Thai) 
Currently translated at 61.4% (525 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/th/
 2017-10-03 10:45:08 +00:00
Luke Barnard
03581adf85 Merge pull request #1438 from matrix-org/luke/groups-remove-room 
Implement button to remove a room from a group
 2017-10-03 11:45:03 +01:00
Luke Barnard
6b834bc72e Add confirmation dialog for removing room from group 2017-10-03 11:16:22 +01:00
Luke Barnard
0116c4b486 Log the error when failing to removie room from group 2017-10-03 10:14:08 +01:00
Luke Barnard
3e34a460a4 Add error dialog for when removing room fails 2017-10-03 10:12:11 +01:00
Stefan Parviainen
a96169e80e Fix merge conflict 2017-10-02 17:57:22 +02:00
Silke
4361953d6d Translated using Weblate (Dutch) 
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/nl/
 2017-10-02 14:18:04 +00:00
David Baker
b202601d65 Fix showing 3pid invites in member list 2017-10-02 15:10:32 +01:00
Travis Ralston
20798dd2fa Expose power level setting for widgets 
Fixes https://github.com/vector-im/riot-web/issues/4866

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 15:37:32 -06:00
Travis Ralston
8ee9d39ffa Expose option for m.room.topic power level 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 15:12:05 -06:00
Travis Ralston
8ab3d94c1c Always show common events in the PL section of room settings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 15:11:48 -06:00
Travis Ralston
614cf950b6 Supply user-friendly labels for common events 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 14:45:00 -06:00
Travis Ralston
2e1b2178a1 Remove assumptions on how languages work in the power levels section 
This does mean that the strings will need to be re-translated, but now they may be more accurate because the comma is not assumed in the code.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 14:35:49 -06:00
Travis Ralston
415693bd83 Support editing power levels of events. 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 14:32:40 -06:00
Luke Barnard
955ca6cd2b Implement button to remove a room from a group 
NB: This doesn't provide any feedback to the user. We should use a GroupSummaryStore-style component to refresh the view after a successful hit to the API. This could affect the summary view as well, because when rooms are removed from a group, they are also removed from the summary (if necessary).
 2017-09-29 17:59:24 +01:00
Luke Barnard
c8b2158156 Lint 2017-09-29 10:42:23 +01:00
Luke Barnard
18e0d8da86 Rename Flair feature to Groups 2017-09-29 10:27:40 +01:00
Luke Barnard
739ddb8410 Merge branch 'develop' into luke/groups-button 2017-09-28 12:11:26 +01:00
Luke Barnard
6a988a0d08 Merge pull request #1436 from matrix-org/luke/lint-jsx-curly-spacing 
Add eslint rule to disallow spaces inside of curly braces
 2017-09-28 12:09:46 +01:00
Luke Barnard
6b9a2909df Add rule to enforce spacing in curly brackets in JSX children 
This required an updated in version of eslint-plugin-react to 7.4.0.
 2017-09-28 11:21:06 +01:00
Luke Barnard
3c99b2af3d Fix ability to invite existing mx users 
Bug introduced by https://github.com/matrix-org/matrix-react-sdk/pull/1432

We should really not be using string constant literals all over the place. 
We'd be less likely to run into this sort of bug these address types weren't copied literals.
 2017-09-28 10:55:09 +01:00
Luke Barnard
e9cf25f946 Remove "You have entered an invalid contact..." from translations 2017-09-28 10:06:51 +01:00
Luke Barnard
38fdd155f0 Construct address picker message using provided validAddressTypes 2017-09-28 10:06:51 +01:00
Luke Barnard
1f66baca4b Remove "You have entered an invalid contact..." from translations 2017-09-27 17:55:09 +01:00
Luke Barnard
929c8627d3 Add button to get to MyGroups (view_my_groups or path #/groups) 2017-09-27 17:45:49 +01:00
Luke Barnard
3a8bfbf7e0 Construct address picker message using provided validAddressTypes 2017-09-27 17:11:30 +01:00
Luke Barnard
f3b6b2cc06 Fix GroupView summary rooms displaying without avatars 
- GroupView can now render with rooms in the summary that do not have an avatar
 - RoomAvatar no longer has a redundant fallback avatar (this is handled by BaseAvatar)
 - RoomAvatar was delinted
 2017-09-27 16:18:15 +01:00
Luke Barnard
d52355f80e Implement adding rooms to a group (or group summary) by room ID 2017-09-27 15:30:58 +01:00
David Baker
2d8bc783b0 Merge pull request #1431 from matrix-org/luke/feature-flair-tooltip 
Give flair avatars a tooltip = the group ID
 2017-09-27 14:44:25 +01:00
Luke Barnard
f528e147e3 Give flair avatars a tooltip = the group ID 2017-09-27 14:36:22 +01:00
Luke Barnard
e3405cfd95 shouldOmitSelf -> includeSelf 2017-09-27 11:52:05 +01:00
Luke Barnard
6bc9b32ab7 Fix ability to feature self in a group summary 
By default the AddressPicker would omit the currently logged-in user. This adds a property to override that to allow "self" to be picked.
 2017-09-27 11:04:41 +01:00
Riot Administration
540885474a Translated using Weblate (English (United States)) 
Currently translated at 99.6% (852 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/

<<<i>>>>xss
 2017-09-27 09:36:53 +00:00
Luke Barnard
1ca9102442 Fix spinner appearing above RP header 
By wrapping the spinner in the mx_MemberList class. Also, use mx_RoomHeader_cancelButton for group settings cancel
 2017-09-27 10:36:44 +01:00
Stefan Parviainen
35cb52febc Fix merge conflict 2017-09-27 08:41:37 +02:00
Riot Administration
6bbf751f4b Translated using Weblate (English (United States)) 
Currently translated at 99.5% (851 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
 2017-09-27 02:37:22 +00: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
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