projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Merge branch 'docs/kyclos' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
controllers
/
emoji_api_controller.ex
2020-02-11
lain
Merge branch 'docs/kyclos' into 'develop'
blob
|
commitdiff
|
raw
2020-02-06
feld
Merge branch 'mastoapi-non-html-strings' into 'develop'
blob
|
commitdiff
|
raw
2020-02-05
rinpatch
Merge branch 'feature/restart-pleroma-from-outside...
blob
|
commitdiff
|
raw
2020-02-03
Maksim Pechnikov
Merge branch 'develop' into issue/1383
blob
|
commitdiff
|
raw
2020-01-30
rinpatch
Merge branch 'fix/disable-rate-limiter-for-socket-local...
blob
|
commitdiff
|
raw
2020-01-30
rinpatch
Merge branch 'develop' into fix/disable-rate-limiter...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-30
lain
Merge branch 'reenable-rate-limit-and-remote-ip' into...
blob
|
commitdiff
|
raw
2020-01-30
feld
Merge branch 'emoji-api-errors' into 'develop'
blob
|
commitdiff
|
raw
2020-01-30
feld
Update emoji_api_controller.ex
blob
|
commitdiff
|
raw
2020-01-29
Alexander Strizhakov
emoji api error on not writable dir
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-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
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-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-12
feld
Merge branch 'config/benchmark' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-12
Mark Felder
Merge branch 'develop' into issue/1354
blob
|
commitdiff
|
raw
|
diff to current
2020-01-12
feld
Merge branch 'issue/1487' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-11
Alexander Strizhakov
Merge branch 'develop' into admin-be
blob
|
commitdiff
|
raw
|
diff to current
2020-01-10
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-10
lain
Merge branch 'issue/1490' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-10
lain
Merge branch 'oauth-scopes-tweaks-and-tests' into ...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
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-19
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
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-15
Ivan Tashkinov
OAuthScopesPlug: disallowed nil token (unless with...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-14
Maksim Pechnikov
Merge branch 'develop' into issue/1383
blob
|
commitdiff
|
raw
|
diff to current
2019-12-12
Egor Kislitsyn
Merge branch 'develop' into feature/custom-runtime...
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-11
rinpatch
Merge branch 'chore/fast_sanitize_bump' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-12-10
feld
Merge branch 'fix/unsubscribe-route' into 'develop'
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
lain
Merge branch '1427-oauth-admin-scopes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-12-10
lain
Merge branch 'develop' into '1427-oauth-admin-scopes'
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-06
Ivan Tashkinov
[#1427] Fixes / improvements of admin scopes support...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-05
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-05
Ivan Tashkinov
[#1427] Reworked admin scopes support.
blob
|
commitdiff
|
raw
|
diff to current
2019-11-29
Ivan Tashkinov
[#1427] Initial support for OAuth admin scopes.
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
[#1234] Merge remote-tracking branch 'remotes/upstream...
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-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-27
kaniini
Merge branch 'patch-2' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-27
kaniini
Merge branch 'update/docs-jp' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
Maxim Filippov
Merge branch 'develop' into feature/moderation-log...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
kaniini
Merge branch 'refactor/notification-controller' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
kaniini
Merge branch 'feature/return-link-for-password-reset...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
kaniini
Merge branch 'refactor/user' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
kaniini
Merge branch 'hex-flake-id' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
kaniini
Merge branch 'feature/activities-pagination-by-offset...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
kaniini
Merge branch 'fix/do-not-embed-first-pages-in-collectio...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-25
rinpatch
Merge branch 'hotfix/hackney-1.15.2' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-25
rinpatch
Merge branch 'support/test' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-25
rinpatch
Merge branch 'emoji-packs-create-dir' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-25
Ekaterina Vaartis
Fix nodeinfo handling
blob
|
commitdiff
|
raw
|
diff to current
2019-09-25
Ekaterina Vaartis
Add an API endpoint for listing remote packs
blob
|
commitdiff
|
raw
|
diff to current
2019-09-25
vaartis
Credo fix (remove parens on function definition)
blob
|
commitdiff
|
raw
|
diff to current
2019-09-25
vaartis
Move emoji_dir_path & cache_seconds_per_file
blob
|
commitdiff
|
raw
|
diff to current
2019-09-25
Ekaterina Vaartis
When listing emoji packs, be sure to create the directory
blob
|
commitdiff
|
raw
|
diff to current
2019-09-25
lain
Merge branch 'issue/1218' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-25
Maksim Pechnikov
Merge branch 'develop' into issue/1218
blob
|
commitdiff
|
raw
|
diff to current
2019-09-24
Maxim Filippov
Merge branch 'develop' into feature/return-link-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-24
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-23
kaniini
Merge branch 'feature/force-password-reset' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-23
kaniini
Merge branch 'support-rel-ugc' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-23
kaniini
Merge branch 'remove-direct-messages-from-public-timeli...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-23
kaniini
Merge branch 'test/activity_pub/transmogrifier.ex'...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-23
kaniini
Merge branch 'emoji-pack-json-pretty' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-23
Ekaterina Vaartis
Also pretty print pack.json
blob
|
commitdiff
|
raw
|
diff to current
2019-09-23
rinpatch
Merge branch 'update-adminfe/2019-09-23' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-23
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-23
Maksim Pechnikov
Merge branch 'develop' into test/activity_pub/transmogr...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-23
rinpatch
Merge branch 'better-emoji-packs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-23
rinpatch
Emoji API Controller: Follow phoenix directory structure
blob
|
commitdiff
|
raw
|
diff to current
projects / akkoma / history