projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'develop' into refactor/subscription
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
views
/
user_view.ex
2019-08-24
lain
Merge branch 'admin-create-users' into 'develop'
blob
|
commitdiff
|
raw
2019-08-24
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
2019-08-21
lain
Merge branch 'rate-limit-ap-routes' into 'develop'
blob
|
commitdiff
|
raw
2019-08-20
lain
Merge branch 'fix/admin-api-user-deletion' into 'develop'
blob
|
commitdiff
|
raw
2019-08-20
lain
Merge branch 'digest-template' into 'develop'
blob
|
commitdiff
|
raw
2019-08-20
lain
Merge branch 'feature/custom-fields' into 'develop'
blob
|
commitdiff
|
raw
2019-08-14
Egor Kislitsyn
Use info.fields instead of source_data for remote users
blob
|
commitdiff
|
raw
2019-08-14
Egor Kislitsyn
Linkify custom fields values in ActivityPub.UserViewx
blob
|
commitdiff
|
raw
|
diff to current
2019-08-14
Egor Kislitsyn
Add profile custom fields to ActivityPub.UserView
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-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-03
kaniini
Merge branch 'patch-2' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-03
Thibaut Girka
Refactor
blob
|
commitdiff
|
raw
|
diff to current
2019-08-03
Thibaut Girka
Only add `preferredUsername` to service actor json...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-03
Thibaut Girka
Add preferredUsername to service actors so Mastodon...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-20
rinpatch
Resolve merge conflicts
blob
|
commitdiff
|
raw
|
diff to current
2019-07-19
Roman Chvanikov
Merge develop
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-19
kaniini
Merge branch 'feature/richmedia-ttl' into 'develop'
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-17
kaniini
Merge branch 'feature/instance-fetch-actor' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-17
Ariadne Conill
activitypub: represent internal fetch actor
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-13
Maxim Filippov
Merge branch 'develop' into feature/admin-api-user...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-13
Haelwenn
Merge branch 'fix/hackney-global-options' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-13
Haelwenn
Merge branch 'fix/ap-hide-follows' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-12
rinpatch
Merge branch 'develop' into fix/ap-hide-follows
blob
|
commitdiff
|
raw
|
diff to current
2019-07-12
rinpatch
ActivityPub User view: Following/Followers refactoring
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-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
William Pitcock
move key generation functions into Pleroma.Keys module
blob
|
commitdiff
|
raw
|
diff to current
2019-05-14
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-08
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-05-07
lambda
Merge branch 'conversations_three' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-07
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-04
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-03
rinpatch
Merge branch 'fix/embeded-relationship-in-follows'...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-03
rinpatch
Merge branch 'fix-search-speed' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-03
lambda
Merge branch 'bugfix/emoji-size' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-03
Haelwenn (lanodan...
formatter.ex: Add get_emoji_map/1
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
Alex S
Merging with develop
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-12
lambda
Merge branch 'ssl_trusted_cert' into 'develop'
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-08
lain
Merge branch 'features/mastoapi/2.6.0-conversations...
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 'features/pleroma-tan' into 'develop'
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-27
lambda
Merge branch 'feature/more-user-filters' into 'develop'
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
lain
AP UserView: Refactor banner / avatar display code...
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-15
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
rinpatch
Merge develop to bump elixir version in the CI so I...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
rinpatch
Merge branch 'hotfix/delete-activities' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
link0ff
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-13
kaniini
Merge branch 'mastofe-content-types' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-13
lambda
Merge branch 'features/add-credo-to-ci' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-13
Haelwenn (lanodan...
[Credo] fix Credo.Check.Readability.AliasOrder
blob
|
commitdiff
|
raw
|
diff to current
2019-03-04
Karen Konou
Merge branch 'bugfix/delete-activity-audience' of git...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-26
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-22
kaniini
Merge branch 'fix/twittercards' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-22
kaniini
Merge branch 'bugfix/outbox-bomb-on-empty-activities...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-22
KZ
Fix: Fixing an outbox related bug when local user activ...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-19
Mark Felder
Merge branch 'develop' into fix/twittercards
blob
|
commitdiff
|
raw
|
diff to current
2019-02-18
kaniini
Merge branch 'feature/jobs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-18
kaniini
Merge branch 'feature/add-oauth-tokens-endpoint' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-17
lambda
Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-17
Ivan Tashkinov
[#468] Merged `upstream/develop`, resolved conflicts.
blob
|
commitdiff
|
raw
|
diff to current
2019-02-15
lambda
Merge branch 'bugfix/oauth-token-padding' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-15
rinpatch
Merge branch 'hellthread-filter-fix' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
lambda
Merge branch 'bugfix/activitypub-reserialization' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
Wim Vanderbauwhede
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
kaniini
Merge branch 'fix/credo-issues-test' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
Haelwenn
Merge branch 'bugfix/activitypub-totalitems-removal...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
William Pitcock
activitypub: user view: formatting
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
William Pitcock
activitypub: user view: report totalItems=0 for follows...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
William Pitcock
activitypub: user view: remove totalItems from user...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
William Pitcock
activitypub: user view: remove totalInbox from user...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
kaniini
Merge branch 'feature/activitypub-oauth-endpoints'...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
William Pitcock
activitypub: user view: do not expose oAuth endpoints...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-13
William Pitcock
activitypub: user view: use route helpers instead of...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-13
William Pitcock
activitypub: user view: add oauthRegistrationEndpoint...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-13
William Pitcock
activitypub: user view: fix up endpoints rendering
blob
|
commitdiff
|
raw
|
diff to current
2019-02-13
William Pitcock
user view: add AP C2S oauth endpoints to local user...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-11
Karen Konou
Merge branch 'develop' into feature/thread-muting
blob
|
commitdiff
|
raw
|
diff to current
2019-02-11
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
next