2ac3d341b0
Fix benchmarks
2021-12-12 17:35:02 +00:00
a61207cf8f
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-11-19 13:43:24 +00:00
e2772d6bf1
Merge branch 'block-behavior' into 'develop'
...
Configurable block visibility, fixes #2123
Closes #2123
See merge request pleroma/pleroma!3242
2021-11-15 14:27:59 +00:00
bd9c9136f9
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-09-13 16:14:58 +01:00
1aab9b94b1
fix config
2021-09-13 16:13:42 +01:00
6b3842cf50
Merge branch 'remove/mastofe' into 'develop'
...
Remove MastoFE from Pleroma, fixes #2625
Closes #2625
See merge request pleroma/pleroma!3392
2021-09-07 16:41:53 +00:00
b202cf15d6
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-08-30 22:04:42 +01:00
21720db859
Merge branch 'dkuku-develop-patch-66061' into 'develop'
...
Update dev.exs error message to write to stderr.
See merge request pleroma/pleroma!3492
2021-08-13 12:10:52 +00:00
901204df22
Merge branch 'poll-notification' into 'develop'
...
MastodonAPI: Support poll notification
See merge request pleroma/pleroma!3484
2021-08-09 10:02:37 +00:00
1841bd8383
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe
2021-08-06 08:08:20 -06:00
ee26f2c91b
Quarantine placeholders
...
* kePlaceholder and valuePlaceholder of quarantined_instances where in wrong case, should be snake_case
* The mrf simple and transparency exclusion were already OK
2021-08-06 07:59:54 +02:00
f4028c908c
Add key- and valuePlaceholders for quarantined_instances and mrf_simple
...
* I also added for keywordpolicy as well now. It was done in the admin-fe, but is better to be done here
* I also added comments to explain why we did the _info keys (backwards compatibility)
2021-08-06 07:59:53 +02:00
64002e92ad
config/description.exs: Update quarantine settings to tuples
2021-08-06 07:59:53 +02:00
2519d4eb1a
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-08-02 22:10:01 +01:00
Daniel
5c5571c668
use puts instead warn
2021-07-27 21:01:41 +00:00
Daniel
69ebfb29fb
Update dev.exs error message to write to stderr. Currently it dumps this message at the beginnig of the file when using vim-autoformat with mix format
2021-07-27 20:41:36 +00:00
33a19c002a
Merge remote-tracking branch 'pleroma/develop' into errorview-json-fix
2021-07-27 08:29:53 -05:00
94db0b7cd6
Add activity+json to Phoenix :format_encoders
...
Fixes ErrorView rendering
2021-07-27 08:28:52 -05:00
62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
2021-07-18 11:49:22 -05:00
0114754db2
MastodonAPI: Support poll notification
2021-07-17 22:19:38 -05:00
e56c319e8f
merge
2021-06-27 22:31:37 +01:00
dc4814f0cd
Fix merge conflicts with upstream
2021-06-04 14:42:44 -06:00
a5dce42c85
Merge branch 'chore/rename-chat' into 'develop'
...
Rename the non-federating Chat feature to Shout
See merge request pleroma/pleroma!2842
2021-06-03 15:52:16 +00:00
679d4c23e9
Update wording for relays in docs and config description
2021-06-02 11:30:09 -05:00
297feb73f4
Formatting
2021-06-02 11:21:04 -05:00
dcf84ac12e
disableChat / disableShout didn't actually do anything for PleromaFE
2021-06-01 16:53:32 -05:00
8ff2d8d17d
Update description file for new shout config setting location
2021-06-01 11:49:47 -05:00
d6432a65da
Move shout configuration from :instance, update docs and changelog
2021-06-01 11:49:46 -05:00
36fe8950f7
Update PleromaFE settings for the old chat box
2021-06-01 11:49:16 -05:00
68aa56b9e4
Just call it shout
2021-06-01 11:49:16 -05:00
ff00b354fa
Rename the non-federating Chat feature to Shout
2021-06-01 11:49:14 -05:00
69aed310de
Adding description
2021-05-29 02:22:33 +00:00
a833a2d76b
Merge branch 'plug-runtime-dev' into 'develop'
...
Put Plugs in runtime mode in :dev, :test to speed up recompilation
See merge request pleroma/pleroma!3411
2021-05-28 18:57:45 +00:00
fe40f6f291
Switch from the deprecated "use Mix.config" to "import Config"
2021-05-20 14:02:58 -05:00
0461794375
Merge remote-tracking branch 'pleroma/develop' into plug-runtime-dev
2021-05-19 14:27:59 -05:00
e3173a279d
Put Plugs in runtime mode in :dev, :test to speed up recompilation
2021-05-19 14:27:46 -05:00
32ae8f4906
Merge remote-tracking branch 'pleroma/develop' into optional-config
2021-05-16 12:27:29 -05:00
b22f54eb29
Make prod.secret.exs optional (with warning)
2021-05-16 12:26:32 -05:00
50a644a221
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-05-12 16:13:30 +01:00
762be6ce10
Merge remote-tracking branch 'upstream/develop' into block-behavior
2021-04-29 11:14:32 -05:00
fa2e62078c
Remove MastoFE configuration stuff
2021-04-15 23:51:04 -06:00
2557e805a3
Support for configuration via AdminFE
2021-03-30 11:10:43 -05:00
8b81d62227
Upstream original followbot implementation
2021-03-30 11:10:03 -05:00
5f62b55a6f
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-03-23 23:01:07 +00:00
f930e83fa2
Merge branch 'fix/remove_auto_nsfw' into 'develop'
...
Remove sensitive setting #nsfw
See merge request pleroma/pleroma!3223
2021-03-19 08:48:22 +00:00
292ddf730c
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-03-03 13:51:07 +00:00
882dd46843
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-02 08:26:30 +03:00
3bc7d12271
Remove sensitive-property setting #nsfw, create HashtagPolicy
2021-02-27 21:26:17 +01:00
8f88a90ca3
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/config.ex
2021-02-23 13:58:35 +03:00
77f3da0358
[ #3213 ] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.
2021-02-23 13:52:28 +03:00
Alex Gleason
sadposter
lain
Haelwenn
rinpatch
Sean King
Ilja
Daniel
Mark Felder
Mark Felder
Snow
Ivan Tashkinov
Haelwenn (lanodan) Monnier