projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Fix merge conflict
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
status_view.ex
2019-01-18
rinpatch
Fix merge conflict
blob
|
commitdiff
|
raw
2019-01-17
kaniini
Merge branch 'resilient-user-view-2' into 'develop'
blob
|
commitdiff
|
raw
2019-01-16
lain
MastoAPI: Don't break on missing users.
blob
|
commitdiff
|
raw
2019-01-14
lambda
Merge branch 'load-all-dms' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-13
rinpatch
Resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-01-10
kaniini
Merge branch 'activitypub-dereference-activity-id'...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-10
kaniini
Merge branch 'twapi-follower-pagination' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-10
Haelwenn
Merge branch 'bugfix/markdown-newline-codeblocks' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-10
kaniini
Merge branch 'feature/pinned-posts' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-09
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-08
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-08
Egor Kislitsyn
add `pinned` property to `StatusView`
blob
|
commitdiff
|
raw
|
diff to current
2019-01-05
kaniini
Merge branch 'fix_486' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-05
scarlett
Merge branch 'emoji-in-summary' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-05
cascode
Merge branch 'develop' of git.pleroma.social:cascode...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-04
rinpatch
Merge branch 'feature/rich-media-cachex' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-04
kaniini
Merge branch 'fix/html-cache-content-collision' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-04
Rin Toshaka
Different caches based on the module. Remove scrubber...
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-31
lambda
Merge branch 'fix/scrubber-cache' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
Rin Toshaka
Move scrubber cache-related functions to Pleroma.HTML
blob
|
commitdiff
|
raw
|
diff to current
2018-12-30
Rin Toshaka
Resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2018-12-30
Rin Toshaka
Friendship ended with Postgresql now Cachex is my best...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-30
Rin Toshaka
Added get_stripped_html_for_object. Renamed a few things
blob
|
commitdiff
|
raw
|
diff to current
2018-12-29
Rin Toshaka
I am not sure what's going on anymore so I'll just...
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 'bugfix/trans_fix_url_videos' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-23
William Pitcock
mastodon api: status view: remove obsolete peertube...
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
href
Merge branch '114_email_invites' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
href
Merge branch 'fix/issue_272' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
Maksim Pechnikov
fix case when tags is invalid
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
Maksim Pechnikov
fix tags
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/mix-task-uploads-moduledoc' into...
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-09
Maksim Pechnikov
formatting
blob
|
commitdiff
|
raw
|
diff to current
2018-12-09
Maksim Pechnikov
fix hashtags in api response
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-03
kaniini
Merge branch 'feature/cors-again' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-03
Haelwenn
Merge branch 'bugfix/harden_status_output' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-03
Haelwenn (lanodan...
Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable
blob
|
commitdiff
|
raw
|
diff to current
2018-11-01
kaniini
Merge branch 'feature/as2-page-support' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-01
William Pitcock
mastodon api: add support for rendering Page objects
blob
|
commitdiff
|
raw
|
diff to current
2018-11-01
kaniini
Merge branch 'feature/relay-tests' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-01
Haelwenn
Merge branch 'bugfix/prismo.news_article_url' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-01
Haelwenn (lanodan...
Pleroma.Web.MastodonAPI.StatusView: Do not fail when...
blob
|
commitdiff
|
raw
|
diff to current
2018-10-29
kaniini
Merge branch 'bugfix/mediaproxy-leaks' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-10-29
William Pitcock
twitter/mastodon api: always use mediaproxy URLs in...
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
kaniini
Merge branch 'bugfix/ap-uri-user-search' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-10-25
Haelwenn
Merge branch 'bugfix/233-handle-missing-StatusView...
blob
|
commitdiff
|
raw
|
diff to current
2018-10-25
Haelwenn (lanodan...
[Pleroma.Web.MastodonAPI.StatusView]: Remove unused...
blob
|
commitdiff
|
raw
|
diff to current
2018-10-25
Haelwenn (lanodan...
[Pleroma.Web.MastodonAPI.StatusView]: Remove nils from...
blob
|
commitdiff
|
raw
|
diff to current
2018-10-25
Haelwenn (lanodan...
[Pleroma.Web.MastodonAPI.StatusView]: Return nil as...
blob
|
commitdiff
|
raw
|
diff to current
2018-09-22
kaniini
Merge branch 'feature/rich-text-optout-backend' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-09-22
William Pitcock
mastodon api: add support for user-supplied html policy
blob
|
commitdiff
|
raw
|
diff to current
2018-09-20
kaniini
Merge branch 'task-204-on-options-request' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-20
Haelwenn
Merge branch 'feature/mastodon_api_2.5.0' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-20
Haelwenn (lanodan...
[Pleroma.Web.MastodonAPI.StatusView] add replies_count
blob
|
commitdiff
|
raw
|
diff to current
2018-09-19
William Pitcock
mastodon api: default attachment type to image if one...
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-12
Haelwenn
Merge branch 'patch-3' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-10
shadowfacts
Add visible_in_picker to status emojis
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-02
kaniini
Merge branch 'hotfix_broken_likes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-27
lambda
Merge branch 'bugfix/announce-timeline-flooding' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-26
kaniini
Merge branch 'feature/emoji-in-local-users' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-26
kaniini
Merge branch 'develop' into 'feature/relay'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-21
Haelwenn (lanodan...
[Pleroma.Web.MastodonAPI.StatusView] Fix rendering...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-21
kaniini
Merge branch 'feature/peertube_2' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-21
Haelwenn (lanodan...
[Pleroma.Web.MastodonAPI.StatusView] Support Peertube...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-21
Haelwenn (lanodan...
Fix attachement rendering
blob
|
commitdiff
|
raw
|
diff to current
2018-08-21
lain
Render peertube videos in mastodon.
blob
|
commitdiff
|
raw
|
diff to current
2018-08-16
kaniini
Merge branch 'mastofe/system-font' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-16
kaniini
Merge branch 'develop' into 'patch-2'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-16
kaniini
Merge branch 'fix/put-repeats-at-activitypub-outbox...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-16
kaniini
Merge branch 'fix/normalize-file-extension' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-12
lambda
Merge branch 'feature/invites' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
next