projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
2019-02-22
kaniini
Merge branch 'fix/twittercards' into 'develop'
tree
|
commitdiff
2019-02-20
kaniini
Merge branch 'feature/reports' into 'develop'
tree
|
commitdiff
2019-02-20
Egor
Reports
tree
|
commitdiff
2019-02-20
kaniini
Merge branch 'nicer-share-urls' into 'develop'
tree
|
commitdiff
2019-02-20
lain
Add some nicer urls in status view.
tree
|
commitdiff
2019-02-20
Ivan Tashkinov
[#468] Merged `upstream/develop`.
tree
|
commitdiff
2019-02-20
lambda
Merge branch 'muting' into 'develop'
tree
|
commitdiff
2019-02-19
Ekaterina Vaartis
Update the mute implementation to the current codebase
tree
|
commitdiff
2019-02-19
Ekaterina Vaartis
Implement muting, add it to the mastodon API
tree
|
commitdiff
2019-02-19
Mark Felder
Merge branch 'develop' into fix/twittercards
tree
|
commitdiff
2019-02-19
Ivan Tashkinov
[#468] Merged `upstream/develop`.
tree
|
commitdiff
2019-02-19
lambda
Merge branch 'fix/check-follower-collection-in-is_priva...
tree
|
commitdiff
2019-02-19
lambda
Merge branch 'fix/ap_id-unique_constraint' into 'develop'
tree
|
commitdiff
2019-02-18
kaniini
Merge branch 'feature/jobs' into 'develop'
tree
|
commitdiff
2019-02-18
kaniini
Merge branch 'patch-image-description' into 'develop'
tree
|
commitdiff
2019-02-18
kaniini
Merge branch 'feature/add-oauth-tokens-endpoint' into...
tree
|
commitdiff
2019-02-18
kaniini
Merge branch 'features/flavour-switching' into 'develop'
tree
|
commitdiff
2019-02-18
kaniini
Merge branch 'follow-request-count' into 'develop'
tree
|
commitdiff
2019-02-18
kaniini
Merge branch 'csv-export' into 'develop'
tree
|
commitdiff
2019-02-17
lambda
Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
tree
|
commitdiff
2019-02-17
lambda
Merge branch 'docker-speedup' into 'develop'
tree
|
commitdiff
2019-02-17
lambda
Merge branch 'mastoapi-stop-capping-attachments' into...
tree
|
commitdiff
2019-02-17
Ivan Tashkinov
[#468] Merged `upstream/develop`, resolved conflicts.
tree
|
commitdiff
2019-02-16
rinpatch
Remove a limit on attachments in Mastodon API and docum...
tree
|
commitdiff
2019-02-14
Wim Vanderbauwhede
Merge remote-tracking branch 'upstream/develop' into...
tree
|
commitdiff
2019-02-14
kaniini
Merge branch 'fix/credo-issues-test' into 'develop'
tree
|
commitdiff
2019-02-11
rinpatch
Merge branch 'feature/thread-muting' into 'develop'
tree
|
commitdiff
2019-02-11
Karen Konou
Merge branch 'develop' into feature/thread-muting
tree
|
commitdiff
2019-02-11
Karen Konou
Refactor as per Rin's suggestions, add endpoint tests
tree
|
commitdiff
2019-02-11
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2019-02-10
kaniini
Merge branch 'update-mastofe/glitch-soc-2019-02-10...
tree
|
commitdiff
2019-02-10
kaniini
Merge branch 'feather_mention' into 'develop'
tree
|
commitdiff
2019-02-10
kaniini
Merge branch 'fix/credo-issues' into 'develop'
tree
|
commitdiff
2019-02-10
Karen Konou
refactor, status view updating, error handling
tree
|
commitdiff
2019-02-09
Haelwenn (lanodan...
de-group alias/es
tree
|
commitdiff
2019-02-09
Haelwenn (lanodan...
Make credo happy
tree
|
commitdiff
2019-02-08
lambda
Merge branch 'fix/do-split-migration-for-local-users...
tree
|
commitdiff
2019-02-08
Karen Konou
Merge branch 'develop' into feature/thread-muting
tree
|
commitdiff
2019-02-08
rinpatch
Merge branch 'develop' into feature/keyword-policy
tree
|
commitdiff
2019-02-06
Haelwenn
Merge branch 'bugfix/rich-media-card' into 'develop'
tree
|
commitdiff
2019-02-06
William Pitcock
mastodon api: rich media: don't clobber %URI struct...
tree
|
commitdiff
2019-02-06
rinpatch
Merge branch 'fix/activitypub-user-view-badmap' into...
tree
|
commitdiff
2019-02-06
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
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-05
kaniini
Merge branch 'bugfix/rich-media-image-nil' into 'develop'
tree
|
commitdiff
2019-02-05
William Pitcock
mastodon api: fix rendering of cards without image...
tree
|
commitdiff
2019-02-04
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2019-02-04
rinpatch
Merge branch 'hotfix/hellthread-deprecation-warning...
tree
|
commitdiff
2019-02-04
kaniini
Merge branch 'mime-riff' into 'develop'
tree
|
commitdiff
2019-02-04
rinpatch
Merge branch 'fix/rich-media-relative-path' into 'develop'
tree
|
commitdiff
2019-02-04
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2019-02-02
rinpatch
Check if rich media uri is relative
tree
|
commitdiff
2019-02-02
rinpatch
Use with instead of if in the card
tree
|
commitdiff
2019-02-02
rinpatch
merge only if page_url is an absolute path
tree
|
commitdiff
2019-02-02
rinpatch
Fix rich media relative path
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
Haelwenn
Merge branch 'docs/pleroma-api-invite-token' into ...
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
Ivan Tashkinov
[#534] Merged `upstream/develop`.
tree
|
commitdiff
2019-01-28
Haelwenn
Merge branch 'safe-render-activities' into 'develop'
tree
|
commitdiff
2019-01-28
href
re f83bae7c: remove unnecessary filter
tree
|
commitdiff
2019-01-28
William Pitcock
mastodon api: card: force OGP images through mediaproxy
tree
|
commitdiff
2019-01-28
William Pitcock
rich media: add helpers module, use instead of Mastodon...
tree
|
commitdiff
2019-01-28
William Pitcock
mastodon api: embed card in status object
tree
|
commitdiff
2019-01-28
William Pitcock
mastodon api: factor out status card fetching, move...
tree
|
commitdiff
2019-01-28
Haelwenn (lanodan...
[MastoAPI][GlitchAPI] Add bookmarks
tree
|
commitdiff
2019-01-27
lambda
Merge branch 'safe-render-activities' into 'develop'
tree
|
commitdiff
2019-01-27
kaniini
Merge branch 'discard-invalid-likes' into 'develop'
tree
|
commitdiff
2019-01-27
href
Views: wrap activity rendering in a rescue
tree
|
commitdiff
2019-01-27
kaniini
Merge branch 'flake-random-worker-id' into 'develop'
tree
|
commitdiff
2019-01-27
kaniini
Merge branch 'features/mastoapi-multi-hashtag' into...
tree
|
commitdiff
2019-01-27
Haelwenn
Merge branch 'features/masto-account-view-rights' into...
tree
|
commitdiff
2019-01-27
Haelwenn (lanodan...
Web.MastodonAPI.AccountView: Add is_moderator and is_admin
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-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
lambda
Merge branch '530_federator_user_info_overwrite_fix...
tree
|
commitdiff
2019-01-21
lambda
Merge branch 'feature/dm-sanity' into 'develop'
tree
|
commitdiff
2019-01-21
Haelwenn (lanodan...
Activity: get_create_activity_by_object_ap_id/1 → get_c...
tree
|
commitdiff
2019-01-21
Haelwenn (lanodan...
Activity: create_activity_by_object_id_query/1 → create...
tree
|
commitdiff
2019-01-20
lambda
Merge branch 'i1t/pleroma-477_user_search_improvements...
tree
|
commitdiff
2019-01-20
William Pitcock
mastodon api: get_visibility(): DMs never have a cc...
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
next