OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
7,331 Commits
229 Branches
566 Tags
473 MiB
Commit Graph

6070 Commits (f0000f74007b09ccad3b9616b11a5553f9eea2db)

Author SHA1 Message Date
Stefan Parviainen 6406fc3865 Use plurals in WhoIsTyping 2017-10-24 18:32:50 +02:00
Stefan Parviainen 4ff369c884 Merge branch 'develop' into departify 2017-10-24 18:27:24 +02:00
Luke Barnard 7b666af24c When dispatching view_[my_]group[s], reset RoomViewStore 
so that RoomTiles are not highlighted when the user is looking at MyGroups or GroupView
 2017-10-24 16:32:52 +01:00
Luke Barnard 640d88f25d Typo 2017-10-24 16:21:18 +01:00
Luke Barnard ee7ebc425c Only show editing UI for aliases/related_groups for users /w power 2017-10-24 16:19:09 +01:00
David Baker f7dce8ec70 Merge pull request #1528 from matrix-org/luke/groups-settings-privileged-only 
Prevent editing of UI requiring user privilege if user unprivileged
 2017-10-24 15:51:16 +01:00
David Baker 9e54002983 Merge pull request #1526 from matrix-org/luke/fix-group-rooms-guest-can-join- 
Use the correct property of the API room objects
 2017-10-24 15:31:49 +01:00
Luke Barnard 459ffc47d6 Prevent editing of UI requiring user privilege if user unprivileged 2017-10-24 15:25:35 +01:00
David Baker 8447d15013 Don't include the |other in the translation value 2017-10-24 14:26:30 +01:00
Luke Barnard e955d27b5f Use the correct property of the API room objects 2017-10-24 13:47:10 +01:00
David Baker f9c45d2c45 Re-run gen-i18n after fixing https://github.com/matrix-org/matrix-react-sdk/pull/1521 2017-10-24 13:40:44 +01:00
David Baker ba46faf1b1 Merge pull request #1522 from matrix-org/luke/fix-group-react-warnings 
Fix some react warnings in GroupMemberList
 2017-10-24 11:18:03 +01:00
David Baker f29f627c31 Merge pull request #1524 from matrix-org/luke/groups-store-true-global 
Make GroupStoreCache global for cross-package access
 2017-10-24 11:05:14 +01:00
