8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
560dbad538
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
e457fcc479
Add `:max_remote_account_fields` config option
5 years ago
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
0e1c481a94
[ #1149 ] Added more oban workers. Refactoring.
5 years ago
a2b98f6d58
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
5 years ago
5ff8f07ca9
Merge branch 'feature/hide-follows-remote' into 'develop'
...
Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users
See merge request pleroma/pleroma!1411
5 years ago
f88560accd
Conversations: Add recipient list to conversation participation.
...
This enables to address the same group of people every time.
5 years ago
9ca4506355
Add configurable length limits for `User.bio` and `User.name`
5 years ago
301ea0dc04
Add tests for counters being updated on follow
5 years ago
58443d0cd6
tests for TwitterApi/UtilController
5 years ago
f42719506c
Fix credo issues
5 years ago
c88a5d3251
Merge branch 'develop' into feature/hide-follows-remote
5 years ago
6a4b8b2681
fixed User.update_and_set_cache for stale user
5 years ago
41e0304757
Merge branch 'develop' into feature/hide-follows-remote
5 years ago
4504135894
Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)
5 years ago
d2da3d30f3
Merge branch 'develop' into feature/digest-email
5 years ago
c49a09ed88
tests for Pleroma.Web.ActivityPub.Publisher
5 years ago
54a161cb7a
move unauth'd user blocks?/2 check
5 years ago
b70e659304
Feature/1087 wildcard option for blocks
5 years ago
196cad46f3
Resolve merge conflicts
5 years ago
d4ee76ab63
Apply suggestion to lib/pleroma/user.ex
5 years ago
8292331b35
Merge branch 'develop' into feature/digest-email
5 years ago
d0198fe215
[ #1112 ] Preserving `id` on user insert conflict on order not to violate conversation_partipations_user_id_fkey constraint.
5 years ago
36049f08ef
Merge develop
5 years ago
62e5ff624e
user: add is_internal_user? helper function
5 years ago
4885473be2
user: refactor get_or_create_instance_user() into get_or_create_service_actor_by_id()
5 years ago
9bca70b10a
Merge develop
5 years ago
c32384c1ea
tests for Pleroma.Signature
5 years ago
c729883936
Merge branch 'develop' into feature/digest-email
5 years ago
e7c39b7ac8
Feature/1072 muting notifications
5 years ago
0c2dcb4c69
Add follow information refetching after following/unfollowing
5 years ago
e8fa477793
Refactor Follows/Followers counter syncronization
...
- Actually sync counters in the database instead of info cache (which got
overriden after user update was finished anyway)
- Add following count field to user info
- Set hide_followers/hide_follows for remote users based on http status
codes for the first collection page
5 years ago
eae991b06a
merge develop
5 years ago
beba7bbc85
removing synchronization worker
5 years ago
f8786fa6f2
adding following_address field to user
5 years ago
2d2b50ccca
Send and handle "Delete" activity for deleted users
5 years ago
371d39e160
Merge develop
5 years ago
d6b0fce6e9
Fix/1019 correct count remote users
5 years ago
6dadf5d6f4
[ #1043 ] fix search accounts.
5 years ago
657277ffc0
Resolve conflicts
5 years ago
a0c4ebb4d7
[ #184 ] small refactoring reset password
5 years ago
2c63c67512
Rework user deletion
5 years ago
c2ca1f22a2
it is changed in compile time
...
we can't change module attributes and endpoint settings in runtime
5 years ago
01fe5abad1
Resolve conflicts
5 years ago
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
a511d2f900
Merge branch 'improve-search' into 'develop'
...
[#943 ] Contain search for unauthenticated users
See merge request pleroma/pleroma!1220
5 years ago
076c9ae40e
User: Remove superfluous `maybe_follow`.
5 years ago
024dfdc39c
Typo + Linting.
5 years ago
8b9a0dd4a7
User: Don't error out when following a user that's already followed.
...
This leads to a few situations where it is impossible to follow a user.
5 years ago
1cb245c982
Fix formatting
5 years ago
5b04f07a1e
Limit search for unauthenticated users to local users only
5 years ago
6ef145b4fc
Merge branch 'develop' into feature/digest-email
5 years ago
2b664b048e
User: Add function to get AP ids from nicknames.
5 years ago
ad5263c647
Merge remote-tracking branch 'upstream/develop' into admin-create-users
5 years ago
5534d4c676
make bulk user creation from admin works as a transaction
5 years ago
6872c5f88f
Mastodon API search default value for "resolve" is false
...
https://docs.joinmastodon.org/api/rest/accounts/
https://docs.joinmastodon.org/api/rest/search/
5 years ago
99f70c7e20
Use Pleroma.Config everywhere
5 years ago
ce47017c89
Merge develop
5 years ago
045803346d
move key generation functions into Pleroma.Keys module
5 years ago
daeae8e2e7
Move default mascot configuration to `config/`
5 years ago
249b31ffe5
Fix specs.
5 years ago
7ed682213f
Fix/902 random compile failing
5 years ago
2c303afc8b
Remove duplicated entries in users' following lists
5 years ago
73ae58fdfa
Feature/896 toggling confirmation
5 years ago
1caa6331ea
Group def perform() together to fix the build
5 years ago
692919c7d2
Merge branch 'refactor/use-job-queue-everywhere' into 'develop'
...
use job queue everywhere
Closes #862
See merge request pleroma/pleroma!1142
5 years ago
ac3a3abf6b
clean up follow/block imports a little
5 years ago
b92c004ea8
Reuse query from User.restrict_deactivated/1
5 years ago
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
69a9e0563c
user: migrate follow/blocks import to job queue
5 years ago
32d4630c9c
user: move initial post fetching to job queue
5 years ago
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
5 years ago
f1f7a11222
Merge develop
5 years ago
bfeb33e951
Merge develop
...
Merge conflict in lib/pleroma/activity.ex
5 years ago
b6b5b16ba4
Merge develop
5 years ago
06947c9147
Remove bookmarks assoc
5 years ago
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
5 years ago
d70af32127
Pleroma.User: remove emojify on parse_bio
5 years ago
f11e7037c2
test fixes
5 years ago
bdfa3a6fa8
Merging with develop
...
Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
5 years ago
0f0cc2703b
Merge develop
5 years ago
229ce6abbc
migration without using old field name
...
removing old field from db, after bookmarks migration
5 years ago
c157e27a00
Merge branch 'develop' into feature/disable-account
5 years ago
324c9c8ab5
migrate user.bookmarks to separate table
5 years ago
73d01857e3
bookmarks in separate table
5 years ago
b9cdf6d3b9
Use `User.get_cached*` everywhere
5 years ago
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
64a2c6a041
Digest emails
6 years ago
bc7862106d
Fix tests
6 years ago
8add119444
Add User.list_inactive_users_query/1
6 years ago
2f0203a4a1
Resolve conflicts
6 years ago
e513504e88
Revert "Assert on the success of enqueue before returning"
...
This reverts commit 16d8c8b33b
6 years ago
16d8c8b33b
Assert on the success of enqueue before returning
6 years ago
5e45557751
Always return {atom, _} from try_send_confirmation
6 years ago
ec42b639a3
fix pattern match on user registration
...
deliver_async will return a single atom
6 years ago
184ae60b21
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
...
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
6 years ago
dd097a406b
add tests
6 years ago
Ivan Tashkinov