about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2018-02-24Update about.scssimncls
2018-02-23Use absolute URL for focus reticleimncls
2018-02-23Merge branch 'master' of https://github.com/tootsuite/mastodonimncls
# 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-23New variable OAUTH_REDIRECT_AT_SIGN_IN + Ref #6538 (not only SAML ↵Ghislain Loaec
strategies) (#6540)
2018-02-22New env variable: SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED + fixes #6533 (#6538)Ghislain Loaec
2018-02-22Fix nil error in focal_point? (#6537)Eugen Rochko
2018-02-22Fix container regression (#6531)Eugen Rochko
* Update public.html.haml * Update auth.html.haml * Update modal.html.haml
2018-02-22fix typo in image serializer (#6530)beatrix
respond to!
2018-02-22Redesign landing page (again) (#6486)Eugen Rochko
* 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-22Fix #6526: Only store redirect location if not in JSON format (#6528)Eugen Rochko
2018-02-22Focal points (#6520)Eugen Rochko
* 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-22Fix #6525: Make sure file is opened in LazyThumbnail processor (#6529)Eugen Rochko
2018-02-21Fix bug in relationships API introduced by #6482 (#6527)Eugen Rochko
It was merge when it needed to be deep_merge. And added some tests
2018-02-21Account archive download (#6460)Eugen Rochko
* 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-21fix #6523 (#6524)りんすき
2018-02-21Fix avatar and header issues by using custom geometry detector (#6515)Eugen Rochko
* 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-19Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-02-19Don't resize avatars/headers if their dimensions are already right (#6508)Eugen Rochko
Also don't apply "-quality 80" option which is probably the reason for slight color differences between original and remote image (because it would apply it twice, once on original instance, and again on the receiving instance)
2018-02-19Fix media spoiler design (#6507)Eugen Rochko
- 4px rounded corners on media attachments - Better colors/contrast for CW/media spoiler on public pages - Fix vertical alignment of "Show more" button - Fix layout jump when unhiding standalone media
2018-02-18add parameter locked to /api/v1/update_credentials (#6506)Konrad Pozniak
2018-02-18Remove outline from body window (Fixes #6501) (#6502)HellPie
2018-02-18Cache relationships in API (#6482)Eugen Rochko
* Cache relationships in API * Fetch relationships for search results in UI * Only save one account's maps in each cache item
2018-02-17Push discovered status through streaming API within a time window (#6484)Eugen Rochko
Time window of 6 hours
2018-02-17Merge remote-tracking branch 'tootsuite/master' into merge-upstreamDavid Yip
Conflicts: Gemfile config/locales/simple_form.pl.yml
2018-02-16Save video metadata and improve video OpenGraph tags (#6481)Eugen Rochko
* Save metadata from video attachments, put correct dimensions into OG tags * Add twitter:player for videos * Fix code style and test
2018-02-16Do not hide NSFW media/CW'd text in OpenGraph tags (#6479)Eugen Rochko
Reasoning: HTML title tag affects everyone. But OpenGraph only affects when somebody is deliberately sharing the content, usually in an environment where such content is expected. Hiding the content in OpenGraph tags results in deceitful previews which inhibit the shareability of the post. Example: Somebody writes a clever post about politics but kindly puts a "uspol" content warning on it. Mastodon users are thankful, but sharing this post on another platform results in non-Mastodon users believing the entire contents of the post is "uspol" and not clicking through/reading and re-sharing.
2018-02-15After click to embed video, autoplay it (#6480)Eugen Rochko
2018-02-15Fix #5173: Click card to embed external content (#6471)Eugen Rochko
2018-02-15Fix media button type (#6478)abcang
2018-02-14i18n: Update Polish translation (#6470)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-02-11Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-02-10Merge remote-tracking branch 'origin/merge-upstream'David Yip
2018-02-10Merge pull request #362 from ThibG/glitch-soc/fix-notifications-clearingbeatrix
Revert 245816ab2721f386184878d71be01143d207abf5 (fixes #348)
2018-02-10Revert 245816ab2721f386184878d71be01143d207abf5 (fixes #348)Thibaut Girka
Since 245816ab2721f386184878d71be01143d207abf5, IntersectionObserverArticle assumes that its children do not change unless the number of children changes. This is not the case with the notification overlay, which resulted in the checkmark of notification cleaning mode not updating unless scrolling to make notifications appear/disappear. This change may negatively impact performances.
2018-02-10Use Html2Text to generate plaintext for keyword mutes. #236.David Yip
This allows us to match URLs inside link hrefs.
2018-02-10Glitch::FilterHelper -> Glitch::KeywordMuteHelper. #234.David Yip
The class helps out with keyword mutes, not just some general concept of "filtering".
2018-02-10Fix password recovery (#6459)ThibG
* Fix password recovery * Use “resource” instead of “current_user”
2018-02-10Fill out some examples for Glitch::FilterHelper. #234.David Yip
Also add HTML entity decoding to Glitch::FilterHelper, which is needed to e.g. match "<" to the tag-stripped version of "<p><3</p>" or "<p>&lt;3</p>".
2018-02-10Strip HTML from keyword mute input. #234.David Yip
2018-02-09Full-text search for authorized statuses (#6423)Eugen Rochko
* Add full-text search for authorized statuses - Search API will return statuses that match the query - Only for logged in users - Only if you are author of the status, - Or you were mentioned in it - Or you favourited or reblogged it - Configuration over `ES_ENABLED`, `ES_HOST`, `ES_PORT`, `ES_PREFIX` - Run `rails chewy:deploy` to create & populate index Fix #5880 Fix #4293 Fix #1152 * Add commented out docker-compose configuration for ES container * Optimize index import, filter search results * Add basic normalization to the index * Add better stemming and normalization to the index * Skip webfinger request if search query includes both @ and a space * Fix code style * Visually separate search result sections * Fix code style issues
2018-02-09Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: .travis.yml app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_detailed_status.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml
2018-02-09Change web UI "posts" to "toots" on profile for consistency (#6447)Eugen Rochko
2018-02-09Add preference to always display sensitive media (#6448)Eugen Rochko
2018-02-08Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-02-08Clear account cache of notification target_status (#6442)abcang
2018-02-08Fix response of signature_verification_failure_reason (#6441)abcang
2018-02-07Change user_id column non-nullable (#6435)Akihiko Odaki
2018-02-05Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-02-05match hashtag regex in js client with server (#6431)Daniel King
the slight mismatch in hashtag regex between js and ruby was causing hashtag warning to be displayed for unlisted tweets when an invalid hashtag was entered exact version of ruby regex not possible in js as POSIX bracket expressions are not supported, this version approximates and doesn't give same unicode support
2018-02-04Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb