| Age | Commit message (Collapse) | Author |
|---|
|
Merge upstream changes
|
|
Regression from cfb2ed78231758a79af038a964ab7f7b7b35274e
|
|
Fixes #1181
|
|
Port 8a4674f2c3d89c998eb5438b96b7977dc2be3167 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 10e78ecf57242cc5030b903131bf27e027bb4a97 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 4eeff26533b75b592395e353c6d4506db9958bcf to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
|
|
|
|
|
|
|
|
* Add search results pagination to web UI
Fix #10737
* Fix code style issue
|
|
|
|
|
|
|
|
|
|
Port 7de8c51873b51d8450f7a6597a43d454964d0407 to glitch-soc
|
|
Fixes #11389
|
|
|
|
Port 4bd58b7f2da369a608eacb97f832728ddc139ce8 to glitch-soc
|
|
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
|
|
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.
|
|
|
|
Port ea7ad59af20af2aa6817b3b40dca34c8fba3373a to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Partial fix from 55abff8af75b9a8ab541ec68a3603c77e1339e23
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port ceed1ebe5b308a95f9c167c93d3bc0976937fb58 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
Port 5129f6f2aa56afb21708aec552a798d062ccaff9 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
* 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
|
|
Already displayed in public pages, but not WebUI
|
|
Merge upstream changes
|
|
|
|
Port SCSS changes from 730c4053d642024b9949d72c8a9f1873532c6212
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port SCSS changes from b8514561394767a10d3cf40132ada24d938c1680 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
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
|
|
Fix #10840
|
|
|
|
* 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
|
|
* 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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Port d723f2a0a88d4ac106638733b7ba17f8d205850a to glitch-soc
|
|
Port ef1134728145c6dcf094e7a0a16a8d63f70aed6c to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Fixes #1136
|
