projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop'
[akkoma]
/
mix.lock
2019-03-01
lambda
Merge branch 'bugfix/236-ambiguous-route-for-numerical...
blob
|
commitdiff
|
raw
2019-03-01
lambda
Merge branch 'feature/cowboy2' into 'develop'
blob
|
commitdiff
|
raw
2019-02-28
William Pitcock
mix: update dependencies for cowboy 2.0
blob
|
commitdiff
|
raw
2019-02-28
href
Merge branch 'customizable_auth' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-28
href
Merge branch 'customizable_auth' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-26
kaniini
Merge branch 'auto_linker' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-26
Egor
AutoLinker
blob
|
commitdiff
|
raw
|
diff to current
2019-02-26
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-23
kaniini
Merge branch 'add-apache-cache-config' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-23
kaniini
Merge branch 'card-handling' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-23
kaniini
Merge branch 'fix/meck' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-22
Mark Felder
Upate meck to fix tests on MacOS
blob
|
commitdiff
|
raw
|
diff to current
2019-02-22
kaniini
Merge branch 'fix/twittercards' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-21
lambda
Merge branch 'bugfix/httpsig-sign-date' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-21
William Pitcock
mix: add timex dependency
blob
|
commitdiff
|
raw
|
diff to current
2019-02-20
lambda
Merge branch '468_oauth2_scopes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-20
Ivan Tashkinov
[#468] Merged `upstream/develop`.
blob
|
commitdiff
|
raw
|
diff to current
2019-02-19
Ivan Tashkinov
[#468] Merged `upstream/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-14
Wim Vanderbauwhede
Merge remote-tracking branch 'upstream/develop' into...
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-01-13
rinpatch
Resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-01-09
lambda
Merge branch 'scarlett/pleroma-summary-html-api' into...
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
kaniini
Merge branch 'features/syslog_logger' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-06
Haelwenn (lanodan...
Install ex_syslogger
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-03
rinpatch
Merge branch 'fix-chat' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-02
rinpatch
Merge branch 'fix/reserve-media-username' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-01
Maxim Filippov
Add OGP parser
blob
|
commitdiff
|
raw
|
diff to current
2019-01-01
kaniini
Merge branch 'pool-usage' 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
2019-01-01
lain
Update Tesla and Hackney.
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-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
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-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-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 '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
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/theora-detection-read-bytes' into...
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-27
kaniini
Merge branch 'revert-02e43d44' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-27
kaniini
Revert "Merge branch 'chore/mix-lock-update' into ...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-27
kaniini
Merge branch 'chore/mix-lock-update' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-27
Maxim Filippov
Add ex_doc & makeup_elixir to mix.lock
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...
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
lain
Update Mix.lock
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
next