projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
mix.exs
2018-12-29
kaniini
Merge branch '471_invalid_accounts_rendering' into...
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
kaniini
Merge branch 'fix/no-attachment-links' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-27
Haelwenn
Merge branch '396_elixir_1.7' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-27
Ivan Tashkinov
[#396] Updated `ex_doc` version spec. Updated README...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-27
Ivan Tashkinov
[Fixes #396] Required Elixir ~> 1.7.
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
kaniini
Merge branch 'readme' into 'develop'
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
Merge branch 'develop' into oembed_provider
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
Haelwenn (lanodan...
Move to docs
blob
|
commitdiff
|
raw
|
diff to current
2018-12-18
Haelwenn (lanodan...
Documentation: Move generated files to priv/static...
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
raeno
Merge branch 'develop' into oembed_provider
blob
|
commitdiff
|
raw
|
diff to current
2018-12-18
Haelwenn (lanodan...
Pleroma-API.md: Import from /wikis/Pleroma-only-api...
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-17
lambda
Merge branch 'fix-tags' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-17
lambda
Merge branch 'test-mix-tasks' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-17
lambda
Merge branch 'phoenix14' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-17
href
Switch to phoenixframework/phoenix as the needed change...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-17
href
Integration tests for mastodon websocket
blob
|
commitdiff
|
raw
|
diff to current
2018-12-17
lambda
Merge branch 'testfix/webfinger-jrd' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-16
href
Upgrade to Phoenix 1.4
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 'bugfix/webfinger-jrd' 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-14
href
Merge branch 'fix/issue_433' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
raeno
Scrub html from activity.content or user.bio for opengr...
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
href
Enable warning_as_errors for tests
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
Maksim Pechnikov
fix markdown formatting
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
href
Merge branch '114_user_registration_emails' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-12
Ivan Tashkinov
[#114] SMTP deps and config.
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-10
lain
Format.
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lain
Treat warnings as errors outside of tests.
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-06
Rin Toshaka
Merge develop
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
Egor Kislitsyn
Add web push support
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
lain
Merge remote-tracking branch 'origin' into follower...
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
kaniini
Merge branch 'optional-retry-queue' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-04
kaniini
Merge branch 'feature/integration_tesla' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-04
Maksim Pechnikov
init tesla and updated the http requests in Pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-01
rinpatch
Attempt to resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2018-11-30
lain
Merge remote-tracking branch 'origin' into validate...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-27
kaniini
Merge branch 'fix/version-string-force-git-abbrev-size...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-27
kaniini
Merge branch 'ogg-theora-detection' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-24
href
version string: force git abbrev size to 8 chars
blob
|
commitdiff
|
raw
|
diff to current
2018-11-22
kaniini
Merge branch 'feature/admin-api' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-21
kaniini
Merge branch 'feature/improve-version' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-20
href
Improved version string
blob
|
commitdiff
|
raw
|
diff to current
2018-11-15
Hakaba Hitoyo
Merge remote-tracking branch 'official/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-10
lambda
Merge branch 'bugfix/json-ld-object-sanitization' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-10
kaniini
Merge branch 'feature/documentation' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-10
Haelwenn (lanodan...
config/config.md: Create
blob
|
commitdiff
|
raw
|
diff to current
2018-11-10
Haelwenn (lanodan...
Add ex_doc
blob
|
commitdiff
|
raw
|
diff to current
2018-11-10
kaniini
Merge branch 'tests/prismo-url-map' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-04
kaniini
Merge branch 'tests-for-emtpy-content' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-03
kaniini
Merge branch 'feature/cors-again' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-03
lain
Add CORSPlug to make web-based OAuth easier.
blob
|
commitdiff
|
raw
|
diff to current
2018-10-07
kaniini
Merge branch 'patch-2' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-10-05
kaniini
Merge branch 'revert-d31bbb1c' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-10-05
William Pitcock
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
blob
|
commitdiff
|
raw
|
diff to current
2018-09-08
lambda
Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-07
kaniini
Merge branch 'add-secure-and-samesite-cookie-flags...
blob
|
commitdiff
|
raw
|
diff to current
2018-09-05
Moon Man
pinned crypt dependency to specific commit
blob
|
commitdiff
|
raw
|
diff to current
2018-09-05
Moon Man
auth against sha512-crypt password hashes, upgrade...
blob
|
commitdiff
|
raw
|
diff to current
2018-09-03
kaniini
Merge branch 'feature/mastodon_api_2.4.x' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-02
kaniini
Merge branch 'hotfix_broken_likes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-31
lambda
Merge branch 'revert-a26d5e6b' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-31
lambda
Revert "Merge branch 'feature/rich-text' into 'develop'"
blob
|
commitdiff
|
raw
|
diff to current
2018-08-31
kaniini
Merge branch 'feature/rich-text' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-31
William Pitcock
common api: add support for formatting messages outside...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-28
kaniini
Merge branch 'feature/s3' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-27
William Pitcock
mix: add ex_aws and ex_aws_s3 dependencies
blob
|
commitdiff
|
raw
|
diff to current
2018-08-27
lambda
Merge branch 'bugfix/announce-timeline-flooding' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-26
kaniini
Merge branch 'feature/emoji-in-local-users' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-26
kaniini
Merge branch 'develop' into 'feature/relay'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-20
eal
Merge branch 'fix/redirect-on-user-fetch' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
next