projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
Merge branch 'stable' into stable-sync/2.1.2
[akkoma]
/
lib
/
pleroma
/
user.ex
2020-07-14
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2020-07-14
Alex Gleason
Add :approval_pending to User @type account_status
blob
|
commitdiff
|
raw
|
diff to current
2020-07-14
Alex Gleason
AdminAPI: Add `PATCH /api/pleroma/admin/users/approve...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-14
feld
Merge branch 'feature/1922-media-proxy-whitelist' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-14
feld
Merge branch '1916-transmogrifier-skipping-oddities...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-14
Alex Gleason
Accept `reason` in POST /api/v1/accounts and store...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-13
Mark Felder
Merge branch 'develop' into refactor/notification_settings
blob
|
commitdiff
|
raw
|
diff to current
2020-07-13
feld
Merge branch 'config-behaviours-runtime' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-13
feld
Merge branch 'features/profile-fields-emojo' into ...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-13
feld
Merge branch 'fix/mediaproxy-cache-settings-types'...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-13
Alex Gleason
Make a user unapproved when registering with `account_a...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-13
Alex Gleason
Add `approval_pending` field to User
blob
|
commitdiff
|
raw
|
diff to current
2020-07-11
Maksim Pechnikov
fix reset confirmation email in admin section
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
feld
Merge branch 'fix/1924-s3-descriptions' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
Mark Felder
Merge branch 'develop' into issue/1790-updated-oban
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
feld
Merge branch 'proxy-range-and-chunk' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
lain
Merge branch 'chat-federation-information' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
lain
Merge branch 'mix-tasks-improvement' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
lain
Merge branch 'cluster-test-ci' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
Haelwenn
Merge branch 'develop' into 'admin-api-user-credentials...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
Haelwenn
Merge branch 'user-search-nickname-rank-boost' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-09
Haelwenn (lanodan...
user: Add support for custom emojis in profile fields
blob
|
commitdiff
|
raw
|
diff to current
2020-07-09
feld
Merge branch 'chore/use-the-alias' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-09
Mark Felder
Use the Pleroma.Config alias
blob
|
commitdiff
|
raw
|
diff to current
2020-07-09
Mark Felder
Merge branch 'develop' into fix/csp-for-captcha
blob
|
commitdiff
|
raw
|
diff to current
2020-07-09
lain
Merge branch '1723-token-fixes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-09
lain
Merge branch 'features/favicons' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-09
Haelwenn
Merge branch '1925-muting-reblogs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-09
Haelwenn
Merge branch 'follow-pipeline' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-09
lain
Merge branch 'bugfix/status-deletion' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-08
lain
ActivityPub: Remove `follow` and fix issues.
blob
|
commitdiff
|
raw
|
diff to current
2020-07-08
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-08
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-08
lain
Merge branch '1895-hashtag-timeline-restrict-unauthenti...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-08
Haelwenn (lanodan...
Move get_favicon to Pleroma.Instances, use /
blob
|
commitdiff
|
raw
|
diff to current
2020-07-08
Haelwenn (lanodan...
Add support for remote favicons
blob
|
commitdiff
|
raw
|
diff to current
2020-07-08
Haelwenn
Merge branch '1918-avatar-background-header-reset-2...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-07
lain
AccountController: Allow removal / reset of user images.
blob
|
commitdiff
|
raw
|
diff to current
2020-07-06
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-06
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-06
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-03
Mark Felder
Merge branch 'develop' into issue/1790-updated-oban
blob
|
commitdiff
|
raw
|
diff to current
2020-07-03
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-03
lain
Merge branch '1892-exclude-bots-from-search-results...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-03
lain
AccountController: Make setting accepts_chat_messages...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-03
lain
ActivityPub: Ingest information about chat acceptance.
blob
|
commitdiff
|
raw
|
diff to current
2020-07-03
lain
User, Migration: Change `accepts_chat_messages` to...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-03
lain
User: On registration, set `accepts_chat_messages`...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-02
Mark Felder
Merge branch 'develop' into activation-meta
blob
|
commitdiff
|
raw
|
diff to current
2020-07-02
Mark Felder
Merge branch 'develop' into feature/1885-MRF-metadata
blob
|
commitdiff
|
raw
|
diff to current
2020-07-02
lain
Merge branch 'feature/update-description' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-30
Haelwenn
Merge branch 'chore/rename-user-settings-column' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-30
Mark Felder
Merge branch 'develop' into activation-meta
blob
|
commitdiff
|
raw
|
diff to current
2020-06-30
Mark Felder
Rename user.settings column
blob
|
commitdiff
|
raw
|
diff to current
2020-06-30
lain
Merge branch 'preload-fixups-2' into preloadfixups
blob
|
commitdiff
|
raw
|
diff to current
2020-06-29
Egor Kislitsyn
Merge branch 'develop' into remove-twitter-api
blob
|
commitdiff
|
raw
|
diff to current
2020-06-29
lain
Merge branch '1031-parent-visible' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-26
Haelwenn
Merge branch 'block-handling' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-26
lain
User: Don't unfollow on block when the relevant setting...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-25
feld
Merge branch 'preload-data' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-25
Mark Felder
Merge branch 'develop' into refactor/notification_settings
blob
|
commitdiff
|
raw
|
diff to current
2020-06-25
lain
ActivityPub: Remove `block`.
blob
|
commitdiff
|
raw
|
diff to current
2020-06-23
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2020-06-23
Haelwenn
Merge branch 'feature/1631-redesign-mrf-configuration...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-23
lain
Merge branch 'issue/1798' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-23
lain
Merge branch 'fix_1586_provide_index_md' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-23
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-22
Haelwenn
Merge branch 'warning/mastofe-settings-blob' into ...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-22
lain
Merge branch 'add-muted-to-notifications' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-22
lain
Merge branch 'feature/1739-account-endpoints' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-22
lain
Merge branch 'fix/1825-admin-api-error-codes' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-22
rinpatch
Merge branch '1865-media-only' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-22
lain
Merge branch 'feature/1854-emoji-pagination' into ...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-20
lain
Merge branch 'bugfix/mix.exs-version-dot-git-less'...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-20
lain
Merge branch 'feature/support-bot-field-in-update-crede...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-20
lain
Merge branch 'develop' into '1865-media-only'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-19
feld
Merge branch 'issue/1855' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-19
Sergey Suprunenko
Add support for bot field in update_credentials
blob
|
commitdiff
|
raw
|
diff to current
2020-06-19
lain
Merge branch 'add-troubleshooting-info' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-19
lain
Merge branch '1873-pagination-fixes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-19
lain
Merge branch 'dry-up-follower-update' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-19
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-17
Mark Felder
Merge branch 'develop' into issue/1855
blob
|
commitdiff
|
raw
|
diff to current
2020-06-17
lain
Merge branch 'fix/1787-mogrify-args' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-17
rinpatch
Merge branch 'features/users-raw_bio' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-16
Alexander Strizhakov
moving custom ecto types in context folders
blob
|
commitdiff
|
raw
|
diff to current
2020-06-15
lain
User: update_follower_count refactor.
blob
|
commitdiff
|
raw
|
diff to current
2020-06-15
Maksim Pechnikov
Merge branch 'develop' into issue/1855
blob
|
commitdiff
|
raw
|
diff to current
2020-06-15
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-15
lain
Merge branch 'notifications-filtering' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-14
eugenijm
Mastodon API: ensure the notification endpoint doesn...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-12
Mark Felder
Merge branch 'develop' into preload-data
blob
|
commitdiff
|
raw
|
diff to current
2020-06-09
rinpatch
Merge branch 'release/2.0.6' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-09
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-08
Roman Chvanikov
merge develop
blob
|
commitdiff
|
raw
|
diff to current
2020-06-08
Egor Kislitsyn
Merge branch 'develop' into global-status-expiration
blob
|
commitdiff
|
raw
|
diff to current
2020-06-08
lain
Merge branch 'openapi/admin/relay' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-08
lain
Merge branch 'feature/delete-follow-requests-on-user...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-07
rinpatch
Merge branch 'recipients-query-speedup' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
next