lain
|
249b31ffe5
|
Fix specs.
|
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 |
|
Alexander Strizhakov
|
73ae58fdfa
|
Feature/896 toggling confirmation
|
5 years ago |
|
Mark Felder
|
1caa6331ea
|
Group def perform() together to fix the build
|
5 years ago |
|
lambda
|
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 |
|
William Pitcock
|
ac3a3abf6b
|
clean up follow/block imports a little
|
5 years ago |
|
Egor Kislitsyn
|
b92c004ea8
|
Reuse query from User.restrict_deactivated/1
|
5 years ago |
|
Egor Kislitsyn
|
5e2b491276
|
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
|
5 years ago |
|
William Pitcock
|
69a9e0563c
|
user: migrate follow/blocks import to job queue
|
5 years ago |
|
William Pitcock
|
32d4630c9c
|
user: move initial post fetching to job queue
|
5 years ago |
|
Alexander Strizhakov
|
a2be420f94
|
differences_in_mastoapi_responses.md: fullname & bio are optionnal
[ci skip]
|
5 years ago |
|
Alexander Strizhakov
|
bfeb33e951
|
Merge develop
Merge conflict in lib/pleroma/activity.ex
|
5 years ago |
|
rinpatch
|
06947c9147
|
Remove bookmarks assoc
|
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 |
|
Alex S
|
bdfa3a6fa8
|
Merging with develop
Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
|
5 years ago |
|
Alex S
|
229ce6abbc
|
migration without using old field name
removing old field from db, after bookmarks migration
|
5 years ago |
|
Egor Kislitsyn
|
c157e27a00
|
Merge branch 'develop' into feature/disable-account
|
5 years ago |
|
Alex S
|
324c9c8ab5
|
migrate user.bookmarks to separate table
|
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 |
|
Sadposter
|
e513504e88
|
Revert "Assert on the success of enqueue before returning"
This reverts commit 16d8c8b33b.
Because it breaks everything
|
6 years ago |
|
Sadposter
|
16d8c8b33b
|
Assert on the success of enqueue before returning
|
6 years ago |
|
Sadposter
|
5e45557751
|
Always return {atom, _} from try_send_confirmation
|
6 years ago |
|
Sadposter
|
ec42b639a3
|
fix pattern match on user registration
deliver_async will return a single atom
|
6 years ago |
|
lambda
|
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 |
|
Egor Kislitsyn
|
dd097a406b
|
add tests
|
6 years ago |
|
Egor Kislitsyn
|
46bd5c1d87
|
fix format
|
6 years ago |
|
Egor Kislitsyn
|
db4badc6aa
|
move user disable into deactivation
|
6 years ago |
|
Egor Kislitsyn
|
0f2f7d2cec
|
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
|
6 years ago |
|
Sadposter
|
be8350baa2
|
Merge branch 'develop' into feature/user-status-subscriptions
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
9c1b36856b
|
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
1791ee8ec4
|
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
|
6 years ago |
|
kaniini
|
97395e013e
|
Merge branch 'notification-pleroma-settings' into 'develop'
Notification controls
Closes #738
See merge request pleroma/pleroma!988
|
6 years ago |
|
lambda
|
0a02ed7a2f
|
Merge branch 'bugfix/follower_count' into 'develop'
update the follower count when a follower is blocked
See merge request pleroma/pleroma!1033
|
6 years ago |
|
Sachin Joshi
|
07afb9b537
|
update the follower count when a follower is blocked
|
6 years ago |
|
Sadposter
|
589629cf3e
|
Used cached user resources in subscriptions
|
6 years ago |
|
Sadposter
|
87a01f9ee0
|
Use Pleroma.Config instead of Application.get_env
|
6 years ago |
|
Sadposter
|
13ff312c48
|
Sever subscription in case of block
|
6 years ago |
|
Sadposter
|
9ca91cbb87
|
Change relationship direction of subscriptions
|
6 years ago |
|
Sadposter
|
d56866c824
|
Add subscribed status to user view
Added in pleroma extensions, but can be moved whenever
|
6 years ago |
|
Sadposter
|
316fe20d86
|
Make subscriptions the same direction as blocks
That being, user - subscribes to -> users, rather than
user - has subscribers -> users
|
6 years ago |
|
Sadposter
|
007762e767
|
Add notification checks
|
6 years ago |
|
Sadposter
|
79910ce5cc
|
Add API endpoints and user column for subscription
|
6 years ago |
|
Ivan Tashkinov
|
45765918c3
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# mix.exs
|
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 |
