projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge pull request 'stable release' (#160) from develop into stable
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
controllers
/
conversation_controller.ex
2021-04-30
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2021-04-29
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2021-03-19
rinpatch
Merge branch 'fix/remove_auto_nsfw' into 'develop'
blob
|
commitdiff
|
raw
2021-03-02
lain
Merge branch 'release/2.3.0' into 'stable'
blob
|
commitdiff
|
raw
2021-02-28
lain
Merge branch 'feat/client_app_details' into 'develop'
blob
|
commitdiff
|
raw
2021-02-26
feld
Merge branch 'ecto-rollback-in-test-env' into 'develop'
blob
|
commitdiff
|
raw
2021-02-24
Haelwenn
Merge branch 'docfix/chat-token' into 'develop'
blob
|
commitdiff
|
raw
2021-02-23
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
2021-02-20
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
2021-02-18
rinpatch
Merge branch 'fix/chats-no-unread-in-openapi' into...
blob
|
commitdiff
|
raw
2021-02-17
rinpatch
Merge branch 'test-docker-images' into 'develop'
blob
|
commitdiff
|
raw
2021-02-17
Haelwenn
Merge branch 'chore/documentation-relicensing' into...
blob
|
commitdiff
|
raw
2021-02-17
Haelwenn
Merge branch 'feat/chat-list-pagination' into 'develop'
blob
|
commitdiff
|
raw
2021-02-17
rinpatch
Merge branch 'remove-conversation-api' into 'develop'
blob
|
commitdiff
|
raw
2021-02-15
Egor Kislitsyn
Add API endpoint to remove a conversation
blob
|
commitdiff
|
raw
2021-01-23
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-20
feld
Merge branch 'deprecate-public_endpoint' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-19
rinpatch
Merge branch 'stable' into mergeback/2.2.2
blob
|
commitdiff
|
raw
|
diff to current
2021-01-15
Haelwenn
Merge branch 'optimize-command_available' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-13
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-13
Haelwenn
Merge branch 'chores/bump-copyright' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-13
Haelwenn (lanodan...
Bump Copyright to 2021
blob
|
commitdiff
|
raw
|
diff to current
2020-11-21
feld
Merge branch 'libmagic' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-12
rinpatch
Merge branch 'release/2.2.0' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'default-mrf' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'ejabberd-pleroma-auth' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-01
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-29
Haelwenn
Merge branch 'issue/2069' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-26
Haelwenn
Merge branch 'docs/ap_c2s' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-17
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-14
Mark Felder
Merge branch 'develop' into feature/account-export
blob
|
commitdiff
|
raw
|
diff to current
2020-10-14
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-14
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-14
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-14
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Mark Felder
Merge branch 'develop' into feature/gen-magic
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Mark Felder
Merge branch 'develop' into chore/elixir-1.11
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Mark Felder
Merge branch 'develop' into refactor/locked_user_field
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Mark Felder
Merge branch 'develop' into refactor/discoverable_user_...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
feld
Merge branch 'feature/1822-files-consistency' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Alexander Strizhakov
alias alphabetically order
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Alexander Strizhakov
OAuthScopesPlug module name
blob
|
commitdiff
|
raw
|
diff to current
2020-08-28
lain
Merge branch 'release/2.1.0' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-08-25
lain
Merge branch 'stable' of git.pleroma.social:pleroma...
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-19
sadposter
Merge branch 'develop' of https://git.pleroma.social...
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-12
Mark Felder
Merge branch 'develop' into preload-data
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-08
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-08
lain
Merge branch 'activity-pub-use-atoms-as-keys' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-06
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-05
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-05
Haelwenn
Merge branch 'features/apc2s-pagination' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-04
Egor Kislitsyn
Use atoms as keys in `ActivityPub.fetch_*` functions...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-04
Egor Kislitsyn
Merge branch 'develop' into openapi/admin/config
blob
|
commitdiff
|
raw
|
diff to current
2020-06-03
stwf
Merge branch 'preload-data' of git.pleroma.social:stwf...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-02
feld
Merge branch 'fix/1794-hashtag-search-results' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-02
Egor Kislitsyn
Merge branch 'develop' into openapi/admin/relay
blob
|
commitdiff
|
raw
|
diff to current
2020-06-02
lain
Merge branch 'openapi/admin/oauth-apps' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-02
lain
Merge branch 'tagline' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-02
lain
Merge branch 'openapi/admin/invites' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-02
lain
Merge branch 'feature/status-by-id-account-view' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-01
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-01
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-30
Haelwenn
Merge branch 'chore/bump-hackney' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-30
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-30
lain
Merge branch 'conversation-pagination' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-30
Steven Fuchs
Conversation pagination
blob
|
commitdiff
|
raw
|
diff to current
2020-05-18
lain
Merge branch 'docs/storing-remote-media' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-16
lain
Merge branch 'develop' into 'remove-twitter-api'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-14
lain
Merge branch 'features/openrc-console' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-10
lain
Merge branch 'shortening-modules-name' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-08
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-08
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-07
Haelwenn
Merge branch 'feature/restrict-c2s' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-07
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-07
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-07
lain
Merge branch 'openapi/polls' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-06
rinpatch
Merge branch 'feature/delete-validator' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-06
Maksim Pechnikov
Merge branch 'develop' into issue/1276-2
blob
|
commitdiff
|
raw
|
diff to current
2020-05-06
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-06
lain
Merge branch 'plug-if-unless-func-options-refactoring...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-06
lain
Merge branch 'openapi/subscriptions' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-06
lain
Merge branch 'openapi/markers' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-06
lain
Merge branch 'bugfix/sensitive_object' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-06
lain
Merge branch 'fix/1726-user-pagination' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-06
lain
Merge branch 'openapi/follow_requests' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-06
lain
Merge branch 'openapi/filters' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-06
lain
Merge branch 'feature/1728-webfinger-acct-scheme' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-06
lain
Merge branch 'openapi/instance' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-06
lain
Merge branch 'openapi/lists' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-06
lain
Merge branch 'openapi/conversations' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-05
Egor Kislitsyn
Add OpenAPI spec for ConversationController
blob
|
commitdiff
|
raw
|
diff to current
2020-05-05
Egor Kislitsyn
Merge branch 'develop' into global-status-expiration
blob
|
commitdiff
|
raw
|
diff to current
2020-05-02
rinpatch
Merge branch 'feature/1710-consolidate-instance-info...
blob
|
commitdiff
|
raw
|
diff to current
next