1964a0f941
Merge remote-tracking branch 'origin/master' into merge-upstream
2018-01-18 09:17:58 -06:00
e27eedbd08
Merge branch 'gs-master' into merge-upstream
2018-01-18 09:14:28 -06:00
708ec07e27
Style fixes to make eslint happier, hopefully
2018-01-18 09:13:07 -06:00
e56404be41
When must_be_following_dm is on, only notify if recipient dm'ed user ( #6283 )
...
* When must_be_following_dm is on, only notify if recipient dm'ed user
Currently, when must_be_following_dm is on, if a user sends a direct
message replying to any status from the recipient, the recipient gets a
notification. This should not be the case, as if the recipient posted
something publicly this can be used to spam their notifications.
* Refactor replied_to_status_is_direct_message?
Following suggestion in PR
2018-01-18 16:12:10 +01:00
201e82686f
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
2018-01-17 18:37:09 -06:00
7badad7797
Fix home regeneration ( #6251 )
...
* Fix regeneration marker not being removed after completion
* Return HTTP 206 from /api/v1/timelines/home if regeneration in progress
Prioritize RegenerationWorker by putting it into default queue
* Display loading indicator and poll home timeline while it regenerates
* Add graphic to regeneration message
* Make "not found" indicator consistent with home regeneration
2018-01-17 23:56:03 +01:00
59797ee233
Weblate translations ( #6284 )
...
* Translated using Weblate (French)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (260 of 260 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (45 of 45 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (529 of 529 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (45 of 45 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/nl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (529 of 529 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (45 of 45 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/gl/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (527 of 529 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (528 of 529 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (45 of 45 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (260 of 260 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Slovak)
Currently translated at 37.2% (197 of 529 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (260 of 260 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Russian)
Currently translated at 99.0% (526 of 531 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (45 of 45 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ca/
* Translated using Weblate (Catalan)
Currently translated at 99.8% (530 of 531 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Japanese)
Currently translated at 92.8% (52 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Japanese)
Currently translated at 75.8% (47 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ja/
* Translated using Weblate (Polish)
Currently translated at 77.4% (48 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/
* Translated using Weblate (Slovak)
Currently translated at 38.3% (204 of 532 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ja/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ca/
* Translated using Weblate (Polish)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/
* Translated using Weblate (Polish)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pl/
* Translated using Weblate (Polish)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/
* Translated using Weblate (Polish)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/
* Translated using Weblate (Russian)
Currently translated at 96.8% (525 of 542 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/
* Translated using Weblate (Japanese)
Currently translated at 99.0% (537 of 542 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Polish)
Currently translated at 99.8% (541 of 542 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/
* Translated using Weblate (Japanese)
Currently translated at 99.0% (538 of 543 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Dutch)
Currently translated at 97.4% (529 of 543 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Normalize translations
Ran i18n-tasks normalize && yarn manage:translations
2018-01-18 07:00:23 +09:00
aa2bf07281
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-17 16:17:10 +00:00
fbe7756da6
implement web share target ( #6278 )
...
* web share target
* fix
* fix
2018-01-17 17:08:10 +01:00
0a103c7749
Upgrade ESLint to version 4.x ( #6276 )
2018-01-17 16:57:15 +01:00
fb16c37d2a
Update Simplified Chinese translations ( #6280 )
...
* i18n: (zh-CN) Update translation for #6252
* e-mail -> email
* i18n: (zh-CN) Update translations for #6256
* i18n: (zh-CN) Minor Improvements
* i18n: (zh-CN) Update translations for #6263
* i18n: (zh-CN) Update translations for #6279
2018-01-17 16:47:25 +01:00
6f244ba82c
Use better reblog icon and improve contrast in HTML e-mails ( #6272 )
2018-01-17 14:12:59 +01:00
eed7484cd6
Change mailer image url ( #6279 )
...
* Change image URL in mailer to full path
* Add application_mailer.view_profile localization.
2018-01-17 12:41:24 +01:00
02194838dd
HTML e-mails for NotificationMailer ( #6263 )
...
* HTML e-mails for NotificationMailer (except digest)
* Add HTML template for digest
* Fix build
2018-01-16 20:20:15 +01:00
9a28052e92
Change image URL in mailer to full path ( #6264 )
2018-01-16 06:26:46 +01:00
60ff086960
Fixed improper mailer import
2018-01-15 21:23:26 -08:00
cda845ae0e
Fix mailer to use webpack core
2018-01-15 21:17:03 -08:00
89a9d629f7
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
Gemfile.lock
2018-01-15 22:17:48 -06:00
5276c0a090
HTML e-mails for UserMailer ( #6256 )
...
- premailer gem to turn CSS into inline styles automatically
- rework UserMailer templates
- reword UserMailer templates
2018-01-16 03:29:11 +01:00
7861c5f108
Surround mid-text display names with bdi tags ( #6257 )
...
* Fix #1095 - Surround mid-text display names with bdi tags
* Update jest snapshot
2018-01-15 18:55:10 +01:00
3987bd18a4
Fix #6128 - Display unfollow button even if account moved ( #6258 )
2018-01-15 18:42:15 +01:00
0c7dc6c781
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-15 06:17:15 +00:00
74c1c9ec01
Allow attributedTo in a status to be an embedded object ( #6238 )
2018-01-15 06:51:46 +01:00
537d2939b1
Suppress CSRF token warnings ( #6240 )
...
CSRF token checking was enabled for API controllers in #6223 ,
producing "Can't verify CSRF token authenticity" log spam. This
disables logging of failed CSRF checks.
This also changes the protection strategy for
PushSubscriptionsController to use exceptions, making it consistent
with other controllers that use sessions.
2018-01-15 06:51:23 +01:00
2091ae92be
Make columns-area unscrollable when modal opened ( #6241 )
...
* Add aria-autocomplete='list' in Textaria
ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete
* Make detect empty string brefore assign upload description
* Change code elements in keyboard-shortcuts component to kbd
* Add validation for onMuteNotifications
* Make columns-area unscrollable when modal opend
* Make columns-area unscrollable when modal opened
2018-01-15 06:51:00 +01:00
ed867eca9d
Move e-mail digest task to sidekiq, reduce workload, improve hint ( #6252 )
2018-01-15 04:34:28 +01:00
08e4c78e78
Fix column headers accessibility ( #6199 )
...
* Fix accessibility of column headers
As a screen reader user new to Mastodon, I encountered the following issues with the column headers as designed:
* Jumping between them was difficult. FOr instance, passing my home timeline to reach notification settings was difficult to impossible, especially considering infinite scrolling.
* There doesn't appear to be any means for triggering the control via the keyboard. the `titleClick` handler only responds to mouse clicks.
* I didn't even realize there was a Settings toggle until I made this change.
Thanks for using ARIA in your designs. It's a huge help. But adding a `button` role doesn't add keyboard handling and other button behavior. Also, because the role was on the heading container, it obscured the controls within the container itself. This fix resolve that. It also exposes the headings as headings rather than buttons, enabling skipping columns by using screen readers' heading navigation commands.
Since I myself am blind, if this fix requires additional visual styling, I'd like help applying that so it can be merged. I'd consider it an essential accessibility fix for my and other blind users' existence on the platform. Thanks!
* Styling fixes
* Fixed overflow issue
2018-01-15 04:33:06 +01:00
8ee6ed358f
Increase priority of favstar gold
2018-01-14 16:05:44 -08:00
1ee0e91fb6
Fixes to notification styling
2018-01-14 15:48:54 -08:00
b9f4896830
Fixes to drawer and CWs
2018-01-14 15:31:00 -08:00
cd6674606f
Merge pull request #329 from KnzkDev/scss-refactor
...
SCSS Refactor
2018-01-14 17:48:02 -05:00
39f231f3da
Merge pull request #328 from glitch-soc/feature/glitchy-elephant-friend
...
Add glitchy elephant friend
2018-01-14 17:40:27 -05:00
0fb3bd09e9
Oops this should have been a part of last commit
2018-01-14 14:21:41 -08:00
1fa03e026a
Fixes onboarding modal ( #318 )
2018-01-14 14:13:24 -08:00
a5931e1f48
Fixed autocollapse detection
2018-01-14 13:29:51 -08:00
c2669f93d0
Fix eslint errors. #294 .
2018-01-14 05:56:43 -06:00
756a9cd139
Run slightly less afoul of accessibility checks. #294 .
...
This makes the clickable element an interactive element, but doesn't add
alt text and makes it not-obvious that you can click the elefriend. On
one hand, this goes against good practice; on the other hand, it's not
*supposed* to be obvious that you can click the elefriend.
2018-01-14 05:07:08 -06:00
e64cc311dd
Introduce a bit of luck into the elefriend selection. #294 .
2018-01-14 04:46:21 -06:00
53cbc9933e
Add wave background; blend elefriend in a bit more. #294 .
2018-01-14 04:00:21 -06:00
cd1377de7f
Bind click event to elefriend cycling. #294 .
2018-01-14 03:35:25 -06:00
1dbb6b5e08
Set glitchy elephant friend variant in initial state. #294 .
...
Also lay some groundwork needed to interactively change the
glitchfriend.
The codebase uses "elefriend" because it's shorter and didn't require me
to realign the actions in actions/compose.js. Same idea, though.
2018-01-14 03:06:11 -06:00
1e0b707018
Add the shrinking glitchy elefriend. #294 .
2018-01-13 21:27:39 -06:00
835eec8a4c
Prototype out glitchy elephant friend. #294 .
...
Glitched elephant friends kindly provided by @ncls7615.
2018-01-13 21:27:14 -06:00
f9b08e2142
Fix collapsed toot style
2018-01-14 11:13:55 +09:00
1ebe66b78c
Fix un-fullwidth media style
2018-01-14 11:07:32 +09:00
be2bac05aa
Fix media detailed style
2018-01-14 10:38:51 +09:00
b5476f6c75
Fix confirmation modal bug
2018-01-14 09:51:01 +09:00
bc0524834e
Fix letterbox bug
2018-01-14 09:25:35 +09:00
6ecf81cacf
Improve scss refactor 5
2018-01-14 09:17:38 +09:00
64425dbb77
Improve scss refactor 4
2018-01-14 09:12:10 +09:00
David Yip
Renato "Lond" Cerqueira
Eugen Rochko
Jenkins
りんすき
Yamagishi Kazutoshi
SerCom_KC
mayaeh
kibi!
puckipedia
Patrick Figel
neetshin
beatrix
ncls7615