Ivan Tashkinov
|
610236d6be
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# docs/config.md
|
5 years ago |
|
rinpatch
|
62bbba80f3
|
Merge branch 'fix/truncate-remote-user-fields' into 'develop'
Truncate remote user fields
See merge request pleroma/pleroma!1619
|
5 years ago |
|
Ivan Tashkinov
|
6bcedb693c
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# docs/config.md
# mix.lock
|
5 years ago |
|
lain
|
53a3ad6043
|
Merge branch 'cleanup-activity' into 'develop'
Cleanup `Pleroma.Activity` and add more tests
See merge request pleroma/pleroma!1623
|
5 years ago |
|
Egor Kislitsyn
|
25d8216804
|
Add email change endpoint
|
5 years ago |
|
Egor Kislitsyn
|
39dc9b470c
|
Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils
|
5 years ago |
|
Ivan Tashkinov
|
ca1ba1e272
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
|
5 years ago |
|
Sadposter
|
2975da284b
|
truncate remote user bio/display name
|
5 years ago |
|
Sadposter
|
e73685834c
|
add mandatory fields for user update
|
5 years ago |
|
Sadposter
|
05c935c396
|
mix format
|
5 years ago |
|
Sadposter
|
35ef470d00
|
truncate fields for remote users instead
|
5 years ago |
|
Ivan Tashkinov
|
a90ea8ba15
|
[#1149] Addressed code review comments (code style, jobs pruning etc.).
|
5 years ago |
|
Ivan Tashkinov
|
e890ea7e82
|
[#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# config/config.exs
|
5 years ago |
|
rinpatch
|
90c2dae9a4
|
Remove most of Pleroma.Web.TwitterAPI.TwitterAPI
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
f3b1266273
|
user_test.exs: fix rel=me tests
|
5 years ago |
|
Ivan Tashkinov
|
7101ba1a21
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
|
5 years ago |
|
Ivan Tashkinov
|
256ff09aa8
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
|
5 years ago |
|
Maksim Pechnikov
|
85bd8a4e31
|
fixed clear config after test
|
5 years ago |
|
lain
|
74f7f308f8
|
Merge branch 'fix/admin-api-user-deletion' into 'develop'
Fix deactivated user deletion
See merge request pleroma/pleroma!1546
|
5 years ago |
|
Maksim
|
a320358703
|
added test helpers to clear config after tests
|
5 years ago |
|
lain
|
49ae3191df
|
Merge branch 'hotfix/user_unfollow' into 'develop'
[#1177] fixed User.unfollow with synchronization external user
See merge request pleroma/pleroma!1579
|
5 years ago |
|
Sadposter
|
58c1391c4d
|
use commonAPI in tests
|
5 years ago |
|
Sadposter
|
94e336d9d5
|
clear follow requests when blocking a user
|
5 years ago |
|
Maksim Pechnikov
|
3315a2a1c3
|
fixed User.unfollow with synchronization external user
|
5 years ago |
|
Maxim Filippov
|
ec969eec51
|
Merge branch 'develop' into 'fix/admin-api-user-deletion'
# Conflicts:
# CHANGELOG.md
|
5 years ago |
|
Maxim Filippov
|
2b94ae3b39
|
Do not check if actor is active when deleting a user
|
5 years ago |
|
Ivan Tashkinov
|
8778c16dac
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
|
5 years ago |
|
rinpatch
|
83a3de8cc4
|
Merge branch 'length-limit-bio' into 'develop'
Add configurable length limits for `User.bio` and `User.name`
See merge request pleroma/pleroma!1515
|
5 years ago |
|
Ivan Tashkinov
|
0e1c481a94
|
[#1149] Added more oban workers. Refactoring.
|
5 years ago |
|
Maxim Filippov
|
dfae61c25c
|
Fix deactivated user deletion
|
5 years ago |
|
Ivan Tashkinov
|
267262491e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
|
5 years ago |
|
Ivan Tashkinov
|
b7fad8d395
|
[#1149] Oban jobs implementation for :federator_incoming and :federator_outgoing queues.
|
5 years ago |
|
Roman Chvanikov
|
9d4f34fbcb
|
Merge branch 'develop' into feature/digest-email
|
5 years ago |
|
Ivan Tashkinov
|
23d279e03e
|
[#1149] Replaced RetryQueue with oban-based retries.
|
5 years ago |
|
Egor Kislitsyn
|
9ca4506355
|
Add configurable length limits for `User.bio` and `User.name`
|
5 years ago |
|
rinpatch
|
301ea0dc04
|
Add tests for counters being updated on follow
|
5 years ago |
|
Maksim
|
6a4b8b2681
|
fixed User.update_and_set_cache for stale user
|
5 years ago |
|
Roman Chvanikov
|
d2da3d30f3
|
Merge branch 'develop' into feature/digest-email
|
5 years ago |
|
Alexander Strizhakov
|
b70e659304
|
Feature/1087 wildcard option for blocks
|
5 years ago |
|
Roman Chvanikov
|
36049f08ef
|
Merge develop
|
5 years ago |
|
Ariadne Conill
|
62e5ff624e
|
user: add is_internal_user? helper function
|
5 years ago |
|
Roman Chvanikov
|
c729883936
|
Merge branch 'develop' into feature/digest-email
|
5 years ago |
|
Alexander Strizhakov
|
e7c39b7ac8
|
Feature/1072 muting notifications
|
5 years ago |
|
Roman Chvanikov
|
eae991b06a
|
merge develop
|
5 years ago |
|
Alex S
|
beba7bbc85
|
removing synchronization worker
|
5 years ago |
|
Sergey Suprunenko
|
2d2b50ccca
|
Send and handle "Delete" activity for deleted users
|
5 years ago |
|
Roman Chvanikov
|
371d39e160
|
Merge develop
|
5 years ago |
|
Alexander Strizhakov
|
d6b0fce6e9
|
Fix/1019 correct count remote users
|
5 years ago |
|
Maksim
|
6dadf5d6f4
|
[#1043] fix search accounts.
|
5 years ago |
|
Roman Chvanikov
|
657277ffc0
|
Resolve conflicts
|
5 years ago |
|
Sergey Suprunenko
|
2c63c67512
|
Rework user deletion
|
5 years ago |
|
Maksim
|
ee4ed87fb4
|
[#948] /api/v1/account_search added optional parameters (limit, offset, following)
|
5 years ago |
|
Egor Kislitsyn
|
6f29865d43
|
Add option to restrict all users to local content
|
5 years ago |
|
Roman Chvanikov
|
01fe5abad1
|
Resolve conflicts
|
5 years ago |
|
Egor
|
f82382de22
|
[#943] Make the unauthenticated users limitation optional
|
5 years ago |
|
kaniini
|
3f6da9c45a
|
Merge branch 'bugfix/377-stuck-follow-request' into 'develop'
Bugfix/377 stuck follow request
Closes #377
See merge request pleroma/pleroma!1250
|
5 years ago |
|
lain
|
076c9ae40e
|
User: Remove superfluous `maybe_follow`.
|
5 years ago |
|
Egor Kislitsyn
|
5b04f07a1e
|
Limit search for unauthenticated users to local users only
|
5 years ago |
|
lain
|
2b664b048e
|
User: Add function to get AP ids from nicknames.
|
5 years ago |
|
Roman Chvanikov
|
ce47017c89
|
Merge develop
|
5 years ago |
|
William Pitcock
|
045803346d
|
move key generation functions into Pleroma.Keys module
|
5 years ago |
|
Aaron Tinio
|
eb02edcad9
|
Add virtual :thread_muted? field
that may be set when fetching activities
|
5 years ago |
|
Alexander Strizhakov
|
7ed682213f
|
Fix/902 random compile failing
|
5 years ago |
|
Sergey Suprunenko
|
2c303afc8b
|
Remove duplicated entries in users' following lists
|
5 years ago |
|
lambda
|
fde30aee43
|
Merge branch 'feature/sql-thread-sat' into 'develop'
SQL thread visibility solver
See merge request pleroma/pleroma!971
|
5 years ago |
|
Alexander Strizhakov
|
73ae58fdfa
|
Feature/896 toggling confirmation
|
5 years ago |
|
William Pitcock
|
f09c3afdf5
|
chase test failures
|
5 years ago |
|
Egor Kislitsyn
|
5e2b491276
|
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
|
5 years ago |
|
Alexander Strizhakov
|
a2be420f94
|
differences_in_mastoapi_responses.md: fullname & bio are optionnal
[ci skip]
|
5 years ago |
|
Roman Chvanikov
|
b6b5b16ba4
|
Merge develop
|
5 years ago |
|
Egor Kislitsyn
|
1557b99beb
|
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
|
5 years ago |
|
Alexander Strizhakov
|
ce6ca0fefe
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
d70af32127
|
Pleroma.User: remove emojify on parse_bio
|
5 years ago |
|
Alex S
|
f11e7037c2
|
test fixes
|
5 years ago |
|
Roman Chvanikov
|
0f0cc2703b
|
Merge develop
|
5 years ago |
|
Egor Kislitsyn
|
c157e27a00
|
Merge branch 'develop' into feature/disable-account
|
5 years ago |
|
Alex S
|
73d01857e3
|
bookmarks in separate table
|
5 years ago |
|
Egor
|
b9cdf6d3b9
|
Use `User.get_cached*` everywhere
|
5 years ago |
|
Egor Kislitsyn
|
e8c2f9a73a
|
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
|
5 years ago |
|
Roman Chvanikov
|
60f213bb1a
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
|
6 years ago |
|
Roman Chvanikov
|
8add119444
|
Add User.list_inactive_users_query/1
|
6 years ago |
|
rinpatch
|
6069d0fd36
|
Fix object search depending on embeded object
|
6 years ago |
|
rinpatch
|
ff8d76c670
|
Refactor all tests that acessed the embeded object
|
6 years ago |
|
Egor Kislitsyn
|
dd097a406b
|
add tests
|
6 years ago |
|
Sadposter
|
be8350baa2
|
Merge branch 'develop' into feature/user-status-subscriptions
|
6 years ago |
|
Sachin Joshi
|
07afb9b537
|
update the follower count when a follower is blocked
|
6 years ago |
|
Sadposter
|
13ff312c48
|
Sever subscription in case of block
|
6 years ago |
|
lambda
|
ce9284b36f
|
Merge branch 'remove-user-activities' into 'develop'
[#757] Add mix task to delete user's activities
See merge request pleroma/pleroma!1008
|
6 years ago |
|
lambda
|
26d509cc86
|
Merge branch 'get_by_id' into 'develop'
Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible
See merge request pleroma/pleroma!1009
|
6 years ago |
|
cascode
|
95c92c49c9
|
Fix account lookup for nicknames beginning with numbers
|
6 years ago |
|
Egor Kislitsyn
|
11c2d6bdc4
|
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)` in tests
|
6 years ago |
|
Egor Kislitsyn
|
1b3d921921
|
change `Repo.get(User, id)` => `User.get_by_id(id)`
|
6 years ago |
|
Egor Kislitsyn
|
a14742f495
|
add `user delete_activities` mix task
|
6 years ago |
|
Maxim Filippov
|
3cf7539bca
|
Add more user filters + move search to its own module
|
6 years ago |
|
rinpatch
|
3229c7a1d6
|
Ensure fts is prefered over trigram and use union_all instead of union in user search query
|
6 years ago |
|
Maxim Filippov
|
ed8a2935f5
|
Use ILIKE to search users
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
a3a9cec483
|
[Credo] fix Credo.Check.Readability.AliasOrder
|
6 years ago |
|
kaniini
|
ace4231628
|
Merge branch 'features/bio_rel_me' into 'develop'
Add rel=me to the User bio
Closes #423
See merge request pleroma/pleroma!813
|
6 years ago |
|
kaniini
|
6c6a2dbfdd
|
Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
Add pagination and search to users
See merge request pleroma/pleroma!873
|
6 years ago |
|
eugenijm
|
1a1f4520cd
|
Use sql query in User.get_follow_requests/1 for filtering logic
|
6 years ago |
