projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
[#1364] Resolved merge conflicts with `develop`.
[akkoma]
/
test
/
conversation
/
participation_test.exs
2020-03-19
lain
Merge branch 'remake-remodel' into develop
blob
|
commitdiff
|
raw
2020-03-13
rinpatch
Merge branch 'feature/mastofe-admin-scope' into 'develop'
blob
|
commitdiff
|
raw
2020-03-13
rinpatch
Merge branch 'docs/direct_conversation_id' into 'develop'
blob
|
commitdiff
|
raw
2020-03-13
rinpatch
Merge branch 'static-accept-missing' into 'develop'
blob
|
commitdiff
|
raw
2020-03-09
lain
Merge branch 'patch-1' into 'develop'
blob
|
commitdiff
|
raw
2020-03-08
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
2020-03-08
rinpatch
Merge branch 'release/2.0.0' into 'stable'
blob
|
commitdiff
|
raw
2020-03-07
rinpatch
Merge branch 'restart-fix-for-mix-tasks' into 'develop'
blob
|
commitdiff
|
raw
2020-03-05
rinpatch
Merge branch 'stable' into release/2.0.0
blob
|
commitdiff
|
raw
2020-03-05
rinpatch
Merge branch 'stable' into release/2.0.0
blob
|
commitdiff
|
raw
2020-03-04
lain
Merge branch 'fix/no-email-no-fail' into 'develop'
blob
|
commitdiff
|
raw
2020-03-03
Alexander Strizhakov
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
2020-03-02
lain
Merge branch 'prepared-statements-settings' into 'develop'
blob
|
commitdiff
|
raw
2020-03-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
2020-03-02
Egor Kislitsyn
Merge branch 'develop' into fix/signup-without-email
blob
|
commitdiff
|
raw
2020-03-02
Haelwenn
Merge branch 'feature/1482-activity_pub_transactions...
blob
|
commitdiff
|
raw
2020-03-02
Haelwenn
Merge branch 'chores/bump-copyright' into 'develop'
blob
|
commitdiff
|
raw
2020-03-02
Haelwenn (lanodan...
Bump copyright years of files changed after 2020-01-07
blob
|
commitdiff
|
raw
2020-02-20
lain
Merge branch 'require-signature' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-30
rinpatch
Merge branch 'develop' into fix/disable-rate-limiter...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-28
lain
Merge branch 'translation/errors-french' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-27
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
|
diff to current
2020-01-22
rinpatch
Merge branch 'no-error-404' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-20
lain
Merge branch 'fix-admin-api-scope' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-15
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-15
Egor Kislitsyn
Merge branch 'develop' into notifications-from-account
blob
|
commitdiff
|
raw
|
diff to current
2020-01-14
Maksim Pechnikov
Merge branch 'develop' into feature/tag_feed
blob
|
commitdiff
|
raw
|
diff to current
2020-01-14
Alexander Strizhakov
Merge branch 'develop' into admin-be
blob
|
commitdiff
|
raw
|
diff to current
2020-01-13
lain
Merge branch 'feature/ci-registry' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-13
Maksim Pechnikov
Merge branch 'develop' into issue/1383
blob
|
commitdiff
|
raw
|
diff to current
2020-01-12
feld
Merge branch 'updated-at-on-conversation-read' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-05
eugenijm
Fix mark-as-read (`POST /api/v1/conversations/:id/read...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-24
Haelwenn
Merge branch 'feat/doc-improvements' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-12-21
Maksim Pechnikov
Merge branch 'develop' into issue/1383
blob
|
commitdiff
|
raw
|
diff to current
2019-12-21
rinpatch
Merge branch 'feature/custom-runtime-modules' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-19
Mark Felder
Merge branch 'develop' into config/benchmark
blob
|
commitdiff
|
raw
|
diff to current
2019-12-19
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-17
Maxim Filippov
Merge branch 'develop' into fix/disable-rate-limiter...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-17
Maksim Pechnikov
Merge branch 'develop' into feature/tag_feed
blob
|
commitdiff
|
raw
|
diff to current
2019-12-16
lain
Merge branch 'fix/remove-useless-sleep' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-12-15
rinpatch
tests: remove a useless sleep in rate limiter tests
blob
|
commitdiff
|
raw
|
diff to current
2019-12-15
rinpatch
tests: Replace 2 second sleep with offseting updated_at
blob
|
commitdiff
|
raw
|
diff to current
2019-12-11
Maxim Filippov
Merge branch 'develop' into feature/report-notes
blob
|
commitdiff
|
raw
|
diff to current
2019-12-11
Mark Felder
Merge branch 'develop' into issue/1411
blob
|
commitdiff
|
raw
|
diff to current
2019-12-10
Sadposter
Merge branch 'develop' into 'domain-block-precedence'
blob
|
commitdiff
|
raw
|
diff to current
2019-12-10
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-09
Egor Kislitsyn
Merge branch 'develop' into feature/custom-runtime...
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-09
lain
Merge branch 'fix/user-list-task' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-12-08
Maksim Pechnikov
Merge branch 'develop' into issue/1342
blob
|
commitdiff
|
raw
|
diff to current
2019-12-08
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
|
diff to current
2019-12-08
Maksim Pechnikov
Merge branch 'develop' into issue/1383
blob
|
commitdiff
|
raw
|
diff to current
2019-12-08
rinpatch
Merge branch 'improve-move-notificaions-api' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-06
rinpatch
Merge branch 'feature/1455-chat-character-limit' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-05
rinpatch
Merge branch 'develop' into fix/mrf-delete
blob
|
commitdiff
|
raw
|
diff to current
2019-12-05
lain
Merge branch '1335-user-api-id-fields-relations' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-04
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-11-29
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-11-26
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-11-21
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-11-20
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-11-19
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-11-19
Ivan Tashkinov
[#1335] Implemented notification mutes and reblog mutes...
blob
|
commitdiff
|
raw
|
diff to current
2019-11-18
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/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-10
Ivan Tashkinov
[#1335] User: refactored :blocks field into :blocked_us...
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-04
Maxim Filippov
Merge branch 'develop' into feature/reports-groups...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-29
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
|
diff to current
2019-10-28
Egor Kislitsyn
Merge branch 'develop' into feature/move-activity
blob
|
commitdiff
|
raw
|
diff to current
2019-10-28
lain
Merge branch 'refactor/following-relationships' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
Maxim Filippov
Merge branch 'develop' into feature/store-statuses...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'improve-user-info-migration' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
kaniini
Merge branch 'readme-pg-contrib' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-26
kaniini
Merge branch 'conversation-read-status-for-blocking...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-25
eugenijm
Mark the conversations with the blocked user as read...
blob
|
commitdiff
|
raw
|
diff to current
next