projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
[akkoma]
/
config
/
config.exs
2019-02-11
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
2019-02-10
kaniini
Merge branch 'fix/credo-issues' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-09
kaniini
Merge branch 'follow-enhancements' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-09
lambda
Merge branch 'feature/keyword-policy' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-08
lambda
Merge branch 'fix/do-split-migration-for-local-users...
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-08
rinpatch
rename ftl_removal to federated_timeline_removal to...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-08
rinpatch
Add default config for keyword policy
blob
|
commitdiff
|
raw
|
diff to current
2019-02-06
Haelwenn
Merge branch 'bugfix/rich-media-card' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-06
kaniini
Merge branch 'add-admin-and-moderator-fields' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-06
Haelwenn
Merge branch 'mr/exsyslogger-doc-and-format' into ...
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-06
Michael Loftis
rids the duplicate timestamp from default ExSyslogger...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-06
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-05
kaniini
Merge branch 'feature/split-hide-network-v2' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-04
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-04
kaniini
Merge branch 'mime-riff' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-04
rinpatch
Merge branch 'fix/rich-media-relative-path' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-04
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-04
rinpatch
Merge branch 'feature/hellthread-filter-improvements...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-03
Karen Konou
added optional delist feature
blob
|
commitdiff
|
raw
|
diff to current
2019-02-01
href
Merge branch 'develop' into 'develop'
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
lain
Merge remote-tracking branch 'origin/develop' into...
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
lambda
Merge branch 'bugfix/rich-media-non-unicode' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-31
kaniini
Merge branch 'develop' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-31
kaniini
Merge branch 'fix/rich-media-disable-in-config' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-31
rinpatch
Make rich media support toggleable
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-31
Egor Kislitsyn
Merge remote-tracking branch 'MAIN/develop' into featur...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-30
kaniini
Merge branch 'multiple-hackney-pools' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-30
href
Use multiple hackney pools
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-28
Egor Kislitsyn
add a job queue
blob
|
commitdiff
|
raw
|
diff to current
2019-01-28
Ivan Tashkinov
[#534] Merged `upstream/develop`.
blob
|
commitdiff
|
raw
|
diff to current
2019-01-28
Ivan Tashkinov
[#534] Various tweaks. Tests for Instances and Instance.
blob
|
commitdiff
|
raw
|
diff to current
2019-01-28
lain
Change default bg image in new config.
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
Ivan Tashkinov
[#534] Configurable outgoing federation reachability...
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
New frontend configuration mechanism.
blob
|
commitdiff
|
raw
|
diff to current
2019-01-20
lambda
Merge branch 'i1t/pleroma-477_user_search_improvements...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-19
kaniini
Merge branch 'bugfix/improve-boost-targeting' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-19
kaniini
Merge branch '491_full_mentions_in_user_bio' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-18
rinpatch
Fix merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-01-18
rinpatch
unfurl_nsfw: false by default
blob
|
commitdiff
|
raw
|
diff to current
2019-01-17
kaniini
Merge branch '502_instance_stats_active_users_count_fix...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-17
kaniini
Merge branch 'bad-copy-paste' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-17
kaniini
Merge branch 'attachment-links' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-17
Mark Felder
Also add to default config
blob
|
commitdiff
|
raw
|
diff to current
2019-01-16
rinpatch
oops
blob
|
commitdiff
|
raw
|
diff to current
2019-01-15
rinpatch
Introduce get_by_id in Activity, replace newlines with...
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-13
rinpatch
Resolve merge conflict
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-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
next
projects / akkoma / history