projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
Merge branch 'develop' into feature/prometheus
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
mastodon_api_controller.ex
2019-02-19
Ekaterina Vaartis
Implement mastodon mutes endpoint
blob
|
commitdiff
|
raw
|
diff to current
2019-02-19
Ekaterina Vaartis
Implement muting, add it to the mastodon API
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-17
Ivan Tashkinov
[#468] Merged `upstream/develop`, resolved conflicts.
blob
|
commitdiff
|
raw
|
diff to current
2019-02-17
Ivan Tashkinov
[#468] Refactored OAuth scopes' defaults & missing...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-16
Haelwenn (lanodan...
[MastoAPI] Add switching of frontend flavours
blob
|
commitdiff
|
raw
|
diff to current
2019-02-15
Ivan Tashkinov
[#468] Defined OAuth restrictions for all applicable...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-15
eugenijm
Add logic for keeping follow_request_count up-to-date...
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
Ivan Tashkinov
[#468] Refactored OAuth scopes parsing / defaults handling.
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-13
Ivan Tashkinov
[#468] User UI for OAuth permissions restriction. Stand...
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-09
lambda
Merge branch 'feature/keyword-policy' into 'develop'
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
lambda
Merge branch 'mark-streaming-feature-for-ios-apps'...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-08
lambda
Merge branch 'oauth2_strengthening' into 'develop'
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-07
Ivan Tashkinov
OAuth2 security fixes: redirect URI validation, "Mastod...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-07
Karen Konou
Migration and some boilerplate stuff
blob
|
commitdiff
|
raw
|
diff to current
2019-02-06
kaniini
Merge branch 'rename-followings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-06
Mark Felder
hide_followings was renamed to hide_followers in the...
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-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-03
Maxim Filippov
Split hide_network into hide_followers & hide_following...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-01
kaniini
Merge branch 'revert-0a82a7e6' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-01
kaniini
Revert "Merge branch 'feature/split-hide-network' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-01
href
Merge branch 'hotfix/object-normalize-cache' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-01
href
Merge branch 'streaming-api-url-fix' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-01
href
Merge branch 'develop' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-01
eugenijm
Use String.replace_leading instead of String.replace...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-01
Haelwenn
Merge branch 'bugfix/get_list_return_404' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-01
Haelwenn (lanodan...
MastodonAPI.MastodonAPIController: Return a 404 when...
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-31
Egor Kislitsyn
Merge remote-tracking branch 'MAIN/develop' into featur...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-30
kaniini
Merge branch 'multiple-hackney-pools' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-30
href
Use multiple hackney pools
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
Maxim Filippov
Split hide_network into hide_followers & hide_followings
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
William Pitcock
rich media: add helpers module, use instead of Mastodon...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-28
William Pitcock
mastodon api: formatting
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
kaniini
Merge branch 'discard-invalid-likes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-27
kaniini
Merge branch 'flake-random-worker-id' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-27
kaniini
Merge branch 'features/mastoapi-multi-hashtag' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-26
kaniini
Merge branch 'webpush-endpoint-size' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-26
kaniini
Merge branch 'flake-from-int' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-26
kaniini
Merge branch 'join-in-preloads' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-26
kaniini
Merge branch 'features/mastoapi-cards' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-26
Haelwenn (lanodan...
Web.MastodonAPI.MastodonAPIController: tag+any bookmark...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-26
William Pitcock
mastodon api: use OGP uri instead of page_url for deduc...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-26
William Pitcock
mastodon api: use HTML.extract_first_external_url()
blob
|
commitdiff
|
raw
|
diff to current
2019-01-26
William Pitcock
mastodon api: provider_name setting is required too...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-26
Haelwenn (lanodan...
Web.MastodonAPI.MastodonAPIController: generic get_stat...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-26
Haelwenn (lanodan...
Web.MastodonAPI.MastodonAPIController: Add Rich-Media...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-26
Haelwenn (lanodan...
Fix the logic in multi-hashtag TLs
blob
|
commitdiff
|
raw
|
diff to current
2019-01-26
Haelwenn (lanodan...
[WIP,MastoAPI] Multi-tag timelines
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 '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-20
lambda
Merge branch 'add-custom-emoji-test' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-20
lambda
Merge branch '2019-1-20-update-frontend' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-20
lambda
Merge branch 'i1t/pleroma-477_user_search_improvements...
blob
|
commitdiff
|
raw
|
diff to current
next