17cecd75ca
Rename FetchRemoteResourceService to ResolveURLService ( #6328 )
The service used to be named FetchRemoteResourceService resolves local
URL as well.
6 years ago
8cc65cde27
Resolve URL for local account in follow authorization success view ( #6324 )
6 years ago
b7f6ddeaf1
Weblate translations ( #6323 )
* Translated using Weblate (Galician)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (543 of 543 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (543 of 543 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (260 of 260 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (260 of 260 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/
* Translated using Weblate (Catalan)
Currently translated at 95.2% (517 of 543 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Catalan)
Currently translated at 99.6% (259 of 260 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* Translated using Weblate (Dutch)
Currently translated at 97.1% (543 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (559 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Japanese)
Currently translated at 99.1% (554 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (French)
Currently translated at 100.0% (260 of 260 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (260 of 260 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (260 of 260 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (558 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Polish)
Currently translated at 99.8% (558 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/
* Translated using Weblate (Catalan)
Currently translated at 94.6% (529 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Catalan)
Currently translated at 95.3% (533 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Dutch)
Currently translated at 98.2% (55 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (260 of 260 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Dutch)
Currently translated at 98.3% (550 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Catalan)
Currently translated at 95.3% (533 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Japanese)
Currently translated at 0.0% (0 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Japanese)
Currently translated at 1.7% (1 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (260 of 260 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Japanese)
Currently translated at 1.7% (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 99.8% (558 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.8% (558 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Galician)
Currently translated at 100.0% (261 of 261 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (261 of 261 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Polish)
Currently translated at 100.0% (261 of 261 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/
* Translated using Weblate (Catalan)
Currently translated at 99.6% (260 of 261 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* Translated using Weblate (Japanese)
Currently translated at 99.6% (260 of 261 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.8% (558 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.6% (260 of 261 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (French)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (261 of 261 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (261 of 261 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (French)
Currently translated at 99.2% (555 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (French)
Currently translated at 99.8% (558 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (261 of 261 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Normalize translations
Ran i18n-tasks normalize && yarn manage:translations
* Add back values removed by weblate
6 years ago
a90d0419d9
Merge pull request #343 from glitch-soc/merge-upstream-20180121
Merge upstream
6 years ago
143fb54ab9
Korean translation ( #6322 )
Related to #6273
6 years ago
48d79007f6
Merge remote-tracking branch 'origin/master' into merge-upstream-20180121
6 years ago
81b78fac54
Update Vagrantfile to ubuntu/xenial64.
The version of Redis that ships with Ubuntu Trusty is too old to support
the HyperLogLog commands. I guess we could add a custom apt repo for
this, but it seems a lot easier to just use the latest Ubuntu LTS
release (i.e. xenial), which has a recent-enough Redis in its archives.
6 years ago
48cd6dc6ca
armenian translations initial commit ( #6320 )
* adding armenian translations
* updating config files for armenian translations
* armenian translation fix
* fixing spaces
6 years ago
1253279feb
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
app/controllers/settings/two_factor_authentication/confirmations_controller.rb
6 years ago
cfd2b06821
fix filter search index being too strict when looking for line breaks ( #6318 )
6 years ago
d613dda91d
Fix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN ( #6319 )
Since 872a0d5bd801c998d911f7da582a60d2f714a710, assets URL are absolute and
not relative. Unfortunately, the domain used to build such URLs is the wrong
one: LOCAL_DOMAIN, and not WEB_DOMAIN, where the assets are stored.
6 years ago
112b1fa265
Redirect to 2FA creation page when otp_secret is not available ( #6314 )
6 years ago
31d1485887
Display number of follow requests in getting started menu, and ( #6313 )
if notifications column is not mounted, also display number of
unread notifications there.
6 years ago
1287de1b83
Fix invalid value passed to full_asset_url in mailers ( #6312 )
6 years ago
2c578a01d8
Merge remote-tracking branch 'origin/master' into gs-master
6 years ago
e7a0840f8c
Merge pull request #336 from ThibG/glitch-soc/features/tag-warning
Display a warning when composing unlisted toots with something looking like a hashtag
6 years ago
24b6e4121f
Merge pull request #342 from glitch-soc/merge-upstream
Merge upstream
6 years ago
72f9eab3d6
Change mailer avatar url ( #6309 )
* Change mailer avatar url
* Use full_asset_url method
6 years ago
3cae362214
Merge new onboarding styles; delete refs to PNGs.
6 years ago
38f6d8130d
Eliminate stray conflict markers.
6 years ago
071c2c9c85
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
app/javascript/styles/mastodon/components.scss
6 years ago
0b7a0d15c7
Bump version to 2.2.0rc1
6 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
6 years ago
45afdf1781
Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views ( #6305 )
6 years ago
79b34a0fa2
Restore onboarding modal ( #6303 )
* Restore onboarding modal
Revert 5ba8b3a396
6 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
6 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
6 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
6 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
6 years ago
1619efd735
Do not discard statuses obtained via websocket when API request finishes
This backports 0b888acfd4
6 years ago
0b888acfd4
Do not throw away statuses obtained via websocket when API request finishes ( #6302 )
6 years ago
238de58e65
Change belongs_to_required_by_default to true ( #5888 )
6 years ago
7233ac07d2
Add support Ruby v2.5.0 ( #6097 )
6 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.
6 years ago
7be53a10b0
Fix "tzinfo-data is not present" docker error ( #6300 )
when starting the container.
6 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.
6 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
6 years ago
852b48295f
i18n: Update Polish translation ( #6297 )
6 years ago
1287b2782b
Display a warning when composing unlisted toots with something looking like a hashtag
This is a backport of b6af88192f
6 years ago
2b2de41bc7
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
6 years ago
26ecee79bf
Merge pull request #332 from glitch-soc/merge-upstream
Merge in home feed regeneration changes from upstream
6 years ago
ae369bceb3
Merge pull request #333 from glitch-soc/win95-update
Update win95 theme from cybrespace/mastodon
6 years ago
9b3b40df66
Fix regeneration marker not expiring ( #6290 )
* Fix regeneration key not getting expired
* Add rake task to remove old regeneration markers
6 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
6 years ago
766d6aac44
Strip trailing whitespace on win95.scss
6 years ago
d3f64812a6
Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update
Conflicts:
app/javascript/styles/win95.scss
config/themes.yml
6 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.
6 years ago
bcd86404da
Port 7badad7797 to glitch frontend
6 years ago
1964a0f941
Merge remote-tracking branch 'origin/master' into merge-upstream
6 years ago
e27eedbd08
Merge branch 'gs-master' into merge-upstream
6 years ago
Akihiko Odaki
Renato "Lond" Cerqueira
David Yip
Jeong Arm
Norayr Chilingarian
codl
ThibG
Aboobacker MK
Eugen Rochko
Iijima Yasushi
SerCom_KC
Yamagishi Kazutoshi
Pierre Ozoux
Marcin Mikołajczak