projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge remote-tracking branch 'upstream/develop' into admin-create-users
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
views
/
user_view.ex
2019-06-01
Sachin Joshi
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2019-05-22
lambda
Merge branch 'feature/object-pruning' into 'develop'
blob
|
commitdiff
|
raw
2019-05-22
lambda
Merge branch 'refactor/keys' into 'develop'
blob
|
commitdiff
|
raw
2019-05-22
William Pitcock
move key generation functions into Pleroma.Keys module
blob
|
commitdiff
|
raw
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
2019-02-10
kaniini
Merge branch 'update-mastofe/glitch-soc-2019-02-10...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-10
kaniini
Merge branch 'feather_mention' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-10
kaniini
Merge branch 'fix/credo-issues' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-09
Haelwenn (lanodan...
de-group alias/es
blob
|
commitdiff
|
raw
|
diff to current
2019-02-09
Haelwenn (lanodan...
Credo fixes: alias grouping/ordering
blob
|
commitdiff
|
raw
|
diff to current
2019-02-08
lambda
Merge branch 'fix/do-split-migration-for-local-users...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-08
Karen Konou
Merge branch 'develop' into feature/thread-muting
blob
|
commitdiff
|
raw
|
diff to current
2019-02-08
rinpatch
Merge branch 'develop' into feature/keyword-policy
blob
|
commitdiff
|
raw
|
diff to current
2019-02-06
kaniini
Merge branch 'rename-followings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-06
Mark Felder
hide_followings was renamed to hide_followers in the...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-06
Haelwenn
Merge branch 'bugfix/rich-media-card' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-06
kaniini
Merge branch 'add-admin-and-moderator-fields' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-06
Haelwenn
Merge branch 'mr/exsyslogger-doc-and-format' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-06
rinpatch
Merge branch 'fix/activitypub-user-view-badmap' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-06
href
Fix if clause in activity_pub user_view
blob
|
commitdiff
|
raw
|
diff to current
2019-02-06
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-05
kaniini
Merge branch 'fix-dm-index' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-05
kaniini
Merge branch 'feature/ap-c2s-whoami' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-05
kaniini
Merge branch 'feature/split-hide-network-v2' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-04
kaniini
Merge branch 'mime-riff' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-03
Maxim Filippov
Split hide_network into hide_followers & hide_following...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-01
kaniini
Merge branch 'revert-0a82a7e6' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-01
kaniini
Revert "Merge branch 'feature/split-hide-network' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-01
href
Merge branch 'develop' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-01
kaniini
Merge branch 'feature/split-hide-network' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-31
kaniini
Merge branch 'spc-fix-3' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-29
kaniini
Merge branch 'hj-happiness-improvement' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-28
Maxim Filippov
Split hide_network into hide_followers & hide_followings
blob
|
commitdiff
|
raw
|
diff to current
2019-01-28
Ivan Tashkinov
[#534] Merged `upstream/develop`.
blob
|
commitdiff
|
raw
|
diff to current
2019-01-25
kaniini
Merge branch 'fix/tusky-dm' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-25
kaniini
Merge branch 'develop' into 'oembed_provider'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-25
kaniini
Merge branch 'classic-flakeids' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-23
href
Flake Ids for Users and Activities
blob
|
commitdiff
|
raw
|
diff to current
2019-01-13
rinpatch
Resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-01-05
kaniini
Merge branch 'fix_486' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-03
rinpatch
Merge branch 'captcha' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-01
lambda
Merge branch 'cleanup/admin-api-useless-if' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-01
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
kaniini
Merge branch 'features/admin-api-user-views' into ...
blob
|
commitdiff
|
raw
|
diff to current
next
projects / akkoma / history