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
/
status_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-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-30
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-28
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-28
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-28
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-19
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-19
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-16
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-16
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-14
Alex Gleason
Merge remote-tracking branch 'upstream/attachment-meta...
blob
|
commitdiff
|
raw
2021-05-13
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2021-05-03
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-04-30
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
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-04-16
rinpatch
Merge branch 'features/ingestion-ecto-tag' into 'develop'
blob
|
commitdiff
|
raw
2021-04-16
rinpatch
Merge branch 'feature/521-pinned-post-federation' into...
blob
|
commitdiff
|
raw
2021-03-25
Alexander Strizhakov
Let pins federate
blob
|
commitdiff
|
raw
2021-03-19
rinpatch
Merge branch 'fix/remove_auto_nsfw' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-03-03
lain
Revert "StatusController: Deactivate application suppor...
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
lain
Linting.
blob
|
commitdiff
|
raw
|
diff to current
2021-03-02
lain
StatusController: Deactivate application support for...
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-03-01
Haelwenn
Merge branch 'application-to-generator' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-03-01
Mark Felder
Store application details in the object under the gener...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-28
lain
Merge branch 'features/reports-enhancements' into ...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-28
lain
Merge branch 'admin-api-versioning' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-28
lain
Merge branch 'bugfix/peertube-mpegURL-object' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-28
lain
Merge branch 'feat/client_app_details' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-27
Mark Felder
Store the client application data in ActivityStreams...
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-18
Mark Felder
Tests to validate client disclosure obeys user setting
blob
|
commitdiff
|
raw
|
diff to current
2021-02-18
Mark Felder
Mastodon makes this field null when posting with MastoF...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-12
Mark Felder
App is already preloaded into the token, so avoid an...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-11
Mark Felder
Consistency
blob
|
commitdiff
|
raw
|
diff to current
2021-02-11
Mark Felder
Revert to original formatting for these function defs
blob
|
commitdiff
|
raw
|
diff to current
2021-02-11
Mark Felder
Prefer naming this put_application because we're puttin...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-11
Mark Felder
%Token{} may not be in the conn, so avoid breaking...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-10
Mark Felder
Ensure we capture the application details into the...
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
2021-01-08
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-08
lain
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-07
lain
Merge branch 'cleanup/unused-proxy-opts' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-07
lain
Merge branch 'object-normalize-refactor' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-05
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-04
lain
Object: Rework how Object.normalize works
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-10
lain
Merge branch '2260-wrong-report-link' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-05
lain
Merge branch 'feature/expire-mutes' into 'develop'
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 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
feld
Merge branch 'chore/elixir-1.11' 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
2020-10-29
feld
Merge branch 'fix/frontend-cli-docs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-29
feld
Merge branch 'issue/2137-user-filters-admin-fe' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-29
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-28
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-27
minibikini
Merge branch 'develop' into 'feature/local-only-scope'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-27
Mark Felder
Merge branch 'develop' into feature/account-export
blob
|
commitdiff
|
raw
|
diff to current
2020-10-27
feld
Merge branch '1668-prometheus-access-restrictions'...
blob
|
commitdiff
|
raw
|
diff to current
next