projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
Merge remote-tracking branch 'origin/develop' into reactions
[akkoma]
/
lib
/
pleroma
/
user.ex
2019-05-01
Alex S
test fixes
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
Alex S
Merging with develop
blob
|
commitdiff
|
raw
|
diff to current
2019-04-30
Sachin Joshi
Merge branch 'develop' into bugfix/web-notification...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-30
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-04-27
kaniini
Merge branch 'feature/bbcode' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-26
lambda
Merge branch 'feature/807-bookmark-endpoint-extension...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-25
Alex S
migration without using old field name
blob
|
commitdiff
|
raw
|
diff to current
2019-04-25
Egor Kislitsyn
Merge branch 'develop' into feature/disable-account
blob
|
commitdiff
|
raw
|
diff to current
2019-04-25
Alex S
migrate user.bookmarks to separate table
blob
|
commitdiff
|
raw
|
diff to current
2019-04-25
Alex S
bookmarks in separate table
blob
|
commitdiff
|
raw
|
diff to current
2019-04-23
kaniini
Merge branch 'security/fix-html-class-scrubbing' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-22
kaniini
Merge branch 'get-cached-everywhere' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-22
Egor
Use `User.get_cached*` everywhere
blob
|
commitdiff
|
raw
|
diff to current
2019-04-22
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-20
Roman Chvanikov
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-20
Roman Chvanikov
Digest emails
blob
|
commitdiff
|
raw
|
diff to current
2019-04-19
Roman Chvanikov
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-19
Roman Chvanikov
Fix tests
blob
|
commitdiff
|
raw
|
diff to current
2019-04-19
Roman Chvanikov
Add User.list_inactive_users_query/1
blob
|
commitdiff
|
raw
|
diff to current
2019-04-19
lambda
Merge branch '923_oauth_consumer_refactoring_ci' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-17
Roman Chvanikov
Resolve conflicts
blob
|
commitdiff
|
raw
|
diff to current
2019-04-17
Roman Chvanikov
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-17
rinpatch
Merge branch 'develop' into feature/database-compaction
blob
|
commitdiff
|
raw
|
diff to current
2019-04-16
kaniini
Merge branch 'feature/788-separate-email-addresses...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-15
lambda
Merge branch 'fix/status-reblogged' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-14
rinpatch
Merge branch 'bugfix/registration-email-pattern' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-14
Sadposter
Revert "Assert on the success of enqueue before returning"
blob
|
commitdiff
|
raw
|
diff to current
2019-04-14
Sadposter
Assert on the success of enqueue before returning
blob
|
commitdiff
|
raw
|
diff to current
2019-04-14
Sadposter
Always return {atom, _} from try_send_confirmation
blob
|
commitdiff
|
raw
|
diff to current
2019-04-14
Sadposter
fix pattern match on user registration
blob
|
commitdiff
|
raw
|
diff to current
2019-04-14
Roman Chvanikov
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-13
Alex S
Merge develop to 788-separate-email-addresses
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
Egor Kislitsyn
add tests
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'features/mastoapi/2.6.0-min_id-pagination...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'fix/732-password-align' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'ssl_trusted_cert' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-11
kaniini
Merge branch 'fix/hackney_max_body_param' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-11
Egor Kislitsyn
fix format
blob
|
commitdiff
|
raw
|
diff to current
2019-04-11
Egor Kislitsyn
move user disable into deactivation
blob
|
commitdiff
|
raw
|
diff to current
2019-04-11
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
Alex S
Merge branch 'develop' into feature/788-separate-email...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
lambda
Merge branch 'feature/767-multiple-use-invite-token...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
lambda
Merge branch 'feature/user-status-subscriptions' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
Sadposter
Merge branch 'develop' into feature/user-status-subscri...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
lambda
Merge branch 'fix/emoji-api-nonsense' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
Haelwenn (lanodan...
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
Haelwenn (lanodan...
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
kaniini
Merge branch 'hotfix/fix_undefined_summary' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
kaniini
Merge branch 'notification-pleroma-settings' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-09
rinpatch
Merge branch 'mastoapi/plaintext-statuses' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-09
lambda
Merge branch 'bugfix/follower_count' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-09
Sachin Joshi
update the follower count when a follower is blocked
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
Sadposter
Used cached user resources in subscriptions
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
lain
Merge branch 'features/mastoapi/2.6.0-conversations...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
Sadposter
Use Pleroma.Config instead of Application.get_env
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
Sadposter
Sever subscription in case of block
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
lambda
Merge branch 'improve_upgrade_user_from_ap_id' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
lambda
Merge branch 'twitter_oauth' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-05
Sadposter
Change relationship direction of subscriptions
blob
|
commitdiff
|
raw
|
diff to current
2019-04-05
Sadposter
Add subscribed status to user view
blob
|
commitdiff
|
raw
|
diff to current
2019-04-05
Sadposter
Make subscriptions the same direction as blocks
blob
|
commitdiff
|
raw
|
diff to current
2019-04-05
Sadposter
Add notification checks
blob
|
commitdiff
|
raw
|
diff to current
2019-04-05
Sadposter
Add API endpoints and user column for subscription
blob
|
commitdiff
|
raw
|
diff to current
2019-04-04
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'bugfix/wrong-date-format' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'feature/fake-statuses' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Alex S
Merging develop into feature/770-add-emoji-tags
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'bugfix/share-mastodon' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'remove-user-activities' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Alex S
Merge develop into feature/770-add-emoji-tags
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'features/pleroma-tan' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'features/mastoapi/2.6.0-force-login-optio...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'get_by_id' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Egor Kislitsyn
change `Repo.get(User, id)` => `User.get_by_id(id)`
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Egor Kislitsyn
add `user delete_activities` mix task
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-01
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-29
lambda
Merge branch 'feature/deploy-docs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-28
eugenijm
Add PUT /api/pleroma/notification_settings endpoint
blob
|
commitdiff
|
raw
|
diff to current
2019-03-27
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-27
lambda
Merge branch 'feature/more-user-filters' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-26
Maxim Filippov
Add more user filters + move search to its own module
blob
|
commitdiff
|
raw
|
diff to current
2019-03-26
lambda
Merge branch 'fix/ap-icon' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-26
lambda
Merge branch 'features/mastoapi/2.7.2-instance-attribut...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-26
lain
AP UserView: Refactor banner / avatar display code...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-26
lambda
Merge branch 'features/mastoapi/2.7.0-auth-error-messag...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-26
Ivan Tashkinov
Mastodon-based auth error messages. Defaulted User...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-25
Mark Felder
Attempt to fix incorrect federation of default instance...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-25
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-24
rinpatch
Merge branch 'features/mrf-keyword-nil-summary' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-24
rinpatch
Merge branch 'fix/eldap-warnings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-24
kaniini
Merge branch 'feature/object-normalize-preload' into...
blob
|
commitdiff
|
raw
|
diff to current
next