about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2020-06-27Remove the terms blacklist and whitelist from UX (#14149)Eugen Rochko
Localization strings: - "Whitelist mode" -> "Limited federation mode" - "Blacklist e-mail domain" -> "Block e-mail domain" - "Whitelist domain" -> "Allow domain for federation" ...And so on Environment variables (backwards-compatible): - `WHITELIST_MODE` -> `LIMITED_FEDERATION_MODE` - `EMAIL_DOMAIN_BLACKLIST` -> `EMAIL_DOMAIN_DENYLIST` - `EMAIL_DOMAIN_WHITELIST` -> `EMAIL_DOMAIN_ALLOWLIST` tootctl: - `tootctl domains purge --whitelist-mode` -> `tootctl domains purge --limited-federation-mode` Removed badly maintained and no longer relevant .env.production.sample file
2020-06-26Fix help text around `tootctl email_domain_blocks` (#14147)Eugen Rochko
2020-06-26Merge pull request #1364 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-06-26Change sensitive preview cards to not blur text (#14143)ThibG
Also only require click-through for interactive embeds.
2020-06-26Fix public page CSS to match upstream's changesThibaut Girka
Kind of a port of 418f0a33e9bcd8a1a2384b426bb3cc59b712ef98 to glitch-soc
2020-06-26[Glitch] Improve appearence consistency of settings pagesMélanie Chauvel
Port 08cf81f8c1b445eba9972214869c376fe6097efb to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-26[Glitch] Fix design issues with sensitive preview cardsThibG
Port 1d2b0d2121550bf973e8a334cfa29c6d8749c52c to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-26[Glitch] Fix avatar size in public page detailed statusThibG
Port 0a56a4a1bc97aac7c10a70a62361c0edfcb2cc54 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-26[Glitch] Fix various issues around OpenGraph representation of mediaEugen Rochko
Port front-end changes (except for audio player) from 662a49dc3f06749936cedd7349092bbe622f0bc6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-26Revert "Remove unused dependency on wavesurfer.js (#14136)"Thibaut Girka
This reverts commit e9ff61ca0704d9570950875e1b72556c4114424f.
2020-06-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-06-26Improve appearence consistency of settings pages (#13938)Mélanie Chauvel
* Fix header button changing header size in settings pages * Make form buttons look more like a part of the form in settings pages - Put buttons closer, using same distance as between inputs - Make buton font size a bit smaller to blend a bit more - Add the class button to button tags for consisent styling
2020-06-26Improve wording of the “Add media” button tooltip (#13954)Mélanie Chauvel
- Remove (incomplete) list of supported formats - List types of media (image, video, audio) - Tell that several images could be uploaded using plural
2020-06-25Fix Thai being skipped from language detection (#13989)Sasha Sorokin
Thai does not separate words by spaces, so I figured out it should be in 'reliable characters regexp' that denotes languages that do the same. Related #13891.
2020-06-25Change to correct the role of the boost button (#14132)Takeshi Umeda
2020-06-25Add a visibility icon to status (#14123)Takeshi Umeda
* Add a visibility icon to status * Change to using the icon element * Fix RTL * Add a public globe
2020-06-25Fix design issues with sensitive preview cards (#14126)ThibG
* Fix design issues with sensitive preview cards * Center “sensitive” label on preview image for interactive cards * Add “button” role to sensitive preview card text
2020-06-25Remove unnecessary version locks (#14139)Yamagishi Kazutoshi
2020-06-25Fix avatar size in public page detailed status (#14140)ThibG
Regression from the inline-CSS changes
2020-06-25Update Dockerfile (#13582)Shlee
2020-06-25Add tootctl email-domain-blocks (#13589)tateisu
* Add tootctl email_domains (block|unblock) * fix codeclimate issues. * fix codeclimate issues. * fix codeclimate issues. * add list subcommand, remove log_action. * fix codeclimate issues. * filter duplicate hostnames,ips before block * rebase from currnet master branch. rename email_domains_cli.rb to email_domain_blocks_cli.rb . rename Mastodon::EmailDomainsCLI to Mastodon::EmailDomainBlocksCLI . rename command email_domains to email-domain-blocks . (Thor recognizes both of - and _ ) rename subcommand block to add . rename subcommand unblock to remove . change the color in list subcommand to while for domain or cyan for childlen. don't use include() in list subcommand. suppress console output about succeeded entry. add console output about count of processed/skipped. remove capitalization in subcommand description. remove long_desc in subcommand 'remove'. remove duplicate where in subcommand 'remove'. * fix codeclimate issue.
2020-06-25remove duplicated indexes according to pghero (#13695)Lerk
2020-06-25Bump @babel/plugin-proposal-decorators from 7.8.3 to 7.10.3 (#14137)dependabot[bot]
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators) from 7.8.3 to 7.10.3. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.10.3/packages/babel-plugin-proposal-decorators) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-25Bump aws-sdk-s3 from 1.68.1 to 1.69.0 (#14109)dependabot[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.68.1 to 1.69.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/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-25Bump aws-sigv4 from 1.1.4 to 1.2.0 (#14107)dependabot[bot]
Bumps [aws-sigv4](https://github.com/aws/aws-sdk-ruby) from 1.1.4 to 1.2.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sigv4/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.1.4...1.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-25Bump capybara from 3.32.2 to 3.33.0 (#14105)dependabot[bot]
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.32.2 to 3.33.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.32.2...3.33.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-25Bump rspec-sidekiq from 3.0.3 to 3.1.0 (#14104)dependabot[bot]
Bumps [rspec-sidekiq](https://github.com/philostler/rspec-sidekiq) from 3.0.3 to 3.1.0. - [Release notes](https://github.com/philostler/rspec-sidekiq/releases) - [Changelog](https://github.com/philostler/rspec-sidekiq/blob/develop/CHANGES.md) - [Commits](https://github.com/philostler/rspec-sidekiq/compare/v3.0.3...v3.1.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-25Bump excon from 0.74.0 to 0.75.0 (#14103)dependabot[bot]
Bumps [excon](https://github.com/excon/excon) from 0.74.0 to 0.75.0. - [Release notes](https://github.com/excon/excon/releases) - [Changelog](https://github.com/excon/excon/blob/master/changelog.txt) - [Commits](https://github.com/excon/excon/compare/v0.74.0...v0.75.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-25Bump stackframe from 1.1.1 to 1.2.0 (#14082)dependabot[bot]
Bumps [stackframe](https://github.com/stacktracejs/stackframe) from 1.1.1 to 1.2.0. - [Release notes](https://github.com/stacktracejs/stackframe/releases) - [Changelog](https://github.com/stacktracejs/stackframe/blob/master/CHANGELOG.md) - [Commits](https://github.com/stacktracejs/stackframe/compare/v1.1.1...v1.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-25Bump elasticsearch from 7.7.0 to 7.8.0 (#14108)dependabot[bot]
Bumps [elasticsearch](https://github.com/elastic/elasticsearch-ruby) from 7.7.0 to 7.8.0. - [Release notes](https://github.com/elastic/elasticsearch-ruby/releases) - [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch-ruby/compare/7.7.0...v7.8.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-25Bump eslint-visitor-keys from 1.1.0 to 1.2.0 (#14076)dependabot[bot]
Bumps [eslint-visitor-keys](https://github.com/eslint/eslint-visitor-keys) from 1.1.0 to 1.2.0. - [Release notes](https://github.com/eslint/eslint-visitor-keys/releases) - [Changelog](https://github.com/eslint/eslint-visitor-keys/blob/master/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint-visitor-keys/compare/v1.1.0...v1.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-25Bump acorn-walk from 7.1.1 to 7.2.0 (#14077)dependabot[bot]
Bumps [acorn-walk](https://github.com/acornjs/acorn) from 7.1.1 to 7.2.0. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](https://github.com/acornjs/acorn/compare/7.1.1...7.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-25Bump loofah from 2.5.0 to 2.6.0 (#14071)dependabot[bot]
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.5.0 to 2.6.0. - [Release notes](https://github.com/flavorjones/loofah/releases) - [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md) - [Commits](https://github.com/flavorjones/loofah/compare/v2.5.0...v2.6.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-25Bump rdf from 3.1.2 to 3.1.3 (#14070)dependabot[bot]
Bumps [rdf](https://github.com/ruby-rdf/rdf) from 3.1.2 to 3.1.3. - [Release notes](https://github.com/ruby-rdf/rdf/releases) - [Changelog](https://github.com/ruby-rdf/rdf/blob/develop/CHANGES.md) - [Commits](https://github.com/ruby-rdf/rdf/compare/3.1.2...3.1.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-25Bump eslint-plugin-jsx-a11y from 6.2.3 to 6.3.1 (#14114)dependabot[bot]
Bumps [eslint-plugin-jsx-a11y](https://github.com/evcohen/eslint-plugin-jsx-a11y) from 6.2.3 to 6.3.1. - [Release notes](https://github.com/evcohen/eslint-plugin-jsx-a11y/releases) - [Changelog](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/master/CHANGELOG.md) - [Commits](https://github.com/evcohen/eslint-plugin-jsx-a11y/compare/v6.2.3...v6.3.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-25Bump parser from 2.7.1.3 to 2.7.1.4 (#14101)dependabot[bot]
Bumps [parser](https://github.com/whitequark/parser) from 2.7.1.3 to 2.7.1.4. - [Release notes](https://github.com/whitequark/parser/releases) - [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/whitequark/parser/compare/v2.7.1.3...v2.7.1.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-25Bump aws-partitions from 1.329.0 to 1.332.0 (#14110)dependabot[bot]
Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.329.0 to 1.332.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-25Bump fast-deep-equal from 3.1.1 to 3.1.3 (#14111)dependabot[bot]
Bumps [fast-deep-equal](https://github.com/epoberezkin/fast-deep-equal) from 3.1.1 to 3.1.3. - [Release notes](https://github.com/epoberezkin/fast-deep-equal/releases) - [Commits](https://github.com/epoberezkin/fast-deep-equal/compare/v3.1.1...v3.1.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-25Bump @babel/core from 7.10.2 to 7.10.3 (#14112)dependabot[bot]
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.10.2 to 7.10.3. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.10.3/packages/babel-core) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-25Bump elliptic from 6.5.2 to 6.5.3 (#14115)dependabot[bot]
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3. - [Release notes](https://github.com/indutny/elliptic/releases) - [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-25Bump es-abstract from 1.17.5 to 1.17.6 (#14117)dependabot[bot]
Bumps [es-abstract](https://github.com/ljharb/es-abstract) from 1.17.5 to 1.17.6. - [Release notes](https://github.com/ljharb/es-abstract/releases) - [Changelog](https://github.com/ljharb/es-abstract/blob/master/CHANGELOG.md) - [Commits](https://github.com/ljharb/es-abstract/compare/v1.17.5...v1.17.6) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-25Fix various issues around OpenGraph representation of media (#14133)Eugen Rochko
- Fix audio attachments not being represented in OpenGraph tags - Fix audio being represented as "1 image" in OpenGraph descriptions - Fix video metadata being overwritten by paperclip-av-transcoder - Fix embedded player not using Mastodon's UI - Fix audio/video progress bars not moving smoothly - Fix audio/video buffered bars not displaying correctly
2020-06-24Remove unused dependency on wavesurfer.js (#14136)ThibG
It's not used anymore now that the audio player design has changed again.
2020-06-24Change streaming server to treat blank redis password as password-less auth ↵ThibG
(#14135) Fixes #14131 Our `mastodon:setup` task defaults to a blank password rather than the absence of password, but some versions of Redis reject blank password authentication when authentication is possible without a password. The Ruby code only uses the Redis password when it's not blank, so do the same for the node.js part.
2020-06-24Merge pull request #1361 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-06-24[Glitch] Fix very wide media attachments resulting in too thin a thumbnailThibG
Port d469247083dbbe5d4f09cc9d13a3ebd400e6068e to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-24[Glitch] Fix modifier key to keep the EmojiPicker on macOSTakeshi Umeda
Port 434a6d0b15ff413c6e4d7e0c3763af6429ad25b6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-24[Glitch] Fix unnecessary gap under of video modalfuyu
Port cb3c6d17804da67d3c0ff233a9ca1c1902f6926f to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-24Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes.
2020-06-24Fix audio/video/images/cards not reacting to window resizes in web UI (#14130)Eugen Rochko
* Fix audio/video/images/cards not reacting to window resizes in web UI * Update app/javascript/mastodon/features/audio/index.js Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
generated by cgit-pink (git 2.37.1) at 2024-12-26 08:28:21 +0000