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
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
Luke Barnard