Commit graph

39709 commits

Author SHA1 Message Date
mayaeh
8995e9238a i18n: Update Japanese translations (#6550)
* Update Japanese translations.

* Add quotation marks.
2018-02-25 01:27:03 +09:00
mayaeh
4d8c0d9959 i18n: Update Japanese translations (#6550)
* Update Japanese translations.

* Add quotation marks.
2018-02-25 01:27:03 +09:00
Jenkins
b4f099ac0a Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-02-24 05:17:10 +00:00
Jenkins
2edf7128f2 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-02-24 05:17:10 +00:00
Akihiko Odaki
7ac6e09dde Do not push status to feed if its reblog is already inserted (#6488)
A complemental change for precompute_feed_service_spec.rb also fixes its
random failure which is caused by the Snowlake randomization of the order
of an original status and its reblog.
2018-02-24 05:40:18 +01:00
Akihiko Odaki
f8f0572ee0 Do not push status to feed if its reblog is already inserted (#6488)
A complemental change for precompute_feed_service_spec.rb also fixes its
random failure which is caused by the Snowlake randomization of the order
of an original status and its reblog.
2018-02-24 05:40:18 +01:00
David Yip
c840346355 Merge pull request #369 from KnzkDev/merge-upstream
Merge with upstream @ d1806f5dc4
2018-02-23 15:05:00 -06:00
David Yip
f53953d28a
Merge pull request #369 from KnzkDev/merge-upstream
Merge with upstream @ e668180044
2018-02-23 15:05:00 -06:00
imncls
9d28dc6c34 Update SCSS 2018-02-24 03:22:58 +09:00
imncls
f2f19e1f8a
Update SCSS 2018-02-24 03:22:58 +09:00
imncls
90765d1e99 Update columns.scss 2018-02-24 01:45:15 +09:00
imncls
7bff3243ae
Update columns.scss 2018-02-24 01:45:15 +09:00
imncls
a6138cc1e9 Update containers.scss 2018-02-24 01:26:48 +09:00
imncls
ef1d46948a
Update containers.scss 2018-02-24 01:26:48 +09:00
imncls
51ff35b344 Update index.scss 2018-02-24 01:25:49 +09:00
imncls
82408904a1
Update index.scss 2018-02-24 01:25:49 +09:00
imncls
1e64435374 Fix data export page error 2018-02-24 00:29:26 +09:00
imncls
3afc6174f5
Fix data export page error 2018-02-24 00:29:26 +09:00
imncls
3419c8e2ac Update about.scss 2018-02-24 00:22:05 +09:00
imncls
fa3641df7f
Update about.scss 2018-02-24 00:22:05 +09:00
imncls
5d8e29ba27 Use absolute URL for focus reticle 2018-02-23 23:50:25 +09:00
imncls
697f289597
Use absolute URL for focus reticle 2018-02-23 23:50:25 +09:00
imncls
c0aabbec0f 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
imncls
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
Ghislain Loaec
d1806f5dc4 New variable OAUTH_REDIRECT_AT_SIGN_IN + Ref #6538 (not only SAML strategies) (#6540) 2018-02-23 01:16:17 +01:00
Ghislain Loaec
e668180044 New variable OAUTH_REDIRECT_AT_SIGN_IN + Ref #6538 (not only SAML strategies) (#6540) 2018-02-23 01:16:17 +01:00
Alexander
32cc2d8c9b Update pam documentation (#6518)
* document pam email extraction

* remove superfluous newline
2018-02-22 23:41:21 +01:00
Alexander
8fa924e372 Update pam documentation (#6518)
* document pam email extraction

* remove superfluous newline
2018-02-22 23:41:21 +01:00
Marcin Mikołajczak
21da2f420e i18n: Update Polish translation (#6539)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-02-22 23:31:41 +01:00
Marcin Mikołajczak
3e46f12340 i18n: Update Polish translation (#6539)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-02-22 23:31:41 +01:00
Ghislain Loaec
deea524052 New env variable: SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED + fixes #6533 (#6538) 2018-02-22 23:31:25 +01:00
Ghislain Loaec
3084fe4959 New env variable: SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED + fixes #6533 (#6538) 2018-02-22 23:31:25 +01:00
Eugen Rochko
692dfd9a93 Fix nil error in focal_point? (#6537) 2018-02-22 17:42:33 +01:00
Eugen Rochko
b8535ad4df
Fix nil error in focal_point? (#6537) 2018-02-22 17:42:33 +01:00
Eugen Rochko
51e1e65c84 Fix container regression (#6531)
* Update public.html.haml

* Update auth.html.haml

* Update modal.html.haml
2018-02-22 03:04:27 +01:00
Eugen Rochko
5f3bee345d
Fix container regression (#6531)
* Update public.html.haml

* Update auth.html.haml

* Update modal.html.haml
2018-02-22 03:04:27 +01:00
beatrix
9184d588c1 fix typo in image serializer (#6530)
respond to!
2018-02-22 02:47:17 +01:00
beatrix
755aad534a fix typo in image serializer (#6530)
respond to!
2018-02-22 02:47:17 +01:00
Eugen Rochko
ad1f541bd7 Redesign landing page (again) (#6486)
* Redesign landing page (again)

* Move login form in small version to the right column

* Display closed registrations message

* Add site setting for the hero image

* Fix test

* Increase spacing, maximum width, change call to action section
2018-02-22 01:03:48 +01:00
Eugen Rochko
c71aa468b5
Redesign landing page (again) (#6486)
* Redesign landing page (again)

* Move login form in small version to the right column

* Display closed registrations message

* Add site setting for the hero image

* Fix test

* Increase spacing, maximum width, change call to action section
2018-02-22 01:03:48 +01:00
Eugen Rochko
eb5b1b45d9 Fix #6526: Only store redirect location if not in JSON format (#6528) 2018-02-22 00:51:30 +01:00
Eugen Rochko
d8bc64bb09
Fix #6526: Only store redirect location if not in JSON format (#6528) 2018-02-22 00:51:30 +01:00
Eugen Rochko
865c7e7178 Focal points (#6520)
* Add focus param to media API, center thumbnails on focus point

* Add UI for setting a focal point

* Improve focal point icon on upload item

* Use focal point in upload preview

* Add focalPoint property to ActivityPub

* Don't show focal point button for non-image attachments
2018-02-22 00:35:46 +01:00
Eugen Rochko
90f12f2e5a
Focal points (#6520)
* Add focus param to media API, center thumbnails on focus point

* Add UI for setting a focal point

* Improve focal point icon on upload item

* Use focal point in upload preview

* Add focalPoint property to ActivityPub

* Don't show focal point button for non-image attachments
2018-02-22 00:35:46 +01:00
Eugen Rochko
c9ed272a4a Fix #6525: Make sure file is opened in LazyThumbnail processor (#6529) 2018-02-22 00:28:19 +01:00
Eugen Rochko
d3a62d2637
Fix #6525: Make sure file is opened in LazyThumbnail processor (#6529) 2018-02-22 00:28:19 +01:00
Eugen Rochko
cdb12bd39b Fix bug in relationships API introduced by #6482 (#6527)
It was merge when it needed to be deep_merge. And added some tests
2018-02-21 23:22:12 +01:00
Eugen Rochko
4bc625166e
Fix bug in relationships API introduced by #6482 (#6527)
It was merge when it needed to be deep_merge. And added some tests
2018-02-21 23:22:12 +01:00
Eugen Rochko
f6884555d7 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
Eugen Rochko
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