]> cat aescling's git repositories - mastodon.git/log
mastodon.git
6 years agoRemove href attribute of invalid links instead of crashing
Thibaut Girka [Tue, 6 Aug 2019 09:31:28 +0000 (11:31 +0200)]
Remove href attribute of invalid links instead of crashing

6 years agoMerge pull request #1187 from ThibG/glitch-soc/merge-upstream
ThibG [Mon, 5 Aug 2019 15:58:39 +0000 (17:58 +0200)]
Merge pull request #1187 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoFix color of dropdown icons
Thibaut Girka [Mon, 5 Aug 2019 12:25:48 +0000 (14:25 +0200)]
Fix color of dropdown icons

6 years ago[Glitch] Change icon button styles to make hover/focus states more obvious
ThibG [Sat, 3 Aug 2019 17:10:50 +0000 (19:10 +0200)]
[Glitch] Change icon button styles to make hover/focus states more obvious

Port c8fd82332749cd58f85dd398d32559a02499c945 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Disable list title validation button when list title is empty
ThibG [Sat, 3 Aug 2019 17:10:39 +0000 (19:10 +0200)]
[Glitch] Disable list title validation button when list title is empty

Port 089c6410208d294e7f1995e000bd796d4625246f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Mon, 5 Aug 2019 11:13:28 +0000 (13:13 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoBump rubocop from 0.73.0 to 0.74.0 (#11486)
dependabot-preview[bot] [Mon, 5 Aug 2019 09:53:30 +0000 (18:53 +0900)]
Bump rubocop from 0.73.0 to 0.74.0 (#11486)

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.73.0 to 0.74.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.73.0...v0.74.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump webmock from 3.6.0 to 3.6.2 (#11488)
dependabot-preview[bot] [Mon, 5 Aug 2019 09:52:57 +0000 (18:52 +0900)]
Bump webmock from 3.6.0 to 3.6.2 (#11488)

Bumps [webmock](https://github.com/bblimke/webmock) from 3.6.0 to 3.6.2.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.6.0...v3.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump dotenv-rails from 2.7.4 to 2.7.5 (#11487)
dependabot-preview[bot] [Mon, 5 Aug 2019 09:42:51 +0000 (18:42 +0900)]
Bump dotenv-rails from 2.7.4 to 2.7.5 (#11487)

Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.7.4 to 2.7.5.
- [Release notes](https://github.com/bkeepers/dotenv/releases)
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md)
- [Commits](https://github.com/bkeepers/dotenv/compare/v2.7.4...v2.7.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump @babel/plugin-transform-react-jsx-source from 7.2.0 to 7.5.0 (#11482)
dependabot-preview[bot] [Mon, 5 Aug 2019 09:25:56 +0000 (18:25 +0900)]
Bump @babel/plugin-transform-react-jsx-source from 7.2.0 to 7.5.0 (#11482)

Bumps [@babel/plugin-transform-react-jsx-source](https://github.com/babel/babel) from 7.2.0 to 7.5.0.
- [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.2.0...v7.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump capybara from 3.27.0 to 3.28.0 (#11484)
dependabot-preview[bot] [Mon, 5 Aug 2019 09:25:40 +0000 (18:25 +0900)]
Bump capybara from 3.27.0 to 3.28.0 (#11484)

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.27.0 to 3.28.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.27.0...3.28.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump webpack-cli from 3.3.5 to 3.3.6 (#11481)
dependabot-preview[bot] [Mon, 5 Aug 2019 09:00:15 +0000 (18:00 +0900)]
Bump webpack-cli from 3.3.5 to 3.3.6 (#11481)

Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.5 to 3.3.6.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/v3.3.6/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.5...v3.3.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump eslint-plugin-react from 7.14.2 to 7.14.3 (#11480)
dependabot-preview[bot] [Mon, 5 Aug 2019 08:40:35 +0000 (17:40 +0900)]
Bump eslint-plugin-react from 7.14.2 to 7.14.3 (#11480)

Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.14.2 to 7.14.3.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.14.2...v7.14.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoFix timestamp on featured tag (#11477)
Jeong Arm [Sun, 4 Aug 2019 21:00:38 +0000 (06:00 +0900)]
Fix timestamp on featured tag (#11477)

It resolves #11338

6 years agoRemove link rewriting option as it is easily bypassable
Thibaut Girka [Thu, 1 Aug 2019 16:48:16 +0000 (18:48 +0200)]
Remove link rewriting option as it is easily bypassable

6 years agoPerform case-insensitive comparison for international domain names
Thibaut Girka [Thu, 1 Aug 2019 16:13:08 +0000 (18:13 +0200)]
Perform case-insensitive comparison for international domain names

Note: this uses `toLowerCase()` instead of doing proper case folding

6 years agoPerform case-insensitive comparison of non-International domain names
Thibaut Girka [Thu, 1 Aug 2019 15:48:11 +0000 (17:48 +0200)]
Perform case-insensitive comparison of non-International domain names

6 years agoMake link target domain tag just a bit smaller
Thibaut Girka [Thu, 1 Aug 2019 14:29:45 +0000 (16:29 +0200)]
Make link target domain tag just a bit smaller

6 years agoEnsure link rewriting setting changes are immediately applied
Thibaut Girka [Thu, 1 Aug 2019 13:20:22 +0000 (15:20 +0200)]
Ensure link rewriting setting changes are immediately applied

6 years agoHandle Mastodon-generated links for targets starting with “www.” properly
Thibaut Girka [Thu, 1 Aug 2019 13:18:38 +0000 (15:18 +0200)]
Handle Mastodon-generated links for targets starting with “www.” properly

6 years agoAdd options to highlight misleading links in statuses
Thibaut Girka [Thu, 1 Aug 2019 13:01:09 +0000 (15:01 +0200)]
Add options to highlight misleading links in statuses

Fixes #1162

6 years agoMove decodeIDNA to app/javascript/flavours/glitch/util
Thibaut Girka [Thu, 1 Aug 2019 12:35:17 +0000 (14:35 +0200)]
Move decodeIDNA to app/javascript/flavours/glitch/util

6 years agoAdd option to exclude suspended domains/subdomains from tootctl domains crawl (#11454)
Darius Kazemi [Sat, 3 Aug 2019 17:11:09 +0000 (10:11 -0700)]
Add option to exclude suspended domains/subdomains from tootctl domains crawl (#11454)

* Add "--exclude-suspended" to tootctl domains crawl

This new option ignores any instances suspended server-wide as
well as their associated subdomains. This queries all domain
blocks up front, then runs a regexp on each domain. This improves
performance over what may be the obvious implementation, which is
to ask `DomainBlocks.blocked?(domain)` for each domain -- this
hits the DB many times, slowing things down considerably.

* cleaning up code style

* Compiling regex

* Removing ternary operator

6 years agoChange icon button styles to make hover/focus states more obvious (#11474)
ThibG [Sat, 3 Aug 2019 17:10:50 +0000 (19:10 +0200)]
Change icon button styles to make hover/focus states more obvious (#11474)

* Change icon buttons styles to make hover/focused states more obvious

* Fix CW button size inconsistency

* Fix icon button background color consistency

6 years agoDisable list title validation button when list title is empty (#11475)
ThibG [Sat, 3 Aug 2019 17:10:39 +0000 (19:10 +0200)]
Disable list title validation button when list title is empty (#11475)

6 years agoFix tag score not being updated when the tag is trending (#11465)
Eugen Rochko [Thu, 1 Aug 2019 17:57:09 +0000 (19:57 +0200)]
Fix tag score not being updated when the tag is trending (#11465)

6 years agoFix scroll to top in single column UI (#11463)
Eugen Rochko [Thu, 1 Aug 2019 17:17:17 +0000 (19:17 +0200)]
Fix scroll to top in single column UI (#11463)

6 years agoRemove XML version of Webfinger and remove links to Atom feeds (#11460)
Eugen Rochko [Thu, 1 Aug 2019 17:14:02 +0000 (19:14 +0200)]
Remove XML version of Webfinger and remove links to Atom feeds (#11460)

Fix #11453

6 years agoFix column header scrolling with the page (#11458)
Eugen Rochko [Thu, 1 Aug 2019 10:26:58 +0000 (12:26 +0200)]
Fix column header scrolling with the page (#11458)

Regression from aa22b38

6 years agoFix jumping of toot date when clicking spoiler button (#11449)
Mélanie Chauvel (ariasuni) [Wed, 31 Jul 2019 08:06:58 +0000 (10:06 +0200)]
Fix jumping of toot date when clicking spoiler button (#11449)

* Fix jumping of toot date when clicking spoiler button

* Fix lint

6 years agoFix delete regression (#11450)
Eugen Rochko [Wed, 31 Jul 2019 07:23:30 +0000 (09:23 +0200)]
Fix delete regression (#11450)

Regression from ff789a751a1c730e4d808410411196b76caff39c

6 years agoChange hashtag search to only return results that have trended in the past (#11448)
Eugen Rochko [Tue, 30 Jul 2019 18:29:50 +0000 (20:29 +0200)]
Change hashtag search to only return results that have trended in the past (#11448)

* Change hashtag search to only return results that have trended in the past

A way to eliminate typos and other one-off "junk" results

* Fix excluding exact matches that don't have a score

* Fix tests

6 years agoMerge pull request #1183 from ThibG/glitch-soc/merge-upstream
ThibG [Tue, 30 Jul 2019 13:40:28 +0000 (15:40 +0200)]
Merge pull request #1183 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoFix boosting & unboosting preventing a boost from appearing in the TL (#11405)
ThibG [Tue, 30 Jul 2019 11:18:23 +0000 (13:18 +0200)]
Fix boosting & unboosting preventing a boost from appearing in the TL (#11405)

* Fix boosting & unboosting preventing a boost from appearing in the TL

* Add tests

* Avoids side effects when aggregate_reblogs isn't true

6 years agoAdd hashtag score for better sorting of autosuggestions (#11427)
Eugen Rochko [Tue, 30 Jul 2019 11:10:40 +0000 (13:10 +0200)]
Add hashtag score for better sorting of autosuggestions (#11427)

* Add hashtag score for better sorting of autosuggestions

* Do not use `~<~` operator with no text_pattern_ops index

6 years ago[Glitch] Fix crash when expanding search results for hashtags
ThibG [Tue, 30 Jul 2019 10:06:21 +0000 (12:06 +0200)]
[Glitch] Fix crash when expanding search results for hashtags

Port 78144f4c7923d502cc86b322f044e740e4a8fa8a to glitch-soc

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Tue, 30 Jul 2019 10:22:33 +0000 (12:22 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock

6 years agoChange links in webUI to rewrite misleading links (#11426)
ThibG [Tue, 30 Jul 2019 10:13:29 +0000 (12:13 +0200)]
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

6 years agoFix crash when expanding search results for hashtags (#11447)
ThibG [Tue, 30 Jul 2019 10:06:21 +0000 (12:06 +0200)]
Fix crash when expanding search results for hashtags (#11447)

6 years agoAdd whitelist mode (#11291)
Eugen Rochko [Tue, 30 Jul 2019 09:10:46 +0000 (11:10 +0200)]
Add whitelist mode (#11291)

6 years agoMerge pull request #1179 from ThibG/glitch-soc/merge-upstream
ThibG [Mon, 29 Jul 2019 21:37:14 +0000 (23:37 +0200)]
Merge pull request #1179 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoBump yargs from 12.0.5 to 13.3.0 (#11434)
dependabot-preview[bot] [Mon, 29 Jul 2019 18:42:19 +0000 (20:42 +0200)]
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>
6 years agolet bundler fetch http_parser.rb submodules (#11444)
Milan [Mon, 29 Jul 2019 18:42:04 +0000 (20:42 +0200)]
let bundler fetch http_parser.rb submodules (#11444)

6 years agoFix tag normalization and migration not removing duplicate tags (#11441)
Eugen Rochko [Mon, 29 Jul 2019 18:40:21 +0000 (20:40 +0200)]
Fix tag normalization and migration not removing duplicate tags (#11441)

Fix #11428

6 years agoBump oj from 3.8.0 to 3.8.1 (#11435)
dependabot-preview[bot] [Mon, 29 Jul 2019 13:51:03 +0000 (22:51 +0900)]
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>
6 years agoBump capybara from 3.26.0 to 3.27.0 (#11437)
dependabot-preview[bot] [Mon, 29 Jul 2019 13:48:56 +0000 (22:48 +0900)]
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>
6 years agoBump httplog from 1.3.1 to 1.3.2 (#11436)
dependabot-preview[bot] [Mon, 29 Jul 2019 13:39:54 +0000 (22:39 +0900)]
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>
6 years agoBump brakeman from 4.5.1 to 4.6.1 (#11438)
dependabot-preview[bot] [Mon, 29 Jul 2019 13:37:02 +0000 (22:37 +0900)]
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>
6 years agoBump sass from 1.20.3 to 1.22.7 (#11432)
dependabot-preview[bot] [Mon, 29 Jul 2019 13:30:44 +0000 (22:30 +0900)]
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>
6 years agoBump aws-sdk-s3 from 1.45.0 to 1.46.0 (#11439)
dependabot-preview[bot] [Mon, 29 Jul 2019 13:29:17 +0000 (22:29 +0900)]
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>
6 years agoBump autoprefixer from 9.6.0 to 9.6.1 (#11431)
dependabot-preview[bot] [Mon, 29 Jul 2019 13:06:15 +0000 (22:06 +0900)]
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>
6 years agoFix emoji autosuggestions (#11442)
Eugen Rochko [Mon, 29 Jul 2019 13:04:49 +0000 (15:04 +0200)]
Fix emoji autosuggestions (#11442)

Regression from cfb2ed78231758a79af038a964ab7f7b7b35274e

6 years agoBump @babel/preset-env from 7.4.5 to 7.5.5 (#11433)
dependabot-preview[bot] [Mon, 29 Jul 2019 13:03:05 +0000 (22:03 +0900)]
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>
6 years agoBump file-loader from 4.0.0 to 4.1.0 (#11430)
dependabot-preview[bot] [Mon, 29 Jul 2019 12:54:14 +0000 (21:54 +0900)]
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>
6 years agoFix crash in /web/lists
Thibaut Girka [Sun, 28 Jul 2019 22:28:13 +0000 (00:28 +0200)]
Fix crash in /web/lists

Fixes #1181

6 years agoRevert "Remove conversation URI (#11423)" (#11424)
Eugen Rochko [Sun, 28 Jul 2019 15:47:37 +0000 (17:47 +0200)]
Revert "Remove conversation URI (#11423)" (#11424)

This reverts commit 75f7f9930eb2a6f5c4041ec44fe0aa795c9ec449.

6 years agoRemove conversation URI (#11423)
Eugen Rochko [Sun, 28 Jul 2019 15:30:12 +0000 (17:30 +0200)]
Remove conversation URI (#11423)

It is not part of ActivityPub and will free up a lot of space

6 years ago[Glitch] Add search results pagination to web UI (#11409)
Eugen Rochko [Sat, 27 Jul 2019 03:49:50 +0000 (05:49 +0200)]
[Glitch] Add search results pagination to web UI (#11409)

Port 8a4674f2c3d89c998eb5438b96b7977dc2be3167 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Change contrast of status links that are not mentions nor hashtags
ThibG [Sun, 28 Jul 2019 04:00:51 +0000 (06:00 +0200)]
[Glitch] Change contrast of status links that are not mentions nor hashtags

Port 10e78ecf57242cc5030b903131bf27e027bb4a97 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Change account domain block to clear out notifications and follows
Eugen Rochko [Thu, 25 Jul 2019 02:17:35 +0000 (04:17 +0200)]
[Glitch] Change account domain block to clear out notifications and follows

Port 4eeff26533b75b592395e353c6d4506db9958bcf to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 28 Jul 2019 14:28:05 +0000 (16:28 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoAdd autosuggestions for hashtags (#11422)
Eugen Rochko [Sun, 28 Jul 2019 12:37:52 +0000 (14:37 +0200)]
Add autosuggestions for hashtags (#11422)

6 years agoBump json-ld-preloaded from 3.0.2 to 3.0.3 (#11316)
dependabot-preview[bot] [Sun, 28 Jul 2019 11:48:43 +0000 (13:48 +0200)]
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

6 years agoAdd `tootctl preview_cards remove` (#11320)
mayaeh [Sun, 28 Jul 2019 11:48:19 +0000 (20:48 +0900)]
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

6 years agoFix animate on hover in poll options without CW (#11404)
ThibG [Sun, 28 Jul 2019 11:48:05 +0000 (13:48 +0200)]
Fix animate on hover in poll options without CW (#11404)

6 years agoPrevent archiving when user set "noindex" (#11421)
Jeong Arm [Sun, 28 Jul 2019 11:46:04 +0000 (20:46 +0900)]
Prevent archiving when user set "noindex" (#11421)

6 years agoChange contrast of status links that are not mentions nor hashtags (#11406)
ThibG [Sun, 28 Jul 2019 04:00:51 +0000 (06:00 +0200)]
Change contrast of status links that are not mentions nor hashtags (#11406)

6 years agoChange hashtags to preserve first-used casing (#11416)
Eugen Rochko [Sun, 28 Jul 2019 03:59:51 +0000 (05:59 +0200)]
Change hashtags to preserve first-used casing (#11416)

6 years agoFix tabs bar scrolling along with content on mobile (#11418)
Eugen Rochko [Sat, 27 Jul 2019 17:25:15 +0000 (19:25 +0200)]
Fix tabs bar scrolling along with content on mobile (#11418)

6 years agoImplement pending tests (#11415)
ysksn [Sat, 27 Jul 2019 08:24:26 +0000 (17:24 +0900)]
Implement pending tests (#11415)

6 years agoAdd search results pagination to web UI (#11409)
Eugen Rochko [Sat, 27 Jul 2019 03:49:50 +0000 (05:49 +0200)]
Add search results pagination to web UI (#11409)

* Add search results pagination to web UI

Fix #10737

* Fix code style issue

6 years agoAdd search syntax for operators and phrases (#11411)
Eugen Rochko [Sat, 27 Jul 2019 02:42:08 +0000 (04:42 +0200)]
Add search syntax for operators and phrases (#11411)

6 years agoRemove timestamps from converted images to make them deterministic (#11408)
Eugen Rochko [Sat, 27 Jul 2019 02:41:55 +0000 (04:41 +0200)]
Remove timestamps from converted images to make them deterministic (#11408)

6 years agoFix invites not being disabled upon account suspension (#11412)
ThibG [Fri, 26 Jul 2019 16:55:33 +0000 (18:55 +0200)]
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

6 years agoRemove pre from version, add extra suffix variable (#11407)
Clar Fon [Fri, 26 Jul 2019 05:57:27 +0000 (01:57 -0400)]
Remove pre from version, add extra suffix variable (#11407)

6 years agoChange settings to show restricted accounts only what they have access to (#11394)
ThibG [Thu, 25 Jul 2019 02:22:09 +0000 (04:22 +0200)]
Change settings to show restricted accounts only what they have access to (#11394)

Follow-up to 964ae8eee593687f922c873fa7b378bb6e3e39bb

6 years agoChange account domain block to clear out notifications and follows (#11393)
Eugen Rochko [Thu, 25 Jul 2019 02:17:35 +0000 (04:17 +0200)]
Change account domain block to clear out notifications and follows (#11393)

6 years agoFix links in status media having their title rewritten
Thibaut Girka [Wed, 24 Jul 2019 19:14:37 +0000 (21:14 +0200)]
Fix links in status media having their title rewritten

6 years agoMerge pull request #1176 from ThibG/glitch-soc/merge-upstream
ThibG [Wed, 24 Jul 2019 14:53:25 +0000 (16:53 +0200)]
Merge pull request #1176 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Wed, 24 Jul 2019 14:23:53 +0000 (16:23 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoFix tootctl statuses remove
Thomas Citharel [Wed, 24 Jul 2019 13:53:35 +0000 (15:53 +0200)]
Fix tootctl statuses remove

A ending parenthesis was missing in the bookmark special line.

6 years ago Don't delete periods when validating username uniqueness (#11392) (#11400)
Rey Tucker [Wed, 24 Jul 2019 12:19:17 +0000 (08:19 -0400)]
 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

6 years agoMerge pull request #1174 from ThibG/glitch-soc/merge-upstream
ThibG [Tue, 23 Jul 2019 15:21:55 +0000 (17:21 +0200)]
Merge pull request #1174 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoHandle animated emoji on mouse hover in CWs and poll options
Thibaut Girka [Tue, 23 Jul 2019 09:10:22 +0000 (11:10 +0200)]
Handle animated emoji on mouse hover in CWs and poll options

6 years ago[Glitch] Play animated custom emoji on hover
ThibG [Sun, 21 Jul 2019 16:10:40 +0000 (18:10 +0200)]
[Glitch] Play animated custom emoji on hover

Port 7de8c51873b51d8450f7a6597a43d454964d0407 to glitch-soc

6 years agoRemove modules.localIdentName (#11398)
Yamagishi Kazutoshi [Tue, 23 Jul 2019 13:47:48 +0000 (22:47 +0900)]
Remove modules.localIdentName (#11398)

6 years agoFix scrolling in single-column mode on Chrome (#11395)
ThibG [Tue, 23 Jul 2019 13:47:18 +0000 (15:47 +0200)]
Fix scrolling in single-column mode on Chrome (#11395)

Fixes #11389

6 years agoBump active_model_serializers from 0.10.9 to 0.10.10 (#11311)
dependabot-preview[bot] [Tue, 23 Jul 2019 09:10:42 +0000 (11:10 +0200)]
Bump active_model_serializers from 0.10.9 to 0.10.10 (#11311)

* Bump active_model_serializers from 0.10.9 to 0.10.10

Bumps [active_model_serializers](https://github.com/rails-api/active_model_serializers) from 0.10.9 to 0.10.10.
- [Release notes](https://github.com/rails-api/active_model_serializers/releases)
- [Changelog](https://github.com/rails-api/active_model_serializers/blob/v0.10.10/CHANGELOG.md)
- [Commits](https://github.com/rails-api/active_model_serializers/compare/v0.10.9...v0.10.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Add root option to render method

6 years agoList columns within the method (#11377)
Daigo 3 Dango [Tue, 23 Jul 2019 09:08:11 +0000 (23:08 -1000)]
List columns within the method (#11377)

To avoid the exception:

NoMethodError: undefined method `perform' for nil:NilClass
.../vendor/bundle/ruby/2.6.0/gems/strong_migrations-0.4.1/lib/strong_migrations/migration.rb:14:in `method_missing'
.../vendor/bundle/ruby/2.6.0/gems/activerecord-5.2.3/lib/active_record/migration.rb:604:in `method_missing'
.../db/migrate/20170918125918_ids_to_bigints.rb:69:in `<class:IdsToBigints>'
.../db/migrate/20170918125918_ids_to_bigints.rb:3:in `<top (required)>'

6 years agoBump css-loader from 2.1.1 to 3.1.0 (#11382)
dependabot-preview[bot] [Tue, 23 Jul 2019 09:07:47 +0000 (11:07 +0200)]
Bump css-loader from 2.1.1 to 3.1.0 (#11382)

* Bump css-loader from 2.1.1 to 3.1.0

Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 2.1.1 to 3.1.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v2.1.1...v3.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* localIdentName -> modules.localIdentName

6 years agoRefactor DisplayName component to make it closer to upstream
Thibaut Girka [Tue, 23 Jul 2019 08:45:35 +0000 (10:45 +0200)]
Refactor DisplayName component to make it closer to upstream

6 years ago[Glitch] Display custom emoji in bio field names
Thibaut Girka [Tue, 23 Jul 2019 08:33:25 +0000 (10:33 +0200)]
[Glitch] Display custom emoji in bio field names

Port 4bd58b7f2da369a608eacb97f832728ddc139ce8 to glitch-soc

6 years agoRevert some refactoring in order to make codebase closer to upstream
Thibaut Girka [Tue, 23 Jul 2019 08:30:24 +0000 (10:30 +0200)]
Revert some refactoring in order to make codebase closer to upstream

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Tue, 23 Jul 2019 08:17:06 +0000 (10:17 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb

6 years agoBump browser from 2.5.3 to 2.6.1 (#11388)
dependabot-preview[bot] [Mon, 22 Jul 2019 14:11:01 +0000 (23:11 +0900)]
Bump browser from 2.5.3 to 2.6.1 (#11388)

Bumps [browser](https://github.com/fnando/browser) from 2.5.3 to 2.6.1.
- [Release notes](https://github.com/fnando/browser/releases)
- [Changelog](https://github.com/fnando/browser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/browser/compare/v2.5.3...v2.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump oj from 3.7.12 to 3.8.0 (#11387)
dependabot-preview[bot] [Mon, 22 Jul 2019 14:07:42 +0000 (23:07 +0900)]
Bump oj from 3.7.12 to 3.8.0 (#11387)

Bumps [oj](https://github.com/ohler55/oj) from 3.7.12 to 3.8.0.
- [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.7.12...v3.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump rubocop from 0.72.0 to 0.73.0 (#11384)
dependabot-preview[bot] [Mon, 22 Jul 2019 14:06:34 +0000 (23:06 +0900)]
Bump rubocop from 0.72.0 to 0.73.0 (#11384)

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.72.0 to 0.73.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.72.0...v0.73.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump premailer-rails from 1.10.2 to 1.10.3 (#11386)
dependabot-preview[bot] [Mon, 22 Jul 2019 14:05:34 +0000 (23:05 +0900)]
Bump premailer-rails from 1.10.2 to 1.10.3 (#11386)

Bumps [premailer-rails](https://github.com/fphilipe/premailer-rails) from 1.10.2 to 1.10.3.
- [Release notes](https://github.com/fphilipe/premailer-rails/releases)
- [Changelog](https://github.com/fphilipe/premailer-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fphilipe/premailer-rails/compare/v1.10.2...v1.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump capybara from 3.25.0 to 3.26.0 (#11385)
dependabot-preview[bot] [Mon, 22 Jul 2019 14:04:17 +0000 (23:04 +0900)]
Bump capybara from 3.25.0 to 3.26.0 (#11385)

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.25.0 to 3.26.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.25.0...3.26.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoChange unconfirmed user login behaviour (#11375)
Eugen Rochko [Mon, 22 Jul 2019 08:48:50 +0000 (10:48 +0200)]
Change unconfirmed user login behaviour (#11375)

Allow access to account settings, 2FA, authorized applications, and
account deletions to unconfirmed and pending users, as well as
users who had their accounts disabled. Suspended users cannot update
their e-mail or password or delete their account.

Display account status on account settings page, for example, when
an account is frozen, limited, unconfirmed or pending review.

After sign up, login users straight away and show a simple page that
tells them the status of their account with links to account settings
and logout, to reduce onboarding friction and allow users to correct
wrongly typed e-mail addresses.

Move the final sign-up step of SSO integrations to be the same
as above to reduce code duplication.