Merge branch 'csaurus/pleroma-feature/mstdn-direct-api' into develop
[akkoma] / config /
2018-05-26 lainMerge branch 'develop' into csaurus/pleroma-feature...
2018-05-26 lainMerge branch 'kaniini/pleroma-feature/activitypub-accep...
2018-05-26 lambdaMerge branch 'feature/mastodon-s2s-block-opt-out' into...
2018-05-26 William Pitcockactivitypub: allow mastodon S2S block extension support...
2018-05-24 lambdaMerge branch 'feature/lists' into 'develop'
2018-05-24 lambdaMerge branch 'feature/incoming-remote-unfollow' into...
2018-05-24 lambdaMerge branch 'feature/change-password' into 'develop'
2018-05-23 lambdaMerge branch 'feature/deps-migration' into 'develop'
2018-05-20 ThogMigrate to comeonin 4 and Cachex 3
2018-05-13 lambdaMerge branch 'feature/unrepeats' into 'develop'
2018-05-13 lainMerge branch 'develop' into kaniini/pleroma-bugfix...
2018-05-06 lambdaMerge branch 'feld-varnish' into 'develop'
2018-05-05 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-05-05 lambdaMerge branch 'feld-test.secret' into 'develop'
2018-05-04 Mark FelderMerge branch 'feld-test.secret' into feld-warnings
2018-05-04 Mark FelderSpeling
2018-05-04 Mark FelderMerge branch 'feld-test.secret' into feld-warnings
2018-05-04 Mark FelderMake it possible to use custom database connection...
2018-04-28 lambdaMerge branch 'fix/blocked-user-boosts' into 'develop'
2018-04-28 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2018-04-27 lambdaMerge branch 'bugfix/mrf-simple-media-stripping' into...
2018-04-25 ealMerge branch 'patch-1' into 'develop'
2018-04-25 lainOptionally deactivate public timelines.
2018-04-25 Francis DinhMerge branch 'feature/unrepeats' of git.pleroma.social...
2018-04-25 Francis DinhMerge branch 'develop' of https://git.pleroma.social...
2018-04-24 lambdaMerge branch 'feature/message-rewrite-facility' into...
2018-04-24 lambdaMerge branch 'favicon_tag' into 'develop'
2018-04-14 William PitcockActivityPub MRF: implement the SimplePolicy policy
2018-04-14 William PitcockActivityPub: implement MRF core hook and baseline noop...
2018-04-10 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-02 lambdaMerge branch 'fix-107' into 'develop'
2018-04-02 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-04-01 lainRespond to proper ActivityPub type.
2018-04-01 lambdaMerge branch 'feature/cors' into 'develop'
2018-04-01 lambdaMerge branch 'feature/mastodon-search-tags' into 'develop'
2018-04-01 lambdaMerge branch 'feature/upload-limit' into 'develop'
2018-04-01 KANEKO YoshitakaFix conflict
2018-04-01 William Pitcockconfig: make the upload limit configurable
2018-03-31 lambdaMerge branch 'new-mastofe' into 'develop'
2018-03-31 lainAdd gopher server.
2018-03-30 lainFormat the code.
2018-03-30 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-03-28 lainClean up prod.exs a bit.
2018-03-27 lainReturn version in instance endpoint, set version to...
2018-03-27 lainSwitch to Jason for json handling.
2018-03-08 lambdaMerge branch 'feature/activitypub' into 'develop'
2018-03-08 lainMerge branch 'develop' into feature/activitypub
2018-03-05 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-03-05 lainAdd way to disable federation.
2018-02-24 lainLonger header lenght.
2018-02-21 lainMerge branch 'develop' into feature/activitypub
2018-02-12 lainMerge branch 'develop' into feature/activitypub
2018-02-11 Hakaba HitoyoMerge remote-tracking branch 'hakabahitoyo/feature...
2018-02-11 Roger BraunMerge branch 'develop' into feature/activitypub
2018-02-09 lambdaMerge branch 'develop' into 'develop'
2018-02-08 lambdaMerge branch 'fix/config-disable-chat' into 'develop'
2018-02-03 ealAdd config option for enabling/disabling chat.
2018-01-31 ealRevert renaming emoji.txt
2018-01-31 ealMerge branch 'feature/instance-thumbnail-api' into...
2018-01-31 lambdaMerge branch 'fix/split-custom-emoji' into 'develop'
2018-01-31 ealSplit emoji to default and custom.
2018-01-30 Roger BraunMerge branch 'develop' of git.pleroma.social:pleroma...
2018-01-30 Roger BraunMerge branch 'hakabahitoyo/pleroma-feature/atom-feed...
2018-01-30 lambdaMerge branch 'pr-upstream-http-proxy' into 'develop'
2018-01-30 lambdaMerge branch 'feature/caddyfile' into 'develop'
2018-01-29 Roger BraunMerge branch 'develop' of git.pleroma.social:pleroma...
2018-01-29 Jeff Beckeruse nil instead of empty string
2018-01-27 lambdaMerge branch 'feature/longfox' into 'develop'
2018-01-26 Hakaba Hitoyoadd longfox emojis
2018-01-26 lambdaMerge branch 'feature/cross-origin' into 'develop'
2018-01-24 Jeff BeckerMerge remote-tracking branch 'upstream/develop' into...
2018-01-15 ealMerge branch 'default-pictures' into 'develop'
2018-01-15 ealMerge branch 'prod.exs' into 'develop'
2018-01-14 Hakaba Hitoyo#95 Correct prod.exs
2017-12-30 Jeff Beckerdocs
2017-12-30 Jeff Beckermake httppoison use configurable http proxy
2017-12-20 lambdaMerge branch 'media-proxy' into 'develop'
2017-12-11 Roger BraunBasic incoming AP support.
2017-12-11 hrefMerge remote-tracking branch 'upstream/develop' into...
2017-12-09 Roger BraunMerge branch 'develop' into feature/activitypub
2017-12-05 hrefMerge remote-tracking branch 'upstream/develop' into...
2017-11-28 hrefImprove error handling, add configuration
2017-11-23 Lain IwakuraAdd configuration generation tool, update readme.
2017-11-02 Roger BraunRead variable for testing db.
2017-09-16 Roger BraunMake emoji configurable in files.
2017-09-15 Roger BraunAdd configuration option for registrations.
2017-09-15 Roger BraunRefactor posting and make character limit configurable.
2017-09-15 Roger BraunAdd instance config options.
2017-05-07 Roger BraunMerge branch 'develop' into dtluna/pleroma-feature...
2017-05-05 Roger BraunMock HTTPoison in testing.
2017-05-05 Roger BraunMerge branch 'develop' into dtluna/pleroma-refactor/1
2017-04-28 Roger BraunHandle incoming websub subscriptions.
2017-04-28 dtlunaMerge branch 'develop' of ssh.gitgud.io:lambadalambda...
2017-04-23 lambadalambdaMerge branch 'feature/follow-unfollow-by-screen-name...
2017-04-23 Roger BraunMerge branch 'ostatus' into develop
2017-04-23 Roger BraunMerge branch 'develop' of ssh.gitgud.io:lambadalambda...
2017-04-22 Roger BraunOnly have one subscription per callback.
2017-04-21 Roger BraunMerge branch 'develop' of ssh.gitgud.io:lambadalambda...
2017-04-17 Roger BraunAdd basic webfinger.
2017-03-29 Roger BraunBasic file uploading via TwAPI.
next