projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'add-local-field-to-status' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
representers
/
activity_representer.ex
2019-03-04
Karen Konou
Merge branch 'bugfix/delete-activity-audience' of git...
blob
|
commitdiff
|
raw
2019-03-03
kaniini
Merge branch 'feature/add-pagination-to-users-admin...
blob
|
commitdiff
|
raw
2019-03-03
lambda
Merge branch 'fix/dont-show-dms-in-mentions-timeline...
blob
|
commitdiff
|
raw
2019-03-02
rinpatch
Merge branch 'bugfix/oauth-scopes-join' into 'develop'
blob
|
commitdiff
|
raw
2019-03-01
lambda
Merge branch 'bugfix/236-ambiguous-route-for-numerical...
blob
|
commitdiff
|
raw
2019-02-28
href
Merge branch 'customizable_auth' into 'develop'
blob
|
commitdiff
|
raw
2019-02-28
kaniini
Merge branch 'with-mutes' into 'develop'
blob
|
commitdiff
|
raw
2019-02-27
lain
Remove parts of the old activity view.
blob
|
commitdiff
|
raw
2019-02-17
Ivan Tashkinov
[#468] Merged `upstream/develop`, resolved conflicts.
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
Wim Vanderbauwhede
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-11
Karen Konou
Merge branch 'develop' into feature/thread-muting
blob
|
commitdiff
|
raw
|
diff to current
2019-02-11
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-10
kaniini
Merge branch 'update-mastofe/glitch-soc-2019-02-10...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-10
kaniini
Merge branch 'feather_mention' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-10
kaniini
Merge branch 'fix/credo-issues' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-09
Haelwenn (lanodan...
de-group alias/es
blob
|
commitdiff
|
raw
|
diff to current
2019-02-09
Haelwenn (lanodan...
Credo fixes: alias grouping/ordering
blob
|
commitdiff
|
raw
|
diff to current
2019-02-01
kaniini
Merge branch 'feature/split-hide-network' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-01
href
Merge branch '534_federation_targets_reachability'...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-31
kaniini
Merge branch 'spc-fix-3' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-31
Haelwenn
Merge branch 'features/glitch-soc-frontend' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-31
Egor Kislitsyn
Merge remote-tracking branch 'MAIN/develop' into featur...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-29
kaniini
Merge branch 'hj-happiness-improvement' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-29
Haelwenn
Merge branch 'feature/rich-media-part-2-electric-boogal...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-28
Ivan Tashkinov
[#534] Merged `upstream/develop`.
blob
|
commitdiff
|
raw
|
diff to current
2019-01-28
William Pitcock
rich media: add helpers module, use instead of Mastodon...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-28
William Pitcock
twitter api: fix up activity representer
blob
|
commitdiff
|
raw
|
diff to current
2019-01-25
rinpatch
Merge remote-tracking branch 'pl/develop' into oembed_p...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-25
kaniini
Merge branch 'fix/tusky-dm' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-24
Maxim Filippov
Use correct logic to determine "attentions" list
blob
|
commitdiff
|
raw
|
diff to current
2019-01-19
Maxim Filippov
Add current user to mentioned
blob
|
commitdiff
|
raw
|
diff to current
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-10
kaniini
Merge branch 'mass-follow' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-10
kaniini
Merge branch 'dm-optimizations' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-09
rinpatch
Merge branch 'hotfix/ogp-cachex-fix' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-09
lambda
Merge branch 'scarlett/pleroma-summary-html-api' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-09
Egor Kislitsyn
Add Twitter API for the pinned statuses
blob
|
commitdiff
|
raw
|
diff to current
2019-01-06
scarlett
Twitter API: Add a summary_html field.
blob
|
commitdiff
|
raw
|
diff to current
2019-01-05
kaniini
Merge branch 'fix/user-search-null-name' into 'develop'
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
kaniini
Merge branch 'activitypub-tombstone-fix' 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
scarlett
Resolve some test failures.
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 'bugfix/trans_fix_url_videos' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-23
William Pitcock
twitter api: activity representer: remove 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-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-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-10-25
kaniini
Merge branch 'finmoji-optional' 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
kaniini
Merge branch 'feature/add-in-reply-to-profileurl' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-10-25
William Pitcock
twitterapi: activity view: add the other in_reply_to...
blob
|
commitdiff
|
raw
|
diff to current
2018-10-25
kaniini
Merge branch 'feature/in-reply-to-screen-name' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-10-25
William Pitcock
twitterapi: activity view: implement in_reply_to_screen...
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
twitter api: add support for user-specified html policy
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-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
kaniini
Merge branch 'feature/peertube_2' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-21
Haelwenn (lanodan...
Basic peertube support.
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
2018-07-13
Tristan Mahé
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-07-12
lambda
Merge branch 'feature/object-normalization' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-07-12
lambda
Merge branch 'feature/mediaproxy-nodeinfo' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-07-12
lambda
Merge branch 'bugfix/activitypub-object-actor' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-07-12
lambda
Merge branch 'feature/message-summary' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
next