projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'remote-ip' into 'develop'
[akkoma]
/
lib
/
pleroma
/
emoji.ex
2019-09-27
kaniini
Merge branch 'patch-2' into 'develop'
blob
|
commitdiff
|
raw
2019-09-27
kaniini
Merge branch 'update/docs-jp' into 'develop'
blob
|
commitdiff
|
raw
2019-09-26
Maxim Filippov
Merge branch 'develop' into feature/moderation-log...
blob
|
commitdiff
|
raw
2019-09-26
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
2019-09-26
kaniini
Merge branch 'refactor/notification-controller' into...
blob
|
commitdiff
|
raw
2019-09-26
kaniini
Merge branch 'feature/return-link-for-password-reset...
blob
|
commitdiff
|
raw
2019-09-26
kaniini
Merge branch 'refactor/user' into 'develop'
blob
|
commitdiff
|
raw
2019-09-26
kaniini
Merge branch 'hex-flake-id' into 'develop'
blob
|
commitdiff
|
raw
2019-09-26
kaniini
Merge branch 'feature/activities-pagination-by-offset...
blob
|
commitdiff
|
raw
2019-09-26
kaniini
Merge branch 'fix/do-not-embed-first-pages-in-collectio...
blob
|
commitdiff
|
raw
2019-09-25
rinpatch
Merge branch 'hotfix/hackney-1.15.2' into 'develop'
blob
|
commitdiff
|
raw
2019-09-25
rinpatch
Merge branch 'support/test' into 'develop'
blob
|
commitdiff
|
raw
2019-09-25
lain
Merge branch 'issue/1218' into 'develop'
blob
|
commitdiff
|
raw
2019-09-25
Maksim Pechnikov
Merge branch 'develop' into issue/1218
blob
|
commitdiff
|
raw
2019-09-24
Maxim Filippov
Merge branch 'develop' into feature/return-link-for...
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
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 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-18
Ekaterina Vaartis
Change YAML to JSON
blob
|
commitdiff
|
raw
|
diff to current
2019-09-18
Ekaterina Vaartis
Clean out old emojis on reload
blob
|
commitdiff
|
raw
|
diff to current
2019-09-18
Ekaterina Vaartis
Swap TOML for YAML to get YAML generation for packs...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-18
Ekaterina Vaartis
Add pack.toml loading
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 Pechnikov
division emoji.ex on loader.ex and emoji.ex
blob
|
commitdiff
|
raw
|
diff to current
2019-08-24
lain
Merge branch 'admin-create-users' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-24
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-22
Ivan Tashkinov
[#1149] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-20
lain
Merge branch 'digest-template' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-20
lain
Merge branch 'feature/custom-fields' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-19
lain
Merge branch 'develop' into 'fix/reverse-proxy-body...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-16
lain
Merge branch 'pleroma-conversations' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-14
Maxim Filippov
Merge branch 'develop' into 'fix/admin-api-user-deletion'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-14
rinpatch
Merge branch 'misc-otp-issues' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-14
stwf
use default child_specs
blob
|
commitdiff
|
raw
|
diff to current
2019-07-15
Mark Felder
Merge branch 'develop' into feature/matstodon-statuses...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-11
Egor Kislitsyn
Merge branch 'develop' into feature/addressable-lists
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
kaniini
Merge branch 'remove-avatar-header' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-28
Roman Chvanikov
Resolve conflicts
blob
|
commitdiff
|
raw
|
diff to current
2019-06-28
lain
Merge branch 'release-docs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-26
rinpatch
Merge branch 'update-mastofe/glitch-soc-2019-06-26...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-26
kaniini
Merge branch 'refactoring/fix_render_view' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-26
kaniini
Merge branch 'feature/configurable-pack-extensions...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-26
rinpatch
Make default pack extensions configurable and default...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-23
Sachin Joshi
Merge branch 'develop' into 'remove-avatar-header'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-15
lain
Merge branch 'bugfix/980-polls-double-vote' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-15
kaniini
Merge branch '963_oob_oauth_redirect_fix' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-14
rinpatch
Merge branch 'feature/add-background-image-to-mastoapi...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-14
kaniini
Merge branch 'feature/905-dynamic-configuration-in...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-14
Alexander Strizhakov
it is changed in compile time
blob
|
commitdiff
|
raw
|
diff to current
2019-06-11
lain
Merge branch 'feature/rate-limiter' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-11
kaniini
Merge branch 'change-containment-default' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-11
kaniini
Merge branch 'preload-changes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-09
rinpatch
Merge branch 'develop' into feature/releases
blob
|
commitdiff
|
raw
|
diff to current
2019-06-08
lain
Merge branch 'prod-loglevel-warn' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-08
lain
Merge branch 'fix/transmogrifier-inReplyTo' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-08
rinpatch
Merge branch 'bugfix/959-emoji-loading' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-07
lain
Emoji: Use full path to check if a file is a directory.
blob
|
commitdiff
|
raw
|
diff to current
2019-06-05
kaniini
Merge branch 'explicit-addressing' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-05
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Roman Chvanikov
Fix conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Maksim Pechnikov
Merge branch 'develop' into issue/941
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Haelwenn
Merge branch 'emoji-loader-fix' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
lain
Emoji: Don't die when files are present in the emoji...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
Mark Felder
Merge branch 'develop' into feature/digest-email
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
Mark Felder
Merge branch 'develop' into update-oauth-template
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
lambda
Merge branch 'align-mastodon-conversations' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-02
kaniini
Merge branch 'feature/notification-control-part-2'...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-01
rinpatch
Resolve merge conflicts
blob
|
commitdiff
|
raw
|
diff to current
2019-06-01
Sachin Joshi
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-01
kaniini
Merge branch 'bugfix/visibility-indicator-litepub-dm...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-31
Haelwenn
Merge branch 'dokku' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-31
lambda
Merge branch 'hotfix/leaking-lists' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-30
lambda
Merge branch 'use-pleroma-config' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-30
Egor Kislitsyn
Use Pleroma.Config everywhere
blob
|
commitdiff
|
raw
|
diff to current
2019-05-04
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
Mark Felder
Merge branch 'develop' into update-oauth-template
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
lambda
Merge branch 'features/download-mastofe-build' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
Alex S
Merging with develop
blob
|
commitdiff
|
raw
|
diff to current
2019-04-30
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-04-23
kaniini
Merge branch 'security/fix-html-class-scrubbing' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-22
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-22
kaniini
Merge branch 'rework-emoji-management' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-21
Ekaterina Vaartis
Fix emoji.txt / custom_emoji.txt / shortcode_globs...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-21
Ekaterina Vaartis
Formatting
blob
|
commitdiff
|
raw
|
diff to current
2019-04-20
Ekaterina Vaartis
Remove most finmoji mentions where appropriate
blob
|
commitdiff
|
raw
|
diff to current
2019-04-20
Ekaterina Vaartis
Fix priv/static/instance/static to be just instance...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-20
Ekaterina Vaartis
Fix incorrect multiple emoji tag handling introduced...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-20
Ekaterina Vaartis
mix format
blob
|
commitdiff
|
raw
|
diff to current
2019-04-20
Ekaterina Vaartis
Assume packs without emoji.txt only have emoji pictures...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-20
Ekaterina Vaartis
Remove useless comment
blob
|
commitdiff
|
raw
|
diff to current
2019-04-20
Ekaterina Vaartis
Remove finmoji and add a way to download emojis in...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-17
rinpatch
Merge branch 'develop' into feature/database-compaction
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'features/mastoapi/2.6.0-min_id-pagination...
blob
|
commitdiff
|
raw
|
diff to current
next