projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'develop' into tests/mastodon_api_controller.ex
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
account_view.ex
2019-09-23
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
2019-09-19
Haelwenn
Merge branch 'docs/clients-update' into 'develop'
blob
|
commitdiff
|
raw
2019-09-18
Haelwenn
Merge branch 'issue/733' into 'develop'
blob
|
commitdiff
|
raw
2019-09-18
rinpatch
Merge branch 'chores/bump-copyright-year' into 'develop'
blob
|
commitdiff
|
raw
2019-09-18
feld
Merge branch 'hide-follower-following-count' into ...
blob
|
commitdiff
|
raw
2019-09-17
eugenijm
Mastodon API: Add a setting to hide follow/follower...
blob
|
commitdiff
|
raw
2019-08-24
lain
Merge branch 'admin-create-users' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-24
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-22
Ivan Tashkinov
[#1149] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-21
lain
Merge branch 'rate-limit-ap-routes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-20
lain
Merge branch 'fix/admin-api-user-deletion' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-20
lain
Merge branch 'digest-template' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-20
lain
Merge branch 'feature/custom-fields' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-19
lain
Merge branch 'develop' into 'fix/reverse-proxy-body...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-18
kaniini
Merge branch 'feature/hide-muted-threads-from-timeline...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-16
lain
Merge branch 'pleroma-conversations' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-15
kaniini
Merge branch 'features/formatting-sub_sup' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-15
lain
Merge branch 'cache-follow-state' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-14
Maxim Filippov
Merge branch 'develop' into 'fix/admin-api-user-deletion'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-14
rinpatch
Cache follow state
blob
|
commitdiff
|
raw
|
diff to current
2019-08-14
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-14
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-14
Egor Kislitsyn
Use info.fields instead of source_data for remote users
blob
|
commitdiff
|
raw
|
diff to current
2019-08-14
Egor Kislitsyn
Add custom profile fields
blob
|
commitdiff
|
raw
|
diff to current
2019-08-13
rinpatch
Merge branch 'length-limit-bio' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-10
kaniini
Merge branch 'fix/hide-follows-counters' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-10
kaniini
Merge branch 'develop' into 'fix/hide-follows-counters'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-09
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-09
rinpatch
Mastodon API: Set follower/following counters to 0...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-08
lain
Merge branch 'feature/digest-email' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-08
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-07
rinpatch
Merge branch 'patch-3' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-07
Thibaut Girka
Return profile URL in MastodonAPI's `url` field
blob
|
commitdiff
|
raw
|
diff to current
2019-08-07
Thibaut Girka
Simplify logic to mention.js `url` field
blob
|
commitdiff
|
raw
|
diff to current
2019-08-07
Thibaut Girka
Return profile URL when available instead of actor...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-02
Roman Chvanikov
Merge branch 'develop' into feature/digest-email
blob
|
commitdiff
|
raw
|
diff to current
2019-07-25
rinpatch
Merge branch 'develop' into feature/hide-follows-remote
blob
|
commitdiff
|
raw
|
diff to current
2019-07-24
kaniini
Merge branch 'fix-remote-follow-from-ostatus-subscribe...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-24
kaniini
Merge branch 'domain-blocking-relationship-api' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-24
Eugenij
Add `domain_blocking` to the relationship API (GET...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-20
rinpatch
Resolve merge conflicts
blob
|
commitdiff
|
raw
|
diff to current
2019-07-19
Mark Felder
Merge branch 'develop' into feature/matstodon-statuses...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-18
Maxim Filippov
Merge branch 'develop' into feature/admin-api-user...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-16
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-07-16
kaniini
Merge branch 'add-deactivated-to-account-view' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-16
Eugenij
Add `pleroma.deactivated` to the Account entity (Mastod...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-16
kaniini
Merge branch 'add-blocked-by-to-relationship' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-16
Eugenij
Add the `blocked_by` attribute to the relationship...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-15
Mark Felder
Merge branch 'develop' into feature/matstodon-statuses...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-15
Sachin Joshi
Merge branch 'develop' into match-file-name
blob
|
commitdiff
|
raw
|
diff to current
2019-07-15
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-14
Roman Chvanikov
Merge branch 'develop' into feature/digest-email
blob
|
commitdiff
|
raw
|
diff to current
2019-07-14
kaniini
Merge branch 'bugfix/llal-object-containment' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-14
kaniini
Merge branch 'feature/1072-muting-notifications' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-14
Alexander Strizhakov
Feature/1072 muting notifications
blob
|
commitdiff
|
raw
|
diff to current
2019-07-11
Egor Kislitsyn
Merge branch 'develop' into feature/addressable-lists
blob
|
commitdiff
|
raw
|
diff to current
2019-06-28
Roman Chvanikov
Resolve conflicts
blob
|
commitdiff
|
raw
|
diff to current
2019-06-23
Sachin Joshi
Merge branch 'develop' into 'remove-avatar-header'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-21
kaniini
Merge branch 'oauth_secure_redirect' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-20
rinpatch
Merge branch 'feature/release-update-script' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-19
rinpatch
Merge branch 'begone-the-dot-hack' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-19
lain
Merge branch 'fix/rich-media-hashtags-again' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-19
lain
Merge branch 'update-frontend-c4fcdc71' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-18
lain
Merge branch 'deps/update-auto-linker' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-18
lain
Merge branch 'fix/mastoapi-sanitize-display-name' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-18
rinpatch
Mastodon API: Sanitize display names
blob
|
commitdiff
|
raw
|
diff to current
2019-06-16
rinpatch
Merge branch 'fix/991-version-generation' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-15
lain
Merge branch 'bugfix/980-polls-double-vote' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-15
kaniini
Merge branch '963_oob_oauth_redirect_fix' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-15
rinpatch
Merge branch 'feature/add-chat-token-to-masto-api'...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-15
lain
Mastodon API: Return the token needed for the chat.
blob
|
commitdiff
|
raw
|
diff to current
2019-06-14
rinpatch
Merge branch 'feature/add-background-image-to-mastoapi...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-13
lain
AccountView: Add user background.
blob
|
commitdiff
|
raw
|
diff to current
2019-06-05
kaniini
Merge branch 'explicit-addressing' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-05
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Roman Chvanikov
Fix conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Haelwenn
Merge branch 'remove-tag-warning' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Haelwenn
Merge branch 'bugfix/956-activity-id-nil-conversations...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
lain
Merge branch 'issue/941' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Maksim Pechnikov
Merge branch 'develop' into issue/941
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Maksim Pechnikov
Merge branch 'develop' into issue/941
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
kaniini
Merge branch 'feature/mrf-subchain' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
kaniini
Merge branch 'generic-fe-settings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
Maksim Pechnikov
update api to set skip_thread_containment
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
Mark Felder
Merge branch 'develop' into update-oauth-template
blob
|
commitdiff
|
raw
|
diff to current
2019-06-01
rinpatch
Resolve merge conflicts
blob
|
commitdiff
|
raw
|
diff to current
2019-06-01
Sachin Joshi
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-31
lain
AccountView: settings -> settings_store
blob
|
commitdiff
|
raw
|
diff to current
2019-05-31
lain
User: Add settings store to Info, AccountView
blob
|
commitdiff
|
raw
|
diff to current
2019-05-29
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-05-24
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-23
Sachin Joshi
fix merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-05-22
lambda
Merge branch 'feature/object-pruning' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-22
lambda
Merge branch 'refactor/keys' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-22
rinpatch
Merge branch 'bugfix/account_view_source.note' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-22
Haelwenn (lanodan...
MastoAPI AccountView: fill source.note with plaintext...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-18
rinpatch
Resolve merge conflicts and remove IO.inspects
blob
|
commitdiff
|
raw
|
diff to current
2019-05-17
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
next