about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-02-11Interactive `rake mastodon:setup` task (#6451)Eugen Rochko
* 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-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-10Merge pull request #236 from glitch-soc/plaintext-mutesbeatrix
Make keyword mutes operate on plain text input
2018-02-10Remove NOKOGIRI_USE_SYSTEM_LIBRARIES from Travis. #236.David Yip
Nokogiri linked to the version of libxml2 shipped in Travis' Trusty image exhibits incorrect behavior when parsing strings resembling <p>I <3 oats</p> In particular, Html2Text.convert (which uses nokogiri) will return "I" for the above string when it ought to return "I <3 oats". The version of libxml2 shipped with nokogiri 1.8.1+ exhibits correct parse behavior for this string, as does the libxml2 present in Ubuntu Xenial.
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-10Introduce html2text for extracting plaintext from statuses. #236.David Yip
Unlike strip_tags, html2text will preserve text present in other nodes, e.g. anchor tags: [1] pry(main)> str = '<a href="http://www.example.com">A link</a>' => "<a href=\"http://www.example.com\">A link</a>" [2] pry(main)> Html2Text.convert(str) => "[A link](http://www.example.com)" [3] pry(main)> include ActionView::Helpers::SanitizeHelper => Object [4] pry(main)> strip_tags(str) => "A link" Preserving the href of an anchor allows keyword mutes to also match on URLs, which is something that the frontend regex filter can currently do.
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-10Added FetchRemoteAccountService spec (#6456)Kazushige Tominaga
* Added #link_header spec * Added #call spec * Delete spec of private methods * Added #call spec
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-10Added #call spec (#6455)Kazushige Tominaga
* Added #link_header spec * Added #call spec * Delete spec of private methods
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-09Normalize simple_form.en.yml.David Yip
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-09fix-indent (#6453)masarakki
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-09Perform request spec (#6446)Kazushige Tominaga
* Added #link_header spec * Added #perform_request spec
2018-02-08Clear account cache of notification target_status (#6442)abcang
2018-02-08Fix response of signature_verification_failure_reason (#6441)abcang
2018-02-08Added #link_header spec (#6439)Kazushige Tominaga
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-04db/schema.rb: resolve erroneously-unresolved conflictDavid Yip
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
2018-02-04Make PAM gem optional, allow configuration over environment (#6415)Eugen Rochko
2018-02-04Validation of count works even when text of status is nil (#6429)abcang
2018-02-04Exclude nil from relationships array (#6427)abcang
2018-02-04Make sure status is not nil (#6428)abcang
2018-02-04Upgrade Vagrant box to Xenial (#6421)Daniel King
* upgrade vagrant box to xenial this allows the redis version to be upgraded to support the new redis features used in the activity tracker * add libpam0g package to vagrant box this is required for native extensions of gems to build after the addition of PAM support was added in #5303
2018-02-04Add option to show only local toots in timeline preview (#6292)Renato "Lond" Cerqueira
* Add option to show only local toots in timeline preview Right know, toots from all the known fediverse are shown in the main page of an instance. That however doesn't reflect the instance itself. With this option the admin may choose to display only local toots so that users checking the instance get a better idea of internal conversations. * Fix issues pointed by codeclimate and eslint * Add default message for community timeline * Update pl.yml
2018-02-04CAS + SAML authentication feature (#6425)Eugen Rochko
* Cas authentication feature * Config * Remove class_eval + Omniauth initializer * Codeclimate review * Codeclimate review 2 * Codeclimate review 3 * Remove uid/email reconciliation * SAML authentication * Clean up code * Improve login form * Fix code style issues * Add locales
2018-02-04Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-02-03Merge pull request #357 from KnzkDev/fix/detail-styleDavid Yip
Fix detailed-status
2018-02-04Fix detailed-statusncls7615
2018-02-03change referrer policy to same-originbeatrix
2018-02-03Isolate internal services from external networks in Docker configuration (#6369)Akihiko Odaki
The database and Redis do not need external connections, so isolate them and prevent unauthorized access.
2018-02-03fix ColumnBackButtonSlim should extended from ColumnBackButton (#6417)takayamaki
2018-02-03Require environment for generate_static_pages (#6420)Akihiko Odaki
It is required for ApplicationController.
2018-02-02Merge remote-tracking branch 'tootsuite/master' into merge-upstreamDavid Yip
Conflicts: app/javascript/styles/mastodon/components.scss
2018-02-02Fix column header button (#6411)abcang
2018-02-02Fix saving of oEmbed image (#6409)abcang
2018-02-02Set minimum height for mastodon on drawer (#6142)Akihiko Odaki
2018-02-02Allow HTTP caching of atom-rendered public toots (OStatus compatibility) (#6207)ThibG