nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
14756 commits 2 branches 0 tags 272 MiB
Commit graph

1274 commits

Author SHA1 Message Date
Ekaterina Vaartis 88891e9d76 Add tests for local post indexing for meilisearch 2022-06-29 20:48:29 +01:00
Ekaterina Vaartis e961cf2689 Initial meilisearch implementation, doesn't delete posts yet 2022-06-29 20:48:28 +01:00
FloatingGhost e22f3ce89c don't enable static-fe 2022-06-29 12:16:00 +01:00
FloatingGhost 22090b2fd1 re-add gopher to URLs, fix markdown 2022-06-29 12:12:48 +01:00
FloatingGhost 1c8a2cf901 Update README, add migration docs 2022-06-29 12:05:59 +01:00
floatingghost 2342fface1 Add visibility check in context path (#26) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/26
 2022-06-29 09:33:57 +00:00
FloatingGhost 064c36274c Purge gopher frontend 2022-06-27 17:31:16 +01:00
floatingghost e6cd61619f Purge SSH frontend (#23) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/23
 2022-06-27 11:32:06 +00:00
FloatingGhost f15c9e8b08 format everything 2022-06-15 18:22:30 +01:00
FloatingGhost 5b11543c96 update pleroma-fe url 2022-06-15 18:18:23 +01:00
FloatingGhost abefbcec64 Merge branch 'mfm' into develop 2022-06-14 16:25:47 +01:00
FloatingGhost 4fb2251221 Allow authoring MFM 2022-06-14 15:56:12 +01:00
sn0w 60bfaed368
Allow reacting with emojis containing a number 2022-06-14 11:47:09 +02:00
FloatingGhost 32fbd2e4e3 fix all tests 2022-06-11 16:14:22 +01:00
FloatingGhost 142646426e fix emoji tests 2022-06-11 14:08:54 +01:00
FloatingGhost 0f6bece60d Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop 2022-01-08 21:45:12 +00:00
FloatingGhost 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
FloatingGhost 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
Alibek Omarov f02715c4b2 Fix lint errors 2021-12-27 03:42:03 +03:00
Alibek Omarov 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
FloatingGhost de60b1f3c1 make search provider configurable 2021-12-12 17:35:35 +00:00
FloatingGhost 449d8ff165 integrate search endpoint with ES 2021-12-12 17:35:35 +00:00
Alex Gleason 2ac3d341b0 Fix benchmarks 2021-12-12 17:35:02 +00:00
lain 613f55b078 Merge branch 'benchmark' into 'develop' 
Fix benchmarks

See merge request pleroma/pleroma!3551
 2021-12-06 21:16:30 +00:00
Alex Gleason ce4560c2a1
Fix benchmarks 2021-12-03 16:20:54 -05: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
rinpatch 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
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
Ilja 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
Ilja 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
Ilja 64002e92ad
config/description.exs: Update quarantine settings to tuples 2021-08-06 07:59:53 +02:00
sadposter 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
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
Haelwenn 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
Mark Felder 679d4c23e9 Update wording for relays in docs and config description 2021-06-02 11:30:09 -05:00
Mark Felder 297feb73f4 Formatting 2021-06-02 11:21:04 -05:00
Mark Felder dcf84ac12e disableChat / disableShout didn't actually do anything for PleromaFE 2021-06-01 16:53:32 -05:00
Mark Felder 8ff2d8d17d Update description file for new shout config setting location 2021-06-01 11:49:47 -05:00
Mark Felder d6432a65da Move shout configuration from :instance, update docs and changelog 2021-06-01 11:49:46 -05:00
Mark Felder 36fe8950f7 Update PleromaFE settings for the old chat box 2021-06-01 11:49:16 -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
Snow 69aed310de Adding description 2021-05-29 02:22:33 +00:00
feld 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
Mark Felder fe40f6f291 Switch from the deprecated "use Mix.config" to "import Config" 2021-05-20 14:02:58 -05:00
Alex Gleason 0461794375
Merge remote-tracking branch 'pleroma/develop' into plug-runtime-dev 2021-05-19 14:27:59 -05:00
Alex Gleason e3173a279d
Put Plugs in runtime mode in :dev, :test to speed up recompilation 2021-05-19 14:27:46 -05:00
Alex Gleason 32ae8f4906
Merge remote-tracking branch 'pleroma/develop' into optional-config 2021-05-16 12:27:29 -05:00
Alex Gleason b22f54eb29
Make prod.secret.exs optional (with warning) 2021-05-16 12:26:32 -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 2557e805a3 Support for configuration via AdminFE 2021-03-30 11:10:43 -05: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
sadposter 292ddf730c Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2021-03-03 13:51:07 +00:00
Ivan Tashkinov 882dd46843 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework 2021-03-02 08:26:30 +03: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
Ivan Tashkinov a98c4423f3 Apply i1t's suggestion(s) to 1 file(s) 2021-02-22 20:41:57 +00:00
sadposter 5f33699169 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2021-02-20 15:27:56 +00:00
Mark Felder db7d6f337f Avoid unnecessary 500ms sleeps from CommonAPI.follow when the target user is remote 2021-02-19 18:37:37 -06: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
rinpatch a52cedba62 Merge branch 'chore/descriptions-improvements' into 'develop' 
More descriptions improvements

See merge request pleroma/pleroma!3307
 2021-02-08 19:21:01 +00:00
Mark Felder ce7c275fb3 Improve various descriptions and labels 2021-02-08 11:45:50 -06:00
Mark Felder 2bffa8e020 Make the suggestion match the default value 2021-02-08 11:25:32 -06:00
Mark Felder 4dbb08a19f Improved Mailer descriptions 2021-02-08 10:08:33 -06:00
Ivan Tashkinov d1c6dd97aa [#3213] Partially addressed code review points. 
migration rollback task changes, hashtags-related config handling tweaks, `hashtags.data` deletion (unused).
 2021-02-07 22:24:12 +03:00
Mark Felder f736501e97 Alpha-sort adapters 
Add various labels, descriptions and suggestions for all adapter settings and try to use
the same terminology by the service provider.
 2021-02-06 13:18:48 -06:00
Mark Felder 0fcf16dcb8 Move Enabled to top as it's the master control of all email. Description not really needed. 2021-02-06 12:34:32 -06:00
Mark Felder bd828e5c9c More description improvements 2021-02-06 12:28:49 -06:00
Mark Felder 227dd84f11 Update SMTP error description and default value 2021-02-06 12:06:47 -06:00
Mark Felder 9e3e8e2e30 Update Swoosh docs URL, lint 2021-02-06 12:04:28 -06:00
Mark Felder cfc474c5f7 There is no reason to expose these Local adapter settings either. 2021-02-06 12:01:11 -06:00