24968d20a0
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock
5 years ago
b31b232edf
Change links in webUI to rewrite misleading links ( #11426 )
...
* [WiP] Show host for “misleading” links
* Disallow misleading targets which domain names are prefixes of link text
* Move decodeIDNA to app/javascript/mastodon/utils
* Add support for international domain names
* Change link origin tag color to darker text color
* Handle links to domains starting with www. as shortened by Mastodon
* [WiP] Ignore links that cannot be misread as URLs, rewrite other links
5 years ago
78144f4c79
Fix crash when expanding search results for hashtags ( #11447 )
5 years ago
24552b5160
Add whitelist mode ( #11291 )
5 years ago
f48c7689d2
Merge pull request #1179 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
5 years ago
85b7b565de
Bump yargs from 12.0.5 to 13.3.0 ( #11434 )
...
Bumps [yargs](https://github.com/yargs/yargs ) from 12.0.5 to 13.3.0.
- [Release notes](https://github.com/yargs/yargs/releases )
- [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yargs/yargs/compare/v12.0.5...v13.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
658277b07e
let bundler fetch http_parser.rb submodules ( #11444 )
5 years ago
e136112ab7
Fix tag normalization and migration not removing duplicate tags ( #11441 )
...
Fix #11428
5 years ago
aefeb65656
Bump oj from 3.8.0 to 3.8.1 ( #11435 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.8.0 to 3.8.1.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.8.0...v3.8.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
44ae763312
Bump capybara from 3.26.0 to 3.27.0 ( #11437 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.26.0 to 3.27.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.26.0...3.27.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
f3d7b168a7
Bump httplog from 1.3.1 to 1.3.2 ( #11436 )
...
Bumps [httplog](https://github.com/trusche/httplog ) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/trusche/httplog/releases )
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md )
- [Commits](https://github.com/trusche/httplog/compare/v1.3.1...v1.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
dbb74ad351
Bump brakeman from 4.5.1 to 4.6.1 ( #11438 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 4.5.1 to 4.6.1.
- [Release notes](https://github.com/presidentbeef/brakeman/releases )
- [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md )
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.5.1...v4.6.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
a586248f08
Bump sass from 1.20.3 to 1.22.7 ( #11432 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.20.3 to 1.22.7.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.20.3...1.22.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
6aca7969c9
Bump aws-sdk-s3 from 1.45.0 to 1.46.0 ( #11439 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.45.0 to 1.46.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.45.0...v1.46.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
25731bafed
Bump autoprefixer from 9.6.0 to 9.6.1 ( #11431 )
...
Bumps [autoprefixer](https://github.com/postcss/autoprefixer ) from 9.6.0 to 9.6.1.
- [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.0...9.6.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
784c88e16d
Fix emoji autosuggestions ( #11442 )
...
Regression from cfb2ed7823
5 years ago
2f0820963d
Bump @babel/preset-env from 7.4.5 to 7.5.5 ( #11433 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel ) from 7.4.5 to 7.5.5.
- [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.4.5...v7.5.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
e9a7d721d8
Bump file-loader from 4.0.0 to 4.1.0 ( #11430 )
...
Bumps [file-loader](https://github.com/webpack-contrib/file-loader ) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases )
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v4.0.0...v4.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
a4a81c5434
Fix crash in /web/lists
...
Fixes #1181
5 years ago
b9b0313c78
Revert "Remove conversation URI ( #11423 )" ( #11424 )
...
This reverts commit 75f7f9930e
5 years ago
75f7f9930e
Remove conversation URI ( #11423 )
...
It is not part of ActivityPub and will free up a lot of space
5 years ago
51411267fd
[Glitch] Add search results pagination to web UI ( #11409 )
...
Port 8a4674f2c3
5 years ago
7f147acea6
[Glitch] Change contrast of status links that are not mentions nor hashtags
...
Port 10e78ecf57
5 years ago
31fc3be0a4
[Glitch] Change account domain block to clear out notifications and follows
...
Port 4eeff26533
5 years ago
bca3825c17
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
cfb2ed7823
Add autosuggestions for hashtags ( #11422 )
5 years ago
15de24a425
Bump json-ld-preloaded from 3.0.2 to 3.0.3 ( #11316 )
...
* Bump json-ld-preloaded from 3.0.2 to 3.0.3
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded ) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases )
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.2...3.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* use json-ld edge
5 years ago
0d80f686d8
Add `tootctl preview_cards remove` ( #11320 )
...
* Add `tootctl preview_cards remove`
* fix code style
* Remove `Scheduler::PreviewCardsCleanupScheduler` file
* fix code style again
Add exclude case where image_file_name is blank
* Added a function to output confirmation if the specified number of days is less than 2 weeks
5 years ago
9349f1067a
Fix animate on hover in poll options without CW ( #11404 )
5 years ago
6a1f08d29a
Prevent archiving when user set "noindex" ( #11421 )
5 years ago
10e78ecf57
Change contrast of status links that are not mentions nor hashtags ( #11406 )
5 years ago
f371b32137
Change hashtags to preserve first-used casing ( #11416 )
5 years ago
4cc29eb5ad
Fix tabs bar scrolling along with content on mobile ( #11418 )
5 years ago
d6ada2eb30
Implement pending tests ( #11415 )
5 years ago
8a4674f2c3
Add search results pagination to web UI ( #11409 )
...
* Add search results pagination to web UI
Fix #10737
* Fix code style issue
5 years ago
b9fbcbfe4e
Add search syntax for operators and phrases ( #11411 )
5 years ago
501148ab91
Remove timestamps from converted images to make them deterministic ( #11408 )
5 years ago
92569ffde8
Fix invites not being disabled upon account suspension ( #11412 )
...
* Disable invite links from disabled/suspended users
* Add has_many invites relationship to users
* Destroy unused invites when suspending an account
5 years ago
a6b4440115
Remove pre from version, add extra suffix variable ( #11407 )
5 years ago
d0c25584b8
Change settings to show restricted accounts only what they have access to ( #11394 )
...
Follow-up to 964ae8eee5
5 years ago
4eeff26533
Change account domain block to clear out notifications and follows ( #11393 )
5 years ago
91da921dbb
Fix links in status media having their title rewritten
5 years ago
88e79c179a
Merge pull request #1176 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
5 years ago
2d35e4460a
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
e3a551cbd1
Fix tootctl statuses remove
...
A ending parenthesis was missing in the bookmark special line.
5 years ago
94f5c714f1
Don't delete periods when validating username uniqueness ( #11392 ) ( #11400 )
...
* Check to make sure usernames with '.' cannot be created
* Add test for instance actor account name conflicts
This makes sure that migration 20190715164535_add_instance_actor
won't fail if there's already an account that is named the same
as the domain (minus the .)
* Put the test into the correct context...
* Add another test to split this into two validations
* Don't delete periods when validating username uniqueness (#11392 )
The 20190715164535_add_instance_actor migration fails if there's
already a username similar to the domain name, e.g. if you are
'vulpine.club' and have a user named 'vulpineclub', validation
fails.
Upon further review, usernames with periods are dropped by the
regular expression in the Account class, so we don't need to
worry about it here.
Fixes #11392
5 years ago
08325db62b
Merge pull request #1174 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
5 years ago
48c68eafb7
Handle animated emoji on mouse hover in CWs and poll options
5 years ago
c1231a846a
[Glitch] Play animated custom emoji on hover
...
Port 7de8c51873
5 years ago
fada60cbe7
Remove modules.localIdentName ( #11398 )
5 years ago
Thibaut Girka
Eugen Rochko
dependabot-preview[bot]
Milan
mayaeh
Jeong Arm
ysksn
Clar Fon
Thomas Citharel
Rey Tucker
Yamagishi Kazutoshi