projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Resolve merge conflict
[akkoma]
/
lib
/
pleroma
/
formatter.ex
2019-01-13
rinpatch
Resolve merge conflict
blob
|
commitdiff
|
raw
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-23
lambda
Merge branch 'hotfix/activity-without-content' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-20
lambda
Merge branch 'ci-test-fix' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-20
kaniini
Merge branch '114_email_confirmation' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-20
kaniini
Merge branch 'support/issue_413' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-20
Maksim
[#413] fix parse mentions
blob
|
commitdiff
|
raw
|
diff to current
2018-12-20
kaniini
Merge branch 'documentation/copy-pleroma-api' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-19
raeno
Merge branch 'develop' into oembed_provider
blob
|
commitdiff
|
raw
|
diff to current
2018-12-19
kaniini
Merge branch 'userless-admin' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-18
lambda
Merge branch 'fix/ci-cache-improved' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-18
lambda
Merge branch 'fix/formatter-ignore-html-chars' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-18
rinpatch
Merge branch 'develop' into fix/formatter-ignore-html...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-18
rinpatch
Ignore HTML characters in formatter.ex
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-18
raeno
Merge branch 'develop' into oembed_provider
blob
|
commitdiff
|
raw
|
diff to current
2018-12-16
Haelwenn
Merge branch 'develop' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-16
eal
Merge branch 'fix/masto-put-settings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-15
lambda
Merge branch 'fix/views-ignore-unhandled-activites...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-15
lambda
Merge branch 'tests-warning-as-errors' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
href
Merge branch 'fix/issue_433' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
raeno
Merge branch 'develop' into oembed_provider
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
Maksim Pechnikov
fixed typo
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
Maksim Pechnikov
fix markdown formatting
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-14
href
Merge branch '114_user_registration_emails' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-13
raeno
Remove oembed for now, will submit it in another MR...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-13
raeno
WIP. Implement oembed route and handle both json/xml...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-13
lambda
Merge branch 'username-underscores' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-12
href
Extended nicknames: allow dashes.
blob
|
commitdiff
|
raw
|
diff to current
2018-12-12
href
Allow underscores in usernames.
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-06
Rin Toshaka
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
kaniini
Merge branch 're-mrf' into 'develop'
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-06
Egor Kislitsyn
Merge branch 'develop' into feature/compat/push-subscri...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
kaniini
Merge branch '210_twitter_api_uploads_alt_text' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
Hakaba Hitoyo
Merge remote-tracking branch 'origin/debug-suggestions...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-05
kaniini
Merge branch 'follower-hiding' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-05
kaniini
Merge branch 'dev_vald_fe/data_tag' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-05
Vald
added data attrs for user and tag
blob
|
commitdiff
|
raw
|
diff to current
2018-12-05
Rin Toshaka
Merge develop to refactor/mix-tasks
blob
|
commitdiff
|
raw
|
diff to current
2018-12-03
lambda
Merge branch 'fix-media-proxy-defaults' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-02
rinpatch
Merge branch 'develop' into fix/theora-detection-read...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-01
kaniini
Merge branch 'validate-user-info' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-01
rinpatch
Attempt to resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2018-12-01
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-30
lain
Merge remote-tracking branch 'origin' into validate...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-18
lain
Fix most User tests.
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-08
lambda
Merge branch 'small-jsonld-refactor' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-07
kaniini
Merge branch 'feature/qvitter-notifications-dismiss...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-07
kaniini
Merge branch 'runtime-config' 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
href
Runtime configuration
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-05
lambda
Merge branch 'runtime-emojis' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-05
href
Runtime configured emojis
blob
|
commitdiff
|
raw
|
diff to current
2018-10-25
kaniini
Merge branch 'finmoji-optional' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-10-25
scarlett
Make finmoji optional
blob
|
commitdiff
|
raw
|
diff to current
2018-10-18
kaniini
Merge branch 'bugfix/html-scrub-schemes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-10-18
Haelwenn (lanodan...
lib/pleroma/html.ex: Use macros for valid_schemes,...
blob
|
commitdiff
|
raw
|
diff to current
2018-10-17
kaniini
Merge branch 'bugfix/osada-mention' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-10-17
William Pitcock
formatter: fix matching osada users
blob
|
commitdiff
|
raw
|
diff to current
2018-10-07
kaniini
Merge branch 'patch-2' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-10-05
kaniini
Merge branch 'revert-d31bbb1c' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-10-05
William Pitcock
formatter: use Pleroma.HTML module instead of HtmlSanit...
blob
|
commitdiff
|
raw
|
diff to current
2018-10-05
William Pitcock
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
blob
|
commitdiff
|
raw
|
diff to current
2018-09-30
kaniini
Merge branch 'bugfix/fix-mrf-reject-match' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-28
Haelwenn
Merge branch 'bugfix/magnet-links' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-28
Haelwenn (lanodan...
formatter: Stop using phoenix HTML and format it ourselves
blob
|
commitdiff
|
raw
|
diff to current
2018-09-16
kaniini
Merge branch 'update-pleroma-frontend' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-16
kaniini
Merge branch 'feature/html-scrub-policy' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-10
William Pitcock
everywhere: use Pleroma.HTML module instead of HtmlSani...
blob
|
commitdiff
|
raw
|
diff to current
2018-09-07
kaniini
Merge branch 'add-secure-and-samesite-cookie-flags...
blob
|
commitdiff
|
raw
|
diff to current
2018-09-07
kaniini
Merge branch 'improve-server-config-examples' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-09-07
kaniini
Merge branch 'feature/custom_media_url' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-05
Haelwenn
Merge branch 'fix/sign-in-with-toot' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-03
kaniini
Merge branch 'develop' into 'feature/staff-discovery...
blob
|
commitdiff
|
raw
|
diff to current
2018-09-03
kaniini
Merge branch 'feature/mastodon_api_2.4.x' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-03
kaniini
Merge branch 'nil-bio-emojis' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-02
Thurloat
sloop around get_emoji/1 to check is_binary and have...
blob
|
commitdiff
|
raw
|
diff to current
2018-09-02
kaniini
Merge branch 'hotfix_broken_likes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-02
kaniini
Merge branch 'security/emoji-xss' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-02
William Pitcock
formatter: don't add XSS emoji
blob
|
commitdiff
|
raw
|
diff to current
2018-08-31
Thurloat
add nil clause for Formatter.get_emoji/1 to return...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-31
lambda
Merge branch 'revert-a26d5e6b' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
next
projects / akkoma / history