David Yip
db052e79ad
Merge remote-tracking branch 'origin/master' into merge-upstream-20180121
2018-01-21 16:26:50 -06:00
David Yip
37d03b1639
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
Norayr Chilingarian
62e47f7041
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
David Yip
a95ca95b7b
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
codl
4d15390eb6
fix filter search index being too strict when looking for line breaks ( #6318 )
2018-01-21 13:23:17 +01:00
ThibG
55567d05b2
Fix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN ( #6319 )
...
Since 896cadceed
, 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.
2018-01-21 13:22:31 +01:00
Aboobacker MK
a1979b50c9
Redirect to 2FA creation page when otp_secret is not available ( #6314 )
2018-01-21 13:21:28 +01:00
Eugen Rochko
4ee27e1630
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
Eugen Rochko
d9421e01df
Fix invalid value passed to full_asset_url in mailers ( #6312 )
2018-01-21 13:20:00 +01:00
David Yip
d000f5dd80
Merge remote-tracking branch 'origin/master' into gs-master
2018-01-20 16:42:57 -06:00
David Yip
8354cca2fa
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
David Yip
6b4f90e5fb
Merge pull request #342 from glitch-soc/merge-upstream
...
Merge upstream
2018-01-20 16:37:35 -06:00
Iijima Yasushi
c8d971a5c1
Change mailer avatar url ( #6309 )
...
* Change mailer avatar url
* Use full_asset_url method
2018-01-20 19:27:13 +01:00
David Yip
75dac5d056
Merge new onboarding styles; delete refs to PNGs.
2018-01-20 11:23:06 -06:00
David Yip
0f703fe455
Eliminate stray conflict markers.
2018-01-20 10:46:43 -06:00
David Yip
03f157f6da
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
2018-01-20 10:45:43 -06:00
Eugen Rochko
b9794f1a49
Bump version to 2.2.0rc1
2018-01-20 16:27:19 +01:00
SerCom_KC
d26ae4a147
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
Eugen Rochko
9c6dba3999
Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views ( #6305 )
2018-01-20 03:49:06 +01:00
Eugen Rochko
adb0b4a59a
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
Eugen Rochko
896cadceed
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
Eugen Rochko
5f9c017c01
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
David Yip
d45ebe26dc
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
David Yip
f281097ea7
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
Thibaut Girka
12edfead8e
Do not discard statuses obtained via websocket when API request finishes
...
This backports 0b888acfd4
2018-01-19 21:59:12 +01:00
ThibG
1e6d392ff5
Do not throw away statuses obtained via websocket when API request finishes ( #6302 )
2018-01-19 21:48:00 +01:00
Yamagishi Kazutoshi
49b76b3025
Change belongs_to_required_by_default to true ( #5888 )
2018-01-19 20:56:47 +01:00
Yamagishi Kazutoshi
2df7c3a008
Add support Ruby v2.5.0 ( #6097 )
2018-01-19 20:53:30 +01:00
ThibG
dc4054abe9
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
Pierre Ozoux
4ae0ea3802
Fix "tzinfo-data is not present" docker error ( #6300 )
...
when starting the container.
2018-01-19 19:11:19 +01:00
ThibG
30df8fc679
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
Eugen Rochko
5daf5f2c57
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
Marcin Mikołajczak
a34f6ba630
i18n: Update Polish translation ( #6297 )
2018-01-19 21:49:25 +09:00
Thibaut Girka
41c1e5533e
Display a warning when composing unlisted toots with something looking like a hashtag
...
This is a backport of b42cdedfc3
to the glitch flavour.
2018-01-19 12:59:33 +01:00
David Yip
83b911f883
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-01-18 23:40:37 -06:00
David Yip
477fbec714
Merge pull request #332 from glitch-soc/merge-upstream
...
Merge in home feed regeneration changes from upstream
2018-01-18 22:00:11 -06:00
David Yip
91f892fd6e
Merge pull request #333 from glitch-soc/win95-update
...
Update win95 theme from cybrespace/mastodon
2018-01-18 13:35:24 -06:00
Eugen Rochko
92df0bba59
Fix regeneration marker not expiring ( #6290 )
...
* Fix regeneration key not getting expired
* Add rake task to remove old regeneration markers
2018-01-18 20:29:56 +01:00
Eugen Rochko
b0f2bff481
Replace tutorial modal with welcome e-mail ( #6273 )
...
* Remove onboarding modal
* Welcome e-mail
* Send welcome e-mail after confirmation
* Remove obsolete translations
2018-01-18 19:17:25 +01:00
David Yip
011d6011f9
Strip trailing whitespace on win95.scss
2018-01-18 10:54:50 -06:00
David Yip
fc20361bbe
Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update
...
Conflicts:
app/javascript/styles/win95.scss
config/themes.yml
2018-01-18 10:54:12 -06:00
David Yip
14fffe6e88
Use absolute paths for new working/not-found SVGs
...
This allows these component styles to be used in i.e. the win95 skin.
2018-01-18 10:25:54 -06:00
David Yip
2a201c2ec6
Port 9cfbbbce1f
to glitch frontend
2018-01-18 10:25:37 -06:00
David Yip
f4428a7ba8
Merge remote-tracking branch 'origin/master' into merge-upstream
2018-01-18 09:17:58 -06:00
David Yip
d0e525c463
Merge branch 'gs-master' into merge-upstream
2018-01-18 09:14:28 -06:00
David Yip
dfcee78446
Style fixes to make eslint happier, hopefully
2018-01-18 09:13:07 -06:00
Renato "Lond" Cerqueira
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
2018-01-18 16:12:10 +01:00
David Yip
b1155460ba
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
2018-01-17 18:37:09 -06:00
Eugen Rochko
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
2018-01-17 23:56:03 +01:00
Jenkins
9d3388ab6e
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-17 22:17:14 +00:00