projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
Resolve merge conflict
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
2018-09-12
Haelwenn
Merge branch 'patch-3' into 'develop'
tree
|
commitdiff
2018-09-10
shadowfacts
Add visible_in_picker to status emojis
tree
|
commitdiff
2018-09-10
William Pitcock
everywhere: use Pleroma.HTML module instead of HtmlSani...
tree
|
commitdiff
2018-09-08
lambda
Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'
tree
|
commitdiff
2018-09-07
kaniini
Merge branch 'add-secure-and-samesite-cookie-flags...
tree
|
commitdiff
2018-09-07
kaniini
Merge branch 'improve-server-config-examples' into...
tree
|
commitdiff
2018-09-07
kaniini
Merge branch 'feature/custom_media_url' into 'develop'
tree
|
commitdiff
2018-09-07
kaniini
Merge branch 'fix/tusk' into 'develop'
tree
|
commitdiff
2018-09-07
Martin Kühl
Mastodon API: Add unsupported attributes to relationshi...
tree
|
commitdiff
2018-09-05
Haelwenn
Merge branch 'fix/sign-in-with-toot' into 'develop'
tree
|
commitdiff
2018-09-03
kaniini
Merge branch 'develop' into 'feature/staff-discovery...
tree
|
commitdiff
2018-09-03
kaniini
Merge branch 'feature/mastodon_api_2.4.x' into 'develop'
tree
|
commitdiff
2018-09-03
kaniini
Merge branch 'nil-bio-emojis' into 'develop'
tree
|
commitdiff
2018-09-02
kaniini
Merge branch 'hotfix_broken_likes' into 'develop'
tree
|
commitdiff
2018-09-01
Martin Kühl
AccountView: `sensitive` is supposed to be a boolean...
tree
|
commitdiff
2018-09-01
kaniini
Merge branch 'lanodan/code-dup_in_mastoapi_search'...
tree
|
commitdiff
2018-09-01
kaniini
Merge branch 'verify-credentials-default-scope' into...
tree
|
commitdiff
2018-09-01
Will Pearson
Specify default scope in verify_credentials
tree
|
commitdiff
2018-08-30
kaniini
Merge branch 'use-media-proxy-in-suggestions-api' into...
tree
|
commitdiff
2018-08-30
kaniini
Merge branch 'backendhack' into 'develop'
tree
|
commitdiff
2018-08-29
Haelwenn
Merge branch 'fix-mastodon-notifications-without-nickna...
tree
|
commitdiff
2018-08-29
href
Fix Mastodon API when actor's nickname is null
tree
|
commitdiff
2018-08-27
Haelwenn (lanodan...
[Pleroma.Web.MastodonAPI.FilterView] fix expires_at...
tree
|
commitdiff
2018-08-27
Haelwenn (lanodan...
[Pleroma.Web.MastodonAPI.FilterView]: expires_at should...
tree
|
commitdiff
2018-08-27
Haelwenn (lanodan...
[MastodonAPI] Add filters
tree
|
commitdiff
2018-08-27
Haelwenn (lanodan...
[Pleroma.Web.MastodonAPI.AccountView]: Add fields support
tree
|
commitdiff
2018-08-27
Haelwenn (lanodan...
[Pleroma.Web.MastodonAPI.AccountView]: Add bot field
tree
|
commitdiff
2018-08-27
lambda
Merge branch 'bugfix/announce-timeline-flooding' into...
tree
|
commitdiff
2018-08-26
kaniini
Merge branch 'feature/emoji-in-local-users' into 'develop'
tree
|
commitdiff
2018-08-26
kaniini
Merge branch 'develop' into 'feature/relay'
tree
|
commitdiff
2018-08-21
Haelwenn (lanodan...
[Pleroma.Web.MastodonAPI.StatusView] Fix rendering...
tree
|
commitdiff
2018-08-21
kaniini
Merge branch 'feature/peertube_2' into 'develop'
tree
|
commitdiff
2018-08-21
kaniini
Merge branch 'sanitize-bio' into 'develop'
tree
|
commitdiff
2018-08-21
Haelwenn (lanodan...
[Pleroma.Web.MastodonAPI.StatusView] Support Peertube...
tree
|
commitdiff
2018-08-21
Haelwenn (lanodan...
Fix attachement rendering
tree
|
commitdiff
2018-08-21
lain
Render peertube videos in mastodon.
tree
|
commitdiff
2018-08-21
ensra
mastodon api: sanitize the bio HTML
tree
|
commitdiff
2018-08-16
kaniini
Merge branch 'dev-lanodan-url-regex' into 'develop'
tree
|
commitdiff
2018-08-16
kaniini
Merge branch 'mastofe/system-font' into 'develop'
tree
|
commitdiff
2018-08-16
kaniini
Merge branch 'develop' into 'patch-2'
tree
|
commitdiff
2018-08-16
kaniini
Merge branch 'fix/put-repeats-at-activitypub-outbox...
tree
|
commitdiff
2018-08-16
kaniini
Merge branch 'fix/normalize-file-extension' into 'develop'
tree
|
commitdiff
2018-08-15
lambda
Merge branch 'feature/suggestions-api-with-third-party...
tree
|
commitdiff
2018-08-12
lambda
Merge branch 'feature/invites' into 'develop'
tree
|
commitdiff
2018-08-12
lambda
Merge branch 'fix/remote-follow-errormessage' into...
tree
|
commitdiff
2018-08-12
lambda
Merge branch 'bugfix/gopher-empty-lines' into 'develop'
tree
|
commitdiff
2018-08-12
lambda
Merge branch 'emoji-in-account-view' into 'develop'
tree
|
commitdiff
2018-08-07
eal
MastoAPI AccountView: render profile emoji.
tree
|
commitdiff
2018-07-20
Tristan Mahé
Merge remote-tracking branch 'upstream/develop' into...
tree
|
commitdiff
2018-07-19
Hakaba Hitoyo
merge
tree
|
commitdiff
2018-07-19
lambda
Merge branch 'tests/plume' into 'develop'
tree
|
commitdiff
2018-07-19
lambda
Merge branch 'bugfix/activitystreams-notice-urls' into...
tree
|
commitdiff
2018-07-19
lambda
Merge branch 'feature/fe-configuration' into 'develop'
tree
|
commitdiff
2018-07-18
lambda
Merge branch 'feature/media-description' into 'develop'
tree
|
commitdiff
2018-07-17
William Pitcock
mastodon api: use object name as alt text
tree
|
commitdiff
2018-07-13
Tristan Mahé
Merge remote-tracking branch 'upstream/develop' into...
tree
|
commitdiff
2018-07-12
lambda
Merge branch 'feature/object-normalization' into 'develop'
tree
|
commitdiff
2018-07-12
lambda
Merge branch 'feature/mediaproxy-nodeinfo' into 'develop'
tree
|
commitdiff
2018-07-12
lambda
Merge branch 'feature/default-scope' into 'develop'
tree
|
commitdiff
2018-07-12
lambda
Merge branch 'feature/article-support' into 'develop'
tree
|
commitdiff
2018-07-12
lambda
Merge branch 'feature/auto-shortcodes' into 'develop'
tree
|
commitdiff
2018-07-12
lambda
Merge branch 'bugfix/status-url-field' into 'develop'
tree
|
commitdiff
2018-07-11
Haelwenn (lanodan...
[Pleroma.Web.MastodonAPI.StatusView]: Fill the url...
tree
|
commitdiff
2018-06-27
William Pitcock
activity interpretation: formatting
tree
|
commitdiff
2018-06-27
William Pitcock
mastodon api: add interpreter for Article activity...
tree
|
commitdiff
2018-06-25
lambda
Merge branch 'fix/mutes.json-emptyarray' into 'develop'
tree
|
commitdiff
2018-06-25
lambda
Merge branch 'feature/configurable-blocks' into 'develop'
tree
|
commitdiff
2018-06-24
lambda
Merge branch 'feature/application-xml-mime' into 'develop'
tree
|
commitdiff
2018-06-24
lambda
Merge branch 'features/glitch-soc-frontend' into 'develop'
tree
|
commitdiff
2018-06-23
Haelwenn (lanodan...
Fake 2.4.0 API
tree
|
commitdiff
2018-06-16
squidboi
Merge branch 'develop' into feature/configurable-blocks
tree
|
commitdiff
2018-06-16
lambda
Merge branch 'feature/configure-mrf-rejectnonpublic...
tree
|
commitdiff
2018-06-15
eal
Merge branch 'bugfix/mastofe_thread_render' into 'develop'
tree
|
commitdiff
2018-06-15
Haelwenn (lanodan...
Pleroma.Web.MastodonAPI.StatusView: Fix status.json...
tree
|
commitdiff
2018-05-26
lain
Merge branch 'csaurus/pleroma-feature/mstdn-direct...
tree
|
commitdiff
2018-05-26
lain
Merge branch 'develop' into csaurus/pleroma-feature...
tree
|
commitdiff
2018-05-26
lain
Merge branch 'kaniini/pleroma-feature/activitypub-accep...
tree
|
commitdiff
2018-05-25
William Pitcock
mastodon api: properly track if an account is locked...
tree
|
commitdiff
2018-05-24
lambda
Merge branch 'feature/lists' into 'develop'
tree
|
commitdiff
2018-05-24
eal
MastoAPI: add lists.
tree
|
commitdiff
2018-05-22
csaurus
Merge branch 'develop' into feature/mstdn-direct-api
tree
|
commitdiff
2018-05-13
csaurus
Formatting
tree
|
commitdiff
2018-05-13
csaurus
Fix tests.
tree
|
commitdiff
2018-05-13
lambda
Merge branch 'feature/unrepeats' into 'develop'
tree
|
commitdiff
2018-05-13
lain
Merge branch 'develop' into kaniini/pleroma-bugfix...
tree
|
commitdiff
2018-05-13
lambda
Merge branch 'patch-2' into 'develop'
tree
|
commitdiff
2018-05-06
lambda
Merge branch 'feld-varnish' into 'develop'
tree
|
commitdiff
2018-05-06
lambda
Merge branch 'feld-warnings' into 'develop'
tree
|
commitdiff
2018-05-04
Mark Felder
Group def renders together to fix warning
tree
|
commitdiff
2018-05-04
Mark Felder
Merge branch 'feld-test.secret' into feld-warnings
tree
|
commitdiff
2018-05-04
Mark Felder
Fix unused variables, imports, and aliases
tree
|
commitdiff
2018-04-24
lambda
Merge branch 'favicon_tag' into 'develop'
tree
|
commitdiff
2018-04-10
lambda
Merge branch 'feld-varnish' into 'develop'
tree
|
commitdiff
2018-04-02
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2018-04-02
lambda
Merge branch 'fix-107' into 'develop'
tree
|
commitdiff
2018-04-02
Morgan Bazalgette
masto api: run emojis through mediaproxy
tree
|
commitdiff
2018-04-01
KANEKO Yoshitaka
Fix conflict
tree
|
commitdiff
2018-03-30
lain
Format the code.
tree
|
commitdiff
2018-03-27
lain
Reduce OP fetching queries.
tree
|
commitdiff
2018-03-27
lain
Don't try to fetch OP if none is there.
tree
|
commitdiff
next