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
/
router.ex
2019-01-13
rinpatch
Resolve merge conflict
blob
|
commitdiff
|
raw
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
2018-12-20
kaniini
Merge branch '114_email_confirmation' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-20
Ivan Tashkinov
[#114] Added :user_id component to email confirmation...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-20
kaniini
Merge branch 'documentation/copy-pleroma-api' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-19
raeno
Remove extra bracket
blob
|
commitdiff
|
raw
|
diff to current
2018-12-19
raeno
Merge branch 'develop' into oembed_provider
blob
|
commitdiff
|
raw
|
diff to current
2018-12-19
kaniini
Merge branch 'userless-admin' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-18
lain
Add a way to use the admin api without a user.
blob
|
commitdiff
|
raw
|
diff to current
2018-12-18
rinpatch
Merge branch 'develop' into fix/formatter-ignore-html...
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
Ivan Tashkinov
[#114] Added email confirmation resend action. Added...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-18
Ivan Tashkinov
[#114] Account confirmation email, registration as...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-18
Ivan Tashkinov
[#114] Email confirmation route, action, node setting...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-18
raeno
Merge branch 'develop' into oembed_provider
blob
|
commitdiff
|
raw
|
diff to current
2018-12-18
lambda
Merge branch 'runtime-static-plug' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-17
href
Instance/Static runtime plug
blob
|
commitdiff
|
raw
|
diff to current
2018-12-17
lambda
Merge branch '459_fix_user_profile_crash' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-17
lambda
Merge branch 'captcha' into 'develop'
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-15
Ekaterina Vaartis
Add base CAPTCHA support (currently only kocaptcha)
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
2018-12-14
raeno
Merge branch 'develop' into oembed_provider
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
raeno
Handle "users/:id" links as well. Fix comments in MR.
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
href
Merge branch 'feature/file-size-checking' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
Ivan Tashkinov
[#114] Moved email_invite action to AdminAPIController...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
href
Merge branch '114_user_registration_emails' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
Ivan Tashkinov
[#114] Addressed MR comments. Removed functionality...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-13
raeno
Remove oembed for now, will submit it in another MR...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-13
raeno
Refactor ostatus_controller, extract metatags redirecti...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-13
raeno
Insert meta tags into static index.html on the fly...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-12
Ivan Tashkinov
[#114] Routes and config for `confirm_email` and `email...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-12
Ivan Tashkinov
[#114] Initial implementation of user password reset...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-12
Ivan Tashkinov
[#114] Added /dev/mailbox dev-only route (emails previe...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'fix_empty_bio_crash' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'fix/config-md-typos' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'support/bugfix_272' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'fix/theora-detection-read-bytes' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'anonymize-filter-text' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'develop' into 'fix/mix-task-uploads-modul...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'parallel588/pleroma-support/compile_warni...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-09
Maksim Pechnikov
fix compile warnings
blob
|
commitdiff
|
raw
|
diff to current
2018-12-08
lambda
Merge branch 'fix/add-upload.ex' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-08
lambda
Merge branch 'fix/typo-relay-ex' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-07
lambda
Merge branch 'fix/gopher-respect-ip' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-07
lambda
Merge branch 'media-proxy-follow-redirect' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-07
lambda
Merge branch '394_user_tags' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-07
Ivan Tashkinov
[#394] Refactoring (using Ecto.Multi; "untag" route...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
Rin Toshaka
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
Ivan Tashkinov
[#394] Added `users.tags` and admin routes to tag and...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
kaniini
Merge branch 'fix/mastodon-api-settings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
kaniini
Merge branch 'correct-and-improve-http-options' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
kaniini
Merge branch 're-mrf' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
kaniini
Merge branch 'feature/compat/push-subscriptions' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
Egor Kislitsyn
Merge branch 'develop' into feature/compat/push-subscri...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
Egor Kislitsyn
Merge branch 'develop' into feature/compat/push-subscri...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
kaniini
Merge branch '210_twitter_api_uploads_alt_text' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-05
Rin Toshaka
Merge develop to refactor/mix-tasks
blob
|
commitdiff
|
raw
|
diff to current
2018-12-04
Ivan Tashkinov
[#210] TwitterAPI: implemented /api/media/metadata...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-03
lambda
Merge branch 'fix-media-proxy-defaults' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-02
rinpatch
Merge branch 'develop' into fix/theora-detection-read...
blob
|
commitdiff
|
raw
|
diff to current
next
projects / akkoma / history