477fbec714
Merge pull request #332 from glitch-soc/merge-upstream
...
Merge in home feed regeneration changes from upstream
7 years ago
91f892fd6e
Merge pull request #333 from glitch-soc/win95-update
...
Update win95 theme from cybrespace/mastodon
7 years ago
92df0bba59
Fix regeneration marker not expiring ( #6290 )
...
* Fix regeneration key not getting expired
* Add rake task to remove old regeneration markers
7 years ago
b0f2bff481
Replace tutorial modal with welcome e-mail ( #6273 )
...
* Remove onboarding modal
* Welcome e-mail
* Send welcome e-mail after confirmation
* Remove obsolete translations
7 years ago
011d6011f9
Strip trailing whitespace on win95.scss
7 years ago
fc20361bbe
Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update
...
Conflicts:
app/javascript/styles/win95.scss
config/themes.yml
7 years ago
14fffe6e88
Use absolute paths for new working/not-found SVGs
...
This allows these component styles to be used in i.e. the win95 skin.
7 years ago
2a201c2ec6
Port 9cfbbbce1f to glitch frontend
7 years ago
f4428a7ba8
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
d0e525c463
Merge branch 'gs-master' into merge-upstream
7 years ago
dfcee78446
Style fixes to make eslint happier, hopefully
7 years ago
b2632dfad7
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
7 years ago
b1155460ba
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
7 years ago
9cfbbbce1f
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
7 years ago
9d3388ab6e
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
4f86722a65
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
7 years ago
8c41fb4acc
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
1827d142ee
implement web share target ( #6278 )
...
* web share target
* fix
* fix
7 years ago
ea55e437f7
Upgrade ESLint to version 4.x ( #6276 )
7 years ago
350f65a6ef
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
7 years ago
2c81cf416d
Use better reblog icon and improve contrast in HTML e-mails ( #6272 )
7 years ago
0b8a96e767
Use be_within instead of eq for a to_f test match ( #6275 )
...
Floating point values are notoriously hard to pin down, so use the
`be_within` matcher to verify the approximate value.
7 years ago
6892cca838
Korean translate ( #6277 )
...
* Translate Korean
* Translate Korean #6263
7 years ago
ef20e5d3fd
Change mailer image url ( #6279 )
...
* Change image URL in mailer to full path
* Add application_mailer.view_profile localization.
7 years ago
000b0baac2
HTML e-mails for NotificationMailer ( #6263 )
...
* HTML e-mails for NotificationMailer (except digest)
* Add HTML template for digest
* Fix build
7 years ago
172a88c444
Change disclaimer in email according to #5817 ( #6266 )
7 years ago
d60d5fbd26
Change image URL in mailer to full path ( #6264 )
7 years ago
89e8f9549b
Fixed improper mailer import
7 years ago
be525dd4db
Fix mailer to use webpack core
7 years ago
8d6415d675
Stop duplicate CI with Pull Request ( #6265 )
...
see also https://blog.travis-ci.com/2012-08-13-build-workflow-around-pull-requests
7 years ago
de7283a318
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
Gemfile.lock
7 years ago
9613c3238c
HTML e-mails for UserMailer ( #6256 )
...
- premailer gem to turn CSS into inline styles automatically
- rework UserMailer templates
- reword UserMailer templates
7 years ago
19aaf0e99f
Surround mid-text display names with bdi tags ( #6257 )
...
* Fix #1095 - Surround mid-text display names with bdi tags
* Update jest snapshot
7 years ago
1a90ef9c25
Fix #6128 - Display unfollow button even if account moved ( #6258 )
7 years ago
6e821c4273
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
87dd003ea5
Allow attributedTo in a status to be an embedded object ( #6238 )
7 years ago
2a27afc656
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.
7 years ago
e980900b7d
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
7 years ago
a12834a2c0
Add some browsers ( #6246 )
...
Related: #6165
7 years ago
67ee638c28
Move e-mail digest task to sidekiq, reduce workload, improve hint ( #6252 )
7 years ago
c6d5ea8695
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
7 years ago
7a692fe499
Increase priority of favstar gold
7 years ago
28be50d95e
Fixes to notification styling
7 years ago
919caa6e1c
Fixes to drawer and CWs
7 years ago
5ded1fc5b8
Merge pull request #329 from KnzkDev/scss-refactor
...
SCSS Refactor
7 years ago
093cc02c84
Merge pull request #328 from glitch-soc/feature/glitchy-elephant-friend
...
Add glitchy elephant friend
7 years ago
e106f0be6d
Oops this should have been a part of last commit
7 years ago
df2f1344fa
Fixes onboarding modal ( #318 )
7 years ago
8399fba7f2
Fixed autocollapse detection
7 years ago
7333a28191
Fix eslint errors. #294 .
7 years ago
David Yip
Eugen Rochko
Renato "Lond" Cerqueira
Jenkins
りんすき
Yamagishi Kazutoshi
SerCom_KC
Mike Burns
Jeong Arm
mayaeh
kibi!
puckipedia
Patrick Figel
neetshin
beatrix