projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Merge branch 'refactor/locked_user_field' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
controllers
/
scrobble_controller.ex
2020-10-13
Mark Felder
Merge branch 'develop' into refactor/locked_user_field
blob
|
commitdiff
|
raw
2020-10-13
feld
Merge branch 'feature/1822-files-consistency' into...
blob
|
commitdiff
|
raw
2020-10-13
Alexander Strizhakov
alias alphabetically order
blob
|
commitdiff
|
raw
2020-10-13
Alexander Strizhakov
OAuthScopesPlug module name
blob
|
commitdiff
|
raw
|
diff to current
2020-08-28
lain
Merge branch 'release/2.1.0' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-08-25
lain
Merge branch 'stable' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
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
Mark Felder
Merge branch 'develop' into refactor/notification_settings
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-17
rinpatch
Merge branch 'features/users-raw_bio' into 'develop'
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-06-01
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-01
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-21
lain
Merge branch 'features/emoji_stealer' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-21
lain
Merge branch 'issue/749' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-21
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-20
Haelwenn
Merge branch 'chore/update-config-fe' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-20
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-20
lain
Merge branch 'openapi/pleroma-api/emojis' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-20
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-20
lain
Merge branch 'feature/1734-user-deletion' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-20
Haelwenn
Merge branch 'exposed-background-image' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-20
lain
Merge branch 'issue/1509' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-20
Haelwenn
Merge branch 'openapi/pleroma-api/scrobble' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-19
Egor Kislitsyn
Move Scrobble views to ScrobbleView
blob
|
commitdiff
|
raw
|
diff to current
2020-05-19
Egor Kislitsyn
Add OpenAPI spec for PleromaAPI.ScrobbleController
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-16
lain
Merge branch 'develop' into 'remove-twitter-api'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-14
lain
Merge branch 'features/openrc-console' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-10
lain
Merge branch 'shortening-modules-name' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-05
Egor Kislitsyn
Merge branch 'develop' into global-status-expiration
blob
|
commitdiff
|
raw
|
diff to current
2020-05-02
rinpatch
Merge branch 'feature/1710-consolidate-instance-info...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-01
lain
Merge branch 'issue/1577' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-01
Maksim Pechnikov
Merge branch 'develop' into issue/1276-2
blob
|
commitdiff
|
raw
|
diff to current
2020-04-30
lain
Merge branch '1364-no-pushes-from-blocked-domains-users...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-30
Egor Kislitsyn
Merge branch 'develop' into openapi/notifications
blob
|
commitdiff
|
raw
|
diff to current
2020-04-30
Egor Kislitsyn
Merge branch 'develop' into openapi/reports
blob
|
commitdiff
|
raw
|
diff to current
2020-04-29
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-29
lain
Merge branch 'automatic-authentication-and-instance...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-28
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-22
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-22
Ivan Tashkinov
Fixed OAuth restrictions for :api routes. Made auth...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-22
lain
Merge branch 'docs/debian-packages' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-04-21
Ivan Tashkinov
checks of authentication / instance publicity. Definiti...
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-10-19
rinpatch
Merge branch 'mix-emoji-task-pack-json' into 'develop'
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-07
Maxim Filippov
Merge branch 'develop' into feature/reports-groups...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-07
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-07
kaniini
Merge branch 'mrf/simple_policy/check_actor' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-07
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-07
Haelwenn
Merge branch '1234-mastodon-2-4-3-oauth-scopes' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-06
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
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
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
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
kaniini
Merge branch 'cleanup/drop-subscription-table-if-exists...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
kaniini
Merge branch 'feature/scrobbling' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
Ariadne Conill
change new scrobble endpoint
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
Ariadne Conill
split scrobble functions into their own controller
blob
|
commitdiff
|
raw
|
diff to current