Commit graph

10006 commits

Author SHA1 Message Date
ThibG
e2ac47141f [Glitch] Fix crash when expanding search results for hashtags
Port e85805138a to glitch-soc
2019-07-30 12:31:02 +02:00
Thibaut Girka
4973ba2d1f Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock
2019-07-30 12:22:33 +02:00
ThibG
a13ba1cc7b 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
2019-07-30 12:13:29 +02:00
ThibG
e85805138a Fix crash when expanding search results for hashtags (#11447) 2019-07-30 12:06:21 +02:00
Eugen Rochko
825dc3ca22 Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
ThibG
a7a6563f22 Merge pull request #1179 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-07-29 23:37:14 +02:00
dependabot-preview[bot]
6993ca3d90 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>
2019-07-29 20:42:19 +02:00
Milan
b9c4632db3 let bundler fetch http_parser.rb submodules (#11444) 2019-07-29 20:42:04 +02:00
Eugen Rochko
c111bd01a4 Fix tag normalization and migration not removing duplicate tags (#11441)
Fix #11428
2019-07-29 20:40:21 +02:00
dependabot-preview[bot]
ef5debb7a7 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>
2019-07-29 22:51:03 +09:00
dependabot-preview[bot]
4de9652624 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>
2019-07-29 22:48:56 +09:00
dependabot-preview[bot]
569c7dfaed 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>
2019-07-29 22:39:54 +09:00
dependabot-preview[bot]
ec28e1e11d 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>
2019-07-29 22:37:02 +09:00
dependabot-preview[bot]
be99af02f7 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>
2019-07-29 22:30:43 +09:00
dependabot-preview[bot]
1c59a60760 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>
2019-07-29 22:29:17 +09:00
dependabot-preview[bot]
bf839d4ee2 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>
2019-07-29 22:06:15 +09:00
Eugen Rochko
32d2260a8c Fix emoji autosuggestions (#11442)
Regression from 450b8a70a5
2019-07-29 15:04:49 +02:00
dependabot-preview[bot]
3754138c0b 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>
2019-07-29 22:03:05 +09:00
dependabot-preview[bot]
e72b7d2e55 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>
2019-07-29 21:54:14 +09:00
Thibaut Girka
ce25139d5d Fix crash in /web/lists
Fixes #1181
2019-07-29 00:34:39 +02:00
Eugen Rochko
172bf17555 Revert "Remove conversation URI (#11423)" (#11424)
This reverts commit 47bf2698c2.
2019-07-28 17:47:37 +02:00
Eugen Rochko
47bf2698c2 Remove conversation URI (#11423)
It is not part of ActivityPub and will free up a lot of space
2019-07-28 17:30:12 +02:00
Eugen Rochko
a71d66ab0e [Glitch] Add search results pagination to web UI (#11409)
Port 5119a0608d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-28 17:10:52 +02:00
ThibG
1c3117f682 [Glitch] Change contrast of status links that are not mentions nor hashtags
Port 6701b9329d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-28 16:47:36 +02:00
Eugen Rochko
16b5fe3ac3 [Glitch] Change account domain block to clear out notifications and follows
Port 93a6ab5a32 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-28 16:45:36 +02:00
Thibaut Girka
6c7a3268c9 Merge branch 'master' into glitch-soc/merge-upstream 2019-07-28 16:28:05 +02:00
Eugen Rochko
450b8a70a5 Add autosuggestions for hashtags (#11422) 2019-07-28 14:37:52 +02:00
dependabot-preview[bot]
1cf7bdede4 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
2019-07-28 13:48:43 +02:00
mayaeh
7d13da568e 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
2019-07-28 13:48:19 +02:00
ThibG
13b0943e36 Fix animate on hover in poll options without CW (#11404) 2019-07-28 13:48:04 +02:00
Jeong Arm
c4e5f4698c Prevent archiving when user set "noindex" (#11421) 2019-07-28 13:46:04 +02:00
ThibG
6701b9329d Change contrast of status links that are not mentions nor hashtags (#11406) 2019-07-28 06:00:51 +02:00
Eugen Rochko
b8386076c5 Change hashtags to preserve first-used casing (#11416) 2019-07-28 05:59:51 +02:00
Eugen Rochko
5e0ccb3020 Fix tabs bar scrolling along with content on mobile (#11418) 2019-07-27 19:25:15 +02:00
ysksn
3332cfcc23 Implement pending tests (#11415) 2019-07-27 10:24:26 +02:00
Eugen Rochko
5119a0608d Add search results pagination to web UI (#11409)
* Add search results pagination to web UI

Fix #10737

* Fix code style issue
2019-07-27 05:49:50 +02:00
Eugen Rochko
9c617b3b3a Add search syntax for operators and phrases (#11411) 2019-07-27 04:42:08 +02:00
Eugen Rochko
2854c8e4d6 Remove timestamps from converted images to make them deterministic (#11408) 2019-07-27 04:41:55 +02:00
ThibG
52cda33b82 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
2019-07-26 18:55:33 +02:00
Clar Fon
ea0b3589ff Remove pre from version, add extra suffix variable (#11407) 2019-07-26 07:57:27 +02:00
ThibG
9000d604e9 Change settings to show restricted accounts only what they have access to (#11394)
Follow-up to 6be7b414e2
2019-07-25 04:22:09 +02:00
Eugen Rochko
93a6ab5a32 Change account domain block to clear out notifications and follows (#11393) 2019-07-25 04:17:35 +02:00
Thibaut Girka
df7b27753c Fix links in status media having their title rewritten 2019-07-24 21:46:09 +02:00
ThibG
c011361902 Merge pull request #1176 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-07-24 16:53:25 +02:00
Thibaut Girka
124a1d3880 Merge branch 'master' into glitch-soc/merge-upstream 2019-07-24 16:23:53 +02:00
Thomas Citharel
7e413214eb Fix tootctl statuses remove
A ending parenthesis was missing in the bookmark special line.
2019-07-24 15:55:39 +02:00
Rey Tucker
24d2316f63 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
2019-07-24 14:19:17 +02:00
ThibG
2baa4d88ba Merge pull request #1174 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-07-23 17:21:55 +02:00
Thibaut Girka
bf93e0c7c0 Handle animated emoji on mouse hover in CWs and poll options 2019-07-23 16:24:21 +02:00
ThibG
b01e5e372f [Glitch] Play animated custom emoji on hover
Port 99b3dd5b00 to glitch-soc
2019-07-23 16:24:21 +02:00