49ee78dab1
Merge remote-tracking branch 'origin/develop' into dbkr/composer_at_room_pills
2017-11-03 14:39:52 +00:00
151f9917b1
Fix group invites such that they look similar to room invites
...
- Change GroupInviteTile to use RoomTile CSS
- Give group invites their own sub list, with heading "Community Invites"
2017-11-03 12:19:37 +00:00
112c74a255
Add NotifProvider to offer @room as a completion
2017-11-02 18:54:25 +00:00
982e87e01c
Communities are communities, wrap div for label alignment
2017-11-02 15:04:40 +00:00
bf77b51b5e
Merge branch 'develop' into luke/groups-room-publicity
2017-11-02 13:39:33 +00:00
790db94fd7
Add toggle to alter the visibility of a room-group association
2017-11-02 13:31:11 +00:00
e909d859ab
Merge branch 'develop' into luke/groups-room-info
2017-11-02 10:56:33 +00:00
80f79e6b84
Generate translations
2017-11-01 17:58:45 +00:00
64d8c81897
Merge branch 'develop' into matthew/status
2017-11-01 15:24:30 +00:00
d6f1e12bee
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-01 15:50:45 +01:00
f53a12d904
Generate en_EN translations
2017-10-31 10:25:48 +00:00
f44622b3d8
i18n for URL previews
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 21:50:22 -06:00
858c3a2548
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-10-27 18:59:57 +01:00
95b2392104
Merge branch 'develop' into departify
2017-10-27 19:23:13 +02:00
1d5b4a9d50
Merge branch 'develop' into t3chguy/mention_user
2017-10-26 18:10:10 +01:00
eec6ed36cd
Use correct icon for group room deletion and make themeable
...
Also fix cancel icons to have class mx_filterFlipColor
2017-10-26 14:05:58 +01:00
5871a74228
Merge pull request #1534 from matrix-org/t3chguy/invite_in_memberinfo
...
Add invite button to MemberInfo if user has left or wasn't in room
2017-10-26 11:35:45 +01:00
5c32b5b11a
fix i18n
2017-10-26 02:10:03 +01:00
1237de3ef0
Merge branch 'develop' into matthew/status
2017-10-26 01:47:22 +01:00
24000ee456
Re-add i18n for labs
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-25 11:23:04 -06:00
3ae97348f8
Add option to mirror local video feed
2017-10-25 18:17:33 +01:00
cedc0b27a9
Handle redaction with no sender
2017-10-25 17:37:20 +01:00
53e983f9c7
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-25 18:19:27 +02:00
fd7e057ec0
Merge branch 'develop' into t3chguy/invite_in_memberinfo
2017-10-25 16:33:50 +01:00
fd85c74bc5
Merge pull request #1520 from matrix-org/rxl881/deleteWidget
...
Add a delete confirmation dialog for widgets
2017-10-25 10:45:52 +01:00
b3463146ba
Add invite button to MemberInfo if user has left or wasn't in room
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-25 01:00:13 +01:00
5514d81683
Add Mention button to MemberInfo
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-24 23:01:40 +01:00
bc034f3083
Update strings
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-24 19:34:32 +02:00
8447d15013
Don't include the |other in the translation value
2017-10-24 14:26:30 +01:00
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
11d4a63a32
Update text and split across multiple lines.
2017-10-23 23:59:36 +01:00
ee60155846
Add delete widget confirmation dialog.
2017-10-23 17:05:44 +01:00
a133fd1cf4
Fix "failed to create community" message
2017-10-23 14:57:40 +01:00
f09fbccc19
WIP
2017-10-23 00:56:15 +01:00
1a7710c192
Adjust wording on placeholder
2017-10-20 18:10:14 +01:00
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
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
a85a011db9
Fix faulty translation in GroupView
2017-10-19 18:06:32 +01:00
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
877f213057
Merge pull request #1509 from matrix-org/luke/groups-my-groups
...
Improve MyGroups UI
2017-10-19 17:35:48 +01:00
b0f8619754
Improve MyGroups UI
...
as per design layed out by @tur2live!
2017-10-19 17:24:45 +01:00
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
4abaa93cf0
Add clientside error for non-alphanumeric group ID
2017-10-19 16:28:02 +01:00
f98fe7fa87
Add warning when adding group rooms/users
2017-10-19 15:37:35 +01:00
2be0ebdd1d
More Groups->Communities
2017-10-19 15:01:16 +01:00
bafa2c6be0
Fix typo
2017-10-19 12:03:59 +01:00
2db0eab5c5
s/Groups/Communities
2017-10-19 11:29:03 +01:00
12d6722265
Re-run the fun
2017-10-18 15:48:33 +01:00
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
e4a3309752
Merge pull request #1475 from matrix-org/luke/groups-room-directory-esque
...
Modify GroupView UI
2017-10-16 10:17:44 +01:00
2b367edccf
Merge pull request #1439 from turt2live/travis/pinned_messages
...
Message/event pinning
2017-10-15 01:03:18 +01:00
e57d9e686b
Merge branch 'develop' into t3chguy/jump_to_rr
2017-10-14 23:45:17 +01:00
f32ba0b54c
Merge pull request #1462 from pafcu/translation-fixes
...
Use standard subsitution syntax in _tJsx
2017-10-14 23:43:12 +01:00
8a641c7173
Hide message pinning behind a labs setting
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 16:40:10 -06:00
c34b55c6c7
Merge branch 'develop' into travis/pinned_messages
2017-10-14 16:10:32 -06:00
9f64261707
Merge branch 'develop' into travis/alone_warning
2017-10-14 22:43:36 +01:00
3efa0d2a76
Merge pull request #1478 from turt2live/travis/unset-avatar
...
Buttons to remove room/self avatar
2017-10-14 22:13:32 +01:00
c1edc0c32e
add option to disable BigEmoji
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 19:40:45 +01:00
97ebd27175
Add missing translation
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-13 23:08:41 -06:00
83e7fc242a
Merge branch 'develop' into luke/groups-room-directory-esque
2017-10-13 17:48:35 +02:00
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
065ae9580d
Merge pull request #1459 from matrix-org/luke/groups-invite-warm-fuzzy
...
Add warm fuzzy dialog for inviting users to a group
2017-10-13 11:31:48 +02:00
f3b1baa3c0
Suggest to invite people when speaking in an empty room
...
Adds vector-im/riot-web#1053
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-11 21:15:00 -06:00
f694fb24ff
Fix merge-conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-11 20:02:14 +02:00
8958be9321
Merge pull request #1441 from turt2live/travis/who_banned
...
Show who banned the user on hover
2017-10-11 17:33:53 +02:00
8a2813ac08
Fallback to MXID instead of relying on the user being in the room
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-11 09:08:40 -06:00
d1fdd20809
Show who banned the user on hover
...
Fixes https://github.com/vector-im/riot-web/issues/5039
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-11 09:08:29 -06:00
f874fc1203
Merge branch 'develop' into travis/pl_enhancements
2017-10-11 08:42:45 -06:00
ffb9dd844a
Merge pull request #868 from psaavedra/set_default_federate_by_settings
...
Added TextInputWithCheckbox dialog
2017-10-11 16:28:03 +02:00
c128655321
Merge branch 'develop' into luke/groups-invite-warm-fuzzy
2017-10-11 16:05:51 +02:00
36666b3fc3
Add warm fuzzy dialog for inviting users to a group
2017-10-11 15:04:52 +01:00
581abcb4b7
Consistent subsitution variable in translations
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-11 09:15:24 +02:00
80ad7d4ad6
Update translations
2017-10-10 19:27:51 +01:00
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
dbb6f5a44d
i18n the Jump to Read Receipt in MemberInfo
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-07 19:27:49 +01:00
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
7be5e685f7
Implement UI for editing related groups of a room
...
(using the new EditableItemList)
2017-10-04 13:19:57 +01:00
011aadcb94
Merge pull request #1421 from pafcu/develop
...
Add dummy translation function to mark translatable strings
2017-10-04 10:09:09 +01:00
6b834bc72e
Add confirmation dialog for removing room from group
2017-10-03 11:16:22 +01:00
3e34a460a4
Add error dialog for when removing room fails
2017-10-03 10:12:11 +01:00
a96169e80e
Fix merge conflict
2017-10-02 17:57:22 +02:00
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
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
614cf950b6
Supply user-friendly labels for common events
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 14:45:00 -06:00
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
874d383a8f
Add dock for pinned messages at the top of the room
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 08:56:21 -06:00
3a58e1c066
Show pinned message changes in the timeline
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 08:56:21 -06:00
1f66baca4b
Remove "You have entered an invalid contact..." from translations
2017-09-27 17:55:09 +01:00
3a8bfbf7e0
Construct address picker message using provided `validAddressTypes`
2017-09-27 17:11:30 +01:00
35cb52febc
Fix merge conflict
2017-09-27 08:41:37 +02:00
1b12602ea5
Merge branch 'develop' into luke/groups-add-rooms
2017-09-26 17:12:52 +01:00
ddab8d7b5c
Implement "Add room to group" feature
2017-09-26 14:49:13 +01:00
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
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
e42e7bd3ad
Merge pull request #1419 from matrix-org/dbkr/publicity_toggle
...
Add status & toggle for publicity
2017-09-25 14:52:57 +01:00
2b5b708057
Translate unknown presence label
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-09-24 10:14:04 +02:00
14bce1119c
Make theme names translatable
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-09-23 21:36:10 +02:00
4da7a368a4
Fix incorrect variable in string
2017-09-23 10:04:59 +02:00
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
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
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
2e45f121ee
Add missing comma to en_EN.json
2017-09-22 16:25:31 +01:00
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
77efe6a6d0
Merge pull request #1409 from pafcu/develop
...
Remove unneeded strings
2017-09-22 09:46:50 +01:00
411a67c6b0
Remove unneeded strings
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-09-21 18:25:45 +02:00
cf23ac5931
Merge branch 'develop' into luke/groups-add-feature-rooms
2017-09-21 17:20:12 +01:00
3c2e6fdf9e
Honour the is_privileged flag in GroupView
2017-09-21 16:55:56 +01:00
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
4d9c43b3c8
Display dialog when errors occur whilst featuring users
2017-09-21 12:34:16 +01:00
44c38652ab
Implement UserPickerDialog for adding users
...
Also, use AccessibleButtons.
2017-09-20 15:44:42 +01:00
1c6cecbd43
Add "Add a User/Room" buttons and always display default lists
2017-09-20 14:41:29 +01:00
5295d7f058
Merge branch 'develop' into luke/feature-flair
2017-09-19 14:55:54 +01:00
e9fb5712bd
Merge branch 'develop' into dbkr/group_userlist
2017-09-19 13:26:55 +01:00
925cb2dccf
Do translation correctly
2017-09-18 17:44:13 +01:00
26941e994f
Merge branch 'develop' into luke/feature-flair
2017-09-18 14:46:50 +01:00
548e5f516c
Put flair into labs
2017-09-18 14:38:41 +01:00
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
6a53b7b149
Merge pull request #1389 from turt2live/travis/ignored_users
...
Add ignore user API support
2017-09-17 22:05:02 +01:00
bc565ba925
Merge pull request #1392 from turt2live/travis/no_emoji
...
Add option to disable Emoji suggestions
2017-09-17 21:40:43 +01:00
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
ce2cdf3fa1
sanitize the i18n for fn:textForHistoryVisibilityEvent
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-17 13:28:17 +01:00
b2de016b35
Add option to disable Emoji suggestions
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 21:28:12 -06:00
3c71898237
Add /(un)ignore to autocomplete
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 20:30:40 -06:00
3889df6b08
Add (un)ignore button to MemberInfo
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 19:42:09 -06:00
13a251e29c
Give feedback for /ignore and /unignore
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 16:21:36 -06:00
4579d20fd0
Unignore people from the settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 15:33:36 -06:00
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
755f22a7fa
shelving.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-14 17:39:18 +01:00
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
5087da9247
Merge remote-tracking branch 'origin/develop' into luke/feature-flair
2017-09-13 16:52:12 +01:00
3c3328c5f1
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
2017-09-13 16:34:39 +01:00
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
738c81b506
Add missing translations
2017-09-05 17:36:41 +01:00
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
a573a396ad
Remove unused string "changing room on a RoomView is not supported"
2017-09-05 18:07:22 +02:00
5684b6a23c
Remove unused translation code translations
2017-09-05 17:35:03 +02:00
289c3a5fbd
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
2017-09-05 14:20:02 +01:00
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
79ee41351c
Fix typo
2017-09-04 15:45:28 +01:00
9efa604706
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
2017-08-30 17:39:47 +01:00
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
6d5b1b7a55
Percent encoding isn't a valid thing within _t
...
Just use a plain apostrophe
2017-08-29 14:18:24 +01:00
6127727267
text4event widget modified, used to show widget added each time.
2017-08-28 08:19:39 +01:00
299db845ff
PR feedback
2017-08-25 12:10:13 +01:00
5f816666e1
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
2017-08-22 10:08:02 +01:00
e77ea352e4
Support full group membership cycle
...
Apart from knocking, ie. Invite / accept / reject / leave
2017-08-21 19:18:32 +01:00
866f6f1dd3
Add missing translation.
2017-08-21 12:11:21 +01:00
38720e6216
Add internationlisation.
2017-08-21 10:05:16 +01:00
7395f96b77
Rearrange timeline update wording for better internationalisation. Fix widget name values.
2017-08-18 18:02:50 +01:00
b7d46d91ed
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes
2017-08-18 15:35:01 +01:00
9382689675
Merge branch 'develop' into luke/feature-widget-timeline-events
2017-08-18 10:47:25 +01:00
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
bb0845954d
improve wording for directory listings
2017-08-17 19:10:45 +01:00
0907fff080
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes
2017-08-17 17:47:46 +01:00
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
ca5e26744f
Make dialog more specific and hide options behind advanced spoiler
2017-08-17 13:33:07 +01:00
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
fceccfc503
Add missing Robot string to translation
2017-08-16 23:54:36 +02:00
ddf1017799
Make group invites work
2017-08-16 14:58:30 +01:00
64f352dda7
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
2017-08-15 10:49:07 +01:00
0323151bee
Show a dialog if the maximum number of widgets allowed has been reached.
2017-08-10 23:53:43 +01:00
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
ab3abd2f7f
fix string casing
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 13:59:55 +01:00
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
c1546ceb59
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
2017-08-09 13:46:15 +01:00
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
ffdffb643d
allow hiding of avatar/display name changes
2017-08-04 17:22:01 +01:00
234a88c098
WIP group member list/tiles
2017-08-04 15:00:34 +01:00
4b4b730233
fix and i18n the impl
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-02 13:41:26 +01:00
abae43b65e
Merge pull request #1257 from matrix-org/rxl881/widgetPermissions
...
Widget permissions
2017-08-01 12:13:09 +01:00
f310d4446c
i18n the title of the set mxid dialog
2017-07-31 13:31:07 +01:00
8529a21f5c
Translate "Allow"
2017-07-28 16:42:07 +01:00
f7e9dd4118
Add edit translation
2017-07-27 19:56:28 +01:00
997c7493eb
Add translations for delete widget and revoke widget access.
2017-07-27 17:46:45 +01:00
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
598411dd03
Add translation
2017-07-25 17:22:05 +01:00
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
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
b976649b5b
re-add i18n string
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-22 12:52:19 +01:00
f2afd852d8
Make group editing work
2017-07-21 14:03:10 +01:00
7041106bf2
Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit
2017-07-17 17:23:02 +01:00
1cd79fc918
Rename group settings to 'Edit Group'
2017-07-17 17:17:18 +01:00
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
441954c8c1
Remove i18n for "Unknown command"
2017-07-13 09:55:11 +01:00
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
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
925d5bd480
Add featured users to Group View
2017-07-10 19:32:02 +01:00
696c72be2b
Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview
2017-07-10 14:03:30 +01:00
86e717f30d
Fix indenting
...
Also autocomplete delay was duplicated
2017-07-09 12:34:50 +01:00
1e713557bb
PR feedback
2017-07-07 18:34:40 +01:00
c21f90338d
Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview
2017-07-07 12:02:15 +01:00
45986306cc
Merge remote-tracking branch 'origin/develop' into dbkr/my_groups
2017-07-07 10:32:37 +01:00
fa37d03db6
Improve the Group View page
...
Show the rooms in the group in thir various categories, etc
2017-07-06 19:13:14 +01:00
c84d707124
Merge pull request #1169 from matrix-org/t3chguy/add-missing-autocomplete-commands
...
add missing commands to the Autocomplete CommandProvider
2017-07-04 10:32:29 +01:00
fc379e2a15
fix typos post-luke-review
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-03 19:24:18 +01:00
45559f7cf0
AM/PM strings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-07-03 09:25:03 -06:00
fb61a5d68b
post-merge fix
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-01 13:08:23 +01:00
8468a118b5
Merge remote-tracking branch 'origin/develop' into dbkr/my_groups
2017-06-30 16:15:41 +01:00
e5c1aeb14c
Make the Groups page look more like the design
2017-06-30 13:59:49 +01:00
3892362386
Make my groups page a bit saner
2017-06-29 18:30:16 +01:00
d6ecec1987
Behave better on rooms with no avatar / name
...
Also add translation strings
2017-06-29 17:17:43 +01:00
a2ff289ed8
Add 'groups' page
2017-06-28 13:56:18 +01:00
3a10cda2ca
Add translations.
2017-06-28 13:55:18 +01:00
2b1d15717a
Add translation for Matrix Apps labs setting.
2017-06-28 12:00:22 +01:00
ddc0da396d
Merge in changes from develop
2017-06-27 11:44:36 +01:00
09b1012388
Merge remote-tracking branch 'origin/develop' into erikj/group_server
2017-06-26 17:49:06 +01:00
812b3643de
Add message for HSes that don't support groups
...
Also add an unrelated missed translation
2017-06-26 17:47:17 +01:00
48c32172fd
TextualBody: only highlight code block if language was specified
...
The highlight.js autodetection is finicky and often wrong, so disable
highlighting unless the language was explicitly specified, or if the
user has explicitly enabled it in the settings.
Fixes vector-im/riot-web#508 .
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-06-26 17:45:40 +02:00
f0f4a16e97
Translate autocomplete delay
2017-06-23 18:28:02 +01:00
738f261d5d
Add missing translations for RTE ops
2017-06-23 16:14:22 +01:00
ac3e039e2a
Merge pull request #1019 from matrix-org/t3chguy/updating_stuff
...
manual check for updates
2017-06-22 17:36:55 +01:00
efc5cf2889
Remove dead special-casing for OLM.BAD_LEGACY_ACCOUNT_PICKLE
...
We used to show a special error message when we got this error; however
https://github.com/matrix-org/matrix-react-sdk/pull/783 made that not work.
You'll only hit it if you're upgrading from some ancient version of Olm, and
I'm quite happy for us to fall back to the generic 'couldn't restore: vape your
storage?' flow in that case. (In any case that's preferable to dumping you at
the login prompt with no warning that we've just vaped your storage).
2017-06-21 21:49:41 +01:00
a2dc17256a
Merge remote-tracking branch 'origin/develop' into t3chguy/updating_stuff
2017-06-20 13:44:27 +01:00
4f9c1fe199
Merge branch 'develop' into luke/feature-user-settings-password-warning
2017-06-20 13:40:34 +01:00
5b6daba182
Add en_EN translations
2017-06-20 13:33:18 +01:00
f15292becf
Merge branch 'develop' into luke/fix-email-cancel-button-text
2017-06-20 13:30:34 +01:00
0c431887b0
Merge pull request #996 from matrix-org/rav/handle_received_room_key_requests
...
Pop up a dialog when we get a room key request
2017-06-20 13:20:58 +01:00
a0534e7477
Merge branch 'develop' into rav/handle_received_room_key_requests
2017-06-20 00:25:14 +01:00
c418076c32
add two strings to translation
2017-06-19 13:20:16 -03:00
59f6448b3e
Merge branch 'kegan/postmessage-widgets' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps
2017-06-19 16:00:12 +01:00
83d5822c85
Show a "Skip" button instead of "Cancel" in SetEmailDialog
...
Fixes https://github.com/vector-im/riot-web/issues/4309
2017-06-19 13:17:12 +01:00
31b3b4687a
Trailing comma
2017-06-13 18:34:33 +01:00
aa0ef51932
i18n for setting password flow
2017-06-13 18:28:43 +01:00
bc55d44bcf
Merge pull request #1079 from matrix-org/t3chguy/voip/force_turn
...
allow forcing of TURN
2017-06-12 21:44:00 +01:00
c1d1a1377c
allow forcing of TURN, pass account val per-call until UX is designed.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-12 20:20:27 +01:00
7b0565e9d1
Merge branch 'master' into develop
2017-06-12 15:53:04 +01:00
cb38ebed39
Merge pull request #1077 from matrix-org/rav/remove_dead_code
...
Remove a bunch of dead code from react-sdk
2017-06-12 10:10:12 +01:00
57b4c422b1
Merge pull request #1061 from matrix-org/rav/megolm_key_encryption_errors
...
Improve error logging/reporting in megolm import/export
2017-06-12 10:09:52 +01:00
cc74a09abd
Remove start_upgrade_registration dispatch handler
...
This dispatch is no longer raised anywhere, so we may as well get rid of the
code that it executes, as well as the state which is only set there.
2017-06-12 08:38:29 +01:00
e6d7eedbe6
Remove NeedToRegisterDialog
...
- since it's no longer used anywhere
2017-06-12 08:36:41 +01:00
1069bd33f0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/updating_stuff
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-11 23:21:50 +01:00
cbcca78c40
Add text for invite_timeout and fix message for ice_failed.
2017-06-11 07:19:19 +01:00
2bfad52b40
Make unknown failures more helpful.
2017-06-10 14:35:11 +01:00
18490377f8
Show reason for a call hanging up unexpectedly.
2017-06-10 14:27:18 +01:00
d6b85c9d4d
Fix translations on conf call banner
...
* You can't substitute react elements into a text string
* Substituting in undefined gives the string 'undefined', so
initialise it to the empty string.
2017-06-09 22:06:43 +01:00
6d1d435247
Scalar: add in set_widget and get_widgets
2017-06-09 11:21:37 +01:00
3d59fe58dc
Merge pull request #1060 from matrix-org/dbkr/fix_login_error_message
...
Better error messages for login
2017-06-08 16:57:40 +01:00
175599beda
Improve error logging/reporting in megolm import/export
...
I saw a rageshake where somebody had apparently failed to import a key file.
I have no idea why it happened.
Also try to make the errors the users see useful.
2017-06-08 16:55:50 +01:00
8dc20606c8
Use comma for list of three things
2017-06-08 16:07:29 +01:00
d691c891e7
Move all login error string generation into view
...
This makes all the various hits done by login report the same
useful error messages and gets rid of the broken ones like printing
the http status code even if it was undefined. Also add text for
the case of overzealous browser extensions because lots of people
get bitten by it.
2017-06-08 15:49:48 +01:00
614006a256
remove duplicate keys from en_EN
2017-06-08 15:09:23 +01:00
f2efdf8a4f
Review comments
2017-06-08 14:45:59 +01:00
e3ac78bd28
Self-review
2017-06-08 14:36:20 +01:00
c57823a31d
Merge branch 'develop' into kegan/translation-tamarin
2017-06-08 14:19:56 +01:00
00df956ca2
Add remaining translations!
...
Every file has now been manually vetted by me. Due to the extent of
the changes, I've been unable to test all scenarios to make sure this
all works. :(
2017-06-08 14:08:51 +01:00
1c58a9cd5e
Everything but src/components/views/rooms
2017-06-08 12:33:29 +01:00
bc0eb4294c
rename welcome page to home
2017-06-08 10:27:35 +01:00
0f4028da07
Add more translations..
2017-06-08 09:44:58 +01:00
f7ab6a574c
Remove unused string
2017-06-07 18:32:52 +01:00
ef2fedc3a9
fix missing translations and typos in i18n
2017-06-07 18:24:35 +01:00
3b6599dcdc
Use user_directory endpoint to populate ChatInviteDialog
...
Also attempt to slightly improve the feedback given when searching. There is still room for improvement - it's not totally obvious whether to display a spinner because it's quite jarring were it to replace the dd. This does mean that "No results" will flash awkardly between two queries, neither of which return any results.
2017-06-07 16:05:36 +01:00
27e5098e00
Merge remote-tracking branch 'origin/develop' into rav/handle_received_room_key_requests
2017-06-07 15:44:33 +01:00
c1151fd31c
Merge branch 'develop' into rav/handle_received_room_key_requests
2017-06-07 15:37:38 +01:00
53ea41e8a5
Merge branch 'develop' into new-guest-access
2017-06-07 12:08:37 +01:00
4127e7121c
Translate src/components/structures
...
Includes some pluralisation! Tested them manually to make sure they work.
2017-06-07 11:40:46 +01:00
f8198ba9c9
Merge branch 'develop' into new-guest-access
2017-06-06 10:33:01 +01:00
ed7c138d91
quick and dirty override to disable MD globally
2017-06-05 21:38:25 +01:00
32e3ea0601
Address review comments
2017-06-05 17:58:11 +01:00
c690acc638
Add missing command
2017-06-05 17:40:21 +01:00
9f6ab4a31b
Add en_EN i18n strings for setMxIdDialog
2017-06-05 16:12:00 +01:00
619830617a
Merge branch 'develop' into luke/ilag-i18n
...
In order to get ILAG internationalised
Conflicts:
src/components/structures/LoggedInView.js
src/components/structures/MatrixChat.js
src/components/views/dialogs/ChatCreateOrReuseDialog.js
src/components/views/dialogs/SetDisplayNameDialog.js
src/createRoom.js
src/i18n/strings/en_EN.json
2017-06-05 16:08:03 +01:00
98e99d542b
i18n things
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 15:49:28 +01:00
46441d69eb
fix casing
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 21:09:51 +01:00
adfeff34ae
Merge pull request #1004 from matrix-org/t3chguy/hide_redactions
...
allow hiding redactions, restoring old behaviour
2017-06-02 12:27:52 +01:00
defecb1b14
Implement /user/@userid:domain?action=chat
...
This is a URL that can be used to start a chat with a user.
- If the user is a guest, setMxId dialog will appear before anything and a defered action will cause `ChatCreateOrReuseDialog` to appear once they've logged in.
- If the user is registered, they will not see the setMxId dialog.
fixes https://github.com/vector-im/riot-web/issues/4034
2017-06-02 11:36:18 +01:00
a8ca7c899f
Review comments
2017-06-02 11:16:08 +01:00
f54c182eb1
Add remaining strings for vector-im/riot-web#4151
2017-06-02 10:47:08 +01:00
a3a262b150
Merge remote-tracking branch 'origin/develop' into rav/handle_received_room_key_requests
2017-06-02 10:31:14 +01:00
d2e766e4f0
First round
2017-06-02 10:18:31 +01:00
21277557f8
Add translations for new dialog
2017-06-02 10:10:40 +01:00
d2d0ba952a
allow hiding redactions. no point onAccountData as it'd cause a full
...
refresh, this may need to be handled differently in the future.
Currently handling same as the new timestamp stuff
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 04:23:07 +01:00
ec433907f0
Merge pull request #850 from t3chguy/webrtc_settings
...
webrtc config electron
2017-06-02 00:48:25 +01:00
6b4daf02a9
i18 missed things
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 00:27:20 +01:00
0bafd6458a
Revert voodoo
2017-06-02 00:26:31 +01:00
46a9326607
special case default - CallMediaHandler can figure it out
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 00:20:34 +01:00
b411c8f97e
shorten signin label to aid fr i18n
2017-06-02 00:10:54 +01:00
dd4480f8c3
change device data structure to array of objects
...
so that we can set falsey values, for unsetting device
most dolphinately needs testing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:26:43 +01:00
0c36778369
fix bad indentation
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 22:59:37 +01:00
dbba1dedb6
i18nize all the things and change show logic
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 22:58:17 +01:00
ee965a89a7
Merge pull request #986 from uhoreg/compact
...
enable useCompactLayout user setting an add a class when it's enabled
2017-06-01 21:32:54 +01:00
6c56fa3381
Merge pull request #990 from matrix-org/kegan/translation-marmoset
...
Translation fixes for everything but src/components
2017-06-01 21:22:00 +01:00
547f10bcbb
Add translations for slash command failures
2017-06-01 15:44:56 +01:00
f75e714c3a
More translations..
2017-06-01 15:18:06 +01:00
00750b4686
quick and dirty RoomAvatarEvent
2017-06-01 13:31:24 +01:00
b26f4ba578
First lot of translations
2017-06-01 12:09:07 +01:00
92d1a9a6ff
enable useCompactLayout user setting an add a class when it's enabled
...
Signed-off-by: Hubert Chathi <hubert@uhoreg.ca>
2017-05-31 22:00:30 -04:00
3d91b31637
i18n invited, and delete stale warning
2017-06-01 01:29:07 +01:00
b4284cf000
fix up Can't connect to HS i18n with _tJsx
2017-06-01 01:17:39 +01:00
165dfeccb9
Fix rare case where presence duration is undefined & i18n
2017-05-31 11:56:04 -06:00
d4a89cc2df
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop
2017-05-31 09:09:27 -03:00
dcd99ac3de
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_settings
...
# Conflicts:
# src/components/structures/UserSettings.js
# src/i18n/strings/en_EN.json
First time using JetBrains Merge Tool, MAY HAVE GONE HORRIBLY WRONG
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 23:54:57 +01:00
0d930c0553
change wording and i18n it
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 23:46:51 +01:00
f4e5039e70
add string to translate
2017-05-30 19:01:23 -03:00
12f923bc81
add new string to translate
2017-05-30 18:56:52 -03:00
c15568e003
remove spurious string
2017-05-30 21:05:26 +01:00
e30e45a82c
Merge branch 'develop' into new-guest-access
2017-05-30 21:05:07 +01:00
54b8afec38
Fix use of wrong char
2017-05-30 21:47:38 +02:00
4d7ac1b828
Fix missing string in the room settings
2017-05-30 21:46:07 +02:00
48a2ad93da
fix {integrationsUrl} thinko
2017-05-30 20:32:12 +01:00
93a35dc07a
Merge branch 'develop' into t3chguy/piwik
2017-05-30 15:58:55 +01:00
David Baker