projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
Merge branch 'develop' into feature/digest-email
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
status_view.ex
2019-04-06
feld
Merge branch 'feature/prometheus' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-06
Alex S
Merge develop to 770-add-emoji-tags
blob
|
commitdiff
|
raw
|
diff to current
2019-04-05
lambda
Merge branch 'hotfix/html-sanitization' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-05
rinpatch
Refactor html caching functions to have a key instead...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'features/pleroma-tan' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-01
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-29
lambda
Merge branch 'feature/deploy-docs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-27
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-27
lambda
Merge branch 'feature/more-user-filters' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-26
lambda
Merge branch 'fix/ap-icon' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-26
lambda
Merge branch 'features/mastoapi/2.7.2-instance-attribut...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-26
lambda
Merge branch 'features/mastoapi/2.7.0-auth-error-messag...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-26
lambda
Merge branch 'replies-count' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-26
eugenijm
Increment replies_count on replies (MastoAPI)
blob
|
commitdiff
|
raw
|
diff to current
2019-03-25
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-24
rinpatch
Merge branch 'fix/eldap-warnings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-22
lambda
Merge branch 'safe-mentions' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-22
kaniini
Merge branch 'safe-mentions' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-22
kaniini
Merge branch 'feature/mastoapi-ext-conversation-id...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-21
William Pitcock
mastodon api: add conversation_id extension (ref #674)
blob
|
commitdiff
|
raw
|
diff to current
2019-03-16
kaniini
Merge branch 'feature/federated-flags' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-16
lambda
Merge branch 'feature/oauth-me' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-15
kaniini
Merge branch 'fix/mediaproxy-capture-content-dispositio...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-15
kaniini
Merge branch 'feature/openldap-support' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-15
kaniini
Merge branch 'enable-dedupe-by-default' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-15
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-15
Haelwenn
Merge branch 'mastoapi/mime_type' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-15
rinpatch
Extend MastoAPI to provide attachment mimetypes
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
rinpatch
Merge develop to bump elixir version in the CI so I...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
rinpatch
Merge branch 'hotfix/delete-activities' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
link0ff
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-13
kaniini
Merge branch 'mastofe-content-types' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-11
rinpatch
Merge branch 'ci-switch-to-elixir-1-8-1' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-11
lambda
Merge branch 'add-local-field-to-status' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-11
lain
MastoAPI StatusView: Add locality indicator.
blob
|
commitdiff
|
raw
|
diff to current
2019-03-04
Karen Konou
Merge branch 'bugfix/delete-activity-audience' of git...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-03
link0ff
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-03
kaniini
Merge branch 'feature/add-pagination-to-users-admin...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-03
lambda
Merge branch 'fix/dont-show-dms-in-mentions-timeline...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-02
rinpatch
Merge branch 'bugfix/oauth-scopes-join' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-01
lambda
Merge branch 'bugfix/236-ambiguous-route-for-numerical...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-28
href
Merge branch 'customizable_auth' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-28
kaniini
Merge branch 'with-mutes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-27
lain
Add user muted status info to MastodonAPI.
blob
|
commitdiff
|
raw
|
diff to current
2019-02-22
kaniini
Merge branch 'fix/twittercards' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-20
kaniini
Merge branch 'nicer-share-urls' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-20
lain
Add some nicer urls in status view.
blob
|
commitdiff
|
raw
|
diff to current
2019-02-19
Mark Felder
Merge branch 'develop' into fix/twittercards
blob
|
commitdiff
|
raw
|
diff to current
2019-02-19
Ivan Tashkinov
[#468] Merged `upstream/develop`.
blob
|
commitdiff
|
raw
|
diff to current
2019-02-19
lambda
Merge branch 'fix/check-follower-collection-in-is_priva...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-19
lambda
Merge branch 'fix/ap_id-unique_constraint' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-18
kaniini
Merge branch 'feature/jobs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-18
kaniini
Merge branch 'patch-image-description' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-18
kaniini
Merge branch 'feature/add-oauth-tokens-endpoint' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-18
kaniini
Merge branch 'features/flavour-switching' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-18
kaniini
Merge branch 'follow-request-count' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-18
kaniini
Merge branch 'csv-export' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-17
lambda
Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-17
lambda
Merge branch 'docker-speedup' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-17
lambda
Merge branch 'mastoapi-stop-capping-attachments' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-17
Ivan Tashkinov
[#468] Merged `upstream/develop`, resolved conflicts.
blob
|
commitdiff
|
raw
|
diff to current
2019-02-16
rinpatch
Remove a limit on attachments in Mastodon API and docum...
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-14
kaniini
Merge branch 'fix/credo-issues-test' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-11
rinpatch
Merge branch 'feature/thread-muting' into 'develop'
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
Karen Konou
Refactor as per Rin's suggestions, add endpoint tests
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-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-06
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
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
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
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-04
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
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
next
projects / akkoma / history