]> cat aescling's git repositories - mastodon.git/log
mastodon.git
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.

6 years agoBump eslint from 5.16.0 to 6.1.0 (#11383)
dependabot-preview[bot] [Mon, 22 Jul 2019 08:37:11 +0000 (17:37 +0900)]
Bump eslint from 5.16.0 to 6.1.0 (#11383)

Bumps [eslint](https://github.com/eslint/eslint) from 5.16.0 to 6.1.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v5.16.0...v6.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump babel-eslint from 10.0.1 to 10.0.2 (#11381)
dependabot-preview[bot] [Mon, 22 Jul 2019 08:36:55 +0000 (17:36 +0900)]
Bump babel-eslint from 10.0.1 to 10.0.2 (#11381)

Bumps [babel-eslint](https://github.com/babel/babel-eslint) from 10.0.1 to 10.0.2.
- [Release notes](https://github.com/babel/babel-eslint/releases)
- [Commits](https://github.com/babel/babel-eslint/compare/v10.0.1...v10.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump intl-relativeformat from 6.4.2 to 6.4.3 (#11380)
dependabot-preview[bot] [Mon, 22 Jul 2019 07:27:44 +0000 (16:27 +0900)]
Bump intl-relativeformat from 6.4.2 to 6.4.3 (#11380)

Bumps [intl-relativeformat](https://github.com/formatjs/formatjs) from 6.4.2 to 6.4.3.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/intl-relativeformat@6.4.2...intl-relativeformat@6.4.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump @clusterws/cws from 0.14.0 to 0.15.0 (#11379)
dependabot-preview[bot] [Mon, 22 Jul 2019 07:27:16 +0000 (16:27 +0900)]
Bump @clusterws/cws from 0.14.0 to 0.15.0 (#11379)

Bumps @clusterws/cws from 0.14.0 to 0.15.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBind servers to 0.0.0.0 in Procfile (#11378)
Daigo 3 Dango [Mon, 22 Jul 2019 04:16:30 +0000 (18:16 -1000)]
Bind servers to 0.0.0.0 in Procfile (#11378)

* Bind to 0.0.0.0

* Make Procfile common to main and streaming apps

6 years agoAdd (back) rails-level JSON caching (#11333)
Eugen Rochko [Sun, 21 Jul 2019 20:32:16 +0000 (22:32 +0200)]
Add (back) rails-level JSON caching (#11333)

6 years agoClean up redundant shouldUpdateScroll definitions
Thibaut Girka [Sat, 20 Jul 2019 14:07:55 +0000 (16:07 +0200)]
Clean up redundant shouldUpdateScroll definitions

6 years ago[Glitch] Fix mutes, blocks, domain blocks and follow requests not paginating
Eugen Rochko [Sat, 16 Feb 2019 10:56:09 +0000 (11:56 +0100)]
[Glitch] Fix mutes, blocks, domain blocks and follow requests not paginating

Port ea7ad59af20af2aa6817b3b40dca34c8fba3373a  to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Fix followers and followings on account profiles
ThibG [Wed, 12 Dec 2018 21:32:44 +0000 (22:32 +0100)]
[Glitch] Fix followers and followings on account profiles

Partial fix from 55abff8af75b9a8ab541ec68a3603c77e1339e23

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Fix followers/follows layout issues from #8418
Jakub Mendyk [Tue, 28 Aug 2018 23:19:58 +0000 (01:19 +0200)]
[Glitch] Fix followers/follows layout issues from #8418

Port ceed1ebe5b308a95f9c167c93d3bc0976937fb58 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoAdd empty column message to bookmarks column
Thibaut Girka [Sat, 20 Jul 2019 13:07:24 +0000 (15:07 +0200)]
Add empty column message to bookmarks column

6 years ago[Glitch] Add messages informing that collections are empty
Jakub Mendyk [Sun, 26 Aug 2018 14:39:37 +0000 (16:39 +0200)]
[Glitch] Add messages informing that collections are empty

Port 5129f6f2aa56afb21708aec552a798d062ccaff9 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoFix boost to original audience not working on mobile (#11371)
ThibG [Sun, 21 Jul 2019 16:11:09 +0000 (18:11 +0200)]
Fix boost to original audience not working on mobile (#11371)

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

* Play animated custom emoji on hover in status

* Play animated custom emoji on hover in display names

* Play animated custom emoji on hover in bios/bio fields

* Add support for animation on hover on public pages emojis too

* Fix tests

* Code style cleanup

6 years agoFix `alerts` booleans not being typecast correctly in push subscription (#11343)
Eugen Rochko [Sun, 21 Jul 2019 16:10:07 +0000 (18:10 +0200)]
Fix `alerts` booleans not being typecast correctly in push subscription (#11343)

* Fix `alerts` booleans not being typecast correctly in push subscription

Fix #10789

* Fix typo

6 years agoChange locale detection to run once per session (#8657)
Eugen Rochko [Sun, 21 Jul 2019 16:08:02 +0000 (18:08 +0200)]
Change locale detection to run once per session (#8657)

Fix #6462

6 years agoRemove WebSub subscriptions (#11303)
Eugen Rochko [Sun, 21 Jul 2019 02:08:00 +0000 (04:08 +0200)]
Remove WebSub subscriptions (#11303)

6 years agoDisplay custom emoji in bio field names (#11350)
ThibG [Sun, 21 Jul 2019 01:40:27 +0000 (03:40 +0200)]
Display custom emoji in bio field names (#11350)

Already displayed in public pages, but not WebUI

6 years agoNot to create an account if already exist (#11366)
ysksn [Sun, 21 Jul 2019 01:40:08 +0000 (10:40 +0900)]
Not to create an account if already exist (#11366)

6 years agoMerge pull request #1158 from ThibG/glitch-soc/merge-upstream
ThibG [Sat, 20 Jul 2019 22:53:28 +0000 (00:53 +0200)]
Merge pull request #1158 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoAdded max search results var to sample env
Lady Lumb [Sun, 2 Jun 2019 12:50:51 +0000 (05:50 -0700)]
Added max search results var to sample env

Added and documented MAX_SEARCH_RESULTS to the .env.production.sample file

6 years agoAdd env variable to control search limit
Lady Lumb [Fri, 31 May 2019 08:48:11 +0000 (01:48 -0700)]
Add env variable to control search limit

Changed the default search limit to allow a variable called MAX_SEARCH_RESULTS in the .env.production file to change the maximum search results limit.

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Fri, 19 Jul 2019 21:37:41 +0000 (23:37 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoDisallow numeric-only hashtags (#11363)
ThibG [Fri, 19 Jul 2019 21:22:35 +0000 (23:22 +0200)]
Disallow numeric-only hashtags (#11363)

* Add spec covering numeric-only hashtags

* Fix hashtag regex

6 years agoFix some flash notices/alerts staying on unrelated pages (#11364)
ThibG [Fri, 19 Jul 2019 21:13:21 +0000 (23:13 +0200)]
Fix some flash notices/alerts staying on unrelated pages (#11364)

6 years agoFix HTML entities being encoded as hashtag links…
Thibaut Girka [Fri, 19 Jul 2019 18:15:03 +0000 (20:15 +0200)]
Fix HTML entities being encoded as hashtag links…

6 years agoFix filtering behaviors
Thibaut Girka [Fri, 19 Jul 2019 16:00:14 +0000 (18:00 +0200)]
Fix filtering behaviors

6 years agoFix sanitizer text case for glitch-soc, which preserves lists
Thibaut Girka [Fri, 19 Jul 2019 17:02:05 +0000 (19:02 +0200)]
Fix sanitizer text case for glitch-soc, which preserves lists

6 years ago[Glitch] Add ActivityPub actor representing the entire server
ThibG [Thu, 18 Jul 2019 23:44:42 +0000 (01:44 +0200)]
[Glitch] Add ActivityPub actor representing the entire server

Port SCSS changes from 730c4053d642024b9949d72c8a9f1873532c6212

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoRemove Atom feeds and old URLs in the form of `GET /:username/updates/:id`
Eugen Rochko [Sun, 7 Jul 2019 14:16:51 +0000 (16:16 +0200)]
Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id`

Port SCSS changes from b8514561394767a10d3cf40132ada24d938c1680 to glitch-soc

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

Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml

6 years agoBump strong_migrations from 0.4.0 to 0.4.1 (#11307)
dependabot-preview[bot] [Fri, 19 Jul 2019 16:08:02 +0000 (01:08 +0900)]
Bump strong_migrations from 0.4.0 to 0.4.1 (#11307)

Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.4.0 to 0.4.1.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.4.0...v0.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoChange single-column mode to scroll the whole page (#11359)
Eugen Rochko [Fri, 19 Jul 2019 07:25:22 +0000 (09:25 +0200)]
Change single-column mode to scroll the whole page (#11359)

Fix #10840

6 years agoFix avatar animation on hover when not logged in (#11349)
ThibG [Fri, 19 Jul 2019 07:18:23 +0000 (09:18 +0200)]
Fix avatar animation on hover when not logged in (#11349)

6 years agoAdded logout to dropdown menu (#11353)
koyu [Fri, 19 Jul 2019 01:58:46 +0000 (03:58 +0200)]
Added logout to dropdown menu (#11353)

* Added logout to dropdown menu

* Triggering build-and-test with empty commit as it seems it failed due to some internal failure

* Looks fine, ready to review

* Added changes from review

* method can be null without any problems

* Also target can be null

6 years agoFix sanitizing lists contents (#11354)
ThibG [Thu, 18 Jul 2019 23:44:58 +0000 (01:44 +0200)]
Fix sanitizing lists contents (#11354)

* Add test

* Fix code for sanitizing nested lists stripping all tags

6 years agoAdd ActivityPub actor representing the entire server (#11321)
ThibG [Thu, 18 Jul 2019 23:44:42 +0000 (01:44 +0200)]
Add ActivityPub actor representing the entire server (#11321)

* Add support for an instance actor

* Skip username validation for local Application accounts

* Add migration script to create instance actor

* Make Codeclimate happy

* Switch to id -99 for instance actor

* Remove unused `icon` and `image` attributes from instance actor

* Use if/elsif/else instead of return + ternary operator

* Add instance actor to fresh installs

* Use instance actor as instance representative

Use instance actor for forwarding reports, relay operations, and spam
auto-reporting.

* Seed database in test environment

* Fix single-user mode

* Fix tests

* Fix specs to accomodate for an extra `Account`

* Auto-reject follows on instance actor

Following an instance actor might make sense, but we are not handling that
right now, so auto-reject.

* Fix webfinger lookup and serialization for instance actor

* Rename instance actor

* Make it clear in the HTML view that the instance actor should not be blocked

* Raise cache time for instance actor as there's no dynamic content

* Re-use /about/more with a flash message for instance actor profile

6 years agoFix timestamp display in boost/fav modals in RTL locales
Thibaut Girka [Wed, 17 Jul 2019 19:28:17 +0000 (21:28 +0200)]
Fix timestamp display in boost/fav modals in RTL locales

6 years agoFixups
Thibaut Girka [Wed, 17 Jul 2019 19:20:55 +0000 (21:20 +0200)]
Fixups

6 years agoPublic pages RTL fixes
Thibaut Girka [Wed, 17 Jul 2019 18:25:26 +0000 (20:25 +0200)]
Public pages RTL fixes

6 years agoUnfiy status__prepend with upstream
Thibaut Girka [Wed, 17 Jul 2019 18:05:53 +0000 (20:05 +0200)]
Unfiy status__prepend with upstream

6 years agoRTL fixes
Thibaut Girka [Wed, 17 Jul 2019 17:21:12 +0000 (19:21 +0200)]
RTL fixes

6 years agoFix some SCSS for RTL behavior
Thibaut Girka [Wed, 17 Jul 2019 15:55:09 +0000 (17:55 +0200)]
Fix some SCSS for RTL behavior

6 years agoMinor fixup
Thibaut Girka [Wed, 17 Jul 2019 17:14:38 +0000 (19:14 +0200)]
Minor fixup

6 years ago[Glitch] Fix RTL layout of status display names
Eugen Rochko [Wed, 24 Oct 2018 16:18:08 +0000 (18:18 +0200)]
[Glitch] Fix RTL layout of status display names

Port d723f2a0a88d4ac106638733b7ba17f8d205850a to glitch-soc

6 years ago[Glitch] RTL: fix settings button margins in column headers
Masoud Abkenar [Sun, 23 Sep 2018 18:40:37 +0000 (20:40 +0200)]
[Glitch] RTL: fix settings button margins in column headers

Port ef1134728145c6dcf094e7a0a16a8d63f70aed6c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoMake width breakpoint for removing margins consistent and match upstream
Thibaut Girka [Thu, 18 Jul 2019 12:32:45 +0000 (14:32 +0200)]
Make width breakpoint for removing margins consistent and match upstream

Fixes #1136

6 years agoChange Dockerfile to bind to 0.0.0.0 instead of docker-compose.yml (#11351)
Eugen Rochko [Thu, 18 Jul 2019 18:28:05 +0000 (20:28 +0200)]
Change Dockerfile to bind to 0.0.0.0 instead of docker-compose.yml (#11351)

6 years agoWhen cleaning up remote statuses, keep bookmarked ones
Thibaut Girka [Wed, 17 Jul 2019 19:54:03 +0000 (21:54 +0200)]
When cleaning up remote statuses, keep bookmarked ones

6 years agoFix *another* typo and crash in StatusIcons
Thibaut Girka [Thu, 18 Jul 2019 07:53:48 +0000 (09:53 +0200)]
Fix *another* typo and crash in StatusIcons

6 years agoFix typo and crash in StatusIcons
Thibaut Girka [Thu, 18 Jul 2019 07:40:45 +0000 (09:40 +0200)]
Fix typo and crash in StatusIcons

6 years agoFix only one middle dot being recognized in hashtags (#11345)
Eugen Rochko [Thu, 18 Jul 2019 01:02:56 +0000 (03:02 +0200)]
Fix only one middle dot being recognized in hashtags (#11345)

Fix #10934

6 years agoAdd aac, m4a, 3gp to allowed audio formats (#11342)
Eugen Rochko [Thu, 18 Jul 2019 01:02:30 +0000 (03:02 +0200)]
Add aac, m4a, 3gp to allowed audio formats (#11342)

Fix #11186

6 years agoChange language detection to include hashtags as words (#11341)
Eugen Rochko [Thu, 18 Jul 2019 01:02:15 +0000 (03:02 +0200)]
Change language detection to include hashtags as words (#11341)

6 years agoBump rack-attack from 6.0.0 to 6.1.0 (#11313)
dependabot-preview[bot] [Wed, 17 Jul 2019 23:07:02 +0000 (01:07 +0200)]
Bump rack-attack from 6.0.0 to 6.1.0 (#11313)

Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/kickstarter/rack-attack/releases)
- [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kickstarter/rack-attack/compare/v6.0.0...v6.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump rubocop-rails from 2.2.0 to 2.2.1 (#11308)
dependabot-preview[bot] [Wed, 17 Jul 2019 23:06:39 +0000 (01:06 +0200)]
Bump rubocop-rails from 2.2.0 to 2.2.1 (#11308)

Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.2.0...v2.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump puma from 3.12.1 to 4.0.1 (#11306)
dependabot-preview[bot] [Wed, 17 Jul 2019 23:06:14 +0000 (01:06 +0200)]
Bump puma from 3.12.1 to 4.0.1 (#11306)

Bumps [puma](https://github.com/puma/puma) from 3.12.1 to 4.0.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v3.12.1...v4.0.1)

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