Eugen Rochko
e168e8afe5
Merge branch 'master' into for-upstream/optional-notification-muting
2017-11-15 03:36:01 +01:00
SerCom_KC
c3ec1e87b8
Updating Chinese (Simplified) translations ( #5643 )
...
* i18n: (zh-CN) Bug fix for note-counter.
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Add missing translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Add support.array key for better wording
* Revert "i18n: (zh-CN) Add support.array key for better wording"
This reverts commit 27bf9a946e886213e827cd985d4f62419db57534.
Looks like this commit can't get pass the checks, revert it for now.
* i18n: (zh-CN) Change `客户端` to `应用`
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Add missing translations (#5635 )
* i18n: (zh-CN) Change `两步验证` to `双重认证`
* i18n: (zh-CN) Improve translations
2017-11-14 20:44:42 +01:00
Marcin Mikołajczak
8087aa83d4
i18n: Update Polish translation ( #5699 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-14 20:36:11 +01:00
Anna e só
0e6c4cb796
l10n: PT-BR translation updated ( #5681 )
...
* Improved e-mail messages; delted repeated words
* pt-BR.json translations updated
* Revert "pt-BR.json translations updated"
This reverts commit 108c460531196fed6e6d14f93e8d8d047c835ffd.
* Updated pt-BR.json
* pt-BR.yml updated
2017-11-14 11:07:38 +09:00
Eugen Rochko
07f7192bc3
Fix #5632 - Reset column loading status after fetch fail ( #5659 )
2017-11-12 12:51:07 +09:00
Lynx Kotoura
f9e7336296
Fix focused background color of direct toots ( #5642 )
2017-11-09 19:40:34 +01:00
unarist
49a285ce15
Show confirmation dialog on leaving WebUI while composing ( #5616 )
...
* Show confirmation dialog on leaving WebUI while composing
Currently, Back button and Back hotkey can cause leaving from WebUI, as well as browser's back button. Users may hit those buttons accidentally, and their composing text will be lost.
So this prevents it by showing confirmation dialog from `onbeforeunload` event.
* Fix message and comments
2017-11-09 14:34:41 +01:00
nullkal
3f16caaa50
Eliminate space around emoji ( #5474 )
...
* Eliminate space around emoji
* More improve emoji style
* Make more compatible with Twemoji
* Make scss-lint happy
* Make not modify normal emoji's behavior
* Decrease status__action-bar's margin-top to 5px
* Make the test be passed
* Revert "Make the test be passed"
This reverts commit 54a8c60e5907ef20a5ceb5ab2c86a933e06f3ece.
* Revert "Make not modify normal emoji's behavior"
This reverts commit 6a5bdf0c11df16ebd190cb3ab9d2e8f1349f435a.
2017-11-07 19:09:53 +01:00
ThibG
5d5c0f4f43
Twidere mention workaround ( #5552 )
...
* Work around Twidere and Tootdon bug
Tootdon and Twidere construct @user@domain handles from mentions in toots based
solely on the mention text and account URI's domain without performing any
webfinger call or retrieving account info from the Mastodon server.
As a result, when a remote user has WEB_DOMAIN ≠ LOCAL_DOMAIN, Twidere and
Tootdon will construct the mention as @user@WEB_DOMAIN. Now, this will usually
resolve to the correct account (since the recommended configuration is to have
WEB_DOMAIN perform webfinger redirections to LOCAL_DOMAIN) when processing
mentions, but won't do so when displaying them (as it does not go through the
whole account resolution at that time).
This change rewrites mentions to the resolved account, so that displaying the
mentions will work.
* Use lookbehind instead of non-capturing group in MENTION_RE
Indeed, substitutions with the previous regexp would erroneously eat any
preceding whitespace, which would lead to concatenated mentions in the
previous commit.
Note that users will “lose” up to one character space per mention for their
toots, as that regexp is also used to remove the domain-part of mentioned
users for character counting purposes, and it also erroneously removed the
preceding character if it was a space.
2017-11-07 19:08:14 +01:00
Eugen Rochko
1032f3994f
Add ability to disable login and mark accounts as memorial ( #5615 )
...
Fix #5597
2017-11-07 19:06:44 +01:00
voidSatisfaction
e618edf85a
fix: slang to adequate word ( #5453 )
2017-11-07 14:49:50 +01:00
MIYAGI Hikaru
782224c991
Avoid emojifying on invisible text ( #5558 )
2017-11-07 14:48:13 +01:00
nullkal
864c4d869f
Make fullscreen video in detailed status plays in fullscreen (Partly Fix #5160 ) ( #5611 )
...
* Make fullscreen video in detailed status plays in fullscreen (Fix #5160 )
* Directly assign the initial state
2017-11-07 14:24:55 +01:00
MIYAGI Hikaru
8abe9e9058
don't display any descendants of .invisible ( #5567 )
...
* don't display any descendants of .invisible
* reduce the scope of selector
* remove some rules for image
* lint
2017-11-05 13:05:50 +01:00
Quenty31
da3adc0a73
l10n Occitan ( #5586 )
...
* Update OC: time format
Correction for time format according to: https://opinion.jornalet.com/conselh-linguistic-de-jornalet/blog/2379/la-notacion-oraria-en-occitan
Harmonisation words in menu and confirmation windows
* Update for unlisted custum emoji + #5577
* correction subjonctiu
It's either siasque or siague
* Corrections
Any : qual que, in two words, else it means "some".
And "siasque" with S even if I don't pronounce it at all.
* Update oc.json
2017-11-03 17:42:30 +09:00
Sorin Davidoi
5521e94e24
refactor(features/ui): Avoid useless renders in WrappedSwitch ( #5580 )
2017-11-01 12:17:53 +01:00
Yamagishi Kazutoshi
763a2f8511
Replace react-router-scroll to react-router-scroll-4 ( #5568 )
2017-11-01 06:58:38 +09:00
Nolan Lawson
60f962eedc
Refactor initial state: auto_play_gif ( #5576 )
2017-11-01 06:58:07 +09:00
Nolan Lawson
b254e6ca5f
Refactor initial state: "me" ( #5563 )
...
* Refactor initial state: "me"
* remove "me" from reducers/meta.js
2017-10-31 11:27:48 +09:00
SerCom_KC
29609fbb6a
Updating Chinese (Simplified) translations ( #5508 )
...
* i18n: (zh-CN) fix punctuations and spaces
Spaces are fixed according to https://github.com/sparanoid/chinese-copywriting-guidelines
* i18n: (zh-CN) fix punctuation
* i18n: (zh-CN) Adapt official translation of Discourse Privacy Policy from GitHub, with minor fixes
https://github.com/discourse/discourse/blob/master/config/locales/server.zh_CN.yml#L2677
* i18n: (zh-CN) Update missing translations
* i18n: (zh-CN) Fixing errors
* i18n: (zh-CN) Fix indent error
* i18n: (zh-CN) Fix language tag
* i18n: (zh-CN) Remove quotes
* i18n: (zh-CN) Update translation (#5485 )
* i18n: (zh-CN) Remove whitespaces, x -> ×
* i18n: (zh-CN) Rewording on time distance
* i18n: (zh-CN) Overall improvements
* i18n: (zh-CN) i18n-tasks normalization
* i18n: (zh-CN) Add missing translation
2017-10-30 12:34:58 +09:00
Nolan Lawson
2cea4592a3
Avoid modifying emoji data inline ( #5548 )
2017-10-30 00:23:38 +09:00
Nolan Lawson
512feab222
Add margin to account for Edge disappearing scrollbar ( #5522 )
...
* Add margin to account for Edge disappearing scrollbar
* Fix 16px margin for DMs and horizontal line
2017-10-30 00:11:32 +09:00
Nolan Lawson
5e111ce16d
Reactor unfollow_modal, boost_modal, delete_modal ( #5505 )
2017-10-30 00:10:15 +09:00
Herbert Kagumba
3e9236b343
Separate Follow/Unfollow and back buttons ( #5496 )
2017-10-27 19:14:11 +02:00
Nolan Lawson
e843f62f47
Avoid unnecessary Motion components in icon_button.js ( #5544 )
2017-10-27 19:08:07 +02:00
Nolan Lawson
ec487166db
Directly use <Motion/> if not reducing motion ( #5546 )
2017-10-27 19:06:54 +02:00
Nolan Lawson
3de22a82bf
Refactor initial state: reduce_motion and auto_play_gif ( #5501 )
2017-10-28 00:04:44 +09:00
nullkal
781105293c
Feature: Unlisted custom emojis ( #5485 )
2017-10-27 16:11:30 +02:00
りんすき
d556be2968
Fix column design broken with very long title ( #5493 )
...
* Fix #5314
* fix not beautiful code
* fix broken design with mobile view
* remove no longer needed code
2017-10-26 22:52:48 +09:00
Nolan Lawson
02f7f3619a
Remove translateZ(0) on modal overlay ( #5478 )
2017-10-26 22:46:50 +09:00
Ratmir Karabut
20fee786b1
Update Russian translation ( #5517 )
...
* Add Russian translation (ru)
* Fix a missing comma
* Fix the wording for better consistency
* Update Russian translation
* Arrange Russian setting alphabetically
* Fix syntax error
* Update Russian translation
* Fix formatting error
* Update Russian translation
* Update Russian translation
* Update ru.jsx
* Fix syntax error
* Remove two_factor_auth.warning (appears obsolete)
* Add missing strings in ru.yml
A lot of new strings translated, especially for the newly added admin section
* Fix translation consistency
* Update Russian translation
* Update Russian translation (pluralizations)
* Update Russian translation
* Update Russian translation
* Update Russian translation (pin)
* Update Russian translation (account deletion)
* Fix extra line
* Update Russian translation (sessions)
* Update Russian translation
* Update Russian translation
* Fix merge conflicts (revert)
* Update Russian translation
* Update Russian translation (fix)
* Update Russian translation (fix quotes)
* Update Russian translation (fix quotes)
* Update Russian translation (fix)
* Update Russian translation
* Add quotes
* bundle exec i18n-tasks normalize
2017-10-26 00:21:58 +09:00
Olivier Nicole
1ba3725473
Complete Esperanto translation ( #5520 )
2017-10-25 22:38:37 +09:00
aschmitz
6b70c2ca12
Code review suggestions from akihikodaki
...
Also fixed a syntax error in tests for AccountInteractions.
2017-10-22 20:52:54 -05:00
Surinna Curtis
8c6ecd5616
Code style changes in specs and removed an extra space
2017-10-22 20:52:54 -05:00
Surinna Curtis
22cf9bcff6
Make the Toggle in the mute modal look better
2017-10-22 20:52:54 -05:00
Surinna Curtis
21de45c7d2
Use Toggle in place of checkbox in the mute modal.
2017-10-22 20:52:54 -05:00
Surinna Curtis
290c6b0f2e
Apply white-space: nowrap to account relationships icons
2017-10-22 20:52:54 -05:00
Surinna Curtis
74ce229101
fix a missing import
2017-10-22 20:52:54 -05:00
Surinna Curtis
fb8613d09b
In probably dead code, replace a dispatch of muteAccount that was skipping the modal with launching the mute modal.
2017-10-22 20:52:54 -05:00
Surinna Curtis
d73f437419
satisfy eslint
2017-10-22 20:52:54 -05:00
Surinna Curtis
343c358bb2
make the hide/unhide notifications buttons work
2017-10-22 20:52:54 -05:00
Surinna Curtis
9fb8a6f231
Show whether muted users' notifications are muted in account lists
2017-10-22 20:52:54 -05:00
Surinna Curtis
1fc0382d29
Put the label for the hide notifications checkbox in a label element.
2017-10-22 20:52:54 -05:00
Surinna Curtis
90db8b63b0
add trailing newlines to files for Pork :)
2017-10-22 20:52:54 -05:00
Surinna Curtis
d5dc4696a7
Satisfy eslint.
2017-10-22 20:52:54 -05:00
Surinna Curtis
eb6543b36b
Convert profile header mute to use mute modal
2017-10-22 20:52:54 -05:00
Surinna Curtis
920c7cdaf3
Break out a separate mute modal with a hide-notifications checkbox.
2017-10-22 20:52:54 -05:00
Marcin Mikołajczak
fdb0848e08
i18n: Update Polish Translation ( #5494 )
2017-10-22 08:34:39 +09:00
Nolan Lawson
8392ddbf87
Remove unnecessary translateZ(0) when doing scale() ( #5473 )
2017-10-19 18:27:55 +02:00
Sho Kusano
09d81defcd
Suppress type error(not a function) on calling fastSeek ( #5452 )
2017-10-18 17:13:51 +02:00
