Commit graph

78 commits

Author SHA1 Message Date
David Baker
00a13c780f Run prunei18n 2017-10-20 11:39:01 +01:00
Matthew Hodgson
2b367edccf Merge pull request #1439 from turt2live/travis/pinned_messages
Message/event pinning
2017-10-15 01:03:18 +01:00
Travis Ralston
c34b55c6c7 Merge branch 'develop' into travis/pinned_messages 2017-10-14 16:10:32 -06:00
Stefan Parviainen
45137f030b Fix merge conflict
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-12 22:18:50 +02:00
David Baker
ff3a2c1807 Translated using Weblate (English (United States))
Currently translated at 99.6% (852 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
2017-10-12 16:39:41 +00:00
Weblate
11b4ffe302 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
Conflicts:
	src/i18n/strings/cs.json
	src/i18n/strings/de_DE.json
	src/i18n/strings/fi.json
	src/i18n/strings/fr.json
	src/i18n/strings/it.json
	src/i18n/strings/nl.json
	src/i18n/strings/ru.json
	src/i18n/strings/th.json
2017-10-12 16:20:59 +00:00
Stefan Parviainen
f694fb24ff Fix merge-conflict
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-11 20:02:14 +02:00
Luke Barnard
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
Travis Ralston
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
Travis Ralston
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
Travis Ralston
f874fc1203 Merge branch 'develop' into travis/pl_enhancements 2017-10-11 08:42:45 -06:00
Stefan Parviainen
581abcb4b7 Consistent subsitution variable in translations
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-11 09:15:24 +02:00
David Baker
80ad7d4ad6 Update translations 2017-10-10 19:27:51 +01:00
Travis Ralston
20798dd2fa Expose power level setting for widgets
Fixes https://github.com/vector-im/riot-web/issues/4866

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

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 14:35:49 -06:00
Travis Ralston
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
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
Riot Administration
540885474a Translated using Weblate (English (United States))
Currently translated at 99.6% (852 of 855 strings)

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

<<<i>>>>xss
2017-09-27 09:36:53 +00:00
Riot Administration
6bbf751f4b Translated using Weblate (English (United States))
Currently translated at 99.5% (851 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
2017-09-27 02:37:22 +00:00
Stefan Parviainen
411a67c6b0 Remove unneeded strings
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-09-21 18:25:45 +02:00
Luke Barnard
e9fb5712bd Merge branch 'develop' into dbkr/group_userlist 2017-09-19 13:26:55 +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
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
3c3328c5f1 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-09-13 16:34:39 +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
MTRNord
da3336172f
Remove more unused translation strings 2017-09-05 18:12:00 +02:00
MTRNord
4a362c141a
Cleanup unused language code translations 2017-09-05 17:54:49 +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
Weblate
d305f8aacb Merge remote-tracking branch 'origin/develop' into develop 2017-09-04 10:27:17 +00:00
David Baker
9efa604706 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-30 17:39:47 +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
David Baker
299db845ff PR feedback 2017-08-25 12:10:13 +01:00
Eric Newport
f322df6b0c Translated using Weblate (English (United States))
Currently translated at 100.0% (971 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
2017-08-23 23:17:48 +00:00
Matthew Hodgson
bb0845954d improve wording for directory listings 2017-08-17 19:10:45 +01:00
Weblate
d443368aa3 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
Conflicts:
	src/i18n/strings/en_EN.json
	src/i18n/strings/fr.json
	src/i18n/strings/ru.json
2017-08-15 14:00:35 +00:00
Richard Lewis
abae43b65e Merge pull request #1257 from matrix-org/rxl881/widgetPermissions
Widget permissions
2017-08-01 12:13:09 +01:00