projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
emoji.ex
2019-04-29
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
2019-04-23
kaniini
Merge branch 'security/fix-html-class-scrubbing' into...
blob
|
commitdiff
|
raw
2019-04-22
kaniini
Merge branch 'rework-emoji-management' into 'develop'
blob
|
commitdiff
|
raw
2019-04-21
Ekaterina Vaartis
Fix emoji.txt / custom_emoji.txt / shortcode_globs...
blob
|
commitdiff
|
raw
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
2019-04-12
lambda
Merge branch 'fix/732-password-align' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'ssl_trusted_cert' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
lambda
Merge branch 'feature/767-multiple-use-invite-token...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
Sadposter
Merge branch 'develop' into feature/user-status-subscri...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
kaniini
Merge branch 'hotfix/fix_undefined_summary' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
kaniini
Merge branch 'notification-pleroma-settings' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-09
lambda
Merge branch 'bugfix/follower_count' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
lambda
Merge branch 'improve_upgrade_user_from_ap_id' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
lambda
Merge branch 'twitter_oauth' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
lambda
Merge branch 'feature/770-add-emoji-tags' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-06
Alex S
Merge develop to 770-add-emoji-tags
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Alex S
Merging develop into feature/770-add-emoji-tags
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Alex S
second level of headertext change in doc
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Alex S
Merge develop into feature/770-add-emoji-tags
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'features/pleroma-tan' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Alex S
little changes and typos
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Alex S
refactoring of emoji tags config to use groups
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-01
Alex S
code style
blob
|
commitdiff
|
raw
|
diff to current
2019-04-01
Alex S
Adding tag to emoji ets table
blob
|
commitdiff
|
raw
|
diff to current
2019-03-18
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-15
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
rinpatch
Merge develop to bump elixir version in the CI so I...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
rinpatch
Merge branch 'hotfix/delete-activities' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
link0ff
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-13
kaniini
Merge branch 'mastofe-content-types' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-13
lambda
Merge branch 'features/add-credo-to-ci' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-13
Haelwenn (lanodan...
[Credo] Remove parentesis on argument-less functions
blob
|
commitdiff
|
raw
|
diff to current
2019-01-13
rinpatch
Resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-01-05
kaniini
Merge branch 'fix_486' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-03
rinpatch
Merge branch 'captcha' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-01
lambda
Merge branch 'cleanup/admin-api-useless-if' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-01
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
kaniini
Merge branch 'features/admin-api-user-views' into ...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
kaniini
Merge branch 'docs/admin-api' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
kaniini
Merge branch 'maintenance/copyright-2019' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
William Pitcock
update copyright years to 2019
blob
|
commitdiff
|
raw
|
diff to current
2018-12-28
kaniini
Merge branch 'systemd-drop-sysadmin-privilege' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-27
kaniini
Merge branch 'feature/create-tombstone-instead-of-delet...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-25
lambda
Merge branch 'legal-boilerplate' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-23
William Pitcock
add license boilerplate to pleroma core
blob
|
commitdiff
|
raw
|
diff to current
2018-12-18
lambda
Merge branch 'feature/new-user-routes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
href
Merge branch 'feature/file-size-checking' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'fix_empty_bio_crash' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'fix/config-md-typos' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'support/bugfix_272' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'fix/theora-detection-read-bytes' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'anonymize-filter-text' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'develop' into 'fix/mix-task-uploads-modul...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'parallel588/pleroma-support/compile_warni...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-09
Maksim Pechnikov
fix compile warnings
blob
|
commitdiff
|
raw
|
diff to current
2018-12-08
lambda
Merge branch 'fix/add-upload.ex' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-08
lambda
Merge branch 'fix/typo-relay-ex' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-07
lambda
Merge branch 'fix/gopher-respect-ip' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-07
lambda
Merge branch 'media-proxy-follow-redirect' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-07
lambda
Merge branch '394_user_tags' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-07
lambda
Merge branch 'emoji-alphabetical-ordering' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-07
href
Emojis: Alphabetical ordering
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
Egor Kislitsyn
Merge branch 'develop' into feature/compat/push-subscri...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-01
rinpatch
Attempt to resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2018-11-15
Hakaba Hitoyo
Merge remote-tracking branch 'official/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-10
kaniini
Merge branch 'tests/prismo-url-map' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-06
kaniini
Merge branch 'patch-2' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-06
kaniini
Merge branch 'runtime-router' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-06
kaniini
Merge branch 'use-the-same-example-domain-and-use-it...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-06
kaniini
Merge branch 'runtime-emojis-fix-finmoji-return' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-05
href
Fix wrong return when finmoji is disabled
blob
|
commitdiff
|
raw
|
diff to current
2018-11-05
lambda
Merge branch 'runtime-emojis' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-05
href
handle_continue is OTP21+
blob
|
commitdiff
|
raw
|
diff to current
2018-11-05
href
Runtime configured emojis
blob
|
commitdiff
|
raw
|
diff to current
projects / akkoma / history