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
2019-07-21 20:57:42 +02:00
ThibG
bd7b1538f1
[Glitch] Fix followers and followings on account profiles
...
Partial fix from 55abff8af7
2019-07-21 20:57:42 +02:00
Jakub Mendyk
c614abb95d
[Glitch] Fix followers/follows layout issues from #8418
...
Port ceed1ebe5b
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
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
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
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
ThibG
4fa6472523
Fix avatar animation on hover when not logged in ( #11349 )
2019-07-19 09:18:23 +02:00
koyu
8df0022e66
Added logout to dropdown menu ( #11353 )
...
* 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
2019-07-19 03:58:46 +02:00
ThibG
fda437a020
Fix sanitizing lists contents ( #11354 )
...
* Add test
* Fix code for sanitizing nested lists stripping all tags
2019-07-19 01:44:58 +02:00
ThibG
730c4053d6
Add ActivityPub actor representing the entire server ( #11321 )
...
* 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
2019-07-19 01:44:42 +02:00
Thibaut Girka
f170e0492f
Fix timestamp display in boost/fav modals in RTL locales
2019-07-18 20:56:20 +02:00
Thibaut Girka
4c28511e4e
Fixups
2019-07-18 20:56:20 +02:00
Thibaut Girka
45cee95b14
Public pages RTL fixes
2019-07-18 20:56:20 +02:00
Thibaut Girka
c1752b238f
Unfiy status__prepend with upstream
2019-07-18 20:56:20 +02:00
Thibaut Girka
b021efdefe
RTL fixes
2019-07-18 20:56:20 +02:00
Thibaut Girka
964c78c118
Fix some SCSS for RTL behavior
2019-07-18 20:56:20 +02:00
Thibaut Girka
4199f7fd87
Minor fixup
2019-07-18 20:56:20 +02:00
Eugen Rochko
b743308928
[Glitch] Fix RTL layout of status display names
...
Port d723f2a0a8
2019-07-18 20:56:20 +02:00
Masoud Abkenar
bcaea5a9e9
[Glitch] RTL: fix settings button margins in column headers
...
Port ef11347281
2019-07-18 20:56:20 +02:00
Thibaut Girka
fabfa90e6c
Make width breakpoint for removing margins consistent and match upstream
...
Fixes #1136
2019-07-18 20:55:38 +02:00
Thibaut Girka
6ff285d948
Fix *another* typo and crash in StatusIcons
2019-07-18 09:54:59 +02:00
Thibaut Girka
a2df11ebaf
Fix typo and crash in StatusIcons
2019-07-18 09:42:22 +02:00
Eugen Rochko
84e988479e
Fix only one middle dot being recognized in hashtags ( #11345 )
...
Fix #10934
2019-07-18 03:02:56 +02:00
Eugen Rochko
4906cabc6b
Add aac, m4a, 3gp to allowed audio formats ( #11342 )
...
Fix #11186
2019-07-18 03:02:30 +02:00
Eugen Rochko
5bfe1e1f05
Change language detection to include hashtags as words ( #11341 )
2019-07-18 03:02:15 +02:00
ThibG
87f4aea52a
Fix typo in StatusPolicy ( #11344 )
2019-07-18 00:48:26 +02:00
Thibaut Girka
46687a3cbd
Shorten status icon tooltip text
2019-07-17 21:35:34 +02:00
Thibaut Girka
572009cf56
Add status icon for local-only toots
2019-07-17 21:35:34 +02:00
Thibaut Girka
7db7cb31b1
Add tooltips to status icons
2019-07-17 21:35:34 +02:00
ThibG
7e2b6da57f
Add setting to disable the anti-spam ( #11296 )
...
* Add environment variable to disable the anti-spam
* Move antispam setting to admin settings
* Fix typo
* antispam → spam_check
2019-07-17 21:09:15 +02:00
