projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'develop' into feature/thread-muting
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
status_view.ex
2019-02-11
Karen Konou
Merge branch 'develop' into feature/thread-muting
blob
|
commitdiff
|
raw
2019-02-11
Karen Konou
Refactor as per Rin's suggestions, add endpoint tests
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-10
Karen Konou
refactor, status view updating, error handling
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...
Make credo happy
blob
|
commitdiff
|
raw
|
diff to current
2019-02-08
lambda
Merge branch 'fix/do-split-migration-for-local-users...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-08
Karen Konou
Merge branch 'develop' into feature/thread-muting
blob
|
commitdiff
|
raw
|
diff to current
2019-02-08
rinpatch
Merge branch 'develop' into feature/keyword-policy
blob
|
commitdiff
|
raw
|
diff to current
2019-02-06
Haelwenn
Merge branch 'bugfix/rich-media-card' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-06
William Pitcock
mastodon api: rich media: don't clobber %URI struct...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-06
rinpatch
Merge branch 'fix/activitypub-user-view-badmap' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-05
kaniini
Merge branch 'fix-dm-index' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-05
kaniini
Merge branch 'feature/ap-c2s-whoami' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-05
kaniini
Merge branch 'feature/split-hide-network-v2' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-05
kaniini
Merge branch 'bugfix/rich-media-image-nil' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-05
William Pitcock
mastodon api: fix rendering of cards without image...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-04
rinpatch
Merge branch 'hotfix/hellthread-deprecation-warning...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-04
kaniini
Merge branch 'mime-riff' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-04
rinpatch
Merge branch 'fix/rich-media-relative-path' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-02
rinpatch
Check if rich media uri is relative
blob
|
commitdiff
|
raw
|
diff to current
2019-02-02
rinpatch
Use with instead of if in the card
blob
|
commitdiff
|
raw
|
diff to current
2019-02-02
rinpatch
merge only if page_url is an absolute path
blob
|
commitdiff
|
raw
|
diff to current
2019-02-02
rinpatch
Fix rich media relative path
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
Haelwenn
Merge branch 'docs/pleroma-api-invite-token' into ...
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-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
Haelwenn
Merge branch 'safe-render-activities' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-28
href
re f83bae7c: remove unnecessary filter
blob
|
commitdiff
|
raw
|
diff to current
2019-01-28
William Pitcock
mastodon api: card: force OGP images through mediaproxy
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
mastodon api: embed card in status object
blob
|
commitdiff
|
raw
|
diff to current
2019-01-28
William Pitcock
mastodon api: factor out status card fetching, move...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-28
Haelwenn (lanodan...
[MastoAPI][GlitchAPI] Add bookmarks
blob
|
commitdiff
|
raw
|
diff to current
2019-01-27
lambda
Merge branch 'safe-render-activities' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-27
href
Views: wrap activity rendering in a rescue
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-25
kaniini
Merge branch 'develop' into 'oembed_provider'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-25
kaniini
Merge branch 'classic-flakeids' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-23
kaniini
Merge branch 's3-namespace' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-23
lambda
Merge branch 'rename/pleroma_activity_consistency'...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-23
lain
Merge branch 'develop' into rename/pleroma_activity_con...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-21
lambda
Merge branch '530_federator_user_info_overwrite_fix...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-21
lambda
Merge branch 'feature/dm-sanity' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-21
Haelwenn (lanodan...
Activity: get_create_activity_by_object_ap_id/1 → get_c...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-21
Haelwenn (lanodan...
Activity: create_activity_by_object_id_query/1 → create...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-20
lambda
Merge branch 'i1t/pleroma-477_user_search_improvements...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-20
William Pitcock
mastodon api: get_visibility(): DMs never have a cc...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-18
rinpatch
Fix merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-01-17
kaniini
Merge branch 'resilient-user-view-2' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-16
lain
MastoAPI: Don't break on missing users.
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-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
next
projects / akkoma / history