about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-07-30Merge pull request #1183 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-07-30[Glitch] Fix crash when expanding search results for hashtagsThibG
Port 78144f4c7923d502cc86b322f044e740e4a8fa8a to glitch-soc
2019-07-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/directories_controller.rb - package.json - yarn.lock
2019-07-30Change links in webUI to rewrite misleading links (#11426)ThibG
* [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-30Fix crash when expanding search results for hashtags (#11447)ThibG
2019-07-30Add whitelist mode (#11291)Eugen Rochko
2019-07-29Merge pull request #1179 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-07-29Bump yargs from 12.0.5 to 13.3.0 (#11434)dependabot-preview[bot]
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-29let bundler fetch http_parser.rb submodules (#11444)Milan
2019-07-29Fix tag normalization and migration not removing duplicate tags (#11441)Eugen Rochko
Fix #11428
2019-07-29Bump oj from 3.8.0 to 3.8.1 (#11435)dependabot-preview[bot]
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-29Bump capybara from 3.26.0 to 3.27.0 (#11437)dependabot-preview[bot]
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-29Bump httplog from 1.3.1 to 1.3.2 (#11436)dependabot-preview[bot]
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-29Bump brakeman from 4.5.1 to 4.6.1 (#11438)dependabot-preview[bot]
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-29Bump sass from 1.20.3 to 1.22.7 (#11432)dependabot-preview[bot]
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-29Bump aws-sdk-s3 from 1.45.0 to 1.46.0 (#11439)dependabot-preview[bot]
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-29Bump autoprefixer from 9.6.0 to 9.6.1 (#11431)dependabot-preview[bot]
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-29Fix emoji autosuggestions (#11442)Eugen Rochko
Regression from cfb2ed78231758a79af038a964ab7f7b7b35274e
2019-07-29Bump @babel/preset-env from 7.4.5 to 7.5.5 (#11433)dependabot-preview[bot]
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-29Bump file-loader from 4.0.0 to 4.1.0 (#11430)dependabot-preview[bot]
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-29Fix crash in /web/listsThibaut Girka
Fixes #1181
2019-07-28Revert "Remove conversation URI (#11423)" (#11424)Eugen Rochko
This reverts commit 75f7f9930eb2a6f5c4041ec44fe0aa795c9ec449.
2019-07-28Remove conversation URI (#11423)Eugen Rochko
It is not part of ActivityPub and will free up a lot of space
2019-07-28[Glitch] Add search results pagination to web UI (#11409)Eugen Rochko
Port 8a4674f2c3d89c998eb5438b96b7977dc2be3167 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-28[Glitch] Change contrast of status links that are not mentions nor hashtagsThibG
Port 10e78ecf57242cc5030b903131bf27e027bb4a97 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-28[Glitch] Change account domain block to clear out notifications and followsEugen Rochko
Port 4eeff26533b75b592395e353c6d4506db9958bcf to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-07-28Add autosuggestions for hashtags (#11422)Eugen Rochko
2019-07-28Bump json-ld-preloaded from 3.0.2 to 3.0.3 (#11316)dependabot-preview[bot]
* 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-28Add `tootctl preview_cards remove` (#11320)mayaeh
* 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-28Fix animate on hover in poll options without CW (#11404)ThibG
2019-07-28Prevent archiving when user set "noindex" (#11421)Jeong Arm
2019-07-28Change contrast of status links that are not mentions nor hashtags (#11406)ThibG
2019-07-28Change hashtags to preserve first-used casing (#11416)Eugen Rochko
2019-07-27Fix tabs bar scrolling along with content on mobile (#11418)Eugen Rochko
2019-07-27Implement pending tests (#11415)ysksn
2019-07-27Add search results pagination to web UI (#11409)Eugen Rochko
* Add search results pagination to web UI Fix #10737 * Fix code style issue
2019-07-27Add search syntax for operators and phrases (#11411)Eugen Rochko
2019-07-27Remove timestamps from converted images to make them deterministic (#11408)Eugen Rochko
2019-07-26Fix invites not being disabled upon account suspension (#11412)ThibG
* Disable invite links from disabled/suspended users * Add has_many invites relationship to users * Destroy unused invites when suspending an account
2019-07-26Remove pre from version, add extra suffix variable (#11407)Clar Fon
2019-07-25Change settings to show restricted accounts only what they have access to ↵ThibG
(#11394) Follow-up to 964ae8eee593687f922c873fa7b378bb6e3e39bb
2019-07-25Change account domain block to clear out notifications and follows (#11393)Eugen Rochko
2019-07-24Fix links in status media having their title rewrittenThibaut Girka
2019-07-24Merge pull request #1176 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-07-24Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-07-24Fix tootctl statuses removeThomas Citharel
A ending parenthesis was missing in the bookmark special line.
2019-07-24 Don't delete periods when validating username uniqueness (#11392) (#11400)Rey Tucker
* 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-23Merge pull request #1174 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-07-23Handle animated emoji on mouse hover in CWs and poll optionsThibaut Girka