Luke Barnard d1db0d6426 Deduplicate members, key by userId 2017-10-24 10:50:31 +01:00
Luke Barnard 3ae31dd426 Make GroupStoreCache global for cross-package access 2017-10-24 10:39:47 +01:00
Luke Barnard e419446081 Add fields needed by RoomDetailList to groupRoomFromApiObject 
and also alter props API for RDL to match the returned rooms.
(This doesn't affect RoomDirectory - this does not use RDL (yet))
 2017-10-24 10:13:38 +01:00
Luke Barnard 1cc427ba46 Fix some react warnings in GroupMemberList 
- If the list contains two users twice, react would warn about duplicate keys. Use `index` instead.
 - Check if unmounted before setting state after fetching members.
 2017-10-24 09:58:45 +01:00
Richard Lewis 11d4a63a32 Update text and split across multiple lines. 2017-10-23 23:59:36 +01:00
Richard Lewis 8b7f737c97 Remove logging. 
Return early.
 2017-10-23 23:47:37 +01:00
Richard Lewis 54bd916862 Split string across multiple lines. 2017-10-23 20:08:52 +01:00
Stefan Parviainen 115772d526 Fix merge conflict 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-23 19:57:52 +02:00
Stefan Parviainen ef30ba889b Make MemberEventListSummary more translatable 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-23 19:55:40 +02:00
Richard Lewis 3c4c986aca Update button text 2017-10-23 18:42:43 +01:00
Luke Barnard 2f418976aa Only show flair for groups with avatars set 
Fix vector-im/riot-web#5377
 2017-10-23 17:06:47 +01:00
Richard Lewis ee60155846 Add delete widget confirmation dialog. 2017-10-23 17:05:44 +01:00
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 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 e89371fb1c Add click-to-open-settings functionality to GroupAvatar 2017-10-23 14:54:57 +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
David Baker 00a13c780f Run prunei18n 2017-10-20 11:39:01 +01:00
Weblate 639820cfc8 Merge remote-tracking branch 'origin/develop' into develop 2017-10-20 10:01:34 +00: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 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 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
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
David Baker 9141ba280a Lint 2017-10-19 15:55:57 +01:00
Luke Barnard ea1dbe1f76 Fix invites to groups without names 2017-10-19 15:47:52 +01:00
David Baker f98fe7fa87 Add warning when adding group rooms/users 2017-10-19 15:37:35 +01:00
Weblate 284b8803c0 Merge remote-tracking branch 'origin/develop' into develop 2017-10-19 14:07:45 +00:00
Bamstam 388218be6e Translated using Weblate (German) 
Currently translated at 97.5% (883 of 905 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-19 14:07:44 +00:00
Luke Barnard 2be0ebdd1d More Groups->Communities 2017-10-19 15:01:16 +01:00
Weblate 28c4e80870 Merge remote-tracking branch 'origin/develop' into develop 2017-10-19 11:16:19 +00:00
Luke Barnard fd65cb1396 Merge pull request #1501 from matrix-org/luke/groups-are-communities 
Groups -> Communities
 2017-10-19 12:16:15 +01:00
Weblate 9d40e1ad46 Merge remote-tracking branch 'origin/develop' into develop 2017-10-19 11:05:10 +00:00
Luke Barnard bafa2c6be0 Fix typo 2017-10-19 12:03:59 +01:00
Luke Barnard 25d14af616 Export a global.singletonFlairStore to allow cross-project singleton 2017-10-19 12:00:03 +01:00
Luke Barnard c3f143acc3 Merge branch 'develop' into luke/groups-are-communities 2017-10-19 11:31:00 +01:00
Luke Barnard 2db0eab5c5 s/Groups/Communities 2017-10-19 11:29:03 +01:00
Bamstam b1a59d73fd Translated using Weblate (German) 
Currently translated at 100.0% (901 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-19 10:18:33 +00:00
Luke Barnard 71443e9b94 Remove logs comments 2017-10-19 10:34:24 +01:00
Luke Barnard 5f3c06b38a Factor out Flair cache into FlairStore 
This will make invalidating the userGroups cache for the user architecturally more sound (the plan is to have GroupStore hit FlairStore as opposed to Flair itself in order to invalidate the cache).
 2017-10-19 10:28:59 +01:00
Krombel 99520779e8 Translated using Weblate (German) 
Currently translated at 100.0% (901 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-19 08:29:51 +00:00
Weblate 2d3885b146 Merge remote-tracking branch 'origin/develop' into develop 2017-10-19 08:20:31 +00:00
Andrey 9180508bf8 Translated using Weblate (Russian) 
Currently translated at 100.0% (901 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-10-19 08:20:31 +00:00
Matthew Hodgson 7fe8c9cb01 fix lint 2017-10-19 01:48:49 +02:00
Matthew Hodgson 1087b36597 fix editing visuals on groupview header 2017-10-18 17:49:49 +01:00
Andrey 2781a04eca Translated using Weblate (Russian) 
Currently translated at 100.0% (901 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-10-18 16:37:13 +00:00
Luke Barnard a40704f085 Merge branch 'develop' into luke/groups-are-communities 2017-10-18 15:57:37 +01:00
Weblate 0ba409a715 Merge remote-tracking branch 'origin/develop' into develop 2017-10-18 14:54:26 +00:00
Krombel 653d5c7365 Translated using Weblate (German) 
Currently translated at 99.6% (926 of 929 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-18 14:54:25 +00:00
David Baker 12d6722265 Re-run the fun 2017-10-18 15:48:33 +01:00
David Baker 474b0c96ad Merge pull request #1495 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2017-10-18 15:19:24 +01:00
Weblate 15cadd864c Merge remote-tracking branch 'origin/develop' into develop 2017-10-18 14:18:25 +00:00
Luke Barnard 96cc74ab62 Attempt to relate a group to a room when adding it 
So as to remove another step on "The Route To Flair" (the steps taken for a user to get flair to appear on their SenderProfile in a room).
 2017-10-18 15:00:54 +01:00
Weblate 47dcf4849e Merge remote-tracking branch 'origin/develop' into develop 2017-10-18 09:13:05 +00:00
Walter b211b9d344 Translated using Weblate (Russian) 
Currently translated at 100.0% (925 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-10-18 09:13:04 +00:00
Luke Barnard 677c8e95ee Merge branch 'develop' into luke/groups-move-buttons 2017-10-18 10:31:54 +02:00
Stefan Parviainen 7eeed3e093 Simplify MemberEventListSummary by using pluralization provided by the i18n library 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-17 23:46:23 +02:00
Stefan Parviainen fc860c66bc De-partify RoomPreviewBar 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-17 22:03:49 +02:00
Stefan Parviainen 468a05c6f1 Fix SenderProfile 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-17 21:32:35 +02:00
Weblate dd33092985 Merge remote-tracking branch 'origin/develop' into develop 2017-10-17 18:30:54 +00:00
David Baker 62a79d823d Merge pull request #1491 from matrix-org/luke/groups-fix-optional-profile-properties 
Fix bug preventing partial group profile
 2017-10-17 19:30:50 +01:00
Weblate dc6f10ee7f Merge remote-tracking branch 'origin/develop' into develop 2017-10-17 17:11:14 +00:00
Ramon Vilar 2b3a8cd365 Translated using Weblate (Catalan) 
Currently translated at 4.5% (42 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
 2017-10-17 17:11:13 +00:00
Luke Barnard df9e037bfc Default values when GETing instead of when POSTing 2017-10-17 18:11:00 +01:00
Luke Barnard 1b8c5b50db Don't show room IDs when picking rooms 2017-10-17 18:02:35 +01:00
Luke Barnard 3bbff627fc Fix bug preventing partial group profile 
When updating the group profile, send empty strings instead of `null` as synapse does not expect `null`.
 2017-10-17 17:26:34 +01:00
Luke Barnard 49b7525a67 Actually move the buttons in GroupView 
- The "Leave" button is now in the top-right
 - The "Publish" button is not a checkbox
 2017-10-17 16:10:34 +01:00
Luke Barnard 0415869b8c Add useful functions to GroupView to inspect user flags 2017-10-17 16:08:19 +01:00
Luke Barnard 626f007f4e Move membership section above long description textarea 2017-10-17 12:00:31 +01:00
Luke Barnard 7df3335570 Only show membership settings when editing 2017-10-17 11:59:52 +01:00
Luke Barnard 495465e865 Put invite accept/decline buttons in correct div to align them to the right 2017-10-17 11:59:16 +01:00
Weblate 68c02cad33 Merge remote-tracking branch 'origin/develop' into develop 2017-10-17 10:33:45 +00:00
Bamstam ba160ffbd0 Translated using Weblate (German) 
Currently translated at 99.8% (924 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-17 10:33:44 +00:00
Luke Barnard 85d99d429d Use correct logic operator 2017-10-17 09:49:39 +01:00
Szimszon 5686d8204a Translated using Weblate (Hungarian) 
Currently translated at 100.0% (925 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2017-10-16 20:16:58 +00:00
Krombel 09070a7747 Translated using Weblate (German) 
Currently translated at 99.8% (924 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-16 19:05:05 +00:00
Stefan Parviainen 8083dccfa5 De-partify SenderProfile 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>

Also, text does not need to be EmojiText
 2017-10-16 20:53:43 +02:00
Andrey b7644a9595 Translated using Weblate (Russian) 
Currently translated at 100.0% (925 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-10-16 17:28:06 +00:00
Luke Barnard 14eee9a37a Only show invited section if there are invited group members 2017-10-16 17:59:53 +01:00
Luke Barnard 0c34e943fb Merge branch 'develop' into luke/groups-are-communities 2017-10-16 17:34:06 +01:00
Weblate 8921eb903f Merge remote-tracking branch 'origin/develop' into develop 2017-10-16 16:29:19 +00:00
Luke Barnard 760b3cc60a Merge pull request #1488 from matrix-org/luke/groups-invited-users 
Show "Invited" section in the user list
 2017-10-16 18:29:15 +02:00
Luke Barnard 9b08f4d11f Separate fetching indicator state 2017-10-16 17:21:05 +01:00
Weblate 88cc53f770 Merge remote-tracking branch 'origin/develop' into develop 2017-10-16 15:42:28 +00:00
Luke Barnard 008e8d4f54 Show "Invited" section in the user list 2017-10-16 16:38:32 +01:00
Luke Barnard 47ac0988ba Refactor class names for an entity tile being hovered over 2017-10-16 16:31:13 +01:00
Stefan Parviainen 9edcd0a9e5 Translated using Weblate (Finnish) 
Currently translated at 78.8% (729 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2017-10-16 13:46:39 +00:00
Luke Barnard eaa5dd5f22 Groups -> Communities in the UI 
Translation files still need updating, and this would be much simpler with a script that could automate the tedium
 2017-10-16 13:18:39 +01:00
Weblate 09b381bc82 Merge remote-tracking branch 'origin/develop' into develop 2017-10-16 09:17:50 +00:00
André Breda b8aa9e8bc1 Translated using Weblate (Portuguese) 
Currently translated at 94.3% (872 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
 2017-10-16 09:17:50 +00:00
Bamstam 62897457fa Translated using Weblate (German) 
Currently translated at 99.8% (923 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-16 09:17:50 +00:00
David Baker e4a3309752 Merge pull request #1475 from matrix-org/luke/groups-room-directory-esque 
Modify GroupView UI
 2017-10-16 10:17:44 +01:00
Krombel b230bb02b3 Translated using Weblate (German) 
Currently translated at 99.8% (923 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-15 21:08:30 +00:00
Bamstam b483b4f3a0 Translated using Weblate (German) 
Currently translated at 99.7% (922 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-15 20:15:27 +00:00
Krombel 9a6bbf373b Translated using Weblate (German) 
Currently translated at 99.6% (921 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-15 20:14:44 +00:00
Bamstam 851e278295 Translated using Weblate (German) 
Currently translated at 99.4% (919 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-15 20:13:25 +00:00
Krombel 8f5cb598f0 Translated using Weblate (German) 
Currently translated at 99.3% (918 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-15 20:12:33 +00:00
Stefan Parviainen ad2f54f8ab Fix italics and parens 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-15 18:01:57 +02:00
Stefan Parviainen 15d1dc1f3b Fix indentation 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-15 16:57:22 +02:00
Stefan Parviainen 9a5cffb5eb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into departify 2017-10-15 16:49:27 +02:00
Andrey bee1623ddc Translated using Weblate (Russian) 
Currently translated at 100.0% (924 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-10-15 06:03:47 +00:00
Weblate 407233757e Merge remote-tracking branch 'origin/develop' into develop 2017-10-15 00:47:19 +00:00
Matthew Hodgson 1d75d9e90d yet more horrifically strict linting :/ 2017-10-15 01:47:11 +01:00
Weblate 69881c4455 Merge remote-tracking branch 'origin/develop' into develop 2017-10-15 00:19:14 +00:00
Matthew Hodgson 635996c083 more bizarrely strict linting :/ 2017-10-15 01:19:06 +01:00
Weblate 2f9e3104de Merge remote-tracking branch 'origin/develop' into develop 2017-10-15 00:14:00 +00:00
Matthew Hodgson 247e32115f bizarrely strict linting :/ 2017-10-15 01:13:52 +01:00
Weblate 10019fb890 Merge remote-tracking branch 'origin/develop' into develop 2017-10-15 00:03:23 +00:00
Bamstam b171636e1b Translated using Weblate (German) 
Currently translated at 99.5% (917 of 921 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-15 00:03:22 +00:00
Matthew Hodgson 2b367edccf Merge pull request #1439 from turt2live/travis/pinned_messages 
Message/event pinning
 2017-10-15 01:03:18 +01:00
Weblate dd948272c5 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:49:39 +00:00
Matthew Hodgson 40c682008b Merge pull request #1483 from turt2live/travis/fix-oct14 
Remove duplicate declaration that breaks the build
 2017-10-14 23:49:35 +01:00
Weblate 57296d03e8 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:48:47 +00:00
Matthew Hodgson 67ba0e59a2 Merge pull request #1301 from zeroware/develop 
Include magnet scheme in sanitize HTML params
 2017-10-14 23:48:43 +01:00
Weblate 8f86a58261 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:45:53 +00:00
Matthew Hodgson e57d9e686b Merge branch 'develop' into t3chguy/jump_to_rr 2017-10-14 23:45:17 +01:00
Weblate a6a0fbfc91 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:43:16 +00:00
Matthew Hodgson f32ba0b54c Merge pull request #1462 from pafcu/translation-fixes 
Use standard subsitution syntax in _tJsx
 2017-10-14 23:43:12 +01:00
Weblate 463e17b223 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:41:36 +00:00
Matthew Hodgson 71d25bf787 Merge pull request #1442 from turt2live/travis/no_grey 
Don't suggest grey as a color scheme for a room
 2017-10-14 23:41:32 +01:00
Travis Ralston c55ffe1be7 Remove duplicate declaration that breaks the build 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-14 16:41:02 -06:00
Travis Ralston 8a641c7173 Hide message pinning behind a labs setting 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-14 16:40:10 -06:00
Travis Ralston 838b9957da Merge remote-tracking branch 'matrix-org/develop' into travis/pinned_messages 2017-10-14 16:33:46 -06:00
Weblate 3428c1c3d3 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:10:39 +00:00
Travis Ralston c34b55c6c7 Merge branch 'develop' into travis/pinned_messages 2017-10-14 16:10:32 -06:00
Matthew Hodgson d63a25a183 Merge branch 'develop' into t3chguy/hide_notification_body 2017-10-14 23:10:01 +01:00
Weblate 9051efeecf Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 21:44:35 +00:00
Matthew Hodgson 9f64261707 Merge branch 'develop' into travis/alone_warning 2017-10-14 22:43:36 +01:00
Weblate dde0cc1baa Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 21:13:35 +00:00
Matthew Hodgson 3efa0d2a76 Merge pull request #1478 from turt2live/travis/unset-avatar 
Buttons to remove room/self avatar
 2017-10-14 22:13:32 +01:00
Matthew Hodgson 8d6f0db3e2 be explicit in remove button height 2017-10-14 22:13:00 +01:00
Weblate 538e0251ed Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 21:09:59 +00:00
Matthew Hodgson 0284a582a1 Merge pull request #1480 from matrix-org/t3chguy/fix_memberlist 
T3chguy/fix memberlist
 2017-10-14 22:09:55 +01:00
Weblate fd6d1f0a75 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 21:06:20 +00:00
Andrey 6dad6da66e Translated using Weblate (Russian) 
Currently translated at 94.8% (870 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-10-14 21:06:20 +00:00
Carlos Marques 8efeab924a Translated using Weblate (Portuguese) 
Currently translated at 93.0% (853 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
 2017-10-14 21:06:19 +00:00
Bamstam 329e258122 Translated using Weblate (German) 
Currently translated at 99.8% (916 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-14 21:06:19 +00:00
Michael Telatynski c7c28c7ad2
make linter happy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-14 19:53:08 +01:00
Michael Telatynski c1edc0c32e
add option to disable BigEmoji 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-14 19:40:45 +01:00
Michael Telatynski b0b7472901
undo bad merge 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-14 17:14:57 +01:00
Michael Telatynski e79f9ef011
=== > == 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-14 17:10:51 +01:00
Michael Telatynski 6ad8532bed
lowerCase query so that searching for `Erik` will actually find `Erik`.. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-14 17:09:58 +01:00
Michael Telatynski a000439948
pass search query to filter fn in _updateList 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-14 17:09:30 +01:00
Travis Ralston 97ebd27175 Add missing translation 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-13 23:08:41 -06:00
Travis Ralston 6e7f0d649b Add option to unset your own avatar 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-13 21:13:47 -06:00
Travis Ralston e5c8e3e7ad Add option to unset room avatar 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-13 20:57:15 -06:00
Stefan Parviainen a84b42bf24 Departify RoomSettings 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-13 21:10:50 +02:00
Stefan Parviainen 3b91ada4c8 Departify sending emails and text messages 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-13 20:44:01 +02:00
Luke Barnard 6f20445a42 Explain topic click stopPropagation 2017-10-13 17:57:28 +01:00
Luke Barnard 3468abc975 Use GeminiScrollbar instead of ScrollPanel 2017-10-13 17:49:52 +01:00
Szimszon 34e9b10e95 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (917 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2017-10-13 16:44:09 +00:00
Luke Barnard 4b24eab8fd Merge branch 'luke/groups-room-directory-esque' of github.com:matrix-org/matrix-react-sdk into luke/groups-room-directory-esque 2017-10-13 17:19:58 +01:00
Luke Barnard aaf32ac9a0 Lint 2017-10-13 16:57:52 +01:00
Luke Barnard 83e7fc242a Merge branch 'develop' into luke/groups-room-directory-esque 2017-10-13 17:48:35 +02:00
Luke Barnard 77418f535e Modify GroupView UI 
- Remove featured users/rooms
 - Add "Rooms" section to show all rooms in the group in a room-directory-esque list. This has a "+" button in "edit" mode.
 - Make the group view body scrollable
 2017-10-13 16:46:33 +01:00
Weblate a4cdbd5fd4 Merge remote-tracking branch 'origin/develop' into develop 2017-10-13 15:14:45 +00:00
Szimszon f5abd1c2c8 Translated using Weblate (Hungarian) 
Currently translated at 93.5% (858 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2017-10-13 15:14:44 +00:00
David Baker d0759a537b Fix the enableLabs flag, again 
We were showing the options but ignoring them
 2017-10-13 16:06:17 +01:00
Weblate 98a5669eb1 Merge remote-tracking branch 'origin/develop' into develop 2017-10-13 13:43:44 +00:00
David Baker 5214a867db Fix labs again 2017-10-13 14:43:26 +01:00
Weblate efc906dd0f Merge remote-tracking branch 'origin/develop' into develop 2017-10-13 13:22:11 +00:00
Krombel 8405ec327e Translated using Weblate (German) 
Currently translated at 99.8% (916 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-13 13:22:10 +00:00
David Baker 4e793d4f68 skip unnecessary filter 2017-10-13 14:11:21 +01:00
David Baker f94873bd5d Honour the (now legacy) enableLabs flag 2017-10-13 13:58:24 +01:00
Weblate 27f6781499 Merge remote-tracking branch 'origin/develop' into develop 2017-10-13 10:53:43 +00:00
Krombel a9831f342f Translated using Weblate (German) 
Currently translated at 93.4% (857 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-13 10:53:42 +00:00
Bamstam e9cc088f7b Translated using Weblate (German) 
Currently translated at 92.9% (852 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-13 10:50:50 +00:00