Commit Graph

78 Commits (643f373514081864814930807432dc0740694c69)

Author SHA1 Message Date
kaniini 183ccd1812 Merge branch 'dev-lanodan-url-regex' into 'develop'
6 years ago
lambda 9908cf8fda Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop'
6 years ago
Hakaba Hitoyo f72cfada1a add suggestions/web config
6 years ago
Haelwenn (lanodan) Monnier d5091c3175
Allow additionnal schemes in the config
6 years ago
Tristan Mahé bc2668bb63 Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
6 years ago
Hakaba Hitoyo cc9c062b55 merge
6 years ago
Hakaba Hitoyo b12d17d2ce configurable timeout
6 years ago
Hakaba Hitoyo e4dd58307a better configuration
6 years ago
William Pitcock 2b3f049b06 config: formatting
6 years ago
William Pitcock b23630076f TwitterAPI: present pleroma frontend config in API
6 years ago
William Pitcock cf219b6add config: make instance description configurable
6 years ago
Hakaba Hitoyo 091b7925d3 debug
6 years ago
Hakaba Hitoyo d76f0d87be do nothing if configuration is skipped
6 years ago
hakabahitoyo e7c580828c format
6 years ago
hakabahitoyo f96244006e change api
6 years ago
hakabahitoyo 127882a5d5 configurable
6 years ago
Tristan Mahé 5469fb9561 Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
6 years ago
Jorty 748fff6544 Fix auto-shortcode emoji
6 years ago
Jorty c171f9790b Move emoji glob setting to config.exs
6 years ago
Tristan Mahé c67cf8e9af format...
6 years ago
Tristan Mahé cb21bf5fc2 filter exif data #187
6 years ago
lambda dfc96f222c Merge branch 'feature/configurable-blocks' into 'develop'
6 years ago
lambda 92135d00fc Merge branch 'feature/application-xml-mime' into 'develop'
6 years ago
William Pitcock 60d6038be5 mrf simple: add accept lists
6 years ago
William Pitcock c5bbc46f87 config: add application/xml mimetype support.
6 years ago
squidboi 2e294ee44a Merge branch 'develop' into feature/configurable-blocks
6 years ago
squidboi 07f0cfa53f
add allow_followersonly and allow_direct options for configuring mrf_rejectnonpublic
6 years ago
squidboi 4f9ecfc77a formatting
6 years ago
squidboi b3580b6971 add option to not deny follow if blocked (fixed)
6 years ago
squidboi e99c73aeba add option to not deny follow if blocked
6 years ago
squidboi 2847fc8f90 add option to not unfollow on block, and option to not federate outgoing blocks
6 years ago
William Pitcock 09604182d0 add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.
6 years ago
William Pitcock 1c926c7b60 activitypub: allow mastodon S2S block extension support to be disabled
6 years ago
Thog e55c6f311b
Migrate to comeonin 4 and Cachex 3
6 years ago
Mark Felder 737c42920a Speling
6 years ago
Mark Felder d30907e573 Make it possible to use custom database connection parameters
6 years ago
lain a7eb148d61 Optionally deactivate public timelines.
7 years ago
William Pitcock d24ddd9fb9 ActivityPub MRF: implement the SimplePolicy policy
7 years ago
William Pitcock 4a178b3d65 ActivityPub: implement MRF core hook and baseline noop policy object
7 years ago
lain cd543d58a1 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
lain 468e41d50c Respond to proper ActivityPub type.
7 years ago
William Pitcock 4bf86d4cf5 config: make the upload limit configurable
7 years ago
lain 4e5aa3b3a0 Add gopher server.
7 years ago
lain 4afbef39f4 Format the code.
7 years ago
lain 6dc98aaf89 Clean up prod.exs a bit.
7 years ago
lain 86058c9a88 Return version in instance endpoint, set version to 0.9.0.
7 years ago
lain fbc187ac15 Switch to Jason for json handling.
7 years ago
lain 611ca385de Merge branch 'develop' into feature/activitypub
7 years ago
lain 0e20d5529a Add way to disable federation.
7 years ago
lain 13ea3eafe5 Longer header lenght.
7 years ago