projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
conversation_view.ex
2020-08-28
lain
Merge branch 'release/2.1.0' into 'stable'
blob
|
commitdiff
|
raw
2020-08-25
Haelwenn
Merge branch 'buildx-multiarch-arm32v7' into 'develop'
blob
|
commitdiff
|
raw
2020-08-25
lain
Merge branch 'stable' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
2020-08-05
Roman Chvanikov
Merge branch 'develop' into command-available-check
blob
|
commitdiff
|
raw
2020-07-31
Haelwenn (lanodan...
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2020-07-29
lain
Merge branch 'issue/1023' into 'develop'
blob
|
commitdiff
|
raw
2020-07-27
lain
Merge branch 'develop' into 'cleanup/masto_fe-default_s...
blob
|
commitdiff
|
raw
2020-07-26
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2020-07-23
feld
Merge branch 'unblock-domain-via-query' into 'develop'
blob
|
commitdiff
|
raw
2020-07-23
feld
Merge branch 'feature/add-mrf-related-policies' into...
blob
|
commitdiff
|
raw
2020-07-23
Haelwenn
Merge branch '1976-status-view-fixes' into 'develop'
blob
|
commitdiff
|
raw
2020-07-23
Maksim Pechnikov
Merge branch 'develop' into issue/1934-welcome-email
blob
|
commitdiff
|
raw
2020-07-23
lain
Merge branch '1973-chats-fix-with-restrict-unauthentica...
blob
|
commitdiff
|
raw
2020-07-22
Ivan Tashkinov
[#1973] Fixed accounts rendering in GET /api/v1/pleroma...
blob
|
commitdiff
|
raw
2020-06-30
Mark Felder
Merge branch 'develop' into activation-meta
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-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-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-22
lain
Merge branch 'feature/1739-account-endpoints' 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 'develop' into '1865-media-only'
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
Haelwenn
Merge branch '1866-last-status-stuff' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-15
lain
Conversations: Return last dm for conversation, not...
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
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-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-05
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
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-05-18
lain
Merge branch 'docs/storing-remote-media' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-14
lain
Merge branch 'features/openrc-console' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-04-22
lain
Merge branch 'docs/debian-packages' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-19
lain
Merge branch 'remake-remodel' into develop
blob
|
commitdiff
|
raw
|
diff to current
2020-03-13
rinpatch
Merge branch 'feature/mastofe-admin-scope' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-13
rinpatch
Merge branch 'docs/direct_conversation_id' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-13
rinpatch
Merge branch 'static-accept-missing' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-12
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-11
feld
Merge branch 'fix/signup-without-email' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-11
feld
Merge branch 'relay-list-change' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-09
lain
Merge branch 'patch-1' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-08
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
|
diff to current
2020-03-08
rinpatch
Merge branch 'release/2.0.0' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-07
rinpatch
Merge branch 'restart-fix-for-mix-tasks' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-06
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-05
rinpatch
Merge branch 'stable' into release/2.0.0
blob
|
commitdiff
|
raw
|
diff to current
2020-03-05
rinpatch
Merge branch 'stable' into release/2.0.0
blob
|
commitdiff
|
raw
|
diff to current
2020-03-04
feld
Merge branch 'exclude-reblogs-from-admin-api-by-default...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-04
lain
Merge branch 'fix/no-email-no-fail' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-03
Mark Felder
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
|
diff to current
2020-03-03
Haelwenn
Merge branch 'chore/update-copyrights' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-03
Mark Felder
Update Copyrights
blob
|
commitdiff
|
raw
|
diff to current
2020-01-28
lain
Merge branch 'translation/errors-french' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-12-09
lain
Merge branch 'exclude-visibilities-for-like-notificatio...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-05
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
|
diff to current
2019-12-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-02
lain
Merge branch 'feature/move-activity' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-11-21
lain
Merge branch 'issue/1348' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-11-15
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-11-15
rinpatch
Merge branch 'bugfix/1395-email-activation' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-11-14
Maxim Filippov
Merge branch 'develop' into feature/admin-api-list...
blob
|
commitdiff
|
raw
|
diff to current
2019-11-14
rinpatch
Merge branch 'fix/conversations-rendering' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-11-14
rinpatch
format the code
blob
|
commitdiff
|
raw
|
diff to current
2019-11-14
Egor Kislitsyn
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-11-12
Mark Felder
Fix rendering conversations when there's a malformed...
blob
|
commitdiff
|
raw
|
diff to current
2019-11-11
lain
Merge branch 'iss-1376' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-11-08
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-11-05
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-11-05
Maxim Filippov
Merge branch 'develop' into feature/multiple-users...
blob
|
commitdiff
|
raw
|
diff to current
2019-11-04
Maxim Filippov
Merge branch 'develop' into feature/reports-groups...
blob
|
commitdiff
|
raw
|
diff to current
2019-11-04
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
|
diff to current
2019-11-04
rinpatch
Merge branch 'failing-search-fixes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-11-04
lain
Merge branch 'add-direct-conversation-id-to-conversatio...
blob
|
commitdiff
|
raw
|
diff to current
2019-11-04
eugenijm
Mastodon API, streaming: Add `pleroma.direct_conversati...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-10
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-04
lain
Merge branch 'featrue/job-monitor' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-02
Ivan Tashkinov
[#1234] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-02
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-02
kaniini
Merge branch 'feature/send-identifier-on-oauth-error...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
kPherox
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
Ivan Tashkinov
[#1260] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
kaniini
Merge branch 'split-masto-api/accounts' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
Egor Kislitsyn
Fix merge
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
kaniini
Merge branch 'features/apc2s-media-upload' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
kaniini
Merge branch 'split-masto-api/reports' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
kaniini
Merge branch 'split-masto-api/conversations' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
Egor Kislitsyn
Extract conversation actions from `MastodonAPIControlle...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-29
kaniini
Merge branch 'feature/follow-requests-count' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-28
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-27
kaniini
Merge branch 'refactor/status-controller' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
next