about summary refs log tree commit diff
AgeCommit message (Collapse)Author
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>
2019-11-27Bump @babel/plugin-transform-react-inline-elements from 7.2.0 to 7.7.4 (#12467)dependabot-preview[bot]
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel) from 7.2.0 to 7.7.4. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.2.0...v7.7.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27Bump @babel/preset-env from 7.7.1 to 7.7.4 (#12471)dependabot-preview[bot]
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.1 to 7.7.4. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.7.1...v7.7.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27Bump rack-cors from 1.0.6 to 1.1.0 (#12477)dependabot-preview[bot]
Bumps [rack-cors](https://github.com/cyu/rack-cors) from 1.0.6 to 1.1.0. - [Release notes](https://github.com/cyu/rack-cors/releases) - [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md) - [Commits](https://github.com/cyu/rack-cors/compare/v1.0.6...v1.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27Bump browser from 2.6.1 to 2.7.0 (#12476)dependabot-preview[bot]
Bumps [browser](https://github.com/fnando/browser) from 2.6.1 to 2.7.0. - [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.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27Bump charlock_holmes from 0.7.6 to 0.7.7 (#12474)dependabot-preview[bot]
Bumps [charlock_holmes](https://github.com/brianmario/charlock_holmes) from 0.7.6 to 0.7.7. - [Release notes](https://github.com/brianmario/charlock_holmes/releases) - [Commits](https://github.com/brianmario/charlock_holmes/compare/0.7.6...v0.7.7) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27Bump @babel/plugin-transform-react-jsx-self from 7.2.0 to 7.7.4 (#12466)dependabot-preview[bot]
Bumps [@babel/plugin-transform-react-jsx-self](https://github.com/babel/babel) from 7.2.0 to 7.7.4. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.2.0...v7.7.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27Bump @babel/plugin-syntax-dynamic-import from 7.2.0 to 7.7.4 (#12469)dependabot-preview[bot]
Bumps [@babel/plugin-syntax-dynamic-import](https://github.com/babel/babel) from 7.2.0 to 7.7.4. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.2.0...v7.7.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27Bump @babel/runtime from 7.7.2 to 7.7.4 (#12472)dependabot-preview[bot]
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.7.2 to 7.7.4. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.7.4/packages/babel-runtime) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27Bump @babel/plugin-transform-runtime from 7.5.5 to 7.7.4 (#12473)dependabot-preview[bot]
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel) from 7.5.5 to 7.7.4. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.5.5...v7.7.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27Bump pghero from 2.3.0 to 2.4.1 (#12478)dependabot-preview[bot]
Bumps [pghero](https://github.com/ankane/pghero) from 2.3.0 to 2.4.1. - [Release notes](https://github.com/ankane/pghero/releases) - [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/pghero/compare/v2.3.0...v2.4.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-26Fix empty poll options not being filtered on remote poll update (#12484)ThibG
If a poll contains empty options (which is apparently possible on Pleroma), it is created without them. However, the poll update code doesn't filter empty options, and thus: 1. Clear known votes, as it assumes the set of options has changed 2. Errors out because it tries adding empty options, which fails validation This commit fixes that by filtering them out the same way they are filtered out at poll creation time.
2019-11-25Fix OCR with delete & redraft (#12465)ThibG
2019-11-24Revert "Bump tesseract.js from 2.0.0-alpha.16 to 2.0.0-beta.2 (#12311)" (#12454)ThibG
This reverts commit 0c204426050071c7f0e1205f1526b091e8408d5a.
2019-11-24Merge pull request #1247 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-11-23[Glitch] Fix blur behind closed registration messageThibG
Port SCSS changes from 42b3b019e01ee0c290a510483a2400e85cc250f1 to glitch flavour Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-23[Glitch] Change media description label to be context-sensitiveThibG
Port e86234b1e90975de6e507a86549f0eb4600c723b to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-11-22Fix an eslint warning (#12426)Dimitri Merejkowsky
2019-11-22Fix blur behind closed registration message (#12442)ThibG
* Fix closed registration message blur * Adjust overlay margins to account for blur Fixes #12425
generated by cgit-pink (git 2.37.1) at 2024-12-24 13:32:02 +0000