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
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
ThibG
f1597e1ab9
Merge pull request #1158 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-07-21 00:53:28 +02:00
Lady Lumb
0ed0c77266
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.
2019-07-20 16:39:48 +02:00
Thibaut Girka
055450bc02
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-19 23:37:41 +02:00
ThibG
c37c1da41e
Disallow numeric-only hashtags ( #11363 )
...
* Add spec covering numeric-only hashtags
* Fix hashtag regex
2019-07-19 23:22:35 +02:00
ThibG
650459f93c
Fix some flash notices/alerts staying on unrelated pages ( #11364 )
2019-07-19 23:13:21 +02:00
Thibaut Girka
86d4461948
Fix HTML entities being encoded as hashtag links…
2019-07-19 20:15:03 +02:00
Thibaut Girka
249b7c7c12
Fix filtering behaviors
2019-07-19 19:21:20 +02:00
ThibG
490cf3aa03
[Glitch] Add ActivityPub actor representing the entire server
...
Port SCSS changes from 730c4053d6
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-19 18:35:45 +02:00
Eugen Rochko
bf3ab44e77
Remove Atom feeds and old URLs in the form of GET /:username/updates/:id
...
Port SCSS changes from b851456139
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-19 18:27:26 +02:00
Thibaut Girka
249991c498
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
2019-07-19 18:26:49 +02:00
Eugen Rochko
aa22b38fdb
Change single-column mode to scroll the whole page ( #11359 )
...
Fix #10840
2019-07-19 09:25:22 +02:00