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.
2018-01-23 20:52:30 +01:00
c53d7196e6
Merge pull request #334 from ThibG/glitch-soc/cleanup-leftover-code
...
Remove some leftover code
2018-01-23 10:27:13 -06:00
4ec9d8b4d9
Display deleted users' role as “Suspended” ( #6339 )
...
Follow-up to 6eb60260b1
2018-01-23 14:31:31 +01:00
d966878e87
Update goldfinger, ostatus2 and http.rb versions ( #6337 )
2018-01-23 14:30:42 +01:00
2fc2725076
Fix e-mail icon for reblog being stretched ( #6336 )
2018-01-23 14:30:28 +01:00
2107891edb
Remove some leftover code, I guess
2018-01-23 09:20:18 +01:00
0ddeed9377
add 'this.props' to fetchLists
2018-01-23 01:23:56 -06:00
16d5f9e162
Fix travis.yml
2018-01-23 15:50:59 +09:00
69f13e7bca
Fix regression from #6199 : Make entire column header clickable ( #6334 )
2018-01-23 05:06:29 +01:00
939075899e
remove unused openOnboardingModal from getting_started
2018-01-22 19:38:34 -06:00
00be9eb3fe
merge tootsuite pr #6313 into glitch
2018-01-22 19:05:13 -06:00
613e7c7521
Rename ResolveRemoteAccountService to ResolveAccountService ( #6327 )
...
The service used to be named ResolveRemoteAccountService resolves local
accounts as well.
2018-01-22 14:25:09 +01:00
17cecd75ca
Rename FetchRemoteResourceService to ResolveURLService ( #6328 )
...
The service used to be named FetchRemoteResourceService resolves local
URL as well.
2018-01-22 14:24:22 +01:00
8cc65cde27
Resolve URL for local account in follow authorization success view ( #6324 )
2018-01-22 14:22:14 +01:00
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
2018-01-22 14:20:58 +01:00
a90d0419d9
Merge pull request #343 from glitch-soc/merge-upstream-20180121
...
Merge upstream
2018-01-21 18:00:08 -06:00
143fb54ab9
Korean translation ( #6322 )
...
Related to #6273
2018-01-22 08:49:57 +09:00
48d79007f6
Merge remote-tracking branch 'origin/master' into merge-upstream-20180121
2018-01-21 16:26:50 -06:00
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.
2018-01-21 16:09:40 -06:00
48cd6dc6ca
armenian translations initial commit ( #6320 )
...
* adding armenian translations
* updating config files for armenian translations
* armenian translation fix
* fixing spaces
2018-01-22 05:02:23 +09:00
1253279feb
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/settings/two_factor_authentication/confirmations_controller.rb
2018-01-21 13:36:10 -06:00
cfd2b06821
fix filter search index being too strict when looking for line breaks ( #6318 )
2018-01-21 13:23:17 +01:00
d613dda91d
Fix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN ( #6319 )
...
Since 872a0d5bd8
2018-01-21 13:22:31 +01:00
112b1fa265
Redirect to 2FA creation page when otp_secret is not available ( #6314 )
2018-01-21 13:21:28 +01:00
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.
2018-01-21 13:20:20 +01:00
1287de1b83
Fix invalid value passed to full_asset_url in mailers ( #6312 )
2018-01-21 13:20:00 +01:00
2c578a01d8
Merge remote-tracking branch 'origin/master' into gs-master
2018-01-20 16:42:57 -06:00
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
2018-01-20 16:37:52 -06:00
24b6e4121f
Merge pull request #342 from glitch-soc/merge-upstream
...
Merge upstream
2018-01-20 16:37:35 -06:00
72f9eab3d6
Change mailer avatar url ( #6309 )
...
* Change mailer avatar url
* Use full_asset_url method
2018-01-20 19:27:13 +01:00
3cae362214
Merge new onboarding styles; delete refs to PNGs.
2018-01-20 11:23:06 -06:00
38f6d8130d
Eliminate stray conflict markers.
2018-01-20 10:46:43 -06:00
071c2c9c85
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
2018-01-20 10:45:43 -06:00
0b7a0d15c7
Bump version to 2.2.0rc1
2018-01-20 16:27:19 +01:00
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
2018-01-21 00:11:21 +09:00
45afdf1781
Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views ( #6305 )
2018-01-20 03:49:06 +01:00
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
2018-01-20 01:32:37 +01:00
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
2018-01-20 01:32:21 +01:00
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
2018-01-20 01:32:05 +01:00
2ca965c704
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
app/javascript/styles/mastodon/modal.scss
2018-01-19 15:22:10 -06:00
b8c6656ce9
Merge pull request #339 from ThibG/glitch-soc/features/timeline-tweaks
...
Do not discard statuses obtained via websocket when API request finishes
2018-01-19 15:17:20 -06:00
1619efd735
Do not discard statuses obtained via websocket when API request finishes
...
This backports 0b888acfd4
2018-01-19 21:59:12 +01:00
0b888acfd4
Do not throw away statuses obtained via websocket when API request finishes ( #6302 )
2018-01-19 21:48:00 +01:00
238de58e65
Change belongs_to_required_by_default to true ( #5888 )
2018-01-19 20:56:47 +01:00
7233ac07d2
Add support Ruby v2.5.0 ( #6097 )
2018-01-19 20:53:30 +01:00
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.
2018-01-19 19:11:35 +01:00
7be53a10b0
Fix "tzinfo-data is not present" docker error ( #6300 )
...
when starting the container.
2018-01-19 19:11:19 +01:00
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.
2018-01-19 15:49:48 +01:00
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
2018-01-19 15:25:27 +01:00
852b48295f
i18n: Update Polish translation ( #6297 )
2018-01-19 21:49:25 +09:00
Eugen Rochko
David Yip
ThibG
cwm
ncls7615
Akihiko Odaki
Renato "Lond" Cerqueira
Jeong Arm
Norayr Chilingarian
codl
Aboobacker MK
Iijima Yasushi
SerCom_KC
Yamagishi Kazutoshi
Pierre Ozoux
Marcin Mikołajczak