sadposter
|
a61207cf8f
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2021-11-19 13:43:24 +00:00 |
|
lain
|
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 |
|
sadposter
|
bd9c9136f9
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2021-09-13 16:14:58 +01:00 |
|
sadposter
|
1aab9b94b1
|
fix config
|
2021-09-13 16:13:42 +01:00 |
|
Haelwenn
|
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 |
|
sadposter
|
b202cf15d6
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2021-08-30 22:04:42 +01:00 |
|
Haelwenn
|
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 |
|
Sean King
|
1841bd8383
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe
|
2021-08-06 08:08:20 -06:00 |
|
sadposter
|
2519d4eb1a
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2021-08-02 22:10:01 +01:00 |
|
Alex Gleason
|
33a19c002a
|
Merge remote-tracking branch 'pleroma/develop' into errorview-json-fix
|
2021-07-27 08:29:53 -05:00 |
|
Alex Gleason
|
94db0b7cd6
|
Add activity+json to Phoenix :format_encoders
Fixes ErrorView rendering
|
2021-07-27 08:28:52 -05:00 |
|
Alex Gleason
|
62bf6d67e3
|
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
|
2021-07-18 11:49:22 -05:00 |
|
Alex Gleason
|
0114754db2
|
MastodonAPI: Support poll notification
|
2021-07-17 22:19:38 -05:00 |
|
sadposter
|
e56c319e8f
|
merge
|
2021-06-27 22:31:37 +01:00 |
|
Sean King
|
dc4814f0cd
|
Fix merge conflicts with upstream
|
2021-06-04 14:42:44 -06:00 |
|
Mark Felder
|
d6432a65da
|
Move shout configuration from :instance, update docs and changelog
|
2021-06-01 11:49:46 -05:00 |
|
Mark Felder
|
68aa56b9e4
|
Just call it shout
|
2021-06-01 11:49:16 -05:00 |
|
Mark Felder
|
ff00b354fa
|
Rename the non-federating Chat feature to Shout
|
2021-06-01 11:49:14 -05:00 |
|
|
|
fe40f6f291
|
Switch from the deprecated "use Mix.config" to "import Config"
|
2021-05-20 14:02:58 -05:00 |
|
sadposter
|
50a644a221
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2021-05-12 16:13:30 +01:00 |
|
Alex Gleason
|
762be6ce10
|
Merge remote-tracking branch 'upstream/develop' into block-behavior
|
2021-04-29 11:14:32 -05:00 |
|
Sean King
|
fa2e62078c
|
Remove MastoFE configuration stuff
|
2021-04-15 23:51:04 -06:00 |
|
Mark Felder
|
8b81d62227
|
Upstream original followbot implementation
|
2021-03-30 11:10:03 -05:00 |
|
sadposter
|
5f62b55a6f
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2021-03-23 23:01:07 +00:00 |
|
rinpatch
|
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 |
|
Haelwenn (lanodan) Monnier
|
3bc7d12271
|
Remove sensitive-property setting #nsfw, create HashtagPolicy
|
2021-02-27 21:26:17 +01:00 |
|
Ivan Tashkinov
|
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 |
|
Ivan Tashkinov
|
77f3da0358
|
[#3213] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.
|
2021-02-23 13:52:28 +03:00 |
|
sadposter
|
5f33699169
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2021-02-20 15:27:56 +00:00 |
|
Ivan Tashkinov
|
b981edad8a
|
[#3213] HashtagsTableMigrator: fault rate allowance to enable the feature (defaults to 1%), counting of affected objects, misc. tweaks.
|
2021-02-18 20:40:10 +03:00 |
|
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.
|
2021-02-17 20:47:38 +03:00 |
|
Ivan Tashkinov
|
349b8b0f4f
|
[#3213] rescue around potentially-raising Repo.insert_all/_ calls. Misc. improvements (docs etc.).
|
2021-02-13 22:01:11 +03:00 |
|
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
|
2021-02-11 19:31:57 +03:00 |
|
Ivan Tashkinov
|
a996ab46a5
|
[#3213] Reorganized hashtags cleanup. Transaction-wrapped Hashtag.get_or_create_by_names/1. Misc. improvements.
|
2021-02-11 19:30:21 +03:00 |
|
|
|
008499f65a
|
Merge branch 'develop' into 'fix/2412-filters'
# Conflicts:
# CHANGELOG.md
|
2021-02-03 14:23:23 +00:00 |
|
Ivan Tashkinov
|
1b49b8efe5
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
|
2021-01-31 20:38:58 +03:00 |
|
Ivan Tashkinov
|
9948ff3356
|
[#3213] Added HashtagsCleanupWorker periodic job.
|
2021-01-31 18:24:19 +03:00 |
|
|
|
d7af0294e6
|
Merge branch 'service-worker-allowed-header' into 'develop'
Ability to set custom HTTP headers per each frontend
See merge request pleroma/pleroma!3247
|
2021-01-26 18:14:01 +00:00 |
|
Alexander Strizhakov
|
875fbaae35
|
support for expires_in/expires_at in filters
|
2021-01-26 08:27:45 +03:00 |
|
sadposter
|
3aa25b008d
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2021-01-23 22:38:07 +00:00 |
|
|
|
003402df40
|
Add ability to invalidate cache entries for Apache
|
2021-01-21 14:20:13 -06:00 |
|
eugenijm
|
7fcaa188a0
|
Allow to define custom HTTP headers per each frontend
|
2021-01-21 21:55:23 +03:00 |
|
Alexander Strizhakov
|
5ade430e46
|
changed naming in changelog
|
2021-01-21 10:13:02 +03:00 |
|
Alexander Strizhakov
|
b4ff63d020
|
configurable limits for ConcurrentLimiter
Pleroma.Web.RichMedia.Helpers & Pleroma.Web.MediaProxy
|
2021-01-21 09:47:21 +03:00 |
|
|
|
2926713fe5
|
Merge branch 'deprecate-public_endpoint' into 'develop'
Deprecate Uploaders.S3, :public_endpoint
See merge request pleroma/pleroma!3251
|
2021-01-20 22:48:48 +00:00 |
|
|
|
086100e3b7
|
Consistent comment style for :ex_aws
|
2021-01-20 16:39:39 -06:00 |
|
|
|
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.
|
2021-01-15 14:50:32 -06:00 |
|
|
|
f0ab60189e
|
truncated_namespace should default to nil
|
2021-01-13 11:54:00 -06:00 |
|
|
|
8b28dce82a
|
Deprecate Pleroma.Uploaders.S3, :public_endpoint
|
2021-01-12 16:31:35 -06:00 |
|
Alex Gleason
|
1438fd9583
|
Merge remote-tracking branch 'upstream/develop' into block-behavior
|
2021-01-06 15:22:35 -06:00 |
|
