projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
moving fixture into mastodon folder
[akkoma]
/
lib
/
pleroma
/
emoji
/
loader.ex
2021-03-02
lain
Merge branch 'release/2.3.0' into 'stable'
blob
|
commitdiff
|
raw
2021-02-26
feld
Merge branch 'ecto-rollback-in-test-env' into 'develop'
blob
|
commitdiff
|
raw
2021-02-24
Haelwenn
Merge branch 'docfix/chat-token' into 'develop'
blob
|
commitdiff
|
raw
2021-02-12
rinpatch
Merge branch 'bugfix/answer-outbox' into 'develop'
blob
|
commitdiff
|
raw
2021-02-11
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
2021-02-09
rinpatch
Merge branch 'features/ap_id-c2s-authentication' into...
blob
|
commitdiff
|
raw
2021-02-06
rinpatch
Merge branch 'feat/allow_alt_text_search_config' into...
blob
|
commitdiff
|
raw
2021-02-04
Mark Felder
Merge branch 'develop' into fix/reports-from-admins
blob
|
commitdiff
|
raw
2021-02-04
feld
Merge branch 'chore/fix-mix-env' into 'develop'
blob
|
commitdiff
|
raw
2021-02-04
Mark Felder
Standardize the way we capture and use Mix.env()
blob
|
commitdiff
|
raw
2021-02-04
feld
Merge branch 'fix/configdb-error' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-04
Haelwenn
Merge branch 'bugfix/notice-external-redirect' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-04
Haelwenn
Merge branch 'chore/external-emoji-example' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-03
Mark Felder
Load an emoji.txt specific to the test env
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-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
lain
Merge branch 'stable' of git.pleroma.social:pleroma...
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-19
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-16
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-13
Mark Felder
Merge branch 'develop' into refactor/notification_settings
blob
|
commitdiff
|
raw
|
diff to current
2020-07-13
feld
Merge branch 'features/profile-fields-emojo' into ...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-13
feld
Merge branch 'fix/mediaproxy-cache-settings-types'...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
Mark Felder
Merge branch 'develop' into issue/1790-updated-oban
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
lain
Merge branch 'mix-tasks-improvement' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
lain
Merge branch 'cluster-test-ci' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
Haelwenn
Merge branch 'develop' into 'admin-api-user-credentials...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
Haelwenn
Merge branch 'user-search-nickname-rank-boost' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-09
feld
Merge branch 'chore/use-the-alias' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-09
Mark Felder
Use the Pleroma.Config alias
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-14
lain
Merge branch 'features/openrc-console' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-04-22
lain
Merge branch 'docs/debian-packages' into 'develop'
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-10
lain
Merge remote-tracking branch 'origin/develop' into...
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 emoji tags for shareable packs to be "pack:{name}"
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-07
Maksim Pechnikov
Merge branch 'develop' into issue/1218
blob
|
commitdiff
|
raw
|
diff to current
2019-09-06
Maksim Pechnikov
Merge branch 'develop' into issue/1218
blob
|
commitdiff
|
raw
|
diff to current
2019-08-31
Maksim Pechnikov
added Emoji struct
blob
|
commitdiff
|
raw
|
diff to current
2019-08-30
Maksim
Apply suggestion to lib/pleroma/emoji/loader.ex
blob
|
commitdiff
|
raw
|
diff to current
2019-08-30
Maksim Pechnikov
added code\path fields without html tags in ets
blob
|
commitdiff
|
raw
|
diff to current
2019-08-30
Maksim Pechnikov
division emoji.ex on loader.ex and emoji.ex
blob
|
commitdiff
|
raw
|
diff to current