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

293 commits

Author SHA1 Message Date
Travis Ralston
3a58e1c066 Show pinned message changes in the timeline 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 08:56:21 -06:00
Luke Barnard
1f66baca4b Remove "You have entered an invalid contact..." from translations 2017-09-27 17:55:09 +01:00
Luke Barnard
3a8bfbf7e0 Construct address picker message using provided validAddressTypes 2017-09-27 17:11:30 +01:00
Stefan Parviainen
35cb52febc Fix merge conflict 2017-09-27 08:41:37 +02:00
Luke Barnard
1b12602ea5 Merge branch 'develop' into luke/groups-add-rooms 2017-09-26 17:12:52 +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
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
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
14bce1119c Make theme names translatable 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-09-23 21:36:10 +02:00
Stefan Parviainen
4da7a368a4 Fix incorrect variable in string 2017-09-23 10:04:59 +02: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
Luke Barnard
4c1a85cb71 Merge pull request #1415 from matrix-org/luke/groups-remove-featured-rooms-and-users 
Implement removal function of features users/rooms
 2017-09-22 16:32:40 +01:00
Luke Barnard
2e45f121ee Add missing comma to en_EN.json 2017-09-22 16:25:31 +01:00
Luke Barnard
3f9d20de97 Implement removal function of features users/rooms 
With the appeareance of a "X" in the top right of each featured item when editing.

NB: No reloading of summary is done after adding/removing a user/room. The plan is to better than threading a callback all the way down.
 2017-09-22 15:56:35 +01:00
David Baker
77efe6a6d0 Merge pull request #1409 from pafcu/develop 
Remove unneeded strings
 2017-09-22 09:46:50 +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
cf23ac5931 Merge branch 'develop' into luke/groups-add-feature-rooms 2017-09-21 17:20:12 +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
Luke Barnard
4d9c43b3c8 Display dialog when errors occur whilst featuring users 2017-09-21 12:34:16 +01:00
Luke Barnard
44c38652ab Implement UserPickerDialog for adding users 
Also, use AccessibleButtons.
 2017-09-20 15:44:42 +01:00
Luke Barnard
1c6cecbd43 Add "Add a User/Room" buttons and always display default lists 2017-09-20 14:41:29 +01:00
Luke Barnard
5295d7f058 Merge branch 'develop' into luke/feature-flair 2017-09-19 14:55:54 +01:00
Luke Barnard
e9fb5712bd Merge branch 'develop' into dbkr/group_userlist 2017-09-19 13:26:55 +01:00
Luke Barnard
925cb2dccf Do translation correctly 2017-09-18 17:44:13 +01:00
Luke Barnard
26941e994f Merge branch 'develop' into luke/feature-flair 2017-09-18 14:46:50 +01:00
Luke Barnard
548e5f516c Put flair into labs 2017-09-18 14:38:41 +01:00
Matthew Hodgson
141ae916ce Merge pull request #1387 from turt2live/travis/tooltip_redacter 
Show who redacted an event on hover
 2017-09-17 22:36:18 +01:00
Matthew Hodgson
6a53b7b149 Merge pull request #1389 from turt2live/travis/ignored_users 
Add ignore user API support
 2017-09-17 22:05:02 +01:00
Matthew Hodgson
bc565ba925 Merge pull request #1392 from turt2live/travis/no_emoji 
Add option to disable Emoji suggestions
 2017-09-17 21:40:43 +01:00
Michael Telatynski
63ccc45551
Merge branches 'develop' and 't3chguy/i18n-1' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n-1 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/i18n/strings/nl.json
#	src/i18n/strings/zh_Hans.json
 2017-09-17 13:33:34 +01:00
