about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-12-03Bump autoprefixer from 9.6.1 to 9.7.3 (#12519)dependabot-preview[bot]
Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.6.1 to 9.7.3. - [Release notes](https://github.com/postcss/autoprefixer/releases) - [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md) - [Commits](https://github.com/postcss/autoprefixer/compare/9.6.1...9.7.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-02Update ESLint and RuboCop in Code Climate (#12534)Yamagishi Kazutoshi
2019-12-02Fix blocking/unblocking users from status dropdown menu (#12535)ThibG
Fixes #12511
2019-12-03Bump eslint-plugin-react from 7.16.0 to 7.17.0 (#12524)dependabot-preview[bot]
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.16.0 to 7.17.0. - [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases) - [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md) - [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.16.0...v7.17.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-02Bump blurhash from 1.0.0 to 1.1.3 (#12411)dependabot-preview[bot]
Bumps [blurhash](https://github.com/woltapp/blurhash) from 1.0.0 to 1.1.3. - [Release notes](https://github.com/woltapp/blurhash/releases) - [Commits](https://github.com/woltapp/blurhash/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-02Bump aws-sdk-s3 from 1.55.0 to 1.57.0 (#12528)dependabot-preview[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.55.0 to 1.57.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.55.0...v1.57.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-02Bump arrow-key-navigation from 1.0.2 to 1.1.0 (#12523)dependabot-preview[bot]
Bumps [arrow-key-navigation](https://github.com/nolanlawson/arrow-key-navigation) from 1.0.2 to 1.1.0. - [Release notes](https://github.com/nolanlawson/arrow-key-navigation/releases) - [Commits](https://github.com/nolanlawson/arrow-key-navigation/compare/v1.0.2...v1.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-02Bump tty-prompt from 0.19.0 to 0.20.0 (#12529)dependabot-preview[bot]
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.19.0 to 0.20.0. - [Release notes](https://github.com/piotrmurach/tty-prompt/releases) - [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md) - [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.19.0...v0.20.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-02Bump rubocop-rails from 2.3.2 to 2.4.0 (#12532)dependabot-preview[bot]
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.3.2 to 2.4.0. - [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.3.2...v2.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-02Bump fabrication from 2.20.2 to 2.21.0 (#12527)dependabot-preview[bot]
Bumps [fabrication](https://github.com/paulelliott/fabrication) from 2.20.2 to 2.21.0. - [Release notes](https://github.com/paulelliott/fabrication/releases) - [Changelog](https://github.com/paulelliott/fabrication/blob/master/Changelog.markdown) - [Commits](https://github.com/paulelliott/fabrication/compare/2.20.2...2.21.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-02Bump rails-ujs from 5.2.3 to 5.2.4 (#12526)dependabot-preview[bot]
Bumps [rails-ujs](https://github.com/rails/rails) from 5.2.3 to 5.2.4. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v5.2.3...v5.2.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-02Bump eslint from 6.5.1 to 6.7.2 (#12522)dependabot-preview[bot]
Bumps [eslint](https://github.com/eslint/eslint) from 6.5.1 to 6.7.2. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v6.5.1...v6.7.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-02Fix notifications label (#12517)mayaeh
* Fix translations not being displayed * ran `yarn manage:translations en`
2019-12-02Remove unnecessary dependencies (#12533)Yamagishi Kazutoshi
2019-12-01Link to reports targetting instance in admin view (#12513)ThibG
2019-12-01:sparkles: Add an LDAP Mail attribute config (#12053)Mathieu Brunot
Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
2019-12-01Add follow_request notification type (#12198)ThibG
* Add follow_request notification type The notification type already existed in the backend but was never pushed to the front-end. This also means translation strings were also available for the backend, from the notification mailer. Unlike other notification types, these are off by default, to match what I remember of Gargron's view on the topic: that follow requests should not clutter notifications and should instead be reviewed at the user's own leisure in the dedicated column. Since follow requests have their own column, I've deemed it unnecessary to add a specific tab for them in the notification quick filter. * Show follow request link in single-column if there are pending requests, even if account isn't locked * Push follow requests from notifications to the follow_requests list * Offer to accept or reject follow request from the notification * Redesign follow request notification
2019-12-01Only normalize local polls (#12515)ThibG
Before this patch, if remote poll options have leading or trailing spaces, the information stored locally won't match them, causing federated voting to fail.
2019-12-01Merge pull request #1250 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-12-01[Glitch] Fix conversations not having an unread indicator in web UIEugen Rochko
Fix ed73376f1ca7ef5e254a3ec21e1ead85b2d34fd6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-12-01[Glitch] Fix lost focus when modals open/closeThibG
Port 35b142a7ad19821483f900e81e915a7925fd4eaf to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-12-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-12-01:sparkles: Convert LDAP username (#12461)Mathieu Brunot
* :sparkles: Convert LDAP username #12021 Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io> * :bug: Fix conversion var use Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io> * :bug: Fix LDAP uid conversion test Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io> * :ok_hand: Remove comments with ref to PR Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io> * :ok_hand: Remove unnecessary paranthesis Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io> * :wrench: Move space in conversion string Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
2019-12-01Split relationships page strings (#12502)Sasha Sorokin
Before this moment relationships managing page was using strings from other context - from counters, but in order for translators to be able to translate it relatively to the page, it must use separate strings. I've split the strings for "Following" and "Followers" and put them to "relationships" keyset in localization file. This should solve this issue. Fixes #10863
2019-12-01Fix conversations not having an unread indicator in web UI (#12506)Eugen Rochko
2019-11-30Fallback to Create audience when object has no defined audience (#12249)ThibG
Fixes #11137
2019-11-30Add ability to filter reports by target account domain (#12154)ThibG
* Add ability to filter reports by target account domain * Reword by_target_domain label
2019-11-30LDAP & PAM added to OAuth password grant strategy (#7999) (#12390)ntl-purism
When authenticating via OAuth, the resource owner password grant strategy is allowed by Mastodon, but (without this PR), it does not attempt to authenticate against LDAP or PAM. As a result, LDAP or PAM authenticated users cannot sign in to Mastodon with their email/password credentials via OAuth (for instance, for native/mobile app users). This PR fleshes out the authentication strategy supplied to doorkeeper in its initializer by looking up the user with LDAP and/or PAM when devise is configured to use LDAP/PAM backends. It attempts to follow the same logic as the Auth::SessionsController for handling email/password credentials. Note #1: Since this pull request affects an initializer, it's unclear how to add test automation. Note #2: The PAM authentication path has not been manually tested. It was added for completeness sake, and it is hoped that it can be manually tested before merging.
2019-11-30Fix lost focus when modals open/close (#12437)ThibG
* Fix lost focus after modal closes Regression caused by the use of the wicg-inert polyfill * Fix regression introduced by wicg-inert * Catch errors to please CodeClimate
2019-11-30Merge pull request #1249 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-11-30[Glitch] Fix counter sizingSasha Sorokin
Port b532ead798c481fd03be9eb78e910d62654cdaa8 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-30[Glitch] Add hotkey for opening media filesThibG
Port a690b3e470ed85cc6f3f8fa7aec57d04b60a4705 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-30[Glitch] Fix pending upload count not being decremented on errorThibG
Port 667708f5b00ee8b7795eacd9c20d29f77c8ae602 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-30[Glitch] Fix OCR with delete & redraftThibG
Port e7a7f88df7a763be6dad3a982829ef5a1b1dea09 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-11-29Fix counter sizing (#12446)Sasha Sorokin
Counter size is currently set to strict 33.3% width, but with it counter may break in other languages than English. For example it is already broken on Gargron's profile on mastodon.social using Russian locale. This commit changes "width" to "min-width", so counters still displayed correctly, but if they need more width to fit text, they are now allowed to take as many width as they need.
2019-11-29Updated NodeJS in Dockerfile (#12492)Shlee
2019-11-29Improve notifications page (#12497)Sasha Sorokin
Currently notifications page seems a bit cluttered with no clear separation between e-mail and filtering settings. This commit tries to address them by adding clear separation with headers, hints and removing continuously reused texts for events checkboxes.
2019-11-29Add hotkey for opening media files (#12498)ThibG
* [WiP] Add hotkey to open media * Give focus to play/pause button when opening video modal
2019-11-29Fix pending upload count not being decremented on error (#12499)ThibG
The arguments were passed to the wrong function… also, there is no need to have a conditional decrementation: failure to upload means we marked an upload as pending, in all cases.
2019-11-28Fix n+1 query for bookmarks on statuses (#12494)Eugen Rochko
2019-11-28Fix proofs API being inaccessible in secure mode (#12495)Eugen Rochko
2019-11-27Link move target accountThibaut Girka
2019-11-27Show acct of target accountThibaut Girka
2019-11-27Add moved account warningThibaut Girka
2019-11-27Do not consider moved accounts as non-functionalThibaut Girka
This might be somewhat controversial, but putting a redirection up makes the account unusable, which works against use cases such as using the moved account as backup in case the new one temporarily fails (sure, the redirection can be temporarily removed, but it is a hassle)
2019-11-27Bump net-ldap from 0.16.1 to 0.16.2 (#12479)dependabot-preview[bot]
Bumps [net-ldap](https://github.com/ruby-ldap/ruby-net-ldap) from 0.16.1 to 0.16.2. - [Release notes](https://github.com/ruby-ldap/ruby-net-ldap/releases) - [Changelog](https://github.com/ruby-ldap/ruby-net-ldap/blob/master/History.rdoc) - [Commits](https://github.com/ruby-ldap/ruby-net-ldap/compare/v0.16.1...v0.16.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27Bump parallel from 1.18.0 to 1.19.1 (#12475)dependabot-preview[bot]
Bumps [parallel](https://github.com/grosser/parallel) from 1.18.0 to 1.19.1. - [Release notes](https://github.com/grosser/parallel/releases) - [Commits](https://github.com/grosser/parallel/compare/v1.18.0...v1.19.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27Use override_csp options on pghero (#12489)Yamagishi Kazutoshi
2019-11-27Bump browser from 2.6.1 to 2.7.1 (#12490)dependabot-preview[bot]
Bumps [browser](https://github.com/fnando/browser) from 2.6.1 to 2.7.1. - [Release notes](https://github.com/fnando/browser/releases) - [Changelog](https://github.com/fnando/browser/blob/master/CHANGELOG.md) - [Commits](https://github.com/fnando/browser/compare/v2.6.1...v2.7.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>