about summary refs log tree commit diff
AgeCommit message (Collapse)Author
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
2018-02-02moved save button (#3792)Charlotte Fields
* moved save button * added save back to the bottom * Update show.html.haml
2018-02-02Remove wave from list drawer (#6381)Akihiko Odaki
2018-02-02Unify links container implementation in about pages (#6382)Akihiko Odaki
They were redundant, and also had a inconsistency; the button for "other instances" had an icon for the external link in "more" page, but it didn't in the other pages. This unifies the implementation, and the external link icon is now shown in all the about pages.
2018-02-02Accept ActivityPub announce from the author of the original note (#6236)Akihiko Odaki
2018-02-02Allow retrieval of private statuses (single or in outbox) using HTTP ↵puckipedia
signatures (#6225)
2018-02-02pam authentication (#5303)Alexander
* add pam support, without extra column * bugfixes for pam login * document options * fix code style * fix codestyle * fix tests * don't call remember_me without password * fix codestyle * improve checks for pam usage (should fix tests) * fix remember_me part 1 * add remember_token column because :rememberable requires either a password or this column. * migrate db for remember_token * move pam_authentication to the right place, fix logic bug in edit.html.haml * fix tests * fix pam authentication, improve username lookup, add comment * valid? is sometimes not honored, return nil instead trying to authenticate with pam * update devise_pam_authenticatable2 and adjust code. Fixes sideeffects observed in tests * update devise_pam_authenticatable gem, fixes for codeconventions, fix finding user * codeconvention fixes * code convention fixes * fix idention * update dependency, explicit conflict check * fix disabled password updates if in pam mode * fix check password if password is present, fix templates * block registration if account is maintained by pam * Revert "block registration if account is maintained by pam" This reverts commit 8e7a083d650240b6fac414926744b4b90b435f20. * fix identation error introduced by rebase * block usernames maintained by pam * document pam settings better * fix code style
2018-02-02Fix mistake in cache deletion (#6408)abcang
2018-02-01Upgrade Paperclip > 5.2.1 (#6404)Rob Watson
Mitigation for CVE-2017-0889. https://www.cvedetails.com/cve/CVE-2017-0889/ https://medium.com/in-the-weeds/all-about-paperclips-cve-2017-0889-server-side-request-forgery-ssrf-vulnerability-8cb2b1c96fe8
2018-02-01Fix button hiding when header title is too long (#6406)abcang
2018-01-31Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-02-01Russian language updated (#6397)Evgeny Petrov
2018-01-31fix ruby 2.5 rvm install in vagrant (#6396)Daniel King
RVM has a known issue with installing Ruby 2.5 on the version of Ubuntu the Vagrant box is using: https://github.com/rvm/rvm/issues/4291 This bug was preventing any gem installs in the vagrant box
2018-01-28Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml
2018-01-29Bump version to 2.2.0Eugen Rochko
2018-01-29Fix padding bug in landing page column header (#6374)Eugen Rochko
2018-01-29ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)Eugen Rochko
generated by cgit-pink (git 2.37.1) at 2024-12-14 05:26:41 +0000