projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
[#468] Merged `upstream/develop`, resolved conflicts.
[akkoma]
/
lib
/
pleroma
/
web
/
router.ex
2019-02-17
Ivan Tashkinov
[#468] Merged `upstream/develop`, resolved conflicts.
blob
|
commitdiff
|
raw
2019-02-15
Ivan Tashkinov
[#468] Defined OAuth restrictions for all applicable...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-15
lambda
Merge branch 'bugfix/oauth-token-padding' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-15
rinpatch
Merge branch 'hellthread-filter-fix' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
lambda
Merge branch 'bugfix/activitypub-reserialization' 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-14
kaniini
Merge branch 'feature/activitypub-oauth-endpoints'...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-13
William Pitcock
activitypub: user view: use route helpers instead of...
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-09
Ivan Tashkinov
[#468] MastodonAPI scope restrictions. Removed obsolete...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-09
Ivan Tashkinov
[#468] Prototype of OAuth2 scopes support. TwitterAPI...
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
Karen Konou
Migration and some boilerplate stuff
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-04
William Pitcock
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
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 'bugfix/fix-rejects' 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
William Pitcock
API: kill /api/rich_media/parse endpoint
blob
|
commitdiff
|
raw
|
diff to current
2019-01-28
Haelwenn (lanodan...
[MastoAPI][GlitchAPI] Add bookmarks
blob
|
commitdiff
|
raw
|
diff to current
2019-01-27
rinpatch
Merge branch 'notice-404-to-fe' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-27
href
/notice/:id - send the FE index even if 404
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: Add Rich-Media...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-26
kaniini
Merge branch 'documentation/mastalab' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-25
kaniini
Merge branch 'oembed_provider' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-25
rinpatch
Merge remote-tracking branch 'pl/develop' into oembed_p...
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-23
kaniini
Merge branch 's3-namespace' into 'develop'
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-23
lain
New frontend configuration mechanism.
blob
|
commitdiff
|
raw
|
diff to current
2019-01-22
Haelwenn
Merge branch 'fix/activity_get_by_id' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-22
kaniini
Merge branch 'uploader-controller' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-21
href
Uploader callback controller
blob
|
commitdiff
|
raw
|
diff to current
2019-01-18
rinpatch
Fix merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-01-16
rinpatch
Remove caching because it does not affect performance...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-16
rinpatch
add caching
blob
|
commitdiff
|
raw
|
diff to current
2019-01-15
rinpatch
remove useless newlines after every tag. Make domain...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-15
rinpatch
Fix some edge cases [nervous laughter]
blob
|
commitdiff
|
raw
|
diff to current
2019-01-14
rinpatch
Merge branch 'media-url-escape' into 'develop'
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-14
kaniini
Merge branch 'feature/add-oembed-parser' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-14
kaniini
Merge branch 'activitypub-likes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-13
rinpatch
Resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-01-12
sxsdv1
Add route to get object like activities
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
Add Twitter API for the pinned statuses
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-07
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-07
Egor Kislitsyn
add pinned posts
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
kaniini
Merge branch 'fix/html-cache-content-collision' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-04
kaniini
Merge branch 'feature/rich-media' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-03
rinpatch
Merge branch 'captcha' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-02
Maxim Filippov
Add RichMediaController and tests
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-30
kaniini
Merge branch 'mr/retry-queue' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-30
Rin Toshaka
Resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2018-12-30
kaniini
Merge branch 'activitypub-c2s' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-29
sxsdv1
Wire up stub routes for client calls of activitypub...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-29
kaniini
Merge branch 'carrot-bullying' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-29
kaniini
Merge branch '483_blocks_import_export' into 'develop'
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-28
Ivan Tashkinov
[#483] Blocked users list import (TwitterAPI).
blob
|
commitdiff
|
raw
|
diff to current
2018-12-28
Ivan Tashkinov
[#483] Blocked users export for TwitterAPI.
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 'hotfix/activity-without-content' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-20
lambda
Merge branch 'ci-test-fix' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
next
projects / akkoma / history