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]
/
test
/
formatter_test.exs
2019-09-25
sadposter
Merge branch 'develop' of https://git.pleroma.social...
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-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
rinpatch
Merge branch 'better-emoji-packs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-19
Haelwenn
Merge branch 'docs/clients-update' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-19
Egor Kislitsyn
Add `rel="ugc"` to hashtags and mentions
blob
|
commitdiff
|
raw
|
diff to current
2019-09-19
Egor Kislitsyn
Add support for `rel="ugc"`
blob
|
commitdiff
|
raw
|
diff to current
2019-09-19
Maksim Pechnikov
Merge branch 'develop' into test/activity_pub/transmogr...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-18
Haelwenn
Merge branch 'issue/733' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-18
rinpatch
Merge branch 'chores/bump-copyright-year' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-18
Haelwenn (lanodan...
Bump copyright years of files changed in 2019
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-30
Maksim Pechnikov
added Emoji.Formatter
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-06-23
Sachin Joshi
Merge branch 'develop' into 'remove-avatar-header'
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 update-oauth-template
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-05-31
Haelwenn
Merge branch 'dokku' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-30
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-29
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-05-24
kaniini
Merge branch 'bugfix/mention-all-people-in-beginning...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-24
Sergey Suprunenko
Mention all people in the beginning of DM
blob
|
commitdiff
|
raw
|
diff to current
2019-05-24
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-23
Sachin Joshi
fix merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-05-22
lambda
Merge branch 'feature/object-pruning' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-22
lambda
Merge branch 'refactor/keys' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-22
rinpatch
Merge branch 'bugfix/account_view_source.note' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-22
kaniini
Merge branch 'mongooseim-support' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-22
kaniini
Merge branch 'fix/api-fallback' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-22
kaniini
Merge branch 'bugfix/dm-being-truncated' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-22
Sergey Suprunenko
Do not truncate DM when it contains newlines and safe_d...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-20
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-18
rinpatch
Resolve merge conflicts and remove IO.inspects
blob
|
commitdiff
|
raw
|
diff to current
2019-05-17
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-17
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-17
lambda
Merge branch 'bugfix/903-mastoapi-relationship-requeste...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-17
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-17
rinpatch
Merge branch 'fix/902-random-compile-failing' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-17
Alexander Strizhakov
Fix/902 random compile failing
blob
|
commitdiff
|
raw
|
diff to current
2019-05-14
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-08
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-05-07
lambda
Merge branch 'conversations_three' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-07
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-06
sadposter
Merge branch 'develop' of https://git.pleroma.social...
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-03
rinpatch
Merge branch 'fix/embeded-relationship-in-follows'...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-03
rinpatch
Merge branch 'fix-search-speed' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-03
lambda
Merge branch 'bugfix/emoji-size' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-03
Haelwenn (lanodan...
Pleroma.Formatter: width/height to class=emoji
blob
|
commitdiff
|
raw
|
diff to current
2019-05-02
lambda
Merge branch 'iss-849' into 'develop'
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
lambda
Merge branch 'bugfix/web-notification-special-char...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
lambda
Merge branch 'harmonize_return_types_in_user_module...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
Alex S
test fixes
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-29
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
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-20
Ekaterina Vaartis
Fix tests that used finmoji
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-11
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
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
lain
Merge remote-tracking branch 'origin/develop' into...
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
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
test fix
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-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
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-30
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-27
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-25
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-24
rinpatch
Merge branch 'fix/eldap-warnings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-22
kaniini
Merge branch 'safe-mentions' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-20
lain
Add safe dm mode option.
blob
|
commitdiff
|
raw
|
diff to current
2019-03-18
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
next