3cae362214
Merge new onboarding styles; delete refs to PNGs.
7 years ago
38f6d8130d
Eliminate stray conflict markers.
7 years ago
071c2c9c85
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
7 years ago
0b7a0d15c7
Bump version to 2.2.0rc1
7 years ago
80b3ca0f6f
Update Simplified Chinese translations ( #6306 )
...
* i18n: (zh-CN) Add translations of #6251
* i18n: (zh-CN) Improve translations for #6291
* Fix en.json
* i18n: (zh-CN) Update translations for #6303
* i18n: (zh-CN) Add translations of #6273
with minor adjustment
* Minor fix
* Minor fix
7 years ago
45afdf1781
Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views ( #6305 )
7 years ago
79b34a0fa2
Restore onboarding modal ( #6303 )
...
* Restore onboarding modal
Revert 5ba8b3a396895ecec083c5258aaf9084d584a7c4
* Change greeting elephant graphic, fix up some design issues
* Fix wrong link color in onboarding modal
7 years ago
872a0d5bd8
Improve HTML e-mails based on Litmus tests ( #6301 )
...
* Use PNG images in HTML e-mails
* Make webpack use URLs with host so fonts load inside HTML e-mails
Convert this back to a relative URL in the premailer CSS loader
since local requests are quicker
* Improve responsive design
* Add missing PNG icon
7 years ago
01421999ae
Make text e-mails consistent with HTML ones in UserMailer ( #6291 )
...
* Make text e-mails consistent with HTML ones in UserMailer
* Fix UserMailer specs
7 years ago
2ca965c704
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
app/javascript/styles/mastodon/modal.scss
7 years ago
b8c6656ce9
Merge pull request #339 from ThibG/glitch-soc/features/timeline-tweaks
...
Do not discard statuses obtained via websocket when API request finishes
7 years ago
1619efd735
Do not discard statuses obtained via websocket when API request finishes
...
This backports 0b888acfd4
7 years ago
0b888acfd4
Do not throw away statuses obtained via websocket when API request finishes ( #6302 )
7 years ago
238de58e65
Change belongs_to_required_by_default to true ( #5888 )
7 years ago
7233ac07d2
Add support Ruby v2.5.0 ( #6097 )
7 years ago
b1e03197fa
Process mentions and reblogs even from resolved threads ( #6299 )
...
This may lead to out-of-order notifications, but this is better than not having
notifications at all.
7 years ago
7be53a10b0
Fix "tzinfo-data is not present" docker error ( #6300 )
...
when starting the container.
7 years ago
a0de3222dd
Retry delivering toots over ActivityPub for about 2 days ( #6298 )
...
Currently, Mastodon will retry delivering toots for a bit over 1 hour.
This is a very short timespan when considering private and direct toots, which
cannot be seen by the recipient at all after the delivery attempts have failed.
Ideally, private and direct toots should have a different number of retries,
but I do not know how to do that.
7 years ago
540b3f37ae
Replace drawer elephant graphic with a vector image ( #6286 )
...
* Replace drawer elephant graphic with a vector image
* Replace wave graphic with SVG
* Remove unused elephant graphic
7 years ago
852b48295f
i18n: Update Polish translation ( #6297 )
7 years ago
1287b2782b
Display a warning when composing unlisted toots with something looking like a hashtag
...
This is a backport of b6af88192f
7 years ago
2b2de41bc7
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
26ecee79bf
Merge pull request #332 from glitch-soc/merge-upstream
...
Merge in home feed regeneration changes from upstream
7 years ago
ae369bceb3
Merge pull request #333 from glitch-soc/win95-update
...
Update win95 theme from cybrespace/mastodon
7 years ago
9b3b40df66
Fix regeneration marker not expiring ( #6290 )
...
* Fix regeneration key not getting expired
* Add rake task to remove old regeneration markers
7 years ago
d799921c75
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
766d6aac44
Strip trailing whitespace on win95.scss
7 years ago
d3f64812a6
Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update
...
Conflicts:
app/javascript/styles/win95.scss
config/themes.yml
7 years ago
3896cd5d79
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
bcd86404da
Port 7badad7797 to glitch frontend
7 years ago
1964a0f941
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
e27eedbd08
Merge branch 'gs-master' into merge-upstream
7 years ago
708ec07e27
Style fixes to make eslint happier, hopefully
7 years ago
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
7 years ago
201e82686f
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
7 years ago
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
7 years ago
fe5c1f0803
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
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
7 years ago
aa2bf07281
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
fbe7756da6
implement web share target ( #6278 )
...
* web share target
* fix
* fix
7 years ago
0a103c7749
Upgrade ESLint to version 4.x ( #6276 )
7 years ago
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
7 years ago
6f244ba82c
Use better reblog icon and improve contrast in HTML e-mails ( #6272 )
7 years ago
ea75ae2d1f
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
acb982fc66
Korean translate ( #6277 )
...
* Translate Korean
* Translate Korean #6263
7 years ago
eed7484cd6
Change mailer image url ( #6279 )
...
* Change image URL in mailer to full path
* Add application_mailer.view_profile localization.
7 years ago
02194838dd
HTML e-mails for NotificationMailer ( #6263 )
...
* HTML e-mails for NotificationMailer (except digest)
* Add HTML template for digest
* Fix build
7 years ago
3323b4173e
Change disclaimer in email according to #5817 ( #6266 )
7 years ago
9a28052e92
Change image URL in mailer to full path ( #6264 )
7 years ago
60ff086960
Fixed improper mailer import
7 years ago
David Yip