Ekaterina Vaartis
|
e961cf2689
|
Initial meilisearch implementation, doesn't delete posts yet
|
2022-06-29 20:48:28 +01:00 |
|
|
|
2342fface1
|
Add visibility check in context path (#26)
Reviewed-on: AkkomaGang/akkoma#26
|
2022-06-29 09:33:57 +00:00 |
|
|
|
064c36274c
|
Purge gopher frontend
|
2022-06-27 17:31:16 +01:00 |
|
|
|
e6cd61619f
|
Purge SSH frontend (#23)
Reviewed-on: AkkomaGang/akkoma#23
|
2022-06-27 11:32:06 +00:00 |
|
|
|
f15c9e8b08
|
format everything
|
2022-06-15 18:22:30 +01:00 |
|
|
|
5b11543c96
|
update pleroma-fe url
|
2022-06-15 18:18:23 +01:00 |
|
|
|
4fb2251221
|
Allow authoring MFM
|
2022-06-14 15:56:12 +01:00 |
|
|
|
32fbd2e4e3
|
fix all tests
|
2022-06-11 16:14:22 +01:00 |
|
|
|
0f6bece60d
|
Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop
|
2022-01-08 21:45:12 +00:00 |
|
|
|
0d012ebea1
|
Revert "Merge branch 'remove/mastofe' into 'develop'"
This reverts commit 6b3842cf50, reversing
changes made to 6b1282a829.
|
2022-01-08 21:44:37 +00:00 |
|
|
|
12a171844b
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2021-12-30 18:05:22 +00:00 |
|
Alex Gleason
|
a659428024
|
Merge branch 'restricted-moderators' into 'develop'
AdminAPI: Optionally restrict moderators from accessing sensitive data
See merge request pleroma/pleroma!3578
|
2021-12-27 17:06:22 +00:00 |
|
Alex Gleason
|
6e27fc9c12
|
Merge branch 'log-slow-queries' into 'develop'
Log slow Ecto queries
See merge request pleroma/pleroma!3553
|
2021-12-27 15:41:06 +00:00 |
|
Ivan Tashkinov
|
08c0f09bad
|
Made slow queries logging disabled by default.
|
2021-12-27 09:13:31 +03:00 |
|
|
|
cd1041c3a4
|
API: optionally restrict moderators from accessing sensitive data
|
2021-12-27 02:27:48 +03:00 |
|
Ivan Tashkinov
|
3e9e7178bc
|
Configurability of slow queries logging ([:pleroma, :telemetry, :slow_queries_logging]). Adjusted log messages truncation to 65 kb (was default: 8 kb). Non-truncated logging of slow query params.
|
2021-12-26 22:49:00 +03:00 |
|
marcin mikołajczak
|
de006443f0
|
MastoAPI: Profile directory
|
2021-12-26 02:35:17 +00:00 |
|
Alex Gleason
|
e1b89fe3aa
|
Merge remote-tracking branch 'origin/develop' into live-dashboard
|
2021-12-15 19:05:36 -05:00 |
|
Alex Gleason
|
29d80b39f2
|
Add Phoenix LiveDashboard
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
|
2021-12-15 19:05:27 -05:00 |
|
|
|
de60b1f3c1
|
make search provider configurable
|
2021-12-12 17:35:35 +00:00 |
|
|
|
449d8ff165
|
integrate search endpoint with ES
|
2021-12-12 17:35:35 +00:00 |
|
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 |
|
