djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-25 01:24:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
10,011 Commits 69 Branches 20 Tags 378 MiB
c01de0f721
Commit Graph

6968 Commits

Author SHA1 Message Date
Thibaut Girka
c01de0f721 Ensure link rewriting setting changes are immediately applied 2019-08-04 22:25:56 +02:00
Thibaut Girka
6600da0f7b Handle Mastodon-generated links for targets starting with “www.” properly 2019-08-04 22:25:56 +02:00
Thibaut Girka
df866a464d Add options to highlight misleading links in statuses 
Fixes #1162
 2019-08-04 22:25:56 +02:00
Thibaut Girka
49a28e69a5 Move decodeIDNA to app/javascript/flavours/glitch/util 2019-08-04 22:25:56 +02:00
ThibG
d8097ecd2f [Glitch] Fix crash when expanding search results for hashtags 
Port 78144f4c79 to glitch-soc
 2019-07-30 12:31:02 +02:00
Thibaut Girka
24968d20a0 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
b31b232edf 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
78144f4c79 Fix crash when expanding search results for hashtags (#11447) 2019-07-30 12:06:21 +02:00
Eugen Rochko
24552b5160
Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
ThibG
f48c7689d2
Merge pull request #1179 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-07-29 23:37:14 +02:00
Eugen Rochko
e136112ab7
Fix tag normalization and migration not removing duplicate tags (#11441) 
Fix #11428
 2019-07-29 20:40:21 +02:00
Eugen Rochko
784c88e16d
Fix emoji autosuggestions (#11442) 
Regression from cfb2ed7823
 2019-07-29 15:04:49 +02:00
Thibaut Girka
a4a81c5434 Fix crash in /web/lists 
Fixes #1181
 2019-07-29 00:34:39 +02:00
Eugen Rochko
b9b0313c78
Revert "Remove conversation URI (#11423)" (#11424) 
This reverts commit 75f7f9930e.
 2019-07-28 17:47:37 +02:00
Eugen Rochko
75f7f9930e
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
51411267fd [Glitch] Add search results pagination to web UI (#11409) 
Port 8a4674f2c3 to glitch-soc

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

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

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-07-28 16:45:36 +02:00
Thibaut Girka
bca3825c17 Merge branch 'master' into glitch-soc/merge-upstream 2019-07-28 16:28:05 +02:00
Eugen Rochko
cfb2ed7823
Add autosuggestions for hashtags (#11422) 2019-07-28 14:37:52 +02:00
dependabot-preview[bot]
15de24a425 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
0d80f686d8 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
9349f1067a Fix animate on hover in poll options without CW (#11404) 2019-07-28 13:48:04 +02:00
Jeong Arm
6a1f08d29a Prevent archiving when user set "noindex" (#11421) 2019-07-28 13:46:04 +02:00
ThibG
10e78ecf57 Change contrast of status links that are not mentions nor hashtags (#11406) 2019-07-28 06:00:51 +02:00
Eugen Rochko
f371b32137
Change hashtags to preserve first-used casing (#11416) 2019-07-28 05:59:51 +02:00
Eugen Rochko
4cc29eb5ad
Fix tabs bar scrolling along with content on mobile (#11418) 2019-07-27 19:25:15 +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
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
Thibaut Girka
2d35e4460a Merge branch 'master' into glitch-soc/merge-upstream 2019-07-24 16:23:53 +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
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
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
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
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
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