about summary refs log tree commit diff
AgeCommit message (Collapse)Author
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
2019-11-21Fix OEmbed discovery not handling different URL variants in query (#12439)Eugen Rochko
Fix #12433
2019-11-21Simplify SQL query when performing account search amongst followings (#12302)ThibG
2019-11-21Fix FetchLinkCardServices crashing on a tags without a target (#12159)ThibG
* Add test for links without targets * Fix FetchLinkCardServices crashing on a tags without a target
2019-11-21Change media description label to be context-sensitive (#12270)ThibG
“Describe for the visually impaired” makes no sense when the uploaded media is an audio file.
2019-11-21Change domain block behavior to update user records before deleting data ↵ThibG
(#12247) When suspending or silencing a domain, one probably wants the silence or suspend parts to take effect as soon as possible. Deleting media files can take a while (possibly days), so perform silencing as soon as possible, and clean up media afterwards.
2019-11-21Fix whitelist federation for subdomains (#12435)noiob
2019-11-21Merge pull request #1246 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-11-20Fix weird edge case in load_schemaThibaut Girka
2019-11-20Revert CircleCI and some webpack changes to match upstreamThibaut Girka
2019-11-20Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-11-20[Glitch] Fix unread toot indicator not honoring onlyMedia in public and ↵ThibG
community timelines Port 0d6da8892a675962f8e7fe1f1edc960c4a0ce36d to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-20Bump webpacker from 4.0.7 to 4.2.0 (#12416)dependabot-preview[bot]
* Bump webpacker from 4.0.7 to 4.2.0 Bumps [webpacker](https://github.com/rails/webpacker) from 4.0.7 to 4.2.0. - [Release notes](https://github.com/rails/webpacker/releases) - [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/webpacker/compare/v4.0.7...v4.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Use NODE_ENV=tests instead of test, to work around async modules not having a chunk
2019-11-20Override Migrator.new instead of Migrator#initialize, it's easier to understandThibaut Girka
2019-11-20Add documentation about the migration hackThibaut Girka
2019-11-20Monkey-patch Rails' migrator to ignore duplicate migrations across Mastodon ↵Thibaut Girka
and glitch-soc
2019-11-20Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code
2019-11-20Fix account dropdown not opening due to regression from #12377 (#12430)Eugen Rochko
generated by cgit-pink (git 2.37.1) at 2024-12-25 22:56:32 +0000