sadposter
|
a61207cf8f
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
3 years ago |
|
lain
|
e2772d6bf1
|
Merge branch 'block-behavior' into 'develop'
Configurable block visibility, fixes #2123
Closes #2123
See merge request pleroma/pleroma!3242
|
3 years ago |
|
sadposter
|
bd9c9136f9
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
3 years ago |
|
sadposter
|
1aab9b94b1
|
fix config
|
3 years ago |
|
Haelwenn
|
6b3842cf50
|
Merge branch 'remove/mastofe' into 'develop'
Remove MastoFE from Pleroma, fixes #2625
Closes #2625
See merge request pleroma/pleroma!3392
|
3 years ago |
|
sadposter
|
b202cf15d6
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
3 years ago |
|
Haelwenn
|
901204df22
|
Merge branch 'poll-notification' into 'develop'
MastodonAPI: Support poll notification
See merge request pleroma/pleroma!3484
|
3 years ago |
|
Sean King
|
1841bd8383
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe
|
3 years ago |
|
sadposter
|
2519d4eb1a
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
3 years ago |
|
Alex Gleason
|
33a19c002a
|
Merge remote-tracking branch 'pleroma/develop' into errorview-json-fix
|
3 years ago |
|
Alex Gleason
|
94db0b7cd6
|
Add activity+json to Phoenix :format_encoders
Fixes ErrorView rendering
|
3 years ago |
|
Alex Gleason
|
62bf6d67e3
|
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
|
3 years ago |
|
Alex Gleason
|
0114754db2
|
MastodonAPI: Support poll notification
|
3 years ago |
|
sadposter
|
e56c319e8f
|
merge
|
3 years ago |
|
Sean King
|
dc4814f0cd
|
Fix merge conflicts with upstream
|
3 years ago |
|
Mark Felder
|
d6432a65da
|
Move shout configuration from :instance, update docs and changelog
|
3 years ago |
|
Mark Felder
|
68aa56b9e4
|
Just call it shout
|
3 years ago |
|
Mark Felder
|
ff00b354fa
|
Rename the non-federating Chat feature to Shout
|
3 years ago |
|
Mark Felder
|
fe40f6f291
|
Switch from the deprecated "use Mix.config" to "import Config"
|
3 years ago |
|
sadposter
|
50a644a221
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
3 years ago |
|
Alex Gleason
|
762be6ce10
|
Merge remote-tracking branch 'upstream/develop' into block-behavior
|
3 years ago |
|
Sean King
|
fa2e62078c
|
Remove MastoFE configuration stuff
|
3 years ago |
|
Mark Felder
|
8b81d62227
|
Upstream original followbot implementation
|
4 years ago |
|
sadposter
|
5f62b55a6f
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
4 years ago |
|
rinpatch
|
f930e83fa2
|
Merge branch 'fix/remove_auto_nsfw' into 'develop'
Remove sensitive setting #nsfw
See merge request pleroma/pleroma!3223
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
3bc7d12271
|
Remove sensitive-property setting #nsfw, create HashtagPolicy
|
4 years ago |
|
Ivan Tashkinov
|
8f88a90ca3
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/config.ex
|
4 years ago |
|
Ivan Tashkinov
|
77f3da0358
|
[#3213] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.
|
4 years ago |
|
sadposter
|
5f33699169
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
4 years ago |
|
Ivan Tashkinov
|
b981edad8a
|
[#3213] HashtagsTableMigrator: fault rate allowance to enable the feature (defaults to 1%), counting of affected objects, misc. tweaks.
|
4 years ago |
|
rinpatch
|
6d66fadea7
|
Remove `:auth, :enforce_oauth_admin_scope_usage`
`admin` scope has been required by default for more than a year now
and all apps that use the API seems to request a proper scope by now.
|
4 years ago |
|
Ivan Tashkinov
|
349b8b0f4f
|
[#3213] `rescue` around potentially-raising `Repo.insert_all/_` calls. Misc. improvements (docs etc.).
|
4 years ago |
|
Ivan Tashkinov
|
5992382cf8
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
# lib/mix/tasks/pleroma/database.ex
# lib/pleroma/web/templates/feed/feed/_activity.rss.eex
|
4 years ago |
|
Ivan Tashkinov
|
a996ab46a5
|
[#3213] Reorganized hashtags cleanup. Transaction-wrapped Hashtag.get_or_create_by_names/1. Misc. improvements.
|
4 years ago |
|
feld
|
008499f65a
|
Merge branch 'develop' into 'fix/2412-filters'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Ivan Tashkinov
|
1b49b8efe5
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Ivan Tashkinov
|
9948ff3356
|
[#3213] Added HashtagsCleanupWorker periodic job.
|
4 years ago |
|
feld
|
d7af0294e6
|
Merge branch 'service-worker-allowed-header' into 'develop'
Ability to set custom HTTP headers per each frontend
See merge request pleroma/pleroma!3247
|
4 years ago |
|
Alexander Strizhakov
|
875fbaae35
|
support for expires_in/expires_at in filters
|
4 years ago |
|
sadposter
|
3aa25b008d
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
4 years ago |
|
Mark Felder
|
003402df40
|
Add ability to invalidate cache entries for Apache
|
4 years ago |
|
eugenijm
|
7fcaa188a0
|
Allow to define custom HTTP headers per each frontend
|
4 years ago |
|
Alexander Strizhakov
|
5ade430e46
|
changed naming in changelog
|
4 years ago |
|
Alexander Strizhakov
|
b4ff63d020
|
configurable limits for ConcurrentLimiter
Pleroma.Web.RichMedia.Helpers & Pleroma.Web.MediaProxy
|
4 years ago |
|
feld
|
2926713fe5
|
Merge branch 'deprecate-public_endpoint' into 'develop'
Deprecate Uploaders.S3, :public_endpoint
See merge request pleroma/pleroma!3251
|
4 years ago |
|
Mark Felder
|
086100e3b7
|
Consistent comment style for :ex_aws
|
4 years ago |
|
Mark Felder
|
f9e0c05ca4
|
Only run one attachment cleanup job per node
The previous limit of 5 was probably causing massing performance issues due to concurrent full table scans.
|
4 years ago |
|
Mark Felder
|
f0ab60189e
|
truncated_namespace should default to nil
|
4 years ago |
|
Mark Felder
|
8b28dce82a
|
Deprecate Pleroma.Uploaders.S3, :public_endpoint
|
4 years ago |
|
Alex Gleason
|
1438fd9583
|
Merge remote-tracking branch 'upstream/develop' into block-behavior
|
4 years ago |
