ThibG
e2ac47141f
[Glitch] Fix crash when expanding search results for hashtags
...
Port e85805138a
to glitch-soc
2019-07-30 12:31:02 +02:00
Thibaut Girka
4973ba2d1f
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
a13ba1cc7b
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
e85805138a
Fix crash when expanding search results for hashtags ( #11447 )
2019-07-30 12:06:21 +02:00
Eugen Rochko
825dc3ca22
Add whitelist mode ( #11291 )
2019-07-30 11:10:46 +02:00
ThibG
a7a6563f22
Merge pull request #1179 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-07-29 23:37:14 +02:00
Eugen Rochko
c111bd01a4
Fix tag normalization and migration not removing duplicate tags ( #11441 )
...
Fix #11428
2019-07-29 20:40:21 +02:00
Eugen Rochko
32d2260a8c
Fix emoji autosuggestions ( #11442 )
...
Regression from 450b8a70a5
2019-07-29 15:04:49 +02:00
Thibaut Girka
ce25139d5d
Fix crash in /web/lists
...
Fixes #1181
2019-07-29 00:34:39 +02:00
Eugen Rochko
172bf17555
Revert "Remove conversation URI ( #11423 )" ( #11424 )
...
This reverts commit 47bf2698c2
.
2019-07-28 17:47:37 +02:00
Eugen Rochko
47bf2698c2
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
a71d66ab0e
[Glitch] Add search results pagination to web UI ( #11409 )
...
Port 5119a0608d
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-28 17:10:52 +02:00
ThibG
1c3117f682
[Glitch] Change contrast of status links that are not mentions nor hashtags
...
Port 6701b9329d
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-28 16:47:36 +02:00
Eugen Rochko
16b5fe3ac3
[Glitch] Change account domain block to clear out notifications and follows
...
Port 93a6ab5a32
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-28 16:45:36 +02:00
Thibaut Girka
6c7a3268c9
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-28 16:28:05 +02:00
Eugen Rochko
450b8a70a5
Add autosuggestions for hashtags ( #11422 )
2019-07-28 14:37:52 +02:00
dependabot-preview[bot]
1cf7bdede4
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
7d13da568e
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
13b0943e36
Fix animate on hover in poll options without CW ( #11404 )
2019-07-28 13:48:04 +02:00
Jeong Arm
c4e5f4698c
Prevent archiving when user set "noindex" ( #11421 )
2019-07-28 13:46:04 +02:00
ThibG
6701b9329d
Change contrast of status links that are not mentions nor hashtags ( #11406 )
2019-07-28 06:00:51 +02:00
Eugen Rochko
b8386076c5
Change hashtags to preserve first-used casing ( #11416 )
2019-07-28 05:59:51 +02:00
Eugen Rochko
5e0ccb3020
Fix tabs bar scrolling along with content on mobile ( #11418 )
2019-07-27 19:25:15 +02:00
Eugen Rochko
5119a0608d
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
9c617b3b3a
Add search syntax for operators and phrases ( #11411 )
2019-07-27 04:42:08 +02:00
Eugen Rochko
2854c8e4d6
Remove timestamps from converted images to make them deterministic ( #11408 )
2019-07-27 04:41:55 +02:00
ThibG
52cda33b82
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
93a6ab5a32
Change account domain block to clear out notifications and follows ( #11393 )
2019-07-25 04:17:35 +02:00
Thibaut Girka
df7b27753c
Fix links in status media having their title rewritten
2019-07-24 21:46:09 +02:00
Thibaut Girka
124a1d3880
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-24 16:23:53 +02:00
Rey Tucker
24d2316f63
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
bf93e0c7c0
Handle animated emoji on mouse hover in CWs and poll options
2019-07-23 16:24:21 +02:00
ThibG
b01e5e372f
[Glitch] Play animated custom emoji on hover
...
Port 99b3dd5b00
to glitch-soc
2019-07-23 16:24:21 +02:00
ThibG
1635e401b6
Fix scrolling in single-column mode on Chrome ( #11395 )
...
Fixes #11389
2019-07-23 15:47:18 +02:00
dependabot-preview[bot]
884e20c028
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
09a68ce895
Refactor DisplayName component to make it closer to upstream
2019-07-23 10:51:12 +02:00
Thibaut Girka
4eb0c50699
[Glitch] Display custom emoji in bio field names
...
Port 2582701b72
to glitch-soc
2019-07-23 10:51:12 +02:00
Thibaut Girka
403eca7ad6
Revert some refactoring in order to make codebase closer to upstream
2019-07-23 10:51:12 +02:00
Thibaut Girka
579ccb0bb9
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
6be7b414e2
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
79b9eee938
Add (back) rails-level JSON caching ( #11333 )
2019-07-21 22:32:16 +02:00
Thibaut Girka
f447eef7cd
Clean up redundant shouldUpdateScroll definitions
2019-07-21 20:57:42 +02:00
Eugen Rochko
06990c0ece
[Glitch] Fix mutes, blocks, domain blocks and follow requests not paginating
...
Port 8ff757ed6a
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-21 20:57:42 +02:00
ThibG
9b58e25df5
[Glitch] Fix followers and followings on account profiles
...
Partial fix from 513f59726a
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-21 20:57:42 +02:00
Jakub Mendyk
1d58c95a8b
[Glitch] Fix followers/follows layout issues from #8418
...
Port 816384cf32
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-21 20:57:42 +02:00
Thibaut Girka
b67c436220
Add empty column message to bookmarks column
2019-07-21 20:57:42 +02:00
Jakub Mendyk
be07e0038c
[Glitch] Add messages informing that collections are empty
...
Port 6fae7f6a04
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-21 20:57:42 +02:00
ThibG
ee7254e8eb
Fix boost to original audience not working on mobile ( #11371 )
2019-07-21 18:11:09 +02:00
ThibG
99b3dd5b00
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
9027d911d0
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