d75a6054a0
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-13 18:17:20 +00:00
2ef1ce1182
Bump version to 2.3.1
2018-03-13 15:50:15 +01:00
79d3a8553f
Bump version to 2.3.1rc3
2018-03-13 09:21:21 +01:00
f8e934f955
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
README.md
2018-03-12 17:52:19 -05:00
051b649628
Detailed SMTP setup ( #6759 )
...
* add detailed SMTP settings setup in mastodon:setup
* add localhost SMTP settings setup in mastodon:setup
* SMTP settings setup should exit after successful delivery of test mail
2018-03-12 21:41:26 +01:00
f5f165a5eb
set SAFETY_ASSURED=1 of db:setup in mastodon:setup ( #6758 )
2018-03-12 16:21:48 +01:00
f89ff65ec7
Bump version to 2.3.1rc2
2018-03-12 12:48:49 +01:00
ab27dccba5
Bump version to 2.3.1rc1
2018-03-11 15:13:13 +01:00
e553905ba7
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-09 12:17:22 +00:00
6e309f5e45
Bump version to 2.3.0
2018-03-09 12:59:58 +01:00
e5f18ace2a
When inside Docker, output saved configuration during mastodon:setup ( #6711 )
2018-03-09 11:52:18 +01:00
447d7e6127
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-09 00:17:17 +00:00
bd077ad7d9
Bump version to 2.3.0rc3
2018-03-08 11:19:02 +01:00
64db9ed5f6
After blocking domain with reject_media, invalidate cache ( #6679 )
...
Media attachments are part of the association cache of statuses,
since they are presumed to be immutable. Unless this cache is
cleared manually, the statuses will continue to look like they
have media embedded.
2018-03-08 06:59:42 +01:00
4ca60c665e
Bump version to 2.3.0rc2
2018-03-07 12:06:23 +01:00
78d772af86
Fix #3807 : Increase avatars to 400x400 max ( #6651 )
...
But do not upscale when they are smaller
2018-03-06 06:29:01 +01:00
778b37790b
Do not fetch environment variables to determine default locale ( #6618 )
...
The default locale is now set by config.
2018-03-04 10:00:46 +01:00
1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
README.md
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/serializers/rest/instance_serializer.rb
app/views/stream_entries/_simple_status.html.haml
config/locales/simple_form.ja.yml
2018-03-02 21:46:44 -06:00
ecd36c1ede
Fixes #6584 ( #6585 )
2018-03-01 23:30:06 +01:00
64f2ada5d4
Bump version to 2.3.0rc1
2018-03-01 20:50:23 +01:00
47bdb9b33b
Fix #942 : Seamless LDAP login ( #6556 )
2018-02-28 19:04:53 +01:00
76198c63b6
Some images can cause `convert` to fail, which crashes this whole task ( #6565 )
...
* Some images can cause `convert` to fail, which crashes this whole task
* Add more specific exception
2018-02-26 22:01:49 +01:00
5cc716688a
Ensure the app does not even start if OTP_SECRET is not set ( #6557 )
...
* Ensure the app does not even start if OTP_SECRET is not set
* Remove PAPERCLIP_SECRET (it's not used by anything, actually)
Imports are for internal consumption and the url option isn't even
used correctly, so we can remove the hash stuff from them
2018-02-26 01:31:44 +01:00
bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
...
# Conflicts:
# app/controllers/settings/exports_controller.rb
# app/models/media_attachment.rb
# app/models/status.rb
# app/views/about/show.html.haml
# docker_entrypoint.sh
# spec/views/about/show.html.haml_spec.rb
2018-02-23 23:28:31 +09:00
d3a62d2637
Fix #6525 : Make sure file is opened in LazyThumbnail processor ( #6529 )
2018-02-22 00:28:19 +01:00
61ed133fea
Account archive download ( #6460 )
...
* Fix #201 : Account archive download
* Export actor and private key in the archive
* Optimize BackupService
- Add conversation to cached associations of status, because
somehow it was forgotten and is source of N+1 queries
- Explicitly call GC between batches of records being fetched
(Model class allocations are the worst offender)
- Stream media files into the tar in 1MB chunks
(Do not allocate media file (up to 8MB) as string into memory)
- Use #bytesize instead of #size to calculate file size for JSON
(Fix FileOverflow error)
- Segment media into subfolders by status ID because apparently
GIF-to-MP4 media are all named "media.mp4" for some reason
* Keep uniquely generated filename in Paperclip::GifTranscoder
* Ensure dumped files do not overwrite each other by maintaing directory partitions
* Give tar archives a good name
* Add scheduler to remove week-old backups
* Fix code style issue
2018-02-21 23:21:32 +01:00
f69d7cb43b
fix purge_removed_accounts task should suspend account before delete it ( #6521 )
2018-02-21 16:30:46 +01:00
a7171af0a3
Fix avatar and header issues by using custom geometry detector ( #6515 )
...
* Fix avatar and header issues by using custom geometry detector
Revert a part of #6508 . The file passed to dynamic styles method
was not actually a file, but an instance of Paperclip::Attachment,
which broke all styles by always returning {} from the method.
One problem with GIF avatars was that Paperclip::GeometryDetector
reported wrong dimensions for them, e.g. 120x120 GIF avatar would
for some reason be detected as 120x53. By writing our own geometry
parser, we can use FastImage, which also happens to be faster than
ImageMagick, to detect image dimensions, which are also correct.
Unfortunately, this PR does not implement skipping a `convert`
entirely if the dimensions are already correct, as I found no easy
way to write that behaviour into Paperclip without rewriting the
Paperclip::Thumbnail class.
* Only invoke convert if dimension or format needs to be changed
2018-02-21 03:40:12 +01:00
5ffa6f0fa1
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-02-11 18:17:11 +00:00
cf36d184f4
Interactive `rake mastodon:setup` task ( #6451 )
...
* Add better CLI prompt
* Add rake mastodon:setup interactive wizard
* Test db/redis/smtp configurations and add admin user at the end
* Test database connection even when database does not exist yet
2018-02-11 18:40:57 +01:00
530fcc1c14
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-02-04 03:17:11 +00:00
f7bf36d8fc
Require environment for generate_static_pages ( #6420 )
...
It is required for ApplicationController.
2018-02-03 18:41:01 +01:00
f4b2478af1
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/views/layouts/mailer.html.haml
config/locales/ko.yml
2018-01-28 22:45:17 -06:00
e14c20582f
Bump version to 2.2.0
2018-01-29 01:12:36 +01:00
97dcfb0f50
ASSET_HOST is wrong env variable. Fix to CDN_HOST ( #6372 )
2018-01-29 01:06:39 +01:00
0e10667fbe
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-24 19:17:11 +00:00
e6db3427b7
Bump to 2.2.0rc2
2018-01-24 04:16:30 +01:00
b1daa71da5
Fix #6311 : Replace relative URLs in CSS only for Premailer ( #6335 )
2018-01-24 02:57:14 +01: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
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
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
9b3b40df66
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
89a9d629f7
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
Gemfile.lock
2018-01-15 22:17:48 -06:00
5276c0a090
HTML e-mails for UserMailer ( #6256 )
...
- premailer gem to turn CSS into inline styles automatically
- rework UserMailer templates
- reword UserMailer templates
2018-01-16 03:29:11 +01:00
0c7dc6c781
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-15 06:17:15 +00:00
ed867eca9d
Move e-mail digest task to sidekiq, reduce workload, improve hint ( #6252 )
2018-01-15 04:34:28 +01:00
7c719c567c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-09 05:17:13 +00:00
ff6ca8bdc6
Bump version to 2.1.3
2018-01-08 19:15:31 +01:00
f6adb409fd
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-05 22:17:12 +00:00
e9822a4e4e
Bump version to 2.1.2
2018-01-05 04:52:06 +01:00
c69a23ae46
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-04 23:17:11 +00:00
7571c37c99
Bump version to 2.1.1 ( #6164 )
2018-01-04 16:40:26 +01:00
f77c47d01b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-24 15:17:12 +00:00
cafe27fb29
Add rake task to check and purge accounts that are missing in origin ( #6085 )
...
* Add rake task to check and purge accounts that are missing in origin
* Add progress bar and --force options to mastodon:maintenance:purge_removed_accounts
2017-12-24 16:14:33 +01:00
05a2a70ca2
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-16 15:17:12 +00:00
e202efdf8a
Merge pull request #253 from glitch-soc/prevent-local-only-federation
...
prevent federation of local-only statuses
2017-12-16 09:26:48 -05:00
a434d9c0cc
Remove period from the version number ( #6039 )
...
2.1.0. -> 2.1.0
2017-12-15 21:38:25 +01:00
82b2e224a2
Merge branch 'gs-master' into prevent-local-only-federation
...
Conflicts:
db/schema.rb
2017-12-15 12:20:56 -06:00
40afadfb01
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-15 18:17:14 +00:00
a29432f0cd
Bump version to 2.1.0 🎆
2017-12-15 19:14:57 +01:00
37254c4f5d
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-15 01:17:12 +00:00
098c7d27fe
Bump version to 2.1.0rc6
2017-12-15 02:00:28 +01:00
10f800ab46
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-13 20:17:13 +00:00
7cad926401
Bump version to 2.1.0rc5
2017-12-13 20:53:39 +01:00
82236a3703
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-13 18:17:16 +00:00
57fcc21a86
Bump version to 2.1.0rc4
2017-12-13 12:45:12 +01:00
a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
2017-12-12 02:54:13 -06:00
1138d0c321
Add Rake task to backfill local-only flag ( #253 )
2017-12-10 22:49:59 -06:00
2526ef10c2
Bump version to 2.1.0rc3
2017-12-09 02:42:59 +01:00
776867ea73
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-08 13:17:14 +00:00
369f40bb9f
Bump version to 2.1.0rc2
2017-12-08 01:47:08 +01:00
744447b3c0
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-07 04:17:14 +00:00
c083816c24
Add embed_url to preview cards ( #5775 )
2017-12-07 03:37:43 +01:00
8ca91cef45
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-06 20:17:13 +00:00
f9a0d8f2b9
Bump version to 2.1.0rc1 ( #5834 )
2017-12-06 16:13:32 +01:00
b21db9bbde
Using double splat operator ( #5859 )
2017-12-06 11:41:57 +01:00
b28b405b97
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-16 22:52:37 -06:00
9dd5e329ab
Remove empty strings ( #5732 )
2017-11-17 10:52:30 +09:00
35fbdc36f9
Merge tootsuite/master at 3023725936
2017-11-16 01:21:16 -06:00
7bb8b0b2fc
Add moderator role and add pundit policies for admin actions ( #5635 )
...
* Add moderator role and add pundit policies for admin actions
* Add rake task for turning user into mod and revoking it again
* Fix handling of unauthorized exception
* Deliver new report e-mails to staff, not just admins
* Add promote/demote to admin UI, hide some actions conditionally
* Fix unused i18n
2017-11-11 20:23:33 +01:00
4c0a85ef9b
In remove_remote, exclude removed media attachments. ( #5626 )
2017-11-08 15:19:22 +01:00
dd28b94cf0
Merge remote-tracking branch 'origin/master' into gs-master
2017-10-26 09:18:27 -05:00
4f337c020a
Fix Cocaine::ExitStatusError when upload small non-animated GIF ( #5489 )
...
Looks like copied tempfile need to be flushed before further processing. This issue won't happen if the uploaded file has enough file size.
2017-10-26 22:48:35 +09:00
42e8c8eb0e
Merge tag 'v2.0.0' into gs-master
2017-10-18 11:52:04 -05:00
3810d98cd8
Bump version to 2.0.0 🐘
2017-10-18 13:53:56 +02:00
637ea3bb5b
Bump version to 2.0.0rc4
2017-10-17 23:16:35 +02:00
65154869df
Merge remote-tracking branch 'upstream/master' into upstream-merge-again
2017-10-16 09:54:16 -05:00
bc89995f65
Bump version to 2.0.0rc3
2017-10-16 16:29:00 +02:00
0bf9261e65
Merge remote-tracking branch 'upstream/master'
2017-10-11 21:27:17 +02:00
e5d8166a12
Fix #5329 ( #5332 )
...
This fixes #5329 , which occurred when using MigrationHelpers on a
table that Postgres estimated to be non-empty when it was actually
empty.
2017-10-11 21:20:39 +02:00
8d6b9ba494
Merge upstream 2.0ish #165
2017-10-11 10:43:10 -07:00
7c33da45f0
Bump version to 2.0.0rc2
2017-10-10 20:48:26 +02:00
92e7815d1d
Fix #5274 - Create symlink from public/500.html to public/assets/500.html ( #5288 )
2017-10-09 20:51:24 +02:00
0aa810f9c8
Bump version to 2.0.0rc1 ( #5209 )
2017-10-08 22:03:44 +02:00
0717d9b3e6
Set snowflake IDs for backdated statuses ( #5260 )
...
- Rename Mastodon::TimestampIds into Mastodon::Snowflake for clarity
- Skip for statuses coming from inbox, aka delivered in real-time
- Skip for statuses that claim to be from the future
2017-10-08 17:34:34 +02:00
85d5da86df
raise Mastodon::ValidationError if audio file duration is over 60 secs
2017-10-07 16:14:34 -07:00
e10cff8226
update indentation
2017-10-07 13:55:11 -07:00
96ba3482b9
adding support for audio uploads, transcoded to mp4 videos
2017-10-07 19:54:10 +00:00
fd7f0732fe
Compress and combine emoji data ( #5229 )
2017-10-06 03:42:34 +02:00
Jenkins