ThibG
fa4876a1b9
Fix read marker state not being udpated internally ( #14155 )
...
Fixes #14151
5 years ago
Eugen Rochko
8c04e37b03
Remove the terms blacklist and whitelist from UX ( #14149 )
...
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
5 years ago
Eugen Rochko
4662afe075
Fix help text around `tootctl email_domain_blocks` ( #14147 )
5 years ago
ThibG
10ede3eb27
Merge pull request #1364 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
5 years ago
ThibG
a1ad2ad951
Change sensitive preview cards to not blur text ( #14143 )
...
Also only require click-through for interactive embeds.
5 years ago
Thibaut Girka
de735286cd
Fix public page CSS to match upstream's changes
...
Kind of a port of 418f0a33e9
to glitch-soc
5 years ago
Mélanie Chauvel
4964490bbd
[Glitch] Improve appearence consistency of settings pages
...
Port 08cf81f8c1
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
ThibG
327f6309e4
[Glitch] Fix design issues with sensitive preview cards
...
Port 1d2b0d2121
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
ThibG
9a26d2e127
[Glitch] Fix avatar size in public page detailed status
...
Port 0a56a4a1bc
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
Eugen Rochko
2bb25c7730
[Glitch] Fix various issues around OpenGraph representation of media
...
Port front-end changes (except for audio player) from 662a49dc3f
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
Thibaut Girka
dc99608bcf
Revert "Remove unused dependency on wavesurfer.js ( #14136 )"
...
This reverts commit e9ff61ca07
.
5 years ago
Thibaut Girka
a01674fb2b
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Mélanie Chauvel
08cf81f8c1
Improve appearence consistency of settings pages ( #13938 )
...
* 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
5 years ago
Mélanie Chauvel
e49bd93211
Improve wording of the “Add media” button tooltip ( #13954 )
...
- Remove (incomplete) list of supported formats
- List types of media (image, video, audio)
- Tell that several images could be uploaded using plural
5 years ago
Sasha Sorokin
f5cea4d2ea
Fix Thai being skipped from language detection ( #13989 )
...
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 .
5 years ago
Takeshi Umeda
f7bdfec5bb
Change to correct the role of the boost button ( #14132 )
5 years ago
Takeshi Umeda
418f0a33e9
Add a visibility icon to status ( #14123 )
...
* Add a visibility icon to status
* Change to using the icon element
* Fix RTL
* Add a public globe
5 years ago
ThibG
1d2b0d2121
Fix design issues with sensitive preview cards ( #14126 )
...
* Fix design issues with sensitive preview cards
* Center “sensitive” label on preview image for interactive cards
* Add “button” role to sensitive preview card text
5 years ago
Yamagishi Kazutoshi
8ed2f9409c
Remove unnecessary version locks ( #14139 )
5 years ago
ThibG
0a56a4a1bc
Fix avatar size in public page detailed status ( #14140 )
...
Regression from the inline-CSS changes
5 years ago
Shlee
9ea91bbf59
Update Dockerfile ( #13582 )
5 years ago
tateisu
370e38ee15
Add tootctl email-domain-blocks ( #13589 )
...
* 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.
5 years ago
Lerk
62ef6406cd
remove duplicated indexes according to pghero ( #13695 )
5 years ago
dependabot[bot]
0f8b8bf126
Bump @babel/plugin-proposal-decorators from 7.8.3 to 7.10.3 ( #14137 )
...
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>
5 years ago
dependabot[bot]
21f9cc4c62
Bump aws-sdk-s3 from 1.68.1 to 1.69.0 ( #14109 )
...
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>
5 years ago
dependabot[bot]
3a8ccbae63
Bump aws-sigv4 from 1.1.4 to 1.2.0 ( #14107 )
...
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>
5 years ago
dependabot[bot]
d272a324c1
Bump capybara from 3.32.2 to 3.33.0 ( #14105 )
...
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>
5 years ago
dependabot[bot]
034bd611ca
Bump rspec-sidekiq from 3.0.3 to 3.1.0 ( #14104 )
...
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>
5 years ago
dependabot[bot]
0ab97c7b20
Bump excon from 0.74.0 to 0.75.0 ( #14103 )
...
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>
5 years ago
dependabot[bot]
1c2daaa1b5
Bump stackframe from 1.1.1 to 1.2.0 ( #14082 )
...
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>
5 years ago
dependabot[bot]
759662aa3f
Bump elasticsearch from 7.7.0 to 7.8.0 ( #14108 )
...
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>
5 years ago
dependabot[bot]
cd1f5158b2
Bump eslint-visitor-keys from 1.1.0 to 1.2.0 ( #14076 )
...
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>
5 years ago
dependabot[bot]
bd2550fad3
Bump acorn-walk from 7.1.1 to 7.2.0 ( #14077 )
...
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>
5 years ago
dependabot[bot]
5b2602fd1d
Bump loofah from 2.5.0 to 2.6.0 ( #14071 )
...
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>
5 years ago
dependabot[bot]
32f330dbc0
Bump rdf from 3.1.2 to 3.1.3 ( #14070 )
...
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>
5 years ago
dependabot[bot]
e4503c49d1
Bump eslint-plugin-jsx-a11y from 6.2.3 to 6.3.1 ( #14114 )
...
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>
5 years ago
dependabot[bot]
6d12067b7f
Bump parser from 2.7.1.3 to 2.7.1.4 ( #14101 )
...
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>
5 years ago
dependabot[bot]
844393ec29
Bump aws-partitions from 1.329.0 to 1.332.0 ( #14110 )
...
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>
5 years ago
dependabot[bot]
2e88dc33d3
Bump fast-deep-equal from 3.1.1 to 3.1.3 ( #14111 )
...
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>
5 years ago
dependabot[bot]
0d258eaa10
Bump @babel/core from 7.10.2 to 7.10.3 ( #14112 )
...
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>
5 years ago
dependabot[bot]
f0f1161939
Bump elliptic from 6.5.2 to 6.5.3 ( #14115 )
...
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>
5 years ago
dependabot[bot]
7afc31d793
Bump es-abstract from 1.17.5 to 1.17.6 ( #14117 )
...
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>
5 years ago
Eugen Rochko
662a49dc3f
Fix various issues around OpenGraph representation of media ( #14133 )
...
- 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
5 years ago
ThibG
e9ff61ca07
Remove unused dependency on wavesurfer.js ( #14136 )
...
It's not used anymore now that the audio player design has changed again.
5 years ago
ThibG
ddcdddd6fc
Change streaming server to treat blank redis password as password-less auth ( #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.
5 years ago
ThibG
8f4aff9b6f
Merge pull request #1361 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
5 years ago
ThibG
72d193654b
[Glitch] Fix very wide media attachments resulting in too thin a thumbnail
...
Port d469247083
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
Takeshi Umeda
83bc9f68af
[Glitch] Fix modifier key to keep the EmojiPicker on macOS
...
Port 434a6d0b15
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
fuyu
51922d7ffa
[Glitch] Fix unnecessary gap under of video modal
...
Port cb3c6d1780
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
Thibaut Girka
aae60a2366
Merge branch 'master' into glitch-soc/merge-upstream
...
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.
5 years ago