projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
[#2497] Fixed merge issue.
[akkoma]
/
lib
/
pleroma
/
http
/
connection.ex
2020-06-01
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
2020-05-18
lain
Merge branch 'docs/storing-remote-media' into 'develop'
blob
|
commitdiff
|
raw
2020-05-14
lain
Merge branch 'features/openrc-console' into 'develop'
blob
|
commitdiff
|
raw
2020-04-22
lain
Merge branch 'docs/debian-packages' into 'develop'
blob
|
commitdiff
|
raw
2020-04-17
Haelwenn
Merge branch 'feature/1584-client-captcha-options'...
blob
|
commitdiff
|
raw
2020-04-11
rinpatch
Merge branch 'following-relationships-optimizations...
blob
|
commitdiff
|
raw
2020-04-10
Egor Kislitsyn
Merge branch 'develop' into global-status-expiration
blob
|
commitdiff
|
raw
2020-04-10
Egor Kislitsyn
Merge branch 'develop' into fix/support-conversations...
blob
|
commitdiff
|
raw
2020-04-10
Haelwenn
Merge branch 'bugfix/apc2s_upload_activity' into 'develop'
blob
|
commitdiff
|
raw
2020-04-09
lain
Merge branch 'fix/1658-invite-send' into 'develop'
blob
|
commitdiff
|
raw
2020-04-09
lain
Merge branch 'open-api' into 'develop'
blob
|
commitdiff
|
raw
2020-04-07
rinpatch
Merge branch 'fix-auto-link-for-profile-fields' into...
blob
|
commitdiff
|
raw
2020-04-06
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
2020-04-06
lain
Merge branch 'featureflag/emoji_reactions' into 'develop'
blob
|
commitdiff
|
raw
2020-04-06
lain
Merge branch 'remake-remodel-2' into 'develop'
blob
|
commitdiff
|
raw
2020-04-02
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
2020-04-01
feld
Merge branch 'update/adminfe-20200331' into 'develop'
blob
|
commitdiff
|
raw
2020-04-01
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
2020-04-01
feld
Merge branch 'gun' into 'develop'
blob
|
commitdiff
|
raw
2020-03-30
Alexander Strizhakov
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
2020-03-20
Alexander Strizhakov
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
2020-03-19
lain
Merge branch 'remake-remodel' into develop
blob
|
commitdiff
|
raw
|
diff to current
2020-03-18
Alexander Strizhakov
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
2020-03-16
Alexander Strizhakov
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
2020-03-16
Alexander Strizhakov
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
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-13
Alexander Strizhakov
more clean up
blob
|
commitdiff
|
raw
2020-03-12
Alexander Strizhakov
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
|
diff to current
2020-03-12
Alexander Strizhakov
clean up
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-10
Alexander Strizhakov
add verify tls_opts only when we open connection
blob
|
commitdiff
|
raw
|
diff to current
2020-03-09
lain
Merge branch 'patch-1' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-09
Alexander Strizhakov
Merge branch 'develop' into gun
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
Alexander Strizhakov
Merge branch 'develop' into gun
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
Alexander Strizhakov
little polishing
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-03-03
Alexander Strizhakov
adapter renaming to adapter_helper
blob
|
commitdiff
|
raw
|
diff to current
2020-03-03
Alexander Strizhakov
proxy parsing errors
blob
|
commitdiff
|
raw
|
diff to current
2020-03-03
Alexander Strizhakov
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
|
diff to current
2020-03-01
Alexander Strizhakov
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
|
diff to current
2020-02-29
Alexander Strizhakov
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
|
diff to current
2020-02-21
Alexander Strizhakov
hackney pool timeout
blob
|
commitdiff
|
raw
|
diff to current
2020-02-21
Alexander Strizhakov
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
|
diff to current
2020-02-18
Mark Felder
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
|
diff to current
2020-02-18
Alexander Strizhakov
adding gun adapter
blob
|
commitdiff
|
raw
|
diff to current
2020-01-28
lain
Merge branch 'translation/errors-french' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
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-02
Roman Chvanikov
Merge branch 'develop' into feature/digest-email
blob
|
commitdiff
|
raw
|
diff to current
2019-07-31
rinpatch
Merge branch 'develop' into feature/hide-follows-remote
blob
|
commitdiff
|
raw
|
diff to current
2019-07-28
kaniini
Merge branch 'develop' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-28
kaniini
Merge branch 'feature/hackney-303-redirect' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-28
Sergey Suprunenko
Handle 303 redirects
blob
|
commitdiff
|
raw
|
diff to current
2019-07-20
rinpatch
Resolve merge conflicts
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
kaniini
Merge branch '1041-status-actions-rate-limit' into...
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-12
rinpatch
Merge the default options with custom ones in ReversePr...
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-04
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
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-02
kaniini
Merge branch 'feature/notification-control-part-2'...
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
Haelwenn
Merge branch 'dokku' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-29
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-05-28
kaniini
Merge branch 'respect-proxy-settings-federation' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-28
jeff
Respect proxy settings federation
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
rinpatch
Merge branch 'bugfix/account_view_source.note' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-22
kaniini
Merge branch 'mongooseim-support' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-21
kaniini
Merge branch 'trivial/increase-hackney-timeouts' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-21
William Pitcock
http: bump connection timeout to 10 seconds
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-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-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-08
kaniini
Merge branch 'bugfix/tesla-safety' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
next
projects / akkoma / history