Michael Telatynski
ce2cdf3fa1
sanitize the i18n for fn:textForHistoryVisibilityEvent 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-17 13:28:17 +01:00
turt2live
b2de016b35 Add option to disable Emoji suggestions 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-14 21:28:12 -06:00
turt2live
3c71898237 Add /(un)ignore to autocomplete 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-14 20:30:40 -06:00
Travis Ralston
3889df6b08 Add (un)ignore button to MemberInfo 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-14 19:42:09 -06:00
Travis Ralston
13a251e29c Give feedback for /ignore and /unignore 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-14 16:21:36 -06:00
Travis Ralston
4579d20fd0 Unignore people from the settings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-14 15:33:36 -06:00
Travis Ralston
4df16e8245 Display which users are ignored in the user settings 
Adds https://github.com/vector-im/riot-web/issues/1767

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-14 12:51:53 -06:00
turt2live
8dc2604d63 Show who redacted an event on hover 
This should fix #3931 although it's not obvious who actually performed the redaction.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-14 09:03:05 -06:00
David Baker
5087da9247 Merge remote-tracking branch 'origin/develop' into luke/feature-flair 2017-09-13 16:52:12 +01:00
David Baker
3c3328c5f1 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-09-13 16:34:39 +01:00
Michael Telatynski
b10b0e573d
i18n and change message depending on success of copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-06 11:29:55 +01:00
David Baker
738c81b506 Add missing translations 2017-09-05 17:36:41 +01:00
David Baker
158e6fd9ff Merge pull request #1361 from MTRNord/patch-9 
Remove unused string "changing room on a RoomView is not supported"
 2017-09-05 17:20:26 +01:00
Marcel
a573a396ad Remove unused string "changing room on a RoomView is not supported" 2017-09-05 18:07:22 +02:00
Marcel
5684b6a23c Remove unused translation code translations 2017-09-05 17:35:03 +02:00
David Baker
289c3a5fbd Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-09-05 14:20:02 +01:00
David Baker
de2940f469 Fix plurals in translations 
Weblate doesn't understand counterpart's multi-level format for
plurals and helpfully mangles them to be dot-separated keys when it
saves the translation file. Store the source files with pipe
separators and convert to counterpart format at build time.
 2017-09-04 17:09:36 +01:00
David Baker
79ee41351c Fix typo 2017-09-04 15:45:28 +01:00
David Baker
9efa604706 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-30 17:39:47 +01:00
David Baker
b13ae76cfc Merge pull request #1345 from matrix-org/t3chguy/text4event_modified_widget 
text4event widget modified, used to show widget added each time.
 2017-08-30 13:56:27 +01:00
David Baker
6d5b1b7a55 Percent encoding isn't a valid thing within _t 
Just use a plain apostrophe
 2017-08-29 14:18:24 +01:00
Michael Telatynski
6127727267
text4event widget modified, used to show widget added each time. 2017-08-28 08:19:39 +01:00
David Baker
299db845ff PR feedback 2017-08-25 12:10:13 +01:00
David Baker
5f816666e1 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-22 10:08:02 +01:00
David Baker
e77ea352e4 Support full group membership cycle 
Apart from knocking, ie. Invite / accept / reject / leave
 2017-08-21 19:18:32 +01:00
Richard Lewis
866f6f1dd3 Add missing translation. 2017-08-21 12:11:21 +01:00
Richard Lewis
38720e6216 Add internationlisation. 2017-08-21 10:05:16 +01:00
Richard Lewis
7395f96b77 Rearrange timeline update wording for better internationalisation. Fix widget name values. 2017-08-18 18:02:50 +01:00
Richard Lewis
b7d46d91ed Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes 2017-08-18 15:35:01 +01:00
Luke Barnard
9382689675 Merge branch 'develop' into luke/feature-widget-timeline-events 2017-08-18 10:47:25 +01:00
Luke Barnard
acc54b97f1 Implement TextualEvent tiles for im.vector.modular.widgets 
E.g. "Bob added a Acme widget", "Susan removed a Giraffe widget"

The name is calculated by taking the `name` in the event content, falling back on the `type`, falling back on the previous content `type`. This is then capitalised.
 2017-08-18 10:35:33 +01:00
Matthew Hodgson
bb0845954d improve wording for directory listings 2017-08-17 19:10:45 +01:00
Richard Lewis
0907fff080 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes 2017-08-17 17:47:46 +01:00
Michael Telatynski
bdb2d6b475
Merge remote-tracking branch 'remotes/origin/develop' into set_default_federate_by_settings 
# Conflicts:
#	src/components/structures/MatrixChat.js
 2017-08-17 13:39:19 +01:00
Michael Telatynski
ca5e26744f
Make dialog more specific and hide options behind advanced spoiler 2017-08-17 13:33:07 +01:00
Richard Lewis
9111cb421e Merge pull request #1291 from matrix-org/rxl881/maxWidgets 
Show a dialog if the maximum number of widgets allowed has been reached.
 2017-08-17 10:03:42 +01:00
MTRNord
fceccfc503 Add missing Robot string to translation 2017-08-16 23:54:36 +02:00
David Baker
ddf1017799 Make group invites work 2017-08-16 14:58:30 +01:00
David Baker
64f352dda7 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-15 10:49:07 +01:00
Richard Lewis
0323151bee Show a dialog if the maximum number of widgets allowed has been reached. 2017-08-10 23:53:43 +01:00
Luke Barnard
d3ba1f40dc Merge pull request #1272 from matrix-org/t3chguy/hide_other_events 
allow hiding of avatar/display name changes
 2017-08-10 15:35:11 +01:00
Michael Telatynski
ab3abd2f7f
fix string casing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 13:59:55 +01:00
Luke Barnard
794bf820cc Merge pull request #1259 from matrix-org/t3chguy/fix-select-mxid-dialog 
Fix Set MXID Dialog woes
 2017-08-09 17:53:50 +01:00
David Baker
c1546ceb59 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-09 13:46:15 +01:00
Luke Barnard
b08d32371d Add optional setting for hiding avatars in <Pill>s 
As part of https://github.com/vector-im/riot-web/issues/4640#issuecomment-316659445
 2017-08-08 11:13:29 +01:00
Michael Telatynski
ffdffb643d
allow hiding of avatar/display name changes 2017-08-04 17:22:01 +01:00
David Baker
234a88c098 WIP group member list/tiles 2017-08-04 15:00:34 +01:00
Michael Telatynski
4b4b730233
fix and i18n the impl 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-02 13:41:26 +01:00
Richard Lewis
abae43b65e Merge pull request #1257 from matrix-org/rxl881/widgetPermissions 
Widget permissions
 2017-08-01 12:13:09 +01:00
Michael Telatynski
f310d4446c
i18n the title of the set mxid dialog 2017-07-31 13:31:07 +01:00
Richard Lewis
8529a21f5c Translate "Allow" 2017-07-28 16:42:07 +01:00
Richard Lewis
f7e9dd4118 Add edit translation 2017-07-27 19:56:28 +01:00
Richard Lewis
997c7493eb Add translations for delete widget and revoke widget access. 2017-07-27 17:46:45 +01:00
Luke Barnard
c4f049effe Merge pull request #1243 from matrix-org/t3chguy/hide-join-part-2 
T3chguy/hide join part (attempt) 2
 2017-07-26 17:15:43 +01:00
David Baker
598411dd03 Add translation 2017-07-25 17:22:05 +01:00
Luke Barnard
1ef2a2bcf9 Merge pull request #1250 from matrix-org/dbkr/fix_truncatedlist_i18n 
Fix i18n on truncatedlist & friends to be sane
 2017-07-25 16:17:44 +01:00
David Baker
fa7a9818c6 Fix i19n on truncatedlist & friends to be sane 
Use the proper counterpart tool for plurals rather than if > 1.
Fix up all the translation files respectively.
 2017-07-25 15:59:06 +01:00
Michael Telatynski
b976649b5b
re-add i18n string 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-22 12:52:19 +01:00
David Baker
f2afd852d8 Make group editing work 2017-07-21 14:03:10 +01:00
David Baker
7041106bf2 Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit 2017-07-17 17:23:02 +01:00
David Baker
1cd79fc918 Rename group settings to 'Edit Group' 2017-07-17 17:17:18 +01:00
Luke Barnard
d97de4d576 Implement disabled-by-default setting for auto-replacement of plaintext emojis 
FTR a list of plaintexts and their unicode equivalents can be found here - https://github.com/vector-im/riot-web/issues/4554#issuecomment-314374303

Pressing space after a matching emoji will replace the plaintext emoji with the equivalent unicode emoji.
 2017-07-13 17:37:43 +01:00
Luke Barnard
441954c8c1 Remove i18n for "Unknown command" 2017-07-13 09:55:11 +01:00
Luke Barnard
af3b6484cd Merge pull request #1196 from matrix-org/dbkr/groups_better_groupview 
Add more features to Group View
 2017-07-11 17:03:47 +01:00
Kegsay
6369253142 Scalar messaging: Add can_send_event operation (#1204) 
This is mainly for use to pre-emptively show/hide buttons.
 2017-07-11 15:20:33 +01:00
David Baker
925d5bd480 Add featured users to Group View 2017-07-10 19:32:02 +01:00