tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
10,172 Commits 20 Branches 113 Tags 222 MiB
fae9e34484
Commit Graph

10172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ysksn
d6ada2eb30 Implement pending tests (#11415) 2019-07-27 10:24:26 +02:00
Eugen Rochko
8a4674f2c3
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
b9fbcbfe4e
Add search syntax for operators and phrases (#11411) 2019-07-27 04:42:08 +02:00
Eugen Rochko
501148ab91
Remove timestamps from converted images to make them deterministic (#11408) 2019-07-27 04:41:55 +02:00
ThibG
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
 2019-07-26 18:55:33 +02:00
Clar Fon
a6b4440115 Remove pre from version, add extra suffix variable (#11407) 2019-07-26 07:57:27 +02:00
ThibG
d0c25584b8 Change settings to show restricted accounts only what they have access to (#11394) 
Follow-up to 964ae8eee5
 2019-07-25 04:22:09 +02:00
Eugen Rochko
4eeff26533
Change account domain block to clear out notifications and follows (#11393) 2019-07-25 04:17:35 +02:00
Thibaut Girka
91da921dbb Fix links in status media having their title rewritten 2019-07-24 21:46:09 +02:00
ThibG
88e79c179a
Merge pull request #1176 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-07-24 16:53:25 +02:00
Thibaut Girka
2d35e4460a Merge branch 'master' into glitch-soc/merge-upstream 2019-07-24 16:23:53 +02:00
Thomas Citharel
e3a551cbd1 Fix tootctl statuses remove 
A ending parenthesis was missing in the bookmark special line.
 2019-07-24 15:55:39 +02:00
Rey Tucker
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
 2019-07-24 14:19:17 +02:00
ThibG
08325db62b
Merge pull request #1174 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-07-23 17:21:55 +02:00
Thibaut Girka
48c68eafb7 Handle animated emoji on mouse hover in CWs and poll options 2019-07-23 16:24:21 +02:00
ThibG
c1231a846a [Glitch] Play animated custom emoji on hover 
Port 7de8c51873 to glitch-soc
 2019-07-23 16:24:21 +02:00
Yamagishi Kazutoshi
fada60cbe7 Remove modules.localIdentName (#11398) 2019-07-23 15:47:48 +02:00
ThibG
fb1b710e8d Fix scrolling in single-column mode on Chrome (#11395) 
Fixes #11389
 2019-07-23 15:47:18 +02:00
dependabot-preview[bot]
1955aa9f7d 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
 2019-07-23 11:10:42 +02:00
Daigo 3 Dango
cd68714393 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)>'
 2019-07-23 11:08:11 +02:00
dependabot-preview[bot]
24367ef906 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
 2019-07-23 11:07:47 +02:00
Thibaut Girka
621590b4ab Refactor DisplayName component to make it closer to upstream 2019-07-23 10:51:12 +02:00
Thibaut Girka
cd8763b600 [Glitch] Display custom emoji in bio field names 
Port 4bd58b7f2d to glitch-soc
 2019-07-23 10:51:12 +02:00
Thibaut Girka
8a89a2b0f4 Revert some refactoring in order to make codebase closer to upstream 2019-07-23 10:51:12 +02:00
Thibaut Girka
444796b69b 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
 2019-07-23 10:51:07 +02:00
dependabot-preview[bot]
ab3126e7a2 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>
 2019-07-22 23:11:01 +09:00
dependabot-preview[bot]
05b8468755 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>
 2019-07-22 23:07:42 +09:00
dependabot-preview[bot]
e980e19a91 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>
 2019-07-22 23:06:34 +09:00
dependabot-preview[bot]
362fa2dc8a 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>
 2019-07-22 23:05:34 +09:00
dependabot-preview[bot]
b47e3b6cd8 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>
 2019-07-22 23:04:17 +09:00
Eugen Rochko
964ae8eee5
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.
 2019-07-22 10:48:50 +02:00
dependabot-preview[bot]
fea903f574 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>
 2019-07-22 17:37:11 +09:00
dependabot-preview[bot]
e2b3437a84 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>
 2019-07-22 17:36:55 +09:00
dependabot-preview[bot]
44b04358b3 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>
 2019-07-22 16:27:44 +09:00
dependabot-preview[bot]
28a60cb04f 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>
 2019-07-22 16:27:16 +09:00
Daigo 3 Dango
00fc17b2ed Bind servers to 0.0.0.0 in Procfile (#11378) 
* Bind to 0.0.0.0

* Make Procfile common to main and streaming apps
 2019-07-22 06:16:30 +02:00
Eugen Rochko
c669bb42ba
Add (back) rails-level JSON caching (#11333) 2019-07-21 22:32:16 +02:00
Thibaut Girka
6db5669818 Clean up redundant shouldUpdateScroll definitions 2019-07-21 20:57:42 +02:00
Eugen Rochko
e58af04287 [Glitch] Fix mutes, blocks, domain blocks and follow requests not paginating 
Port ea7ad59af2  to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-07-21 20:57:42 +02:00
ThibG
bd7b1538f1 [Glitch] Fix followers and followings on account profiles 
Partial fix from 55abff8af7

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-07-21 20:57:42 +02:00
Jakub Mendyk
c614abb95d [Glitch] Fix followers/follows layout issues from #8418 
Port ceed1ebe5b to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-07-21 20:57:42 +02:00
Thibaut Girka
b294b5956b Add empty column message to bookmarks column 2019-07-21 20:57:42 +02:00
Jakub Mendyk
e9f88f4005 [Glitch] Add messages informing that collections are empty 
Port 5129f6f2aa to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-07-21 20:57:42 +02:00
ThibG
59fd622adc Fix boost to original audience not working on mobile (#11371) 2019-07-21 18:11:09 +02:00
ThibG
7de8c51873 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
 2019-07-21 18:10:40 +02:00
Eugen Rochko
043d52f785
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
 2019-07-21 18:10:07 +02:00
Eugen Rochko
bd1545de5e
Change locale detection to run once per session (#8657) 
Fix #6462
 2019-07-21 18:08:02 +02:00
Eugen Rochko
bd87e66679
Remove WebSub subscriptions (#11303) 2019-07-21 04:08:00 +02:00
ThibG
4bd58b7f2d Display custom emoji in bio field names (#11350) 
Already displayed in public pages, but not WebUI
 2019-07-21 03:40:27 +02:00
ysksn
2859790890 Not to create an account if already exist (#11366) 2019-07-21 03:40:08 +02:00