aboutsummaryrefslogtreecommitdiff
path: root/config
AgeCommit message (Collapse)Author
2018-08-01Allow additionnal schemes in the configHaelwenn (lanodan) Monnier
2018-07-19Merge remote-tracking branch 'upstream/develop' into feature/filter_exifTristan Mahé
2018-07-19mergeHakaba Hitoyo
2018-07-18configurable timeoutHakaba Hitoyo
2018-07-18better configurationHakaba Hitoyo
2018-07-18config: formattingWilliam Pitcock
2018-07-17TwitterAPI: present pleroma frontend config in APIWilliam Pitcock
2018-07-17config: make instance description configurableWilliam Pitcock
2018-07-17debugHakaba Hitoyo
2018-07-17do nothing if configuration is skippedHakaba Hitoyo
2018-07-15formathakabahitoyo
2018-07-14change apihakabahitoyo
2018-07-14configurablehakabahitoyo
2018-07-13Merge remote-tracking branch 'upstream/develop' into feature/filter_exifTristan Mahé
2018-06-30Fix auto-shortcode emojiJorty
Emoji were broken due to `Pleroma.Formatter` not knowing about the auto-shortcode emoji. This moves that logic from `Pleroma.Web.TwitterAPI.UtilController` to `Pleroma.Formatter`. Additionally, it's now possible to specify multiple shortcode globs, and the default globs were changed to `["/emoji/custom/**/*.png"]`, since that's in the .gitignore and the files there would have to be shortcode emoji anyway.
2018-06-30Move emoji glob setting to config.exsJorty
Also, a bit of formatting, and the glob includes an "/emoji/" prefix to make it more intuitive to users
2018-06-26format...Tristan Mahé
2018-06-26filter exif data #187Tristan Mahé
2018-06-25Merge branch 'feature/configurable-blocks' into 'develop'lambda
Add more configurability to how blocks work See merge request pleroma/pleroma!203
2018-06-24Merge branch 'feature/application-xml-mime' into 'develop'lambda
config: add application/xml mimetype support. See merge request pleroma/pleroma!228
2018-06-19mrf simple: add accept listsWilliam Pitcock
accept lists supplement reject lists by requiring that any message accepted by contained by the accept list. in other words, this functionality can be used to implement instances similar to awoo.space.
2018-06-18config: add application/xml mimetype support.William Pitcock
application/xml is the older xml mimetype. some legacy scripts make use of it, as well as common use for debugging with curl and other tools. so it makes sense to have it alongside text/xml.
2018-06-16Merge branch 'develop' into feature/configurable-blockssquidboi
2018-06-10add allow_followersonly and allow_direct options for configuring ↵squidboi
mrf_rejectnonpublic
2018-06-09formattingsquidboi
2018-06-08add option to not deny follow if blocked (fixed)squidboi
2018-06-08add option to not deny follow if blockedsquidboi
2018-06-08add option to not unfollow on block, and option to not federate outgoing blockssquidboi
2018-06-07add the ability to 'quarantine' an activitypub peer, causing them to be ↵William Pitcock
treated as an OStatus peer.
2018-05-26activitypub: allow mastodon S2S block extension support to be disabledWilliam Pitcock
2018-05-20Migrate to comeonin 4 and Cachex 3Thog
Also fix some warning in the code and add a missing alias
2018-05-04SpelingMark Felder
2018-05-04Make it possible to use custom database connection parametersMark Felder
2018-04-25Optionally deactivate public timelines.lain
2018-04-14ActivityPub MRF: implement the SimplePolicy policyWilliam Pitcock
2018-04-14ActivityPub: implement MRF core hook and baseline noop policy objectWilliam Pitcock
2018-04-02Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain
2018-04-01Respond to proper ActivityPub type.lain
2018-03-31config: make the upload limit configurableWilliam Pitcock
2018-03-31Add gopher server.lain
2018-03-30Format the code.lain
2018-03-28Clean up prod.exs a bit.lain
2018-03-27Return version in instance endpoint, set version to 0.9.0.lain
2018-03-27Switch to Jason for json handling.lain
It's twice as fast and will be the standard in the coming ecto.
2018-03-08Merge branch 'develop' into feature/activitypublain
2018-03-05Add way to disable federation.lain
2018-02-24Longer header lenght.lain
2018-02-11Merge branch 'develop' into feature/activitypubRoger Braun
2018-02-03Add config option for enabling/disabling chat.eal
2018-01-31Revert renaming emoji.txteal