8d2d7a8859
Implement uploader behaviour
...
run formatter <#
2018-08-28 09:57:41 -03:00
0df558a6a5
cleaning up a bit.
2018-08-27 22:45:53 -03:00
709816a0f8
example of flexible storage backends
2018-08-27 22:20:54 -03:00
e95d958b52
sample config: show how amazon s3 support is activated, including third-party clones like wasabi
2018-08-27 23:30:53 +00:00
0f5bff8c66
Merge branch 'develop' into 'feature/relay'
...
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
2018-08-26 21:06:15 +00:00
89e2cb0828
remove unused settings
2018-08-26 17:21:57 +09:00
09cb402203
fe config: add collapse_message_with_subject fe option
2018-08-24 18:21:42 +00:00
183ccd1812
Merge branch 'dev-lanodan-url-regex' into 'develop'
...
lib/pleroma/formatter.ex: Fix URL regex
Closes #127
See merge request pleroma/pleroma!69
2018-08-16 15:41:16 +00:00
9908cf8fda
Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop'
...
Feature / Suggestions API with third party recommendation engine
See merge request pleroma/pleroma!254
2018-08-15 07:47:33 +00:00
7bed350a23
config: allow relaying to be disabled
2018-08-06 08:22:10 +00:00
f72cfada1a
add suggestions/web config
2018-08-02 18:03:35 +09:00
d5091c3175
Allow additionnal schemes in the config
2018-08-01 02:52:42 +02:00
bc2668bb63
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
2018-07-19 17:44:18 -07:00
cc9c062b55
merge
2018-07-19 17:42:00 +09:00
b12d17d2ce
configurable timeout
2018-07-18 13:36:20 +09:00
e4dd58307a
better configuration
2018-07-18 09:58:59 +09:00
2b3f049b06
config: formatting
2018-07-18 00:05:36 +00:00
b23630076f
TwitterAPI: present pleroma frontend config in API
2018-07-17 15:46:24 +00:00
cf219b6add
config: make instance description configurable
2018-07-17 15:46:23 +00:00
091b7925d3
debug
2018-07-17 17:20:13 +09:00
d76f0d87be
do nothing if configuration is skipped
2018-07-17 16:45:18 +09:00
e7c580828c
format
2018-07-15 20:36:26 +09:00
f96244006e
change api
2018-07-14 12:07:09 +09:00
127882a5d5
configurable
2018-07-14 11:41:09 +09:00
5469fb9561
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
2018-07-13 11:14:37 -07:00
748fff6544
Fix auto-shortcode emoji
...
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-30 21:31:08 -04:00
c171f9790b
Move emoji glob setting to config.exs
...
Also, a bit of formatting, and the glob includes an "/emoji/" prefix to
make it more intuitive to users
2018-06-30 17:58:44 -04:00
c67cf8e9af
format...
2018-06-26 13:49:57 -07:00
cb21bf5fc2
filter exif data #187
2018-06-26 13:45:47 -07:00
dfc96f222c
Merge branch 'feature/configurable-blocks' into 'develop'
...
Add more configurability to how blocks work
See merge request pleroma/pleroma!203
2018-06-25 06:12:29 +00:00
92135d00fc
Merge branch 'feature/application-xml-mime' into 'develop'
...
config: add application/xml mimetype support.
See merge request pleroma/pleroma!228
2018-06-24 13:28:42 +00:00
60d6038be5
mrf simple: add accept lists
...
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-19 21:28:24 +00:00
c5bbc46f87
config: add application/xml mimetype support.
...
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-18 05:41:04 +00:00
2e294ee44a
Merge branch 'develop' into feature/configurable-blocks
2018-06-16 15:37:16 -07:00
07f0cfa53f
add allow_followersonly and allow_direct options for configuring mrf_rejectnonpublic
2018-06-10 16:40:51 -07:00
4f9ecfc77a
formatting
2018-06-09 04:28:11 +00:00
b3580b6971
add option to not deny follow if blocked (fixed)
2018-06-08 18:29:41 -07:00
e99c73aeba
add option to not deny follow if blocked
2018-06-08 17:47:24 -07:00
2847fc8f90
add option to not unfollow on block, and option to not federate outgoing blocks
2018-06-08 17:12:16 -07:00
09604182d0
add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.
2018-06-07 14:38:09 +00:00
1c926c7b60
activitypub: allow mastodon S2S block extension support to be disabled
2018-05-26 08:30:41 +00:00
e55c6f311b
Migrate to comeonin 4 and Cachex 3
...
Also fix some warning in the code and add a missing alias
2018-05-20 20:08:40 +02:00
737c42920a
Speling
2018-05-04 22:05:01 +00:00
d30907e573
Make it possible to use custom database connection parameters
2018-05-04 21:00:18 +00:00
a7eb148d61
Optionally deactivate public timelines.
2018-04-25 16:11:07 +02:00
d24ddd9fb9
ActivityPub MRF: implement the SimplePolicy policy
2018-04-14 06:32:45 -05:00
4a178b3d65
ActivityPub: implement MRF core hook and baseline noop policy object
2018-04-14 06:32:44 -05:00
cd543d58a1
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-04-02 13:15:38 +02:00
468e41d50c
Respond to proper ActivityPub type.
2018-04-01 14:58:01 +02:00
4bf86d4cf5
config: make the upload limit configurable
2018-03-31 19:53:23 -05:00
Thurloat
William Pitcock
kaniini
hakabahitoyo
lambda
Haelwenn (lanodan) Monnier
Tristan Mahé
Jorty
squidboi
Thog
Mark Felder
lain