projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Resolve merge conflict
[akkoma]
/
config
/
config.exs
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-10
kaniini
Merge branch 'mass-follow' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-10
kaniini
Merge branch 'dm-optimizations' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-10
kaniini
Merge branch 'fix-alphasort' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-10
Mark Felder
Alpha sort the restricted nicknames
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-09
Egor Kislitsyn
move defaults from sample_config.exs to config.exs
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-09
kaniini
Merge branch 'hotfix/media-proxy-uri' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-08
rinpatch
Merge branch 'autofollow' into 'develop'
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-08
lain
Add a setting for users to autofollow on sign up.
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...
config/config.exs: Add syslog backends
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-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-04
kaniini
Merge branch 'activitypub-c2s-delete-activity' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-03
kaniini
Merge branch 'mr/retry-queue-remove-fold' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-03
kaniini
Merge branch 'media-proxy-remove-empty-conf-defaults...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-03
href
Remove media proxy examples in config/config.exs
blob
|
commitdiff
|
raw
|
diff to current
2019-01-03
kaniini
Merge branch 'fix/follow-requests-deleted-accounts...
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-02
Rin Toshaka
reserve /media
blob
|
commitdiff
|
raw
|
diff to current
2019-01-02
lain
Add handler for Phoenix-style socket.
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
rinpatch
Merge branch 'configurable-federator' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-01
lain
Make Federator options configurable.
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-30
Rin Toshaka
Resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2018-12-29
Haelwenn
Merge branch 'fix_485' into 'develop'
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 '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
lambda
Raise remote limit
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
kaniini
Merge branch 'feature/create-tombstone-instead-of-delet...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-27
kaniini
Merge branch 'reserve-user-names' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-26
Ekaterina Vaartis
Up captcha timer to 60 secs again, save used captchas...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-26
lain
Add 'about' to restricted list.
blob
|
commitdiff
|
raw
|
diff to current
2018-12-26
lain
Add ~ to the list of restricted names.
blob
|
commitdiff
|
raw
|
diff to current
2018-12-26
lain
Add some hard limits on inserted activities.
blob
|
commitdiff
|
raw
|
diff to current
2018-12-25
lain
Reserve a few user names
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-23
kaniini
Merge branch 'feature/hellthread-mitigation' into ...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-23
Karen Konou
Renamed the things
blob
|
commitdiff
|
raw
|
diff to current
2018-12-22
Karen Konou
Fix formatting
blob
|
commitdiff
|
raw
|
diff to current
2018-12-22
Karen Konou
Implement large thread filter
blob
|
commitdiff
|
raw
|
diff to current
2018-12-21
Ekaterina Vaartis
Make captcha (kocaptcha) stateless
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 '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
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
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-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
Cowboy handler for Mastodon WebSocket
blob
|
commitdiff
|
raw
|
diff to current
2018-12-16
Ekaterina Vaartis
Change minutes_retained config to seconds_retained
blob
|
commitdiff
|
raw
|
diff to current
2018-12-16
Ekaterina Vaartis
Make the hosted kocaptcha the default value
blob
|
commitdiff
|
raw
|
diff to current
2018-12-16
Ekaterina Vaartis
Add a configurable auto-cleanup for captchas
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
Ekaterina Vaartis
Add captcha documentation to config.md
blob
|
commitdiff
|
raw
|
diff to current
2018-12-15
Ekaterina Vaartis
Formatting fixes
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
Haelwenn (lanodan...
config/config.exs: Add application/jrd+json => jrd...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-15
Ekaterina Vaartis
Add an ability to disabled captcha
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
raeno
Merge branch 'develop' into oembed_provider
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] 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
Add opengraph/twitter_card:summary support. Add config...
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
scarlett
Merge branch 'new-fe-options' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
scarlett
Add new frontend options to server-side 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-09
Maxim Filippov
Use "~" as a route namespace symbol on FE
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
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
next
projects / akkoma / history