projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest...
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
views
/
2019-02-05
kaniini
Merge branch 'fix-dm-index' into 'develop'
tree
|
commitdiff
2019-02-05
kaniini
Merge branch 'feature/ap-c2s-whoami' into 'develop'
tree
|
commitdiff
2019-02-05
kaniini
Merge branch 'feature/split-hide-network-v2' into ...
tree
|
commitdiff
2019-02-04
kaniini
Merge branch 'mime-riff' into 'develop'
tree
|
commitdiff
2019-02-03
Maxim Filippov
Split hide_network into hide_followers & hide_following...
tree
|
commitdiff
2019-02-01
kaniini
Merge branch 'revert-0a82a7e6' into 'develop'
tree
|
commitdiff
2019-02-01
kaniini
Revert "Merge branch 'feature/split-hide-network' into...
tree
|
commitdiff
2019-02-01
href
Merge branch 'develop' into 'develop'
tree
|
commitdiff
2019-02-01
kaniini
Merge branch 'feature/split-hide-network' into 'develop'
tree
|
commitdiff
2019-02-01
href
Merge branch '534_federation_targets_reachability'...
tree
|
commitdiff
2019-01-31
kaniini
Merge branch 'spc-fix-3' into 'develop'
tree
|
commitdiff
2019-01-31
Haelwenn
Merge branch 'features/glitch-soc-frontend' into 'develop'
tree
|
commitdiff
2019-01-31
Egor Kislitsyn
Merge remote-tracking branch 'MAIN/develop' into featur...
tree
|
commitdiff
2019-01-29
kaniini
Merge branch 'hj-happiness-improvement' into 'develop'
tree
|
commitdiff
2019-01-29
Haelwenn
Merge branch 'feature/rich-media-part-2-electric-boogal...
tree
|
commitdiff
2019-01-28
Maxim Filippov
Split hide_network into hide_followers & hide_followings
tree
|
commitdiff
2019-01-28
Ivan Tashkinov
[#534] Merged `upstream/develop`.
tree
|
commitdiff
2019-01-28
William Pitcock
rich media: add helpers module, use instead of Mastodon...
tree
|
commitdiff
2019-01-28
William Pitcock
twitter api: embed card in twitterapi posts
tree
|
commitdiff
2019-01-27
lambda
Merge branch 'safe-render-activities' into 'develop'
tree
|
commitdiff
2019-01-27
href
Views: wrap activity rendering in a rescue
tree
|
commitdiff
2019-01-25
rinpatch
Merge remote-tracking branch 'pl/develop' into oembed_p...
tree
|
commitdiff
2019-01-25
kaniini
Merge branch 'fix/tusky-dm' into 'develop'
tree
|
commitdiff
2019-01-25
kaniini
Merge branch 'develop' into 'oembed_provider'
tree
|
commitdiff
2019-01-25
kaniini
Merge branch 'classic-flakeids' into 'develop'
tree
|
commitdiff
2019-01-24
Maxim Filippov
Use correct logic to determine "attentions" list
tree
|
commitdiff
2019-01-23
kaniini
Merge branch 'fix/hide-network-setting' into 'develop'
tree
|
commitdiff
2019-01-23
Maxim Filippov
Send "hide_network" in user_view
tree
|
commitdiff
2019-01-23
kaniini
Merge branch 's3-namespace' into 'develop'
tree
|
commitdiff
2019-01-23
lambda
Merge branch 'rename/pleroma_activity_consistency'...
tree
|
commitdiff
2019-01-23
lain
Merge branch 'develop' into rename/pleroma_activity_con...
tree
|
commitdiff
2019-01-21
Haelwenn (lanodan...
Activity: get_create_activity_by_object_ap_id/1 → get_c...
tree
|
commitdiff
2019-01-20
lambda
Merge branch 'i1t/pleroma-477_user_search_improvements...
tree
|
commitdiff
2019-01-18
rinpatch
Fix merge conflict
tree
|
commitdiff
2019-01-17
kaniini
Merge branch 'resilient-user-view-2' into 'develop'
tree
|
commitdiff
2019-01-16
lain
MastoAPI: Don't break on missing users.
tree
|
commitdiff
2019-01-14
lambda
Merge branch 'load-all-dms' into 'develop'
tree
|
commitdiff
2019-01-13
rinpatch
Resolve merge conflict
tree
|
commitdiff
2019-01-10
kaniini
Merge branch 'activitypub-dereference-activity-id'...
tree
|
commitdiff
2019-01-10
kaniini
Merge branch 'twapi-follower-pagination' into 'develop'
tree
|
commitdiff
2019-01-10
Haelwenn
Merge branch 'bugfix/markdown-newline-codeblocks' into...
tree
|
commitdiff
2019-01-10
kaniini
Merge branch 'feature/pinned-posts' into 'develop'
tree
|
commitdiff
2019-01-10
kaniini
Merge branch 'mass-follow' into 'develop'
tree
|
commitdiff
2019-01-10
kaniini
Merge branch 'dm-optimizations' into 'develop'
tree
|
commitdiff
2019-01-09
rinpatch
Merge branch 'hotfix/ogp-cachex-fix' into 'develop'
tree
|
commitdiff
2019-01-09
lambda
Merge branch 'scarlett/pleroma-summary-html-api' into...
tree
|
commitdiff
2019-01-09
Egor Kislitsyn
Add Twitter API for the pinned statuses
tree
|
commitdiff
2019-01-08
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2019-01-07
kaniini
Merge branch 'features/syslog_logger' into 'develop'
tree
|
commitdiff
2019-01-07
kaniini
Merge branch 'spc-fix-2' into 'develop'
tree
|
commitdiff
2019-01-07
lain
Actually put some onformation in the error user, make...
tree
|
commitdiff
2019-01-07
kaniini
Merge branch 'resilient-user-view' into 'develop'
tree
|
commitdiff
2019-01-07
lain
Make TwAPI UserView more resilient to issues.
tree
|
commitdiff
2019-01-06
scarlett
Twitter API: Add a summary_html field.
tree
|
commitdiff
2019-01-05
kaniini
Merge branch 'fix/user-search-null-name' into 'develop'
tree
|
commitdiff
2019-01-05
kaniini
Merge branch 'fix_486' into 'develop'
tree
|
commitdiff
2019-01-05
kaniini
Merge branch 'activitypub-tombstone-fix' into 'develop'
tree
|
commitdiff
2019-01-05
scarlett
Merge branch 'emoji-in-summary' into 'develop'
tree
|
commitdiff
2019-01-05
scarlett
Strip HTML in and allow emoji in summaries.
tree
|
commitdiff
2019-01-05
cascode
Merge branch 'develop' of git.pleroma.social:cascode...
tree
|
commitdiff
2019-01-04
rinpatch
Merge branch 'feature/rich-media-cachex' into 'develop'
tree
|
commitdiff
2019-01-04
kaniini
Merge branch 'fix/html-cache-content-collision' into...
tree
|
commitdiff
2019-01-04
Rin Toshaka
Different caches based on the module. Remove scrubber...
tree
|
commitdiff
2019-01-03
rinpatch
Merge branch 'captcha' into 'develop'
tree
|
commitdiff
2019-01-01
lambda
Merge branch 'cleanup/admin-api-useless-if' into 'develop'
tree
|
commitdiff
2019-01-01
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2018-12-31
kaniini
Merge branch 'features/admin-api-user-views' into ...
tree
|
commitdiff
2018-12-31
kaniini
Merge branch 'docs/admin-api' into 'develop'
tree
|
commitdiff
2018-12-31
kaniini
Merge branch 'maintenance/copyright-2019' into 'develop'
tree
|
commitdiff
2018-12-31
William Pitcock
update copyright years to 2019
tree
|
commitdiff
2018-12-31
lambda
Merge branch 'fix/scrubber-cache' into 'develop'
tree
|
commitdiff
2018-12-31
Rin Toshaka
Move scrubber cache-related functions to Pleroma.HTML
tree
|
commitdiff
2018-12-30
Rin Toshaka
Resolve merge conflict
tree
|
commitdiff
2018-12-30
Rin Toshaka
Friendship ended with Postgresql now Cachex is my best...
tree
|
commitdiff
2018-12-30
Rin Toshaka
Added get_stripped_html_for_object. Renamed a few things
tree
|
commitdiff
2018-12-29
Rin Toshaka
I am not sure what's going on anymore so I'll just...
tree
|
commitdiff
2018-12-29
kaniini
Merge branch 'carrot-bullying' into 'develop'
tree
|
commitdiff
2018-12-29
kaniini
Merge branch '483_blocks_import_export' into 'develop'
tree
|
commitdiff
2018-12-29
kaniini
Merge branch '471_invalid_accounts_rendering' into...
tree
|
commitdiff
2018-12-28
kaniini
Merge branch 'systemd-drop-sysadmin-privilege' into...
tree
|
commitdiff
2018-12-28
Ivan Tashkinov
[#467] Refactored valid / invalid user rendering.
tree
|
commitdiff
2018-12-28
Haelwenn (lanodan...
Web.TwitterAPI.UserView: Add rights.admin
tree
|
commitdiff
2018-12-28
Ivan Tashkinov
[#471] Factored out User.visible_for?/2.
tree
|
commitdiff
2018-12-27
kaniini
Merge branch 'feature/create-tombstone-instead-of-delet...
tree
|
commitdiff
2018-12-27
Ivan Tashkinov
[#471] Prevented rendering of inactive local accounts.
tree
|
commitdiff
2018-12-25
lambda
Merge branch 'legal-boilerplate' into 'develop'
tree
|
commitdiff
2018-12-23
William Pitcock
add license boilerplate to pleroma core
tree
|
commitdiff
2018-12-23
lambda
Merge branch 'bugfix/trans_fix_url_videos' into 'develop'
tree
|
commitdiff
2018-12-23
William Pitcock
twitter api: add "Video" to supported activity types...
tree
|
commitdiff
2018-12-23
lambda
Merge branch 'hotfix/activity-without-content' into...
tree
|
commitdiff
2018-12-20
lambda
Merge branch 'ci-test-fix' into 'develop'
tree
|
commitdiff
2018-12-20
kaniini
Merge branch '114_email_confirmation' into 'develop'
tree
|
commitdiff
2018-12-18
rinpatch
Merge branch 'develop' into fix/formatter-ignore-html...
tree
|
commitdiff
2018-12-18
lambda
Merge branch 'feature/new-user-routes' into 'develop'
tree
|
commitdiff
2018-12-18
href
Twitter ActivityView: fix crash when activity content...
tree
|
commitdiff
2018-12-18
Ivan Tashkinov
[#114] Added `pleroma.confirmation_pending` to user...
tree
|
commitdiff
2018-12-18
raeno
Merge branch 'develop' into oembed_provider
tree
|
commitdiff
2018-12-17
lambda
Merge branch 'fix-test' into 'develop'
tree
|
commitdiff
2018-12-17
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2018-12-17
lambda
Merge branch '459_fix_user_profile_crash' into 'develop'
tree
|
commitdiff
next