projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge remote-tracking branch 'upstream/develop' into block-behavior
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
controllers
/
emoji_pack_controller.ex
2021-01-06
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2020-12-30
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2020-12-23
lain
Merge branch 'stable' into mergeback/2.2.1
blob
|
commitdiff
|
raw
2020-12-20
rinpatch
Merge branch 'bugfix/mastofe-install-script' into ...
blob
|
commitdiff
|
raw
2020-12-17
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2020-12-16
lain
Merge branch 'fix/2336-mastoapi-ws-posts-dropping'...
blob
|
commitdiff
|
raw
2020-12-15
lain
Merge branch 'support/2255_posix_errors' into 'develop'
blob
|
commitdiff
|
raw
2020-11-21
feld
Merge branch 'libmagic' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-18
Maksim Pechnikov
fix tests
blob
|
commitdiff
|
raw
2020-11-18
Maksim
Apply 1 suggestion(s) to 1 file(s)
blob
|
commitdiff
|
raw
|
diff to current
2020-11-13
Maksim Pechnikov
added error messages for posix error code
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-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-10-29
Haelwenn
Merge branch 'issue/2069' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-26
Haelwenn
Merge branch 'docs/ap_c2s' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-17
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-14
Mark Felder
Merge branch 'develop' into feature/account-export
blob
|
commitdiff
|
raw
|
diff to current
2020-10-14
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-14
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-14
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-14
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Mark Felder
Merge branch 'develop' into feature/gen-magic
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Mark Felder
Merge branch 'develop' into chore/elixir-1.11
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Mark Felder
Merge branch 'develop' into refactor/locked_user_field
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Mark Felder
Merge branch 'develop' into refactor/discoverable_user_...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
feld
Merge branch 'feature/1822-files-consistency' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Alexander Strizhakov
fixes after rebase
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Alexander Strizhakov
OAuthScopesPlug module name
blob
|
commitdiff
|
raw
|
diff to current
2020-10-12
feld
Merge branch 'docs/improve-backup-restore' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-12
feld
Merge branch 'improve/instance-gen' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-12
feld
Merge branch 'chore/copyright-headers' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-12
Mark Felder
Add missing Copyright headers
blob
|
commitdiff
|
raw
|
diff to current
2020-10-09
Mark Felder
Merge branch 'develop' into feature/gen-magic
blob
|
commitdiff
|
raw
|
diff to current
2020-10-08
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-08
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-08
Haelwenn
Merge branch 'fix/2209-remoteip' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-06
Mark Felder
Merge branch 'develop' into revert/rich-media-censorship
blob
|
commitdiff
|
raw
|
diff to current
2020-10-06
rinpatch
Merge branch 'filtering-following' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-06
rinpatch
Merge branch 'feature/update-description-for-frontends...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-05
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-05
feld
Merge branch 'feature/1893-remote-emoji-packs-paginatio...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-05
Mark Felder
Merge branch 'develop' into feature/1893-remote-emoji...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-25
Mark Felder
Merge branch 'develop' into fix/deprecation-warning...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-25
rinpatch
Merge branch 'features/incoming-create-exists' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-24
lain
Merge branch 'smol-test' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-24
Alexander Strizhakov
pagination for remote emoji packs
blob
|
commitdiff
|
raw
|
diff to current
2020-09-23
Mark Felder
Merge branch 'develop' into feature/bulk-confirmation
blob
|
commitdiff
|
raw
|
diff to current
2020-09-23
lain
Merge branch 'user-query/filter-out-internal' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-23
lain
Merge branch 'develop' into 'issue/2115'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-23
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2020-09-23
lain
Merge branch 'issue/1975' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-23
lain
Merge branch 'develop' into 'issue/1975'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-22
Maksim Pechnikov
Merge branch 'develop' into issue/1975
blob
|
commitdiff
|
raw
|
diff to current
2020-09-10
Mark Felder
Merge branch 'develop' into feature/gen-magic
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
Haelwenn
Merge branch 'buildx-multiarch-arm32v7' into 'develop'
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-08-19
Maksim Pechnikov
added Pleroma.Web.PleromaAPI.EmojiFileController
blob
|
commitdiff
|
raw
|
diff to current
2020-08-07
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-08-07
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-08-05
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-08-05
Roman Chvanikov
Merge branch 'develop' into command-available-check
blob
|
commitdiff
|
raw
|
diff to current
2020-07-31
Haelwenn (lanodan...
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-29
lain
Merge branch 'issue/1023' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-27
lain
Merge branch 'develop' into 'cleanup/masto_fe-default_s...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-26
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-23
feld
Merge branch 'unblock-domain-via-query' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-23
feld
Merge branch 'feature/add-mrf-related-policies' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-23
Haelwenn
Merge branch '1976-status-view-fixes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-23
Maksim Pechnikov
Merge branch 'develop' into issue/1934-welcome-email
blob
|
commitdiff
|
raw
|
diff to current
2020-07-23
lain
Merge branch 'bugfix/mrf-reject-logging' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-23
lain
Merge branch 'issue/1878' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-23
lain
Merge branch 'linkify' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-22
lain
Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-21
Mark Felder
Skip the correct plug
blob
|
commitdiff
|
raw
|
diff to current
2020-07-21
Mark Felder
Merge branch 'develop' into fix/pleroma-api-emoji-packs
blob
|
commitdiff
|
raw
|
diff to current
2020-07-18
KokaKiwi
Fix /api/pleroma/emoji/packs index endpoint.
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
feld
Merge branch 'preload-data' into 'develop'
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-23
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2020-06-23
Haelwenn
Merge branch 'feature/1631-redesign-mrf-configuration...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-23
lain
Merge branch 'issue/1798' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-23
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-22
Haelwenn
Merge branch 'warning/mastofe-settings-blob' into ...
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-22
lain
Merge branch 'fix/1825-admin-api-error-codes' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-22
rinpatch
Merge branch '1865-media-only' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-22
rinpatch
Merge branch '1883-mrf-chat' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-22
lain
Merge branch 'feature/1854-emoji-pagination' 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-19
Alexander Strizhakov
adding overall count for packs and files
blob
|
commitdiff
|
raw
|
diff to current
2020-06-18
Alexander Strizhakov
emoji pagination for pack show action
blob
|
commitdiff
|
raw
|
diff to current
2020-06-18
Alexander Strizhakov
emoji packs pagination
blob
|
commitdiff
|
raw
|
diff to current
2020-06-08
Roman Chvanikov
merge develop
blob
|
commitdiff
|
raw
|
diff to current
next