projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Fix merge conflicts with upstream
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
controllers
/
timeline_controller.ex
2021-06-04
Sean King
Fix merge conflicts with upstream
blob
|
commitdiff
|
raw
2021-06-04
Haelwenn
Merge branch 'tests/openapi-everywhere' into 'develop'
blob
|
commitdiff
|
raw
2021-06-02
feld
Merge branch 'Snow-develop-patch-01683' into 'develop'
blob
|
commitdiff
|
raw
2021-06-01
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-06-01
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-06-01
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-06-01
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-06-01
Haelwenn
Merge branch 'features/validators-note' into 'develop'
blob
|
commitdiff
|
raw
2021-05-31
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-31
Haelwenn
Merge branch 'docs/goto-libera' into 'develop'
blob
|
commitdiff
|
raw
2021-05-30
Alex Gleason
Merge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-30
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-29
feld
Merge branch 'cycles-views' into 'develop'
blob
|
commitdiff
|
raw
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-29
Alex Gleason
Create real Views for all Controllers
blob
|
commitdiff
|
raw
|
diff to current
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-28
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-28
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-28
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-19
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-19
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-16
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-16
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-14
Alex Gleason
Merge remote-tracking branch 'upstream/attachment-meta...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-13
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-03
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-04-30
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-04-30
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-04-01
rinpatch
Merge branch 'refactor/object_validator_validate' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-21
rinpatch
Merge branch 'richmedia-workaround' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-03-19
rinpatch
Merge branch 'mediaproxy-decode' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-03-19
rinpatch
Merge branch 'fix/remove_auto_nsfw' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-03-19
rinpatch
Merge branch 'bugfix/bridgy-user-icon' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-03-16
Haelwenn
Merge branch 'update_open_api_spex' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-03-15
rinpatch
Merge branch 'feature/object-hashtags-rework' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-12
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-10
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-07
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-07
Ivan Tashkinov
[#3213] Performance optimization of filtering by hashta...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-02
lain
Merge branch 'release/2.3.0' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2021-03-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-26
feld
Merge branch 'ecto-rollback-in-test-env' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-23
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-16
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-12
rinpatch
Merge branch 'bugfix/answer-outbox' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-11
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
rinpatch
Merge branch 'feat/allow_alt_text_search_config' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-04
feld
Merge branch 'fix/configdb-error' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-03
feld
Merge branch 'develop' into 'fix/2412-filters'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-03
feld
Merge branch 'fix/2449-scheduled-poll-bug' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-03
feld
Merge branch 'feature/2438-users-posts-total-count...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-03
rinpatch
Merge branch 'feat/openapi-spec-export' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-03
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-02
feld
Merge branch 'email-stub-in-verify-credentials' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-02
Mark Felder
Merge branch 'develop' into a1batross-develop-patch...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-02
Mark Felder
Merge branch 'develop' into fix/majic-nits
blob
|
commitdiff
|
raw
|
diff to current
2021-02-02
feld
Merge branch 'develop' into 'fix/2411-mutes-api'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-02
feld
Merge branch 'fix/2473-purge-expired-activities-duplica...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-02
feld
Merge branch 'feature/2164-unify-api-arguments' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-02
feld
Merge branch 'develop' into 'feature/2164-unify-api...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-01
Alexander Strizhakov
list timeline filtration by params
blob
|
commitdiff
|
raw
|
diff to current
2021-02-01
Alexander Strizhakov
expanding filtration for home timeline
blob
|
commitdiff
|
raw
|
diff to current
2021-01-31
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-28
Ivan Tashkinov
[#3213] Reinstated DISTINCT clause for hashtag "any...
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-12-30
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-23
lain
Merge branch 'stable' into mergeback/2.2.1
blob
|
commitdiff
|
raw
|
diff to current
2020-12-15
lain
Merge branch 'support/2255_posix_errors' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-21
feld
Merge branch 'libmagic' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-21
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-21
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-20
feld
Merge branch 'fix/2302-report-duplicates' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-19
feld
Merge branch 'oban-jobs-to-simple-tasks' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-19
Haelwenn
Merge branch '2317-old-reset-tokens' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-19
lain
Merge branch 'hide-muted-reactions' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-18
minibikini
Merge branch 'develop' into 'hide-muted-reactions'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-17
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-17
Egor Kislitsyn
Merge branch 'develop' into hide-muted-reactions
blob
|
commitdiff
|
raw
|
diff to current
2020-11-17
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-17
rinpatch
Import stable commits into develop after releasing...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-16
Egor Kislitsyn
Hide reactions from muted and blocked users
blob
|
commitdiff
|
raw
|
diff to current
2020-11-15
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
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-11
Egor Kislitsyn
Merge branch 'develop' into frontend-admin-api
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-04
lain
Merge branch 'features/federation-status' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'restrict-domain' 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-10-29
Haelwenn
Merge branch 'issue/2069' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
next
projects / akkoma / history