1b4d79acf8
Merge pull request #346 from KnzkDev/fix/travis
Fix travis.yml
6 years ago
5a4de1cf0f
Merge pull request #349 from codl/patch-1
remove escapes from server-side ɣaml handler
6 years ago
a3c0a20373
Fix initial_state me in push_notification_register ( #6349 )
6 years ago
9abb5becf4
remove escapes from server-side γaml handler
this matches a change that was made in the client-side equivalent
6 years ago
8cd2828e91
Fix hide and show media button on admin page ( #6347 )
6 years ago
3d881eed27
Add packs volume to docker-compose.yml ( #6348 )
6 years ago
7650506b39
l10n Occitan language update ( #6346 )
* Small changes
* update for email templates
* Digest changed
* Update oc.yml
waiting to finish
* Update oc.yml
* Update oc.yml
* Update oc.yml
* Update oc.json
6 years ago
e6db3427b7
Bump to 2.2.0rc2
6 years ago
daefbd66a6
Fix style of legacy column headers ( #6342 )
* Fix regression from #6199 : Style of legacy column headers
* Fix tests
* Clean up variables
6 years ago
b1daa71da5
Fix #6311 : Replace relative URLs in CSS only for Premailer ( #6335 )
6 years ago
1cc44cba81
Fix #6331 ( #6341 )
UserTrackingConcern is circumvented by SessionsController#create
because it calls warden, which calls the User#update_tracked_fields!
method directly. Move returning user logic to that method.
6 years ago
c53d7196e6
Merge pull request #334 from ThibG/glitch-soc/cleanup-leftover-code
Remove some leftover code
6 years ago
4ec9d8b4d9
Display deleted users' role as “Suspended” ( #6339 )
Follow-up to 6eb60260b1
6 years ago
d966878e87
Update goldfinger, ostatus2 and http.rb versions ( #6337 )
6 years ago
2fc2725076
Fix e-mail icon for reblog being stretched ( #6336 )
6 years ago
2107891edb
Remove some leftover code, I guess
6 years ago
16d5f9e162
Fix travis.yml
6 years ago
69f13e7bca
Fix regression from #6199 : Make entire column header clickable ( #6334 )
6 years ago
613e7c7521
Rename ResolveRemoteAccountService to ResolveAccountService ( #6327 )
The service used to be named ResolveRemoteAccountService resolves local
accounts as well.
6 years ago
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
David Yip
beatrix
abcang
codl
Yamagishi Kazutoshi
Quenty31
Eugen Rochko
ThibG
ncls7615
Akihiko Odaki
Renato "Lond" Cerqueira
Jeong Arm
Norayr Chilingarian
Aboobacker MK
Iijima Yasushi
SerCom_